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

NIHVIVO-714 Fixes to ed background form and short view for ontology changes to degree-related properties

Browse source
This commit is contained in:
rjy7 2010-07-06 15:28:47 +00:00
parent 5e071767d2
commit eaccbe2997
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,8 +20,8 @@ Object properties (domain : range)
core:educationalBackground (Person : EducationalTraining) - inverse of educationalBackgroundOf core:educationalBackground (Person : EducationalTraining) - inverse of educationalBackgroundOf
core:educationalBackgroundOf (EducationalTraining : Person) - inverse of educationalBackground core:educationalBackgroundOf (EducationalTraining : Person) - inverse of educationalBackground
core:degreeTypeAwarded (EducationalTraining : AcademicDegree) - inverse of awardedTo core:degreeEarned (EducationalTraining : AcademicDegree) - inverse of degreeOutcomeOf
core:awardedTo (AcademicDegree : EducationalTraining) - inverse of degreeTypeAwarded core:degreeOutcomeOf (AcademicDegree : EducationalTraining) - inverse of degreeEarned
core:organizationGrantingDegree (EducationalTraining : Organization) - no inverse core:organizationGrantingDegree (EducationalTraining : Organization) - no inverse
@ -145,15 +145,15 @@ core:dateTimePrecision (DateTimeValue : DateTimeValuePrecision)
<%-- Note there is really no difference in how things are set up for an object property except <%-- Note there is really no difference in how things are set up for an object property except
below in the n3ForEdit section, in whether the ..Existing variable goes in SparqlForExistingLiterals below in the n3ForEdit section, in whether the ..Existing variable goes in SparqlForExistingLiterals
or in the SparqlForExistingUris, as well as perhaps in how the options are prepared --%> or in the SparqlForExistingUris, as well as perhaps in how the options are prepared --%>
<c:set var="hasDegree" value="${vivoCore}degreeTypeAwarded" /> <c:set var="degreeEarned" value="${vivoCore}degreeEarned" />
<c:set var="degreeFor" value="${vivoCore}awardedTo" /> <c:set var="degreeOutcomeOf" value="${vivoCore}degreeOutcomeOf" />
<v:jsonset var="degreeExisting" > <v:jsonset var="degreeExisting" >
SELECT ?existingDegreeUri WHERE { SELECT ?existingDegreeUri WHERE {
?edTrainingUri <${hasDegree}> ?existingDegreeUri } ?edTrainingUri <${degreeEarned}> ?existingDegreeUri }
</v:jsonset> </v:jsonset>
<v:jsonset var="degreeAssertion" > <v:jsonset var="degreeAssertion" >
?edTrainingUri <${hasDegree}> ?degreeUri . ?edTrainingUri <${degreeEarned}> ?degreeUri .
?degreeUri <${degreeFor}> ?edTrainingUri . ?degreeUri <${degreeOutcomeOf}> ?edTrainingUri .
</v:jsonset> </v:jsonset>
<c:set var="orgGrantingDegree" value="${vivoCore}organizationGrantingDegree" /> <c:set var="orgGrantingDegree" value="${vivoCore}organizationGrantingDegree" />

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

@ -18,9 +18,9 @@
<%-- Degree type and major --%> <%-- Degree type and major --%>
<c:set var="degreeStr" value="" /> <c:set var="degreeStr" value="" />
<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#degreeEarned'].objectPropertyStatements[0].object}"/>
<c:set var="degreeAbbreviation" value="${degreeType.dataPropertyMap['http://vivoweb.org/ontology/core#degreeAbbreviation'].dataPropertyStatements[0].data}"/> <c:set var="degreeAbbr" value="${degreeType.dataPropertyMap['http://vivoweb.org/ontology/core#abbreviation'].dataPropertyStatements[0].data}"/>
<c:set var="degreeStr" value="${!empty degreeAbbreviation ? degreeAbbreviation : degreeType.name }" /> <c:set var="degreeStr" value="${!empty degreeAbbr ? degreeAbbr : degreeType.name }" />
<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:if test="${ ! empty degreeMajor }"> <c:if test="${ ! empty degreeMajor }">
<c:set var="degreeStr" value="${degreeStr} in ${degreeMajor}" /> <c:set var="degreeStr" value="${degreeStr} in ${degreeMajor}" />
@ -71,7 +71,7 @@
</c:when> </c:when>
<%-- SUBJECT is a Degree Type --%> <%-- SUBJECT is a Degree Type --%>
<c:when test="${predicateUri == 'http://vivoweb.org/ontology/core#awardedTo'}"> <c:when test="${predicateUri == 'http://vivoweb.org/ontology/core#degreeOutcomeOf'}">
<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}"/>