From 7c83e693cce870d25c27fe3cadb1e340b846b0e7 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Thu, 24 Jun 2010 15:14:07 +0000 Subject: [PATCH] NIHVIVO-714 Changes to ed background form and short view for ontology changes. More changes needed to restore full functionality. --- .../user/vivo-core-1.1-annotations.rdf | 2 +- .../forms/personHasEducationalBackground.jsp | 56 +++++++++---------- ...w.jsp => educationalTrainingShortView.jsp} | 2 +- 3 files changed, 30 insertions(+), 30 deletions(-) rename productMods/templates/entity/{educationalAttainmentShortView.jsp => educationalTrainingShortView.jsp} (98%) diff --git a/productMods/WEB-INF/ontologies/user/vivo-core-1.1-annotations.rdf b/productMods/WEB-INF/ontologies/user/vivo-core-1.1-annotations.rdf index 7af92c1b..2d395a30 100644 --- a/productMods/WEB-INF/ontologies/user/vivo-core-1.1-annotations.rdf +++ b/productMods/WEB-INF/ontologies/user/vivo-core-1.1-annotations.rdf @@ -2742,7 +2742,7 @@ true - educationalAttainmentShortView.jsp + educationalTrainingShortView.jsp -1 -1 diff --git a/productMods/edit/forms/personHasEducationalBackground.jsp b/productMods/edit/forms/personHasEducationalBackground.jsp index 26bb4aa4..2a56af5d 100644 --- a/productMods/edit/forms/personHasEducationalBackground.jsp +++ b/productMods/edit/forms/personHasEducationalBackground.jsp @@ -3,29 +3,29 @@ <%-- Custom form for adding an educational attainment to an individual Classes: -core:EducationalAttainment - primary new individual being created +core:EducationalTraining - primary new individual being created foaf:Person - existing individual foaf:Organization - new or existing individual core:AcademicDegree - existing individual core:DateTimeValue core:DateTimeValuePrecision -Data properties of EducationalAttainment: +Data properties of EducationalTraining: core:majorField core:departmentOrSchool core:supplementalInformation Object properties (domain : range) -core:educationalBackground (Person : EducationalAttainment) - inverse of educationalBackgroundOf -core:educationalBackgroundOf (EducationalAttainment : Person) - inverse of educationalBackground +core:educationalBackground (Person : EducationalTraining) - inverse of educationalBackgroundOf +core:educationalBackgroundOf (EducationalTraining : Person) - inverse of educationalBackground -core:degreeTypeAwarded (EducationalAttainment : AcademicDegree) - inverse of awardedTo -core:awardedTo (AcademicDegree : EducationalAttainment) - inverse of degreeTypeAwarded +core:degreeTypeAwarded (EducationalTraining : AcademicDegree) - inverse of awardedTo +core:awardedTo (AcademicDegree : EducationalTraining) - inverse of degreeTypeAwarded -core:organizationGrantingDegree (EducationalAttainment : Organization) - no inverse +core:organizationGrantingDegree (EducationalTraining : Organization) - no inverse -core:dateTimeValue (EducationalAttainment : DateTimeValue) +core:dateTimeValue (EducationalTraining : DateTimeValue) core:dateTimePrecision (DateTimeValue : DateTimeValuePrecision) --%> @@ -73,7 +73,7 @@ core:dateTimePrecision (DateTimeValue : DateTimeValuePrecision) - + @@ -85,14 +85,14 @@ core:dateTimePrecision (DateTimeValue : DateTimeValuePrecision) SELECT ?majorFieldExisting WHERE { - ?edAttainmentUri <${majorFieldPred}> ?majorFieldExisting } + ?edTrainingUri <${majorFieldPred}> ?majorFieldExisting } <%-- Pair the "existing" query with the skeleton of what will be asserted for a new statement involving this field. The actual assertion inserted in the model will be created via string substitution into the ? variables. NOTE the pattern of punctuation (a period after the prefix URI and after the ?field) --%> - ?edAttainmentUri <${majorFieldPred}> ?majorField . + ?edTrainingUri <${majorFieldPred}> ?majorField . <%-- @@ -103,14 +103,14 @@ core:dateTimePrecision (DateTimeValue : DateTimeValuePrecision) SELECT ?existingYear WHERE { - ?edAttainmentUri <${hasDateTimeValue}> ?existingYear } + ?edTrainingUri <${hasDateTimeValue}> ?existingYear } @prefix core: <${vivoCore}> . ?dateTime a core:DateTimeValue ; core:dateTime ?year ; core:dateTimeValuePrecision core:YearPrecision . - ?edAttainmentUri core:dateTimeValue ?dateTime . + ?edTrainingUri core:dateTimeValue ?dateTime . --%> <%-- @@ -126,19 +126,19 @@ core:dateTimePrecision (DateTimeValue : DateTimeValuePrecision) SELECT ?existingDept WHERE { - ?edAttainmentUri <${deptPred}> ?existingDept } + ?edTrainingUri <${deptPred}> ?existingDept } - ?edAttainmentUri <${deptPred}> ?dept . + ?edTrainingUri <${deptPred}> ?dept . SELECT ?existingInfo WHERE { - ?edAttainmentUri <${infoPred}> ?existingInfo } + ?edTrainingUri <${infoPred}> ?existingInfo } - ?edAttainmentUri <${infoPred}> ?info . + ?edTrainingUri <${infoPred}> ?info . <%-- Object properties --%> @@ -149,21 +149,21 @@ core:dateTimePrecision (DateTimeValue : DateTimeValuePrecision) SELECT ?existingDegreeUri WHERE { - ?edAttainmentUri <${hasDegree}> ?existingDegreeUri } + ?edTrainingUri <${hasDegree}> ?existingDegreeUri } - ?edAttainmentUri <${hasDegree}> ?degreeUri . - ?degreeUri <${degreeFor}> ?edAttainmentUri . + ?edTrainingUri <${hasDegree}> ?degreeUri . + ?degreeUri <${degreeFor}> ?edTrainingUri . <%-- This property has no inverse --%> SELECT ?existingOrgUri WHERE { - ?edAttainmentUri <${orgGrantingDegree}> ?existingOrgUri } + ?edTrainingUri <${orgGrantingDegree}> ?existingOrgUri } - ?edAttainmentUri <${orgGrantingDegree}> ?organizationUri . + ?edTrainingUri <${orgGrantingDegree}> ?organizationUri . @@ -178,10 +178,10 @@ the org type still gets asserted. --%> @prefix core: <${vivoCore}> . - ?person core:educationalBackground ?edAttainmentUri . + ?person core:educationalBackground ?edTrainingUri . - ?edAttainmentUri core:educationalBackgroundOf ?person ; - a core:EducationalAttainment , + ?edTrainingUri core:educationalBackgroundOf ?person ; + a core:EducationalTraining , <${flagUri}> . @@ -190,7 +190,7 @@ the org type still gets asserted. --%> a ?newOrgType , <${flagUri}> . - ?edAttainmentUri <${orgGrantingDegree}> ?newOrg . + ?edTrainingUri <${orgGrantingDegree}> ?newOrg . ${edAttainmentClass} @@ -205,7 +205,7 @@ the org type still gets asserted. --%> "subject" : ["person", "${subjectUriJson}" ], "predicate" : ["predicate", "${predicateUriJson}" ], - "object" : ["edAttainmentUri", "${objectUriJson}", "URI" ], + "object" : ["edTrainingUri", "${objectUriJson}", "URI" ], "n3required" : [ "${n3ForStmtToPerson}", "${degreeAssertion}", "${majorFieldAssertion}", "${yearAssertion}" ], @@ -213,7 +213,7 @@ the org type still gets asserted. --%> "${n3ForNewOrg}", "${newOrgNameAssertion}", "${newOrgTypeAssertion}", "${deptAssertion}", "${infoAssertion}" ], - "newResources" : { "edAttainmentUri" : "${defaultNamespace}", + "newResources" : { "edTrainingUri" : "${defaultNamespace}", "newOrg" : "${defaultNamespace}" }, "urisInScope" : { }, diff --git a/productMods/templates/entity/educationalAttainmentShortView.jsp b/productMods/templates/entity/educationalTrainingShortView.jsp similarity index 98% rename from productMods/templates/entity/educationalAttainmentShortView.jsp rename to productMods/templates/entity/educationalTrainingShortView.jsp index 370a5e60..7fc9a397 100644 --- a/productMods/templates/entity/educationalAttainmentShortView.jsp +++ b/productMods/templates/entity/educationalTrainingShortView.jsp @@ -7,7 +7,7 @@ <%-- This is a custom short view render for educational background. The variable individual is the OBJECT of the property statement to be rendered. -- - In this JSP that is the Educational Attainment object, not the Person, Organization or DegreeType + In this JSP that is the Educational Training object, not the Person, Organization or DegreeType --%>