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

NIHVIVO-1467 Added majorFieldAssertion to n3optional. Also added note to educational training short view to remind us to account for the optionality of the major field in the new short view template.

Browse source
This commit is contained in:
rjy7 2010-12-10 15:56:13 +00:00
parent b14cb5596e
commit 3e7f1f7ab0
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -212,7 +212,7 @@ core:dateTimePrecision (DateTimeValue : DateTimeValuePrecision)
"n3required" : [ "${n3ForNewEdTraining}", "${orgLabelAssertion}", "${orgTypeAssertion}", "${dateTimeAssertions}" ], "n3required" : [ "${n3ForNewEdTraining}", "${orgLabelAssertion}", "${orgTypeAssertion}", "${dateTimeAssertions}" ],
"n3optional" : [ "${n3ForEdTrainingToOrg}", "n3optional" : [ "${n3ForEdTrainingToOrg}", "${majorFieldAssertion}",
"${degreeAssertion}", "${deptAssertion}", "${infoAssertion}" ], "${degreeAssertion}", "${deptAssertion}", "${infoAssertion}" ],
"newResources" : { "edTraining" : "${defaultNamespace}", "newResources" : { "edTraining" : "${defaultNamespace}",

1
productMods/templates/entity/educationalTrainingShortView.jsp
View file

@ -25,6 +25,7 @@
<c:set var="degreeLabel" value="${!empty degreeAbbr ? degreeAbbr : degreeType.name }" /> <c:set var="degreeLabel" value="${!empty degreeAbbr ? degreeAbbr : degreeType.name }" />
</c:if> </c:if>
<%-- RY 12/10/10 majorField is no longer required, so make sure we display something reasonable if there is no major field. --%>
<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:choose> <c:choose>