NIHVIVO-805 Fix educational background custom form for change to object property names. Changed names of two custom form jsps.
This commit is contained in:
parent
478a09d8db
commit
85952805f3
5 changed files with 12 additions and 12 deletions
|
@ -1877,7 +1877,7 @@ display level </vitro:publicDescriptionAnnot>
|
|||
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#educationalTraining">
|
||||
<vitro:offerCreateNewOptionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean">true</vitro:offerCreateNewOptionAnnot>
|
||||
<vitro:forceStubDeletionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean">true</vitro:forceStubDeletionAnnot>
|
||||
<vitro:customEntryFormAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">personHasEducationalBackground.jsp</vitro:customEntryFormAnnot>
|
||||
<vitro:customEntryFormAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">personHasEducationalTraining.jsp</vitro:customEntryFormAnnot>
|
||||
<vitro:selectFromExistingAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#boolean">true</vitro:selectFromExistingAnnot>
|
||||
<vitro:publicDescriptionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">This relates a person to the description of their educational background.</vitro:publicDescriptionAnnot>
|
||||
<vitro:displayRankAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">15</vitro:displayRankAnnot>
|
||||
|
@ -3309,7 +3309,7 @@ display level </vitro:publicDescriptionAnnot>
|
|||
<vitro:displayLimitAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">5</vitro:displayLimitAnnot>
|
||||
<vitro:displayRankAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#int">1</vitro:displayRankAnnot>
|
||||
<vitro:prohibitedFromUpdateBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
|
||||
<vitro:customEntryFormAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">addPublicationToAuthor.jsp</vitro:customEntryFormAnnot>
|
||||
<vitro:customEntryFormAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">addPublicationToPerson.jsp</vitro:customEntryFormAnnot>
|
||||
<vitro:fullPropertyNameAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">has authorship</vitro:fullPropertyNameAnnot>
|
||||
<vitro:hiddenFromDisplayBelowRoleLevelAnnot rdf:resource="http://vitro.mannlib.cornell.edu/ns/vitro/role#public"/>
|
||||
<vitro:publicDescriptionAnnot rdf:datatype="http://www.w3.org/2001/XMLSchema#string">This relates a person to their authorship information.</vitro:publicDescriptionAnnot>
|
||||
|
|
|
@ -15,11 +15,11 @@ core:supplementalInformation
|
|||
|
||||
Object properties (domain : range)
|
||||
|
||||
core:educationalBackground (Person : EducationalTraining) - inverse of educationalBackgroundOf
|
||||
core:educationalBackgroundOf (EducationalTraining : Person) - inverse of educationalBackground
|
||||
core:educationalTraining (Person : EducationalTraining) - inverse of core:educationalTrainingOf
|
||||
core:educationalTrainingOf (EducationalTraining : Person) - inverse of core:educationalTraining
|
||||
|
||||
core:degreeEarned (EducationalTraining : AcademicDegree) - inverse of degreeOutcomeOf
|
||||
core:degreeOutcomeOf (AcademicDegree : EducationalTraining) - inverse of degreeEarned
|
||||
core:degreeEarned (EducationalTraining : AcademicDegree) - inverse of core:degreeOutcomeOf
|
||||
core:degreeOutcomeOf (AcademicDegree : EducationalTraining) - inverse of core:degreeEarned
|
||||
|
||||
core:organizationGrantingDegree (EducationalTraining : Organization) - no inverse
|
||||
|
||||
|
@ -174,9 +174,9 @@ the org type still gets asserted. --%>
|
|||
<v:jsonset var="n3ForStmtToPerson">
|
||||
@prefix core: <${vivoCore}> .
|
||||
|
||||
?person core:educationalBackground ?edTrainingUri .
|
||||
?person core:educationalTraining ?edTrainingUri .
|
||||
|
||||
?edTrainingUri core:educationalBackgroundOf ?person ;
|
||||
?edTrainingUri core:educationalTrainingOf ?person ;
|
||||
a core:EducationalTraining .
|
||||
</v:jsonset>
|
||||
|
||||
|
@ -366,7 +366,7 @@ the org type still gets asserted. --%>
|
|||
request.setAttribute("customJs", customJs);
|
||||
|
||||
List<String> customCss = new ArrayList<String>(Arrays.asList("/edit/forms/css/customForm.css",
|
||||
"/edit/forms/css/personHasEducationalBackground.css"
|
||||
"/edit/forms/css/personHasEducationalTraining.css"
|
||||
));
|
||||
request.setAttribute("customCss", customCss);
|
||||
%>
|
|
@ -15,7 +15,7 @@
|
|||
<c:when test="${!empty individual}">
|
||||
<c:choose>
|
||||
<%-- SUBJECT is a Person --%>
|
||||
<c:when test="${predicateUri == 'http://vivoweb.org/ontology/core#educationalBackground'}">
|
||||
<c:when test="${predicateUri == 'http://vivoweb.org/ontology/core#educationalTraining'}">
|
||||
|
||||
<%-- Degree type and major --%>
|
||||
<c:set var="degreeLabel" value="" />
|
||||
|
@ -85,7 +85,7 @@
|
|||
<c:set var="selectedOrganization" value="${individual.objectPropertyMap['http://vivoweb.org/ontology/core#organizationGrantingDegree'].objectPropertyStatements[0].object}"/>
|
||||
<c:set var="selectedOrganizationName" value="${selectedOrganization.name}"/>
|
||||
|
||||
<c:set var="person" value="${individual.objectPropertyMap['http://vivoweb.org/ontology/core#educationalBackgroundOf'].objectPropertyStatements[0].object}"/>
|
||||
<c:set var="person" value="${individual.objectPropertyMap['http://vivoweb.org/ontology/core#educationalTrainingOf'].objectPropertyStatements[0].object}"/>
|
||||
<c:set var="personName" value="${person.name}"/>
|
||||
<c:url var="personURL" value="/individual"><c:param name="uri" value="${person.URI}"/></c:url>
|
||||
<c:set var="personLink" ><a href='${personURL}'>${personName}</a></c:set>
|
||||
|
@ -123,6 +123,6 @@
|
|||
|
||||
<%-- This clause is when there is no object individual defined, it should never be reached. --%>
|
||||
<c:otherwise>
|
||||
<c:out value="Nothing to draw in edBackgroundShortView"/>
|
||||
<c:out value="Nothing to draw in educationalTrainingShortView"/>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue