From eaccbe2997b9726d66e99ae87ec1fa819126d4c1 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 6 Jul 2010 15:28:47 +0000
Subject: [PATCH] NIHVIVO-714 Fixes to ed background form and short view for
 ontology changes to degree-related properties

---
 .../edit/forms/personHasEducationalBackground.jsp  | 14 +++++++-------
 .../entity/educationalTrainingShortView.jsp        |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/productMods/edit/forms/personHasEducationalBackground.jsp b/productMods/edit/forms/personHasEducationalBackground.jsp
index e7be4546..4c17bd9b 100644
--- a/productMods/edit/forms/personHasEducationalBackground.jsp
+++ b/productMods/edit/forms/personHasEducationalBackground.jsp
@@ -20,8 +20,8 @@ Object properties (domain : range)
 core:educationalBackground (Person : EducationalTraining) - inverse of educationalBackgroundOf
 core:educationalBackgroundOf (EducationalTraining : Person) - inverse of educationalBackground
 
-core:degreeTypeAwarded (EducationalTraining : AcademicDegree) - inverse of awardedTo
-core:awardedTo (AcademicDegree : EducationalTraining) - inverse of degreeTypeAwarded
+core:degreeEarned (EducationalTraining : AcademicDegree) - inverse of degreeOutcomeOf
+core:degreeOutcomeOf (AcademicDegree : EducationalTraining) - inverse of degreeEarned
 
 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
       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 --%>
-<c:set var="hasDegree" value="${vivoCore}degreeTypeAwarded" />
-<c:set var="degreeFor" value="${vivoCore}awardedTo" />
+<c:set var="degreeEarned" value="${vivoCore}degreeEarned" />
+<c:set var="degreeOutcomeOf" value="${vivoCore}degreeOutcomeOf" />
 <v:jsonset var="degreeExisting" >      
     SELECT ?existingDegreeUri WHERE {
-        ?edTrainingUri <${hasDegree}> ?existingDegreeUri }
+        ?edTrainingUri <${degreeEarned}> ?existingDegreeUri }
 </v:jsonset>
 <v:jsonset var="degreeAssertion" >      
-    ?edTrainingUri <${hasDegree}> ?degreeUri .
-    ?degreeUri <${degreeFor}> ?edTrainingUri .
+    ?edTrainingUri <${degreeEarned}> ?degreeUri .
+    ?degreeUri <${degreeOutcomeOf}> ?edTrainingUri .
 </v:jsonset>
 
 <c:set var="orgGrantingDegree" value="${vivoCore}organizationGrantingDegree" />
diff --git a/productMods/templates/entity/educationalTrainingShortView.jsp b/productMods/templates/entity/educationalTrainingShortView.jsp
index 7fc9a397..6955d12a 100644
--- a/productMods/templates/entity/educationalTrainingShortView.jsp
+++ b/productMods/templates/entity/educationalTrainingShortView.jsp
@@ -18,9 +18,9 @@
             
                 <%-- 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="degreeType" value="${individual.objectPropertyMap['http://vivoweb.org/ontology/core#degreeEarned'].objectPropertyStatements[0].object}"/>
+                <c:set var="degreeAbbr" value="${degreeType.dataPropertyMap['http://vivoweb.org/ontology/core#abbreviation'].dataPropertyStatements[0].data}"/>
+                <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:if test="${ ! empty degreeMajor }">
                     <c:set var="degreeStr" value="${degreeStr} in ${degreeMajor}" />
@@ -71,7 +71,7 @@
             </c:when>
               
             <%-- 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="degreeMajor" value="${individual.dataPropertyMap['http://vivoweb.org/ontology/core#majorField'].dataPropertyStatements[0].data}"/>