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

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

@ -54,20 +54,20 @@
<c:choose>
<%-- degreeMajor, year, org and abbreviation are all required --%>
<c:when test="${! empty year && ! empty degreeMajor && ! empty selectedOrganizationStr }">
<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 }
</c:when>
<c:when test="${! empty year && empty degreeMajor && ! empty selectedOrganizationStr }">
<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 }
</c:when>
<c:when test="${ empty year && empty degreeMajor && ! empty selectedOrganizationStr }">
<c:when test="${!empty degreeAbbreviation && empty year && empty degreeMajor && ! empty selectedOrganizationStr }">
<p:process>${degreeAbbreviation}</p:process> {selectedOrganizationStr} <p:process> ${degreeDeptOrSchool} ${degreeSupplementalInfo}</p:process> ${contextNodeURL }
</c:when>
<c:when test="${ ! empty year && empty degreeMajor && empty selectedOrganizationStr }">
<c:when test="${!empty degreeAbbreviation && ! empty year && empty degreeMajor && empty selectedOrganizationStr }">
<p:process>${degreeAbbreviation} ${year} ${degreeDeptOrSchool} ${degreeSupplementalInfo}</p:process> ${contextNodeURL }
</c:when>
<c:otherwise>
<a href="${objLink}"><p:process>${individual.name}</p:process></a>
<a href="${objLink}"><p:process>educational background ${individual.name}</p:process></a>
</c:otherwise>
</c:choose>
</c:when>
@ -80,28 +80,28 @@
<c:set var="selectedOrganization" value="${individual.objectPropertyMap['http://vivoweb.org/ontology/core#organizationGrantingDegree'].objectPropertyStatements[0].object}"/>
<c:set var="selectedOrganizationName" value="${selectedOrganization.name}"/>
<c:set var="personName" value="${individual.objectPropertyMap['http://vivoweb.org/ontology/core#educationalBackgroundOf'].objectPropertyStatements[0].object.name}"/>
<c:set var="person" value="${individual.objectPropertyMap['http://vivoweb.org/ontology/core#educationalBackgroundOf'].objectPropertyStatements[0].object}"/>
<c:set var="personName" value="${person.name}"/>
<c:url var="personURL" value="/individual"><c:param name="uri" value="${person.URI}"/></c:url>
<c:set var="personLink" ><a href='${personURL}'><p:process>${personName}</p:process></a></c:set>
<c:url var="objLink" value="/individual"><c:param name="uri" value="${individual.URI}"/></c:url>
<c:choose>
<c:when test="${! empty personName && ! empty year && ! empty degreeMajor && ! empty selectedOrganizationName }">
<c:url var="objLink" value="/individual"><c:param name="uri" value="${individual.URI}"/></c:url>
<a href="<c:out value="${objLink}"/>"><p:process>${personName} in ${degreeMajor}</p:process></a> <p:process>${selectedOrganizationName}, ${year}</p:process>
${personLink} <p:process> in ${degreeMajor}, ${selectedOrganizationName}, ${year}</p:process>
</c:when>
<c:when test="${! empty personName && empty year && ! empty degreeMajor && ! empty selectedOrganizationName }">
<c:url var="objLink" value="/individual"><c:param name="uri" value="${individual.URI}"/></c:url>
<a href="<c:out value="${objLink}"/>"><p:process>${personName} in ${degreeMajor}</p:process></a> <p:process>${selectedOrganizationName}</p:process>
${personLink} <p:process> in ${degreeMajor}, ${selectedOrganizationName}</p:process>
</c:when>
<c:when test="${! empty personName && empty year && ! empty degreeMajor && empty selectedOrganizationName }">
<c:url var="objLink" value="/individual"><c:param name="uri" value="${individual.URI}"/></c:url>
<a href="<c:out value="${objLink}"/>"><p:process>${personName} in ${degreeMajor}</p:process></a>
${personLink} <p:process> in ${degreeMajor}</p:process>
</c:when>
<c:when test="${! empty personName && ! empty year && empty degreeMajor && ! empty selectedOrganizationName }">
<c:url var="objLink" value="/individual"><c:param name="uri" value="${individual.URI}"/></c:url>
<a href="<c:out value="${objLink}"/>"><p:process>${personName}</p:process></a> <p:process>${selectedOrganizationName}, ${year}</p:process>
${personLink} <p:process> ${selectedOrganizationName}, ${year}</p:process>
</c:when>
<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>educational background ${individual.name}</p:process></a>
</c:otherwise>
</c:choose>
</c:when>