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:59:54 +00:00
parent 01d92c5c2d
commit d5b1d77b38
1 changed files with 5 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -10,12 +10,6 @@
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:when test="${!empty individual}">
<c:choose>
@ -47,24 +41,19 @@
<c:set var="degreeAbbreviation" value="${degreeType.name}"/>
</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>
<%-- degreeMajor, year, org and abbreviation are all required --%>
<c:when test="${!empty degreeAbbreviation && ! empty year && ! empty degreeMajor && ! empty selectedOrganizationStr }">
<p:process>${degreeAbbreviation} in ${degreeMajor}</p:process> ${selectedOrganizationStr},<p:process> ${year} ${degreeSupplementalInfo}</p:process> ${contextNodeURL }
<p:process>${degreeAbbreviation} in ${degreeMajor}</p:process> ${selectedOrganizationStr},<p:process> ${year} ${degreeSupplementalInfo}</p:process>
</c:when>
<c:when test="${!empty degreeAbbreviation && ! empty year && empty degreeMajor && ! empty selectedOrganizationStr }">
<p:process>${degreeAbbreviation}</p:process> ${selectedOrganizationStr},<p:process> ${year} ${degreeDeptOrSchool} ${degreeSupplementalInfo}</p:process> ${contextNodeURL }
<p:process>${degreeAbbreviation}</p:process> ${selectedOrganizationStr},<p:process> ${year} ${degreeDeptOrSchool} ${degreeSupplementalInfo}</p:process>
</c:when>
<c:when test="${!empty degreeAbbreviation && empty year && empty degreeMajor && ! empty selectedOrganizationStr }">
<p:process>${degreeAbbreviation}</p:process> {selectedOrganizationStr} <p:process> ${degreeDeptOrSchool} ${degreeSupplementalInfo}</p:process> ${contextNodeURL }
<p:process>${degreeAbbreviation}</p:process> {selectedOrganizationStr} <p:process> ${degreeDeptOrSchool} ${degreeSupplementalInfo}</p:process>
</c:when>
<c:when test="${!empty degreeAbbreviation && ! empty year && empty degreeMajor && empty selectedOrganizationStr }">
<p:process>${degreeAbbreviation} ${year} ${degreeDeptOrSchool} ${degreeSupplementalInfo}</p:process> ${contextNodeURL }
<p:process>${degreeAbbreviation} ${year} ${degreeDeptOrSchool} ${degreeSupplementalInfo}</p:process>
</c:when>
<c:otherwise>
<a href="${objLink}"><p:process>educational background ${individual.name}</p:process></a>