litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Working on short view for educational background.

Browse source
This commit is contained in:
bdc34 2010-04-03 22:42:06 +00:00
parent c0c802af96
commit 42f8aed42e
2 changed files with 38 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
productMods/edit/forms/personHasEducationalBackground.jsp
View file

@ -30,7 +30,7 @@
vreq.setAttribute("defaultNamespace", ""); //empty string triggers default new URI behavior vreq.setAttribute("defaultNamespace", ""); //empty string triggers default new URI behavior
String flagURI = null; String flagURI = null;
if (vreq.getAppBean().isFlag1Active()) { if (wdf.getApplicationDao().isFlag1Active()) {
flagURI = VitroVocabulary.vitroURI+"Flag1Value"+vreq.getPortal().getPortalId()+"Thing"; flagURI = VitroVocabulary.vitroURI+"Flag1Value"+vreq.getPortal().getPortalId()+"Thing";
} else { } else {
flagURI = wdf.getVClassDao().getTopConcept().getURI(); // fall back to owl:Thing if not portal filtering flagURI = wdf.getVClassDao().getTopConcept().getURI(); // fall back to owl:Thing if not portal filtering

49
productMods/templates/entity/edBackgroundShortView.jsp
View file

@ -10,6 +10,12 @@
In this JSP that is the Educational Background, not the Person, Organization or DegreeType In this JSP that is the Educational Background, not the Person, Organization or DegreeType
--%> --%>
<c:if test="${sessionScope.loginHandler != null &&
sessionScope.loginHandler.loginStatus == 'authenticated' &&
sessionScope.loginHandler.loginRole >= sessionScope.loginHandler.dba }">
<c:set var="showEdBackgroundContextNode" value="true"/>
</c:if>
<c:choose> <c:choose>
<c:when test="${!empty individual}"> <c:when test="${!empty individual}">
<c:choose> <c:choose>
@ -18,8 +24,22 @@
<c:set var="year" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#year'].dataPropertyStatements[0].data}"/> <c:set var="year" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#year'].dataPropertyStatements[0].data}"/>
<c:set var="degreeMajor" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#majorField'].dataPropertyStatements[0].data}"/> <c:set var="degreeMajor" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#majorField'].dataPropertyStatements[0].data}"/>
<c:set var="degreeSupplementalInfo" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#supplementalInformation'].dataPropertyStatements[0].data}"/>
<c:if test="${ not empty degreeSupplementalInfo }">
<c:set var="degreeSupplementalInfo" value=", ${degreeSupplementalInfo}"/>
</c:if>
<c:set var="selectedOrganization" value="${individual.objectPropertyMap['http://vivoweb.org/ontology/core#organizationGrantingDegree'].objectPropertyStatements[0].object}"/> <c:set var="selectedOrganization" value="${individual.objectPropertyMap['http://vivoweb.org/ontology/core#organizationGrantingDegree'].objectPropertyStatements[0].object}"/>
<c:set var="selectedOrganizationName" value="${selectedOrganization.name}"/> <c:url var="selectedOrganizationURL" value="/individual">
<c:param name="uri" value="${selectedOrganization.URI}"/>
</c:url>
<c:set var="selectedOrganizationStr" >, <a href='${selectedOrganizationURL}'><p:process>${selectedOrganization.name}</p:process></a></c:set>
<c:set var="degreeDeptOrSchool" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#departmentOrSchool'].dataPropertyStatements[0].data}"/>
<c:if test="${ not empty degreeDeptOrSchool }">
<c:set var="selectedOrganizationStr">${selectedOrganizationStr}, <p:process>${degreeDeptOrSchool}</p:process></c:set>
</c:if>
<c:set var="degreeType" value="${individual.objectPropertyMap['http://vivoweb.org/ontology/core#degreeTypeAwarded'].objectPropertyStatements[0].object}"/> <c:set var="degreeType" value="${individual.objectPropertyMap['http://vivoweb.org/ontology/core#degreeTypeAwarded'].objectPropertyStatements[0].object}"/>
<c:set var="degreeAbbreviation" value="${degreeType.dataPropertyMap['http://vivoweb.org/ontology/core#degreeAbbreviation'].dataPropertyStatements[0].data}"/> <c:set var="degreeAbbreviation" value="${degreeType.dataPropertyMap['http://vivoweb.org/ontology/core#degreeAbbreviation'].dataPropertyStatements[0].data}"/>
@ -27,25 +47,26 @@
<c:set var="degreeAbbreviation" value="${degreeType.name}"/> <c:set var="degreeAbbreviation" value="${degreeType.name}"/>
</c:if> </c:if>
<c:url var="objLink" value="/individual"><c:param name="uri" value="${individual.URI}"/></c:url>
<c:if test="${showEdBackgroundContextNode}">
<c:set var="contextNodeURL" value="<a href='${objLink}'> context node</a>"/>
</c:if>
<c:choose> <c:choose>
<c:when test="${! empty year && ! empty degreeMajor && ! empty selectedOrganizationName && ! empty degreeAbbreviation }"> <%-- degreeMajor, year, org and abbreviation are all required --%>
<c:url var="objLink" value="/individual"><c:param name="uri" value="${individual.URI}"/></c:url> <c:when test="${! empty year && ! empty degreeMajor && ! empty selectedOrganizationStr }">
<a href="<c:out value="${objLink}"/>"><p:process>${degreeAbbreviation} in ${degreeMajor}</p:process></a> <p:process>${selectedOrganizationName}, ${year}</p:process> <p:process>${degreeAbbreviation} in ${degreeMajor}</p:process> ${selectedOrganizationStr},<p:process> ${year} ${degreeSupplementalInfo}</p:process> ${contextNodeURL }
</c:when> </c:when>
<c:when test="${! empty year && empty degreeMajor && ! empty selectedOrganizationName && ! empty degreeAbbreviation }"> <c:when test="${! empty year && empty degreeMajor && ! empty selectedOrganizationStr }">
<c:url var="objLink" value="/individual"><c:param name="uri" value="${individual.URI}"/></c:url> <p:process>${degreeAbbreviation}</p:process> ${selectedOrganizationStr},<p:process> ${year} ${degreeDeptOrSchool} ${degreeSupplementalInfo}</p:process> ${contextNodeURL }
<a href="<c:out value="${objLink}"/>"><p:process>${degreeAbbreviation}</p:process></a> <p:process>${selectedOrganizationName}, ${year}</p:process>
</c:when> </c:when>
<c:when test="${ empty year && empty degreeMajor && ! empty selectedOrganizationName && ! empty degreeAbbreviation }"> <c:when test="${ empty year && empty degreeMajor && ! empty selectedOrganizationStr }">
<c:url var="objLink" value="/individual"><c:param name="uri" value="${individual.URI}"/></c:url> <p:process>${degreeAbbreviation}</p:process> {selectedOrganizationStr} <p:process> ${degreeDeptOrSchool} ${degreeSupplementalInfo}</p:process> ${contextNodeURL }
<a href="<c:out value="${objLink}"/>"><p:process>${degreeAbbreviation}</p:process></a> <p:process>${selectedOrganizationName}</p:process>
</c:when> </c:when>
<c:when test="${ ! empty year && empty degreeMajor && empty selectedOrganizationName && ! empty degreeAbbreviation }"> <c:when test="${ ! empty year && empty degreeMajor && empty selectedOrganizationStr }">
<c:url var="objLink" value="/individual"><c:param name="uri" value="${individual.URI}"/></c:url> <p:process>${degreeAbbreviation} ${year} ${degreeDeptOrSchool} ${degreeSupplementalInfo}</p:process> ${contextNodeURL }
<a href="<c:out value="${objLink}"/>"><p:process>${degreeAbbreviation}</p:process></a> <p:process>${year}</p:process>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<c:url var="objLink" value="/individual"><c:param name="uri" value="${individual.URI}"/></c:url>
<a href="${objLink}"><p:process>${individual.name}</p:process></a> <a href="${objLink}"><p:process>${individual.name}</p:process></a>
</c:otherwise> </c:otherwise>
</c:choose> </c:choose>