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

NIHVIVO-300 Merge changes from rel-1.0-maint to fix ed background short view

Browse source
This commit is contained in:
rjy7 2010-04-08 15:19:14 +00:00
parent ab2869f469
commit 2f3545796c
1 changed files with 109 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,45 +15,54 @@
<c:choose>
<%-- SUBJECT is a Person --%>
<c:when test="${predicateUri == 'http://vivoweb.org/ontology/core#educationalBackground'}">
<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="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}"/>
<%-- Degree type and major --%>
<c:set var="degreeStr" value="" />
<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="degreeStr" value="${!empty degreeAbbreviation ? degreeAbbreviation : degreeType.name }" />
<c:set var="degreeMajor" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#majorField'].dataPropertyStatements[0].data}"/>
<c:if test="${ ! empty degreeMajor }">
<c:set var="degreeStr" value="${degreeStr} in ${degreeMajor}" />
</c:if>
<c:if test="${ ! empty degreeStr }">
<c:set var="degreeStr"><p:process>${degreeStr}</p:process></c:set>
</c:if>
<%-- Organization granting degree --%>
<c:set var="selectedOrganization" value="${individual.objectPropertyMap['http://vivoweb.org/ontology/core#organizationGrantingDegree'].objectPropertyStatements[0].object}"/>
<c:if test="${ ! empty selectedOrganization }">
<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="selectedOrganizationStr" ><a href='${selectedOrganizationURL}'><p:process>${selectedOrganization.name}</p:process></a></c:set>
</c:if>
<%-- Optional department/school to organization --%>
<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 test="${ ! empty degreeDeptOrSchool }">
</c:if>
<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:if test="${ empty degreeAbbreviation }">
<c:set var="degreeAbbreviation" value="${degreeType.name}"/>
<%-- Year of degree --%>
<c:set var="year" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#year'].dataPropertyStatements[0].data}"/>
<c:if test="${ ! empty year }">
<c:set var="year"><p:process>${year}</p:process></c:set>
</c:if>
<%-- Supplemental information --%>
<c:set var="degreeSupplementalInfo" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#supplementalInformation'].dataPropertyStatements[0].data}"/>
<c:if test="${ ! empty degreeSupplementalInfo }">
<c:set var="degreeSupplementalInfo"><p:process>${degreeSupplementalInfo}</p:process></c:set>
</c:if>
<%-- Build the output string --%>
<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>
</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>
</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>
</c:when>
<c:when test="${!empty degreeAbbreviation && ! empty year && empty degreeMajor && empty selectedOrganizationStr }">
<p:process>${degreeAbbreviation} ${year} ${degreeDeptOrSchool} ${degreeSupplementalInfo}</p:process>
<c:when test="${ ! empty degreeStr }">
${degreeStr}
<c:if test="${ ! empty selectedOrganizationStr}">, ${selectedOrganizationStr}</c:if>
<c:if test="${ ! empty degreeDeptOrSchool}">, ${degreeDeptOrSchool}</c:if>
<c:if test="${ ! empty year }">, ${year}</c:if>
<c:if test="${ ! empty degreeSupplementalInfo }">, ${degreeSupplementalInfo}</c:if>
</c:when>
<c:otherwise>
<a href="${objLink}"><p:process>educational background ${individual.name}</p:process></a>