Change core:organizationGrantingDegree to core:trainingAtOrganization on the personHasEducationalTraining form, NIHVIVO-1468

This commit is contained in:
bdc34 2010-12-02 16:52:55 +00:00
parent 32980090ff
commit 880fec4325

View file

@ -80,7 +80,7 @@ core:dateTimePrecision (DateTimeValue : DateTimeValuePrecision)
<c:set var="infoPred" value="${vivoCore}supplementalInformation" /> <c:set var="infoPred" value="${vivoCore}supplementalInformation" />
<c:set var="degreeEarned" value="${vivoCore}degreeEarned" /> <c:set var="degreeEarned" value="${vivoCore}degreeEarned" />
<c:set var="degreeOutcomeOf" value="${vivoCore}degreeOutcomeOf" /> <c:set var="degreeOutcomeOf" value="${vivoCore}degreeOutcomeOf" />
<c:set var="orgGrantingDegree" value="${vivoCore}organizationGrantingDegree" /> <c:set var="trainingAtOrg" value="${vivoCore}trainingAtOrganization" />
<c:set var="hasDateTimeValue" value="${vivoCore}hasDateTimeValue"/> <c:set var="hasDateTimeValue" value="${vivoCore}hasDateTimeValue"/>
<c:set var="dateTimeValueType" value="${vivoCore}DateTimeValue"/> <c:set var="dateTimeValueType" value="${vivoCore}DateTimeValue"/>
@ -147,31 +147,31 @@ core:dateTimePrecision (DateTimeValue : DateTimeValuePrecision)
?edTraining a core:EducationalTraining ; ?edTraining a core:EducationalTraining ;
core:educationalTrainingOf ?person ; core:educationalTrainingOf ?person ;
<${orgGrantingDegree}> ?org . <${trainingAtOrg}> ?org .
</v:jsonset> </v:jsonset>
<%-- This property has no inverse --%> <%-- This property has no inverse --%>
<v:jsonset var="n3ForEdTrainingToOrg" > <v:jsonset var="n3ForEdTrainingToOrg" >
?edTraining <${orgGrantingDegree}> ?org . ?edTraining <${trainingAtOrg}> ?org .
</v:jsonset> </v:jsonset>
<%-- Queries for editing an existing educational training entry --%> <%-- Queries for editing an existing educational training entry --%>
<v:jsonset var="orgQuery" > <v:jsonset var="orgQuery" >
SELECT ?existingOrg WHERE { SELECT ?existingOrg WHERE {
?edTraining <${orgGrantingDegree}> ?existingOrg . } ?edTraining <${trainingAtOrg}> ?existingOrg . }
</v:jsonset> </v:jsonset>
<v:jsonset var="orgLabelQuery" > <v:jsonset var="orgLabelQuery" >
SELECT ?existingOrgLabel WHERE { SELECT ?existingOrgLabel WHERE {
?edTraining <${orgGrantingDegree}> ?existingOrg . ?edTraining <${trainingAtOrg}> ?existingOrg .
?existingOrg <${label}> ?existingOrgLabel . ?existingOrg <${label}> ?existingOrgLabel .
} }
</v:jsonset> </v:jsonset>
<v:jsonset var="orgTypeQuery" > <v:jsonset var="orgTypeQuery" >
SELECT ?existingOrgType WHERE { SELECT ?existingOrgType WHERE {
?edTraining <${orgGrantingDegree}> ?existingOrg . ?edTraining <${trainingAtOrg}> ?existingOrg .
?existingOrg a ?existingOrgType . ?existingOrg a ?existingOrgType .
} }
</v:jsonset> </v:jsonset>