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

VIVO-112: updates for educational training and awards

Browse source
This commit is contained in:
tworrall 2013-09-06 17:02:43 -04:00
parent 5d2e44c08f
commit 15168eb8ea
12 changed files with 417 additions and 249 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
productMods/WEB-INF/ontologies/app/loadedAtStartup/PropertyConfig.n3
View file

@ -25,6 +25,7 @@ local:personInPositionConfig a :ObjectPropertyDisplayConfig ;
:displayName "positions" ; :displayName "positions" ;
:listViewConfigFile "listViewConfig-personInPosition.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-personInPosition.xml"^^xsd:string ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaffiliation> ; :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaffiliation> ;
vitro:displayRankAnnot 40;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasPositionHistoryGenerator"^^xsd:string . vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasPositionHistoryGenerator"^^xsd:string .
@ -38,17 +39,20 @@ local:organizationForPositionConfig a :ObjectPropertyDisplayConfig ;
:displayName "people" ; :displayName "people" ;
:listViewConfigFile "listViewConfig-organizationForPosition.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-organizationForPosition.xml"^^xsd:string ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaffiliation> ; :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaffiliation> ;
vitro:displayRankAnnot 15;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.OrganizationHasPositionHistoryGenerator"^^xsd:string . vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.OrganizationHasPositionHistoryGenerator"^^xsd:string .
local:authorInAuthorshipContext a :ConfigContext ; local:authorInAuthorshipContext a :ConfigContext ;
:hasConfiguration local:authorInAuthorshipConfig ; :hasConfiguration local:authorInAuthorshipConfig ;
:configContextFor vivo:relatedBy ; :configContextFor vivo:relatedBy ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedBy vivo:Authorship . :qualifiedBy vivo:Authorship .
local:authorInAuthorshipConfig a :ObjectPropertyDisplayConfig ; local:authorInAuthorshipConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-authorInAuthorship.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-authorInAuthorship.xml"^^xsd:string ;
:displayName "selected publications" ; :displayName "selected publications" ;
vitro:displayRankAnnot 1;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddPublicationToPersonGenerator"^^xsd:string ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddPublicationToPersonGenerator"^^xsd:string ;
@ -62,6 +66,7 @@ local:hasServiceProviderRoleContext a :ConfigContext ;
local:hasServiceProviderRoleConfig a :ObjectPropertyDisplayConfig ; local:hasServiceProviderRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
:displayName "service to the profession" ; :displayName "service to the profession" ;
vitro:displayRankAnnot 1;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddServiceProviderRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddServiceProviderRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
@ -75,6 +80,7 @@ local:hasClinicalRoleContext a :ConfigContext ;
local:hasClinicalRoleConfig a :ObjectPropertyDisplayConfig ; local:hasClinicalRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
:displayName "clinical activities" ; :displayName "clinical activities" ;
vitro:displayRankAnnot 70;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddClinicalRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddClinicalRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
@ -88,6 +94,7 @@ local:hasLeaderRoleContext a :ConfigContext ;
local:hasLeaderRoleConfig a :ObjectPropertyDisplayConfig ; local:hasLeaderRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
:displayName "head of" ; :displayName "head of" ;
vitro:displayRankAnnot 30;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddHeadOfRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddHeadOfRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
@ -101,6 +108,7 @@ local:hasMemberRoleContext a :ConfigContext ;
local:hasMemberRoleConfig a :ObjectPropertyDisplayConfig ; local:hasMemberRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
:displayName "member of" ; :displayName "member of" ;
vitro:displayRankAnnot 50;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddMemberRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddMemberRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
@ -114,6 +122,7 @@ local:hasTeacherRoleContext a :ConfigContext ;
local:hasTeacherRoleConfig a :ObjectPropertyDisplayConfig ; local:hasTeacherRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
:displayName "teaching activities" ; :displayName "teaching activities" ;
vitro:displayRankAnnot 1;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddTeacherRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddTeacherRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
@ -127,6 +136,7 @@ local:hasEditorRoleContext a :ConfigContext ;
local:hasEditorRoleConfig a :ObjectPropertyDisplayConfig ; local:hasEditorRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
:displayName "collection or series editor for" ; :displayName "collection or series editor for" ;
vitro:displayRankAnnot 2;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddEditorRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddEditorRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
@ -140,6 +150,7 @@ local:hasReviewerRoleContext a :ConfigContext ;
local:hasReviewerRoleConfig a :ObjectPropertyDisplayConfig ; local:hasReviewerRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
:displayName "reviewer of" ; :displayName "reviewer of" ;
vitro:displayRankAnnot 3;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddReviewerRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddReviewerRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
@ -153,6 +164,7 @@ local:hasOrganizerRoleContext a :ConfigContext ;
local:hasOrganizerRoleConfig a :ObjectPropertyDisplayConfig ; local:hasOrganizerRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
:displayName "organizer of" ; :displayName "organizer of" ;
vitro:displayRankAnnot 4;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddOrganizerRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddOrganizerRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
@ -166,6 +178,7 @@ local:hasOutreachProviderRoleContext a :ConfigContext ;
local:hasOutreachProviderRoleConfig a :ObjectPropertyDisplayConfig ; local:hasOutreachProviderRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
:displayName "outreach and community service" ; :displayName "outreach and community service" ;
vitro:displayRankAnnot 50;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddOutreachProviderRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddOutreachProviderRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
@ -179,6 +192,7 @@ local:hasAttendeeRoleContext a :ConfigContext ;
local:hasAttendeeRoleConfig a :ObjectPropertyDisplayConfig ; local:hasAttendeeRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
:displayName "attended" ; :displayName "attended" ;
vitro:displayRankAnnot 1;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddAttendeeRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddAttendeeRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
@ -192,6 +206,7 @@ local:hasResearcherRoleContext a :ConfigContext ;
local:hasResearcherRoleConfig a :ObjectPropertyDisplayConfig ; local:hasResearcherRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
:displayName "research activities" ; :displayName "research activities" ;
vitro:displayRankAnnot 10;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddResearcherRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddResearcherRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
@ -205,6 +220,7 @@ local:hasInvestigatorRoleContext a :ConfigContext ;
local:hasInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ; local:hasInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ;
:displayName "investigator on" ; :displayName "investigator on" ;
vitro:displayRankAnnot 25;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddGrantRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddGrantRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
@ -218,6 +234,7 @@ local:hasPrincipalInvestigatorRoleContext a :ConfigContext ;
local:hasPrincipalInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ; local:hasPrincipalInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ;
:displayName "principal investigator on" ; :displayName "principal investigator on" ;
vitro:displayRankAnnot 15;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddGrantRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddGrantRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
@ -231,6 +248,7 @@ local:hasCo-PrincipalInvestigatorRoleContext a :ConfigContext ;
local:hasCo-PrincipalInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ; local:hasCo-PrincipalInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ;
:displayName "co-principal investigator on" ; :displayName "co-principal investigator on" ;
vitro:displayRankAnnot 20;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddGrantRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddGrantRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
@ -244,6 +262,7 @@ local:hasPresenterRoleContext a :ConfigContext ;
local:hasPresenterRoleConfig a :ObjectPropertyDisplayConfig ; local:hasPresenterRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasPresenterRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasPresenterRole.xml"^^xsd:string ;
:displayName "presentations" ; :displayName "presentations" ;
vitro:displayRankAnnot 30;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddPresenterRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddPresenterRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
@ -251,25 +270,27 @@ local:hasPresenterRoleConfig a :ObjectPropertyDisplayConfig ;
local:awardOrHonorContext a :ConfigContext ; local:awardOrHonorContext a :ConfigContext ;
:hasConfiguration local:awardOrHonorConfig ; :hasConfiguration local:awardOrHonorConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ; :configContextFor <http://vivoweb.org/ontology/core#relatedBy> ;
:qualifiedBy <http://vivoweb.org/ontology/core#AwardorHonorReceipt> . :qualifiedBy <http://vivoweb.org/ontology/core#AwardorHonorReceipt> .
local:awardOrHonorConfig a :ObjectPropertyDisplayConfig ; local:awardOrHonorConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-awardOrHonor.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-awardOrHonor.xml"^^xsd:string ;
:displayName "awards and honors" ; :displayName "awards and honors" ;
vitro:displayRankAnnot 20;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasAwardOrHonorGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasAwardOrHonorGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbackground> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbiography> .
local:educationalTrainingContext a :ConfigContext ; local:educationalTrainingContext a :ConfigContext ;
:hasConfiguration local:educationalTrainingConfig ; :hasConfiguration local:educationalTrainingConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ; :configContextFor <http://purl.obolibrary.org/obo/RO_0000056> ;
:qualifiedBy <http://vivoweb.org/ontology/core#EducationalTraining> . :qualifiedBy <http://vivoweb.org/ontology/core#EducationalProcess> .
local:educationalTrainingConfig a :ObjectPropertyDisplayConfig ; local:educationalTrainingConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-educationalTraining.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-educationalTraining.xml"^^xsd:string ;
:displayName "education and training" ; :displayName "education and training" ;
vitro:displayRankAnnot 10;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasEducationalTraining"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasEducationalTraining"^^<http://www.w3.org/2001/XMLSchema#string> ;
@ -284,6 +305,7 @@ local:informationResourceInAuthorshipContext a :ConfigContext ;
local:informationResourceInAuthorshipConfig a :ObjectPropertyDisplayConfig ; local:informationResourceInAuthorshipConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-informationResourceInAuthorship.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-informationResourceInAuthorship.xml"^^xsd:string ;
:displayName "authors" ; :displayName "authors" ;
vitro:displayRankAnnot 10;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddAuthorsToInformationResourceGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddAuthorsToInformationResourceGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;

314
productMods/config/listViewConfig-awardOrHonor.xml
View file

@ -1,147 +1,167 @@
<?xml version="1.0" encoding="ISO-8859-1"?> <?xml version="1.0" encoding="ISO-8859-1"?>
<!-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<!-- See guidelines in vitro/doc/list_view_configuration_guidelines.txt --> <!-- See guidelines in vitro/doc/list_view_configuration_guidelines.txt -->
<list-view-config> <list-view-config>
<query-select> <query-select>
PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt; PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt; PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
PREFIX bibo: &lt;http://purl.org/ontology/bibo/&gt; PREFIX bibo: &lt;http://purl.org/ontology/bibo/&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX owl: &lt;http://www.w3.org/2002/07/owl#&gt; PREFIX owl: &lt;http://www.w3.org/2002/07/owl#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt; PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt; PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
SELECT DISTINCT ?awardReceipt SELECT DISTINCT ?awardReceipt
?receiptLabel ?receiptLabel
?award ?award
?awardLabel ?awardLabel
?conferredBy ?assignedBy
?conferredByLabel ?assignedByLabel
?dateTimeStart ?dateTimeStart
?dateTimeEnd ?dateTimeEnd
?dateTime ?dateTime
WHERE { WHERE {
?subject ?property ?awardReceipt . ?subject ?property ?awardReceipt .
OPTIONAL { ?awardReceipt rdfs:label ?receiptLabel } ?awardReceipt a core:AwardReceipt .
OPTIONAL { ?awardReceipt core:receiptOf ?award . OPTIONAL { ?awardReceipt rdfs:label ?receiptLabel }
?award core:receipt ?awardReceipt OPTIONAL { ?awardReceipt core:relates ?award .
OPTIONAL { ?award rdfs:label ?awardLabel } ?award a core:Award .
OPTIONAL { ?award core:awardConferredBy ?conferredBy ?award core:relatedBy ?awardReceipt
OPTIONAL { ?conferredBy rdfs:label ?conferredByLabel } OPTIONAL { ?award rdfs:label ?awardLabel }
} OPTIONAL { ?award core:assignedBy ?assignedBy
} OPTIONAL { ?assignedBy rdfs:label ?assignedByLabel }
OPTIONAL { ?awardReceipt core:dateTimeInterval ?dateTimeInterval }
OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue . }
?dateTimeStartValue core:dateTime ?dateTimeStart OPTIONAL { ?awardReceipt core:dateTimeInterval ?dateTimeInterval
} OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue .
} ?dateTimeStartValue core:dateTime ?dateTimeStart
OPTIONAL { ?awardReceipt core:dateTimeInterval ?dateTimeInterval }
OPTIONAL { ?dateTimeInterval core:end ?dateTimeEndValue . }
?dateTimeEndValue core:dateTime ?dateTimeEnd OPTIONAL { ?awardReceipt core:dateTimeInterval ?dateTimeInterval
} OPTIONAL { ?dateTimeInterval core:end ?dateTimeEndValue .
} ?dateTimeEndValue core:dateTime ?dateTimeEnd
OPTIONAL { ?awardReceipt core:dateTimeValue ?dateTimeValue }
OPTIONAL { ?dateTimeValue core:dateTime ?dateTime } }
} OPTIONAL { ?awardReceipt core:dateTimeValue ?dateTimeValue
} ORDER BY DESC(?dateTime) DESC(?dateTimeEnd) OPTIONAL { ?dateTimeValue core:dateTime ?dateTime }
</query-select> }
} ORDER BY DESC(?dateTime) DESC(?dateTimeEnd)
<query-construct> </query-select>
PREFIX bibo: &lt;http://purl.org/ontology/bibo/&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; <query-construct>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt; PREFIX bibo: &lt;http://purl.org/ontology/bibo/&gt;
PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
CONSTRUCT { PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
?subject ?property ?awardReceipt .
?awardReceipt rdfs:label ?receiptLabel . CONSTRUCT {
?awardReceipt core:receiptOf ?award . ?subject ?property ?awardReceipt .
?award core:receipt ?awardReceipt . ?awardReceipt a core:AwardReceipt .
?award rdfs:label ?awardLabel . ?awardReceipt rdfs:label ?receiptLabel .
?award core:awardConferredBy ?conferredBy . ?awardReceipt core:relates ?award .
?conferredBy rdfs:label ?conferredByLabel ?award a core:Award .
} WHERE { ?award core:relatedBy ?awardReceipt .
{ ?award rdfs:label ?awardLabel .
?subject ?property ?awardReceipt ?award core:assignedBy ?assignedBy .
} UNION { ?assignedBy rdfs:label ?assignedByLabel
?subject ?property ?awardReceipt . } WHERE {
?awardReceipt rdfs:label ?receiptLabel {
} UNION { ?subject ?property ?awardReceipt .
?subject ?property ?awardReceipt . ?awardReceipt a core:AwardReceipt .
?awardReceipt rdfs:label ?receiptLabel . } UNION {
?awardReceipt core:receiptOf ?award . ?subject ?property ?awardReceipt .
?award core:receipt ?awardReceipt ?awardReceipt a core:AwardReceipt .
} UNION { ?awardReceipt rdfs:label ?receiptLabel
?subject ?property ?awardReceipt . } UNION {
?awardReceipt rdfs:label ?receiptLabel . ?subject ?property ?awardReceipt .
?awardReceipt core:receiptOf ?award . ?awardReceipt a core:AwardReceipt .
?award core:receipt ?awardReceipt . ?awardReceipt rdfs:label ?receiptLabel .
?award rdfs:label ?awardLabel ?awardReceipt core:relates ?award .
} UNION { ?award a core:Award .
?subject ?property ?awardReceipt . ?award core:relatedBy ?awardReceipt
?awardReceipt rdfs:label ?receiptLabel . } UNION {
?awardReceipt core:receiptOf ?award . ?subject ?property ?awardReceipt .
?award core:receipt ?awardReceipt . ?awardReceipt a core:AwardReceipt .
?award rdfs:label ?awardLabel . ?awardReceipt rdfs:label ?receiptLabel .
?award core:awardConferredBy ?conferredBy ?awardReceipt core:relates ?award .
} UNION { ?award a core:Award .
?subject ?property ?awardReceipt . ?award core:relatedBy ?awardReceipt .
?awardReceipt rdfs:label ?receiptLabel . ?award rdfs:label ?awardLabel
?awardReceipt core:receiptOf ?award . } UNION {
?award core:receipt ?awardReceipt . ?subject ?property ?awardReceipt .
?award rdfs:label ?awardLabel . ?awardReceipt a core:AwardReceipt .
?award core:awardConferredBy ?conferredBy . ?awardReceipt rdfs:label ?receiptLabel .
?conferredBy rdfs:label ?conferredByLabel ?awardReceipt core:relates ?award .
} ?award a core:Award .
} ?award core:relatedBy ?awardReceipt .
</query-construct> ?award rdfs:label ?awardLabel .
?award core:assignedBy ?assignedBy
<query-construct> } UNION {
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; ?subject ?property ?awardReceipt .
CONSTRUCT { ?awardReceipt a core:AwardReceipt .
?subject ?property ?awardReceipt . ?awardReceipt rdfs:label ?receiptLabel .
?awardReceipt core:dateTimeInterval ?dateTimeInterval . ?awardReceipt core:relates ?award .
?dateTimeInterval core:start ?dateTimeStartValue . ?award a core:Award .
?dateTimeStartValue core:dateTime ?dateTimeStart ?award core:relatedBy ?awardReceipt .
} WHERE { ?award rdfs:label ?awardLabel .
?subject ?property ?awardReceipt . ?award core:assignedBy ?assignedBy .
?awardReceipt core:dateTimeInterval ?dateTimeInterval . ?assignedBy rdfs:label ?assignedByLabel
?dateTimeInterval core:start ?dateTimeStartValue . }
?dateTimeStartValue core:dateTime ?dateTimeStart }
} </query-construct>
</query-construct>
<query-construct>
<query-construct> PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; CONSTRUCT {
CONSTRUCT { ?subject ?property ?awardReceipt .
?subject ?property ?awardReceipt . ?awardReceipt a core:AwardReceipt .
?awardReceipt core:dateTimeInterval ?dateTimeInterval . ?awardReceipt core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue . ?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd ?dateTimeStartValue core:dateTime ?dateTimeStart
} WHERE { } WHERE {
?subject ?property ?awardReceipt . ?subject ?property ?awardReceipt .
?awardReceipt core:dateTimeInterval ?dateTimeInterval . ?awardReceipt a core:AwardReceipt .
?dateTimeInterval core:end ?dateTimeEndValue . ?awardReceipt core:dateTimeInterval ?dateTimeInterval .
?dateTimeEndValue core:dateTime ?dateTimeEnd ?dateTimeInterval core:start ?dateTimeStartValue .
} ?dateTimeStartValue core:dateTime ?dateTimeStart
</query-construct> }
</query-construct>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; <query-construct>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT { CONSTRUCT {
?subject ?property ?awardReceipt . ?subject ?property ?awardReceipt .
?awardReceipt core:dateTimeValue ?dateTimeValue . ?awardReceipt a core:AwardReceipt .
?dateTimeValue core:dateTime ?dateTime ?awardReceipt core:dateTimeInterval ?dateTimeInterval .
} WHERE { ?dateTimeInterval core:end ?dateTimeEndValue .
?subject ?property ?awardReceipt . ?dateTimeEndValue core:dateTime ?dateTimeEnd
?awardReceipt core:dateTimeValue ?dateTimeValue . } WHERE {
?dateTimeValue core:dateTime ?dateTime ?subject ?property ?awardReceipt .
} ?awardReceipt a core:AwardReceipt .
</query-construct> ?awardReceipt core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue .
<template>propStatement-awardOrHonor.ftl</template> ?dateTimeEndValue core:dateTime ?dateTimeEnd
</list-view-config> }
</query-construct>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
CONSTRUCT {
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
?awardReceipt core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime
} WHERE {
?subject ?property ?awardReceipt .
?awardReceipt a core:AwardReceipt .
?awardReceipt core:dateTimeValue ?dateTimeValue .
?dateTimeValue core:dateTime ?dateTime
}
</query-construct>
<template>propStatement-awardOrHonor.ftl</template>
</list-view-config>

48
productMods/config/listViewConfig-educationalTraining.xml
View file

@ -20,12 +20,13 @@
?majorField ?deptOrSchool ?info ?majorField ?deptOrSchool ?info
?dateTimeStart ?dateTimeEnd ?dateTimeStart ?dateTimeEnd
WHERE { WHERE {
?subject ?property ?edTraining ?subject ?property ?edTraining .
?edTraining a core:EducationalProcess
OPTIONAL {?edTraining vitro:mostSpecificType ?trainingType . OPTIONAL {?edTraining vitro:mostSpecificType ?trainingType .
?trainingType rdfs:subClassOf core:EducationalTraining . ?trainingType rdfs:subClassOf core:EducationalProcess .
?trainingType rdfs:label ?typeName ?trainingType rdfs:label ?typeName
} }
OPTIONAL { ?edTraining core:trainingAtOrganization ?org . OPTIONAL { ?edTraining core:relates ?org .
?org rdfs:label ?orgName ?org rdfs:label ?orgName
<collated> <collated>
OPTIONAL { ?org vitro:mostSpecificType ?subclass . OPTIONAL { ?org vitro:mostSpecificType ?subclass .
@ -33,7 +34,9 @@
} }
</collated> </collated>
} }
OPTIONAL { ?edTraining core:degreeEarned ?degree OPTIONAL { ?edTraining &lt;http://purl.obolibrary.org/obo/RO_0002234&gt; ?awardedDegree .
?awardedDegree core:relates ?degree .
?degree a core:AcademicDegree
OPTIONAL { ?degree rdfs:label ?degreeName } OPTIONAL { ?degree rdfs:label ?degreeName }
OPTIONAL { ?degree core:abbreviation ?degreeAbbr } OPTIONAL { ?degree core:abbreviation ?degreeAbbr }
} }
@ -69,30 +72,43 @@
CONSTRUCT { CONSTRUCT {
?subject ?property ?edTraining . ?subject ?property ?edTraining .
?edTraining a core:EducationalProcess .
?edTraining ?edTrainingProp ?edTrainingValue . ?edTraining ?edTrainingProp ?edTrainingValue .
?edTraining core:trainingAtOrganization ?org . ?edTraining core:relates ?org .
?org rdfs:label ?orgName . ?org rdfs:label ?orgName .
?edTraining core:degreeEarned ?degree . ?edTraining &lt;http://purl.obolibrary.org/obo/RO_0002234&gt; ?awardedDegree .
?awardedDegree core:relates ?degree .
?edTraining core:dateTimeInterval ?dateTimeInterval ?edTraining core:dateTimeInterval ?dateTimeInterval
} WHERE { } WHERE {
{ {
?subject ?property ?edTraining . ?subject ?property ?edTraining .
?edTraining a core:EducationalProcess
} }
UNION { UNION {
?subject ?property ?edTraining . ?subject ?property ?edTraining .
?edTraining a core:EducationalProcess .
?edTraining ?edTrainingProp ?edTrainingValue ?edTraining ?edTrainingProp ?edTrainingValue
} }
UNION { UNION {
?subject ?property ?edTraining . ?subject ?property ?edTraining .
?edTraining core:trainingAtOrganization ?org . ?edTraining a core:EducationalProcess .
?edTraining core:relates ?org .
?org rdfs:label ?orgName ?org rdfs:label ?orgName
} }
UNION { UNION {
?subject ?property ?edTraining . ?subject ?property ?edTraining .
?edTraining core:degreeEarned ?degree . ?edTraining a core:EducationalProcess .
?edTraining &lt;http://purl.obolibrary.org/obo/RO_0002234&gt; ?awardedDegree .
}
UNION {
?subject ?property ?edTraining .
?edTraining a core:EducationalProcess .
?edTraining &lt;http://purl.obolibrary.org/obo/RO_0002234&gt; ?awardedDegree .
?awardedDegree core:relates ?degree
} }
UNION { UNION {
?subject ?property ?edTraining . ?subject ?property ?edTraining .
?edTraining a core:EducationalProcess .
?edTraining core:dateTimeInterval ?dateTimeInterval ?edTraining core:dateTimeInterval ?dateTimeInterval
} }
} }
@ -104,17 +120,20 @@
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt; PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
CONSTRUCT { CONSTRUCT {
?subject ?property ?edTraining . ?subject ?property ?edTraining .
?edTraining a core:EducationalProcess .
?edTraining vitro:mostSpecificType ?trainingType . ?edTraining vitro:mostSpecificType ?trainingType .
?trainingType rdfs:subClassOf core:EducationalTraining . ?trainingType rdfs:subClassOf core:EducationalTraining .
?trainingType rdfs:label ?typeName ?trainingType rdfs:label ?typeName
} WHERE { } WHERE {
{ {
?subject ?property ?edTraining . ?subject ?property ?edTraining .
?edTraining a core:EducationalProcess .
?edTraining vitro:mostSpecificType ?trainingType . ?edTraining vitro:mostSpecificType ?trainingType .
?trainingType rdfs:subClassOf core:EducationalTraining ?trainingType rdfs:subClassOf core:EducationalTraining
} UNION } UNION
{ {
?subject ?property ?edTraining . ?subject ?property ?edTraining .
?edTraining a core:EducationalProcess .
?edTraining vitro:mostSpecificType ?trainingType . ?edTraining vitro:mostSpecificType ?trainingType .
?trainingType rdfs:subClassOf core:EducationalTraining . ?trainingType rdfs:subClassOf core:EducationalTraining .
?trainingType rdfs:label ?typeName ?trainingType rdfs:label ?typeName
@ -127,16 +146,23 @@
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT { CONSTRUCT {
?degree a core:AcademicDegree .
?degree rdfs:label ?degreeName . ?degree rdfs:label ?degreeName .
?degree core:abbreviation ?degreeAbbr ?degree core:abbreviation ?degreeAbbr
} WHERE { } WHERE {
{ {
?subject ?property ?edTraining . ?subject ?property ?edTraining .
?edTraining core:degreeEarned ?degree . ?edTraining a core:EducationalProcess .
?edTraining &lt;http://purl.obolibrary.org/obo/RO_0002234&gt; ?awardedDegree .
?awardedDegree core:relates ?degree .
?degree a core:AcademicDegree .
?degree rdfs:label ?degreeName ?degree rdfs:label ?degreeName
} UNION { } UNION {
?subject ?property ?edTraining . ?subject ?property ?edTraining .
?edTraining core:degreeEarned ?degree . ?edTraining a core:EducationalProcess .
?edTraining &lt;http://purl.obolibrary.org/obo/RO_0002234&gt; ?awardedDegree .
?awardedDegree core:relates ?degree .
?degree a core:AcademicDegree .
?degree core:abbreviation ?degreeAbbr ?degree core:abbreviation ?degreeAbbr
} }
} }
@ -151,6 +177,7 @@
?dateTimeStartValue core:dateTime ?dateTimeStart . ?dateTimeStartValue core:dateTime ?dateTimeStart .
} WHERE { } WHERE {
?subject ?property ?edTraining . ?subject ?property ?edTraining .
?edTraining a core:EducationalProcess .
?edTraining core:dateTimeInterval ?dateTimeInterval . ?edTraining core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue . ?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart . ?dateTimeStartValue core:dateTime ?dateTimeStart .
@ -166,6 +193,7 @@
?dateTimeEndValue core:dateTime ?dateTimeEnd ?dateTimeEndValue core:dateTime ?dateTimeEnd
} WHERE { } WHERE {
?subject ?property ?edTraining . ?subject ?property ?edTraining .
?edTraining a core:EducationalProcess .
?edTraining core:dateTimeInterval ?dateTimeInterval . ?edTraining core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue . ?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd ?dateTimeEndValue core:dateTime ?dateTimeEnd

8
productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
View file

@ -29,12 +29,12 @@
</#if> </#if>
</#local> </#local>
<#local conferredByOrg> <#local assignedByOrg>
<#if statement.conferredBy?has_content && statement.conferredByLabel?has_content> <#if statement.assignedBy?has_content && statement.assignedByLabel?has_content>
${i18n().conferred_by} <a href="${profileUrl(statement.uri("conferredBy"))}" title="${i18n().conferred_by}">${statement.conferredByLabel}</a> ${i18n().conferred_by} <a href="${profileUrl(statement.uri("assignedBy"))}" title="${i18n().conferred_by}">${statement.assignedByLabel}</a>
</#if> </#if>
</#local> </#local>
<@s.join [ linkedIndividual, conferredByOrg!, dateTimeVal! ] /> <@s.join [ linkedIndividual, assignedByOrg!, dateTimeVal! ] />
</#macro> </#macro>

54
productMods/templates/freemarker/edit/forms/addOrganizerRoleToPerson.ftl
View file

@ -1,28 +1,28 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#--Two stage form for service provider role--> <#--Two stage form for service provider role-->
<#-- <#--
Required Values to be set for each form that includes addRoleToPersonTwoStage.ftl are: Required Values to be set for each form that includes addRoleToPersonTwoStage.ftl are:
roleDescriptor. roleDescriptor.
The other required values (roleType, optionsType, objectClassUri, and literalOptions are The other required values (roleType, optionsType, objectClassUri, and literalOptions are
set in the JAVA class corresponding to the form, e.g. AddOrganizerRoleToPersonGenerator.java. set in the JAVA class corresponding to the form, e.g. AddOrganizerRoleToPersonGenerator.java.
Optional values can be set, but each of these has default values Optional values can be set, but each of these has default values
set in addRoleToPersonTwoStage.ftl: set in addRoleToPersonTwoStage.ftl:
buttonText buttonText
typeSelectorLabel typeSelectorLabel
numDateFields numDateFields
showRoleLAbelField showRoleLAbelField
roleExamples--> roleExamples-->
<#--Variable assignments--> <#--Variable assignments-->
<#assign roleDescriptor = "${i18n().organizer_of}" /> <#assign roleDescriptor = "${i18n().organizer_of}" />
<#assign typeSelectorLabel = "${i18n().organizer_of}" /> <#assign typeSelectorLabel = "${i18n().organizer_of}" />
<#assign genericLabel = "${i18n().event_capitalized}" /> <#assign genericLabel = "${i18n().event_capitalized}" />
<#assign acMultipleTypes = "'true'" /> <#assign acMultipleTypes = "'true'" />
<#assign acTypes = "{activity: 'http://vivoweb.org/ontology/core#EventSeries,http://purl.org/NET/c4dm/event.owl#Event'}" <#assign acTypes = "{activity: 'http://vivoweb.org/ontology/core#EventSeries,http://purl.org/NET/c4dm/event.owl#Event'}">
<#--Each of the two stage forms will include the form below--> <#--Each of the two stage forms will include the form below-->
<#include "addRoleToPersonTwoStage.ftl"> <#include "addRoleToPersonTwoStage.ftl">

8
productMods/templates/freemarker/edit/forms/js/awardReceiptUtils.js
View file

@ -91,8 +91,14 @@ var awardReceiptUtils = {
buildAwardReceiptLabel: function() { buildAwardReceiptLabel: function() {
var rdfsLabel = ""; var rdfsLabel = "";
var $acSelection = $("div.acSelection[acGroupName='award']")
if ( this.editMode == "edit" ) { if ( this.editMode == "edit" ) {
rdfsLabel = this.awardDisplay.val(); if ( $acSelection.find("span.acSelectionInfo").text().length > 0 ) {
rdfsLabel = $("span.acSelectionInfo").text();
}
else {
rdfsLabel = this.award.val();
}
} }
else { else {
rdfsLabel = this.award.val(); rdfsLabel = this.award.val();

31
productMods/templates/freemarker/edit/forms/js/educationalTrainingUtils.js Normal file
View file

@ -0,0 +1,31 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
var educationalTrainingUtils = {
onLoad: function(href, blankSentinel) {
this.initObjectReferences();
this.bindEventListeners();
$.extend(this, customFormData);
},
initObjectReferences: function() {
this.form = $('#personHasEducationalTraining');
this.aDLabel = $('#awardedDegreeLabel');
this.degreeSelector = $('#degreeUri');
},
bindEventListeners: function() {
this.degreeSelector.change(function() {
educationalTrainingUtils.setAwardedDegreeLabel();
});
},
setAwardedDegreeLabel: function() {
var degreeLabel = this.subjectName + ": " + this.degreeSelector.find(":selected").text();
this.aDLabel.val(degreeLabel);
}
}

26
productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl
View file

@ -33,9 +33,11 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
<#assign deptValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "dept") /> <#assign deptValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "dept") />
<#assign infoValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "info") /> <#assign infoValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "info") />
<#assign majorFieldValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "majorField") /> <#assign majorFieldValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "majorField") />
<#assign degreeValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "degree") /> <#assign degreeValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "degreeType") />
<#assign awardedDegreeLabelValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "awardedDegreeLabel") />
<#assign existingOrgValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "existingOrg") /> <#assign existingOrgValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "existingOrg") />
<#assign trainingTypeValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "trainingType")/> <#assign trainingTypeValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "trainingType")/>
<#assign existingADLabelValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "existingAwardedDegreeLabel") />
<#--If edit submission exists, then retrieve validation errors if they exist--> <#--If edit submission exists, then retrieve validation errors if they exist-->
<#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content> <#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content>
@ -56,7 +58,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
<#assign yearHint = "<span class='hint'>(${i18n().year_hint_format})</span>" /> <#assign yearHint = "<span class='hint'>(${i18n().year_hint_format})</span>" />
<h2>${titleVerb}&nbsp;${i18n().educational_training_for} ${subjectName}${editConfiguration.subjectName}</h2> <h2>${titleVerb}&nbsp;${i18n().educational_training_for} ${editConfiguration.subjectName}</h2>
<#--Display error messages if any--> <#--Display error messages if any-->
<#if submissionErrors?has_content> <#if submissionErrors?has_content>
@ -155,13 +157,19 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
<div class="entry"> <div class="entry">
<label for="degreeUri">${i18n().degree}</label> <label for="degreeUri">${i18n().degree}</label>
<#assign degreeOpts = editConfiguration.pageData.degree /> <#assign degreeOpts = editConfiguration.pageData.degreeType />
<select name="degree" id="degreeUri" > <select name="degreeType" id="degreeUri" >
<option value="" <#if degreeValue = "">selected</#if>>${i18n().select_one}</option> <option value="" <#if degreeValue = "">selected</#if>>${i18n().select_one}</option>
<#list degreeOpts?keys as key> <#list degreeOpts?keys as key>
<option value="${key}" <#if degreeValue = key>selected</#if>>${degreeOpts[key]}</option> <option value="${key}" <#if degreeValue = key>selected</#if>>${degreeOpts[key]}</option>
</#list> </#list>
</select> </select>
<#if editMode == "edit">
<input type="hidden" id="newAwardedDegreeLabel" name="awardedDegreeLabel" value=""/>
<input type="hidden" id="awardedDegreeLabel" name="existingAwardedDegreeLabel" value="${existingADLabelValue!}"/>
<#else>
<input type="hidden" id="awardedDegreeLabel" name="awardedDegreeLabel" value=""/>
</#if>
</div> </div>
<p> <p>
@ -208,13 +216,18 @@ var customFormData = {
defaultTypeName: 'organization', defaultTypeName: 'organization',
baseHref: '${urls.base}/individual?uri=', baseHref: '${urls.base}/individual?uri=',
blankSentinel: '${blankSentinel}', blankSentinel: '${blankSentinel}',
flagClearLabelForExisting: '${flagClearLabelForExisting}' flagClearLabelForExisting: '${flagClearLabelForExisting}',
subjectName: '${editConfiguration.subjectName}'
}; };
var i18nStrings = { var i18nStrings = {
selectAnExisting: '${i18n().select_an_existing}', selectAnExisting: '${i18n().select_an_existing}',
orCreateNewOne: '${i18n().or_create_new_one}', orCreateNewOne: '${i18n().or_create_new_one}',
selectedString: '${i18n().selected}' selectedString: '${i18n().selected}'
}; };
$(document).ready(function() {
educationalTrainingUtils.onLoad();
});
</script> </script>
</section> </section>
@ -229,6 +242,7 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/
'<script type="text/javascript" src="${urls.base}/js/extensions/String.js"></script>', '<script type="text/javascript" src="${urls.base}/js/extensions/String.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>', '<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.bgiframe.pack.js"></script>', '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.bgiframe.pack.js"></script>',
'<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/educationalTrainingUtils.js"></script>',
'<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js"></script>')} '<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js"></script>')}

15
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAwardOrHonorGenerator.java
View file

@ -24,12 +24,12 @@ public class PersonHasAwardOrHonorGenerator extends VivoBaseGenerator implements
final static String awardReceiptClass = vivoCore + "AwardReceipt"; final static String awardReceiptClass = vivoCore + "AwardReceipt";
final static String awardClass = vivoCore + "Award"; final static String awardClass = vivoCore + "Award";
final static String orgClass = "http://xmlns.com/foaf/0.1/Organization"; final static String orgClass = "http://xmlns.com/foaf/0.1/Organization";
final static String awardReceiptPred = vivoCore + "awardOrHonor"; final static String awardReceiptPred = vivoCore + "relatedBy";
final static String awardForPred = vivoCore + "awardOrHonorFor"; final static String awardForPred = vivoCore + "relates";
final static String receiptPred =vivoCore+"receipt" ; final static String receiptPred =vivoCore+"relatedBy" ;
final static String receiptOfPred =vivoCore+"receiptOf" ; final static String receiptOfPred =vivoCore+"relates" ;
final static String awardConferredByPred =vivoCore+"awardConferredBy" ; final static String awardConferredByPred =vivoCore+"assignedBy" ;
final static String awardConferredPred =vivoCore+"awardConferred" ; final static String awardConferredPred =vivoCore+"assigns" ;
final static String descriptionPred = vivoCore + "description"; final static String descriptionPred = vivoCore + "description";
final static String yearAwardedPred = vivoCore + "dateTimeValue"; final static String yearAwardedPred = vivoCore + "dateTimeValue";
final static String awardReceiptToInterval = vivoCore + "dateTimeInterval"; final static String awardReceiptToInterval = vivoCore + "dateTimeInterval";
@ -257,11 +257,13 @@ public class PersonHasAwardOrHonorGenerator extends VivoBaseGenerator implements
final static String existingAwardQuery = final static String existingAwardQuery =
"SELECT ?existingAward WHERE { \n" + "SELECT ?existingAward WHERE { \n" +
" ?awardReceipt <" + receiptOfPred + "> ?existingAward . \n" + " ?awardReceipt <" + receiptOfPred + "> ?existingAward . \n" +
" ?existingAward a <" + awardClass + "> . \n" +
"}"; "}";
final static String existingOrgQuery = final static String existingOrgQuery =
"SELECT ?existingOrg WHERE { \n" + "SELECT ?existingOrg WHERE { \n" +
" ?awardReceipt <" + receiptOfPred + "> ?existingAward . \n" + " ?awardReceipt <" + receiptOfPred + "> ?existingAward . \n" +
" ?existingAward a <" + awardClass + "> . \n" +
" ?existingAward<" + awardConferredByPred + "> ?existingOrg . \n" + " ?existingAward<" + awardConferredByPred + "> ?existingOrg . \n" +
" ?existingOrg <" + awardConferredPred + "> ?existingAward . }"; " ?existingOrg <" + awardConferredPred + "> ?existingAward . }";
@ -273,6 +275,7 @@ public class PersonHasAwardOrHonorGenerator extends VivoBaseGenerator implements
final static String awardLabelQuery = final static String awardLabelQuery =
"SELECT ?existingAwardLabel WHERE { \n" + "SELECT ?existingAwardLabel WHERE { \n" +
" ?awardReceipt <" + receiptOfPred + "> ?existingAward . \n" + " ?awardReceipt <" + receiptOfPred + "> ?existingAward . \n" +
" ?existingAward a <" + awardClass + "> . \n" +
" ?existingAward <" + label + "> ?existingAwardLabel . \n" + " ?existingAward <" + label + "> ?existingAwardLabel . \n" +
"}"; "}";

121
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasEducationalTraining.java
View file

@ -30,7 +30,7 @@ import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils;
core:EducationalTraining - primary new individual being created core:EducationalTraining - primary new individual being created
foaf:Person - existing individual foaf:Person - existing individual
foaf:Organization - new or existing individual foaf:Organization - new or existing individual
core:AcademicDegree - existing individual core:AcademicdegreeType - existing individual
Data properties of EducationalTraining: Data properties of EducationalTraining:
core:majorField core:majorField
@ -42,10 +42,10 @@ import edu.cornell.mannlib.vitro.webapp.utils.generators.EditModeUtils;
core:educationalTraining (Person : EducationalTraining) - inverse of core:educationalTrainingOf core:educationalTraining (Person : EducationalTraining) - inverse of core:educationalTrainingOf
core:educationalTrainingOf (EducationalTraining : Person) - inverse of core:educationalTraining core:educationalTrainingOf (EducationalTraining : Person) - inverse of core:educationalTraining
core:degreeEarned (EducationalTraining : AcademicDegree) - inverse of core:degreeOutcomeOf core:degreeTypeEarned (EducationalTraining : AcademicdegreeType) - inverse of core:degreeTypeOutcomeOf
core:degreeOutcomeOf (AcademicDegree : EducationalTraining) - inverse of core:degreeEarned core:degreeTypeOutcomeOf (AcademicdegreeType : EducationalTraining) - inverse of core:degreeTypeEarned
core:organizationGrantingDegree (EducationalTraining : Organization) - no inverse core:organizationGrantingdegreeType (EducationalTraining : Organization) - no inverse
Future version Future version
-------------- --------------
@ -90,10 +90,13 @@ public class PersonHasEducationalTraining extends VivoBaseGenerator implements
conf.setN3Required( Arrays.asList( n3ForNewEdTraining, trainingTypeAssertion ) ); conf.setN3Required( Arrays.asList( n3ForNewEdTraining, trainingTypeAssertion ) );
conf.setN3Optional(Arrays.asList( conf.setN3Optional(Arrays.asList(
n3ForNewOrg, n3ForExistingOrg, majorFieldAssertion, degreeAssertion, n3ForNewOrg, n3ForExistingOrg, n3ForNewAwardedDegree,
deptAssertion, infoAssertion, n3ForStart, n3ForEnd )); majorFieldAssertion,
//existingDegreeTypeAssertion,
existingAwardedDegreeLabel, deptAssertion, infoAssertion, n3ForStart, n3ForEnd ));
conf.addNewResource("edTraining", DEFAULT_NS_FOR_NEW_RESOURCE); conf.addNewResource("edTraining", DEFAULT_NS_FOR_NEW_RESOURCE);
conf.addNewResource("newAwardedDegree",DEFAULT_NS_FOR_NEW_RESOURCE);
conf.addNewResource("newOrg",DEFAULT_NS_FOR_NEW_RESOURCE); conf.addNewResource("newOrg",DEFAULT_NS_FOR_NEW_RESOURCE);
conf.addNewResource("intervalNode",DEFAULT_NS_FOR_NEW_RESOURCE); conf.addNewResource("intervalNode",DEFAULT_NS_FOR_NEW_RESOURCE);
conf.addNewResource("startNode",DEFAULT_NS_FOR_NEW_RESOURCE); conf.addNewResource("startNode",DEFAULT_NS_FOR_NEW_RESOURCE);
@ -102,10 +105,12 @@ public class PersonHasEducationalTraining extends VivoBaseGenerator implements
//uris in scope: none //uris in scope: none
//literals in scope: none //literals in scope: none
conf.setUrisOnform( Arrays.asList( "existingOrg", "orgType", "degree", "trainingType")); conf.setUrisOnform( Arrays.asList( "existingOrg", "orgType", "existingAwardedDegree", "degreeType", "trainingType"));
conf.setLiteralsOnForm( Arrays.asList("orgLabel", "orgLabelDisplay", "majorField", "dept", "info")); conf.setLiteralsOnForm( Arrays.asList("orgLabel", "orgLabelDisplay", "awardedDegreeLabel", "existingAwardedDegreeLabel",
"majorField", "dept", "info"));
conf.addSparqlForExistingLiteral("orgLabel", orgLabelQuery); conf.addSparqlForExistingLiteral("orgLabel", orgLabelQuery);
conf.addSparqlForExistingLiteral("existingAwardedDegreeLabel", existingAwardedDegreeLabelQuery);
conf.addSparqlForExistingLiteral("majorField", majorFieldQuery); conf.addSparqlForExistingLiteral("majorField", majorFieldQuery);
conf.addSparqlForExistingLiteral("dept", deptQuery); conf.addSparqlForExistingLiteral("dept", deptQuery);
conf.addSparqlForExistingLiteral("info", infoQuery); conf.addSparqlForExistingLiteral("info", infoQuery);
@ -113,10 +118,11 @@ public class PersonHasEducationalTraining extends VivoBaseGenerator implements
conf.addSparqlForExistingLiteral("endField-value", existingEndDateQuery); conf.addSparqlForExistingLiteral("endField-value", existingEndDateQuery);
conf.addSparqlForExistingUris("existingAwardedDegree", existingAwardedDegreeQuery);
conf.addSparqlForExistingUris("existingOrg", existingOrgQuery); conf.addSparqlForExistingUris("existingOrg", existingOrgQuery);
conf.addSparqlForExistingUris("orgType", orgTypeQuery); conf.addSparqlForExistingUris("orgType", orgTypeQuery);
conf.addSparqlForExistingUris("trainingType", trainingTypeQuery); conf.addSparqlForExistingUris("trainingType", trainingTypeQuery);
conf.addSparqlForExistingUris("degree", degreeQuery); conf.addSparqlForExistingUris("degreeType", degreeTypeQuery);
conf.addSparqlForExistingUris("intervalNode",existingIntervalNodeQuery); conf.addSparqlForExistingUris("intervalNode",existingIntervalNodeQuery);
conf.addSparqlForExistingUris("startNode", existingStartNodeQuery); conf.addSparqlForExistingUris("startNode", existingStartNodeQuery);
conf.addSparqlForExistingUris("endNode", existingEndNodeQuery); conf.addSparqlForExistingUris("endNode", existingEndNodeQuery);
@ -126,9 +132,9 @@ public class PersonHasEducationalTraining extends VivoBaseGenerator implements
conf.addSparqlForAdditionalUrisInScope("inverseTrainingAtOrg", inverseTrainingAtOrgQuery); conf.addSparqlForAdditionalUrisInScope("inverseTrainingAtOrg", inverseTrainingAtOrgQuery);
conf.addField( new FieldVTwo(). conf.addField( new FieldVTwo().
setName("degree"). setName("degreeType").
setOptions( new IndividualsViaVClassOptions( setOptions( new IndividualsViaVClassOptions(
degreeClass))); degreeTypeClass)));
conf.addField( new FieldVTwo(). conf.addField( new FieldVTwo().
setName("majorField"). setName("majorField").
@ -140,11 +146,26 @@ public class PersonHasEducationalTraining extends VivoBaseGenerator implements
//options will be added in browser by auto complete JS //options will be added in browser by auto complete JS
); );
conf.addField( new FieldVTwo().
setName("existingAwardedDegree")
//options will be added in browser by auto complete JS
);
conf.addField( new FieldVTwo(). conf.addField( new FieldVTwo().
setName("orgLabel"). setName("orgLabel").
setRangeDatatypeUri(XSD.xstring.toString() ). setRangeDatatypeUri(XSD.xstring.toString() ).
setValidators( list("datatype:" + XSD.xstring.toString()))); setValidators( list("datatype:" + XSD.xstring.toString())));
conf.addField( new FieldVTwo().
setName("awardedDegreeLabel").
setRangeDatatypeUri(XSD.xstring.toString() ).
setValidators( list("datatype:" + XSD.xstring.toString())));
conf.addField( new FieldVTwo().
setName("existingAwardedDegreeLabel").
setRangeDatatypeUri(XSD.xstring.toString() ).
setValidators( list("datatype:" + XSD.xstring.toString())));
conf.addField( new FieldVTwo(). conf.addField( new FieldVTwo().
setName("orgLabelDisplay"). setName("orgLabelDisplay").
setRangeDatatypeUri(XSD.xstring.toString() )); setRangeDatatypeUri(XSD.xstring.toString() ));
@ -159,7 +180,7 @@ public class PersonHasEducationalTraining extends VivoBaseGenerator implements
setName("trainingType"). setName("trainingType").
setValidators( list("nonempty") ). setValidators( list("nonempty") ).
setOptions( setOptions(
new ChildVClassesWithParent(trainingClass))); new ChildVClassesWithParent(edProcessClass)));
conf.addField( new FieldVTwo(). conf.addField( new FieldVTwo().
setName("dept"). setName("dept").
@ -201,28 +222,44 @@ public class PersonHasEducationalTraining extends VivoBaseGenerator implements
final static String n3ForNewEdTraining = final static String n3ForNewEdTraining =
"@prefix core: <"+ vivoCore +"> .\n"+ "@prefix core: <"+ vivoCore +"> .\n"+
"?person core:educationalTraining ?edTraining .\n" + "?person <http://purl.obolibrary.org/obo/RO_0000056> ?edTraining .\n" +
"?edTraining a core:EducationalTraining .\n" + "?edTraining a core:EducationalProcess .\n" +
"?edTraining core:educationalTrainingOf ?person ."; "?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?person .";
final static String trainingTypeAssertion = final static String trainingTypeAssertion =
"?edTraining a ?trainingType ."; "?edTraining a ?trainingType .";
final static String n3ForNewAwardedDegree =
"@prefix core: <"+ vivoCore +"> .\n"+
"?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?newAwardedDegree . \n" +
"?newAwardedDegree <http://purl.obolibrary.org/obo/RO_0002353> ?edTraining . \n" +
"?newAwardedDegree <http://vivoweb.org/ontology/core#relates> ?person . \n" +
"?person <http://vivoweb.org/ontology/core#relatedBy> ?newAwardedDegree . \n" +
"?newAwardedDegree <"+ label +"> ?awardedDegreeLabel . \n" +
"?newOrg <http://vivoweb.org/ontology/core#assigns> ?newAwardedDegree . \n" +
"?newAwardedDegree <http://vivoweb.org/ontology/core#assignedBy> ?newOrg . \n" +
"?newAwardedDegree <http://vivoweb.org/ontology/core#relates> ?degreeType .\n"+
"?degreeType <http://vivoweb.org/ontology/core#relatedBy> ?newAwardedDegree . \n"+
"?newAwardedDegree a core:AwardedDegree .";
final static String existingAwardedDegreeLabel =
"?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?existingAwardedDegree . \n" +
"?existingAwardedDegree <http://purl.obolibrary.org/obo/RO_0002353> ?edTraining . \n" +
"?existingAwardedDegree <http://vivoweb.org/ontology/core#relates> ?degreeType .\n"+
"?degreeType <http://vivoweb.org/ontology/core#relatedBy> ?existingAwardedDegree . \n"+
"?existingAwardedDegree <"+ label +"> ?existingAwardedDegreeLabel . " ;
final static String n3ForNewOrg = final static String n3ForNewOrg =
"?edTraining <"+ trainingAtOrg +"> ?newOrg . \n" + "?edTraining <http://vivoweb.org/ontology/core#relates> ?newOrg . \n" +
"?newOrg ?inverseTrainingAtOrg ?edTraining . \n" + "?newOrg <http://vivoweb.org/ontology/core#relatedBy> ?edTraining . \n" +
"?newOrg <"+ label +"> ?orgLabel . \n" + "?newOrg <"+ label +"> ?orgLabel . \n" +
"?newOrg a ?orgType ."; "?newOrg a ?orgType .";
final static String n3ForExistingOrg = final static String n3ForExistingOrg =
"?edTraining <"+ trainingAtOrg +"> ?existingOrg . \n" + "?edTraining <http://vivoweb.org/ontology/core#relates> ?existingOrg . \n" +
"?existingOrg ?inverseTrainingAtOrg ?edTraining . \n" + "?existingOrg <http://vivoweb.org/ontology/core#relatedBy> ?edTraining . \n" +
"?existingOrg a ?orgType . "; "?existingOrg a ?orgType . ";
final static String degreeAssertion =
"?edTraining <"+ degreeEarned +"> ?degree .\n"+
"?degree <"+ degreeOutcomeOf +"> ?edTraining .";
final static String majorFieldAssertion = final static String majorFieldAssertion =
"?edTraining <"+ majorFieldPred +"> ?majorField ."; "?edTraining <"+ majorFieldPred +"> ?majorField .";
@ -252,20 +289,29 @@ public class PersonHasEducationalTraining extends VivoBaseGenerator implements
final static String existingOrgQuery = final static String existingOrgQuery =
"SELECT ?existingOrg WHERE {\n"+ "SELECT ?existingOrg WHERE {\n"+
"?edTraining <"+ trainingAtOrg +"> ?existingOrg . }\n"; "?edTraining <http://vivoweb.org/ontology/core#relates> ?existingOrg . }\n";
final static String orgLabelQuery = final static String orgLabelQuery =
"SELECT ?existingOrgLabel WHERE {\n"+ "SELECT ?existingOrgLabel WHERE {\n"+
"?edTraining <"+ trainingAtOrg +"> ?existingOrg .\n"+ "?edTraining <http://vivoweb.org/ontology/core#relates> ?existingOrg .\n"+
"?existingOrg <"+ label +"> ?existingOrgLabel .\n"+ "?existingOrg <"+ label +"> ?existingOrgLabel .\n"+
"}"; "}";
final static String existingAwardedDegreeQuery =
"SELECT ?existingAwardedDegree WHERE {\n"+
"?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?existingAwardedDegree . }\n";
final static String existingAwardedDegreeLabelQuery =
"SELECT ?existingAwardedDegreeLabel WHERE {\n"+
"?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?existingAwardedDegree . \n" +
"?existingAwardedDegree <"+ label +"> ?existingAwardedDegreeLabel }\n";
/* Limit type to subclasses of foaf:Organization. Otherwise, sometimes owl:Thing or another /* Limit type to subclasses of foaf:Organization. Otherwise, sometimes owl:Thing or another
type is returned and we don't get a match to the select element options. */ type is returned and we don't get a match to the select element options. */
final static String orgTypeQuery = final static String orgTypeQuery =
"PREFIX rdfs: <"+ rdfs +"> \n"+ "PREFIX rdfs: <"+ rdfs +"> \n"+
"SELECT ?existingOrgType WHERE {\n"+ "SELECT ?existingOrgType WHERE {\n"+
"?edTraining <"+ trainingAtOrg +"> ?existingOrg .\n"+ "?edTraining <http://vivoweb.org/ontology/core#relates> ?existingOrg .\n"+
"?existingOrg a ?existingOrgType .\n"+ "?existingOrg a ?existingOrgType .\n"+
"?existingOrgType rdfs:subClassOf <"+ orgClass +"> .\n"+ "?existingOrgType rdfs:subClassOf <"+ orgClass +"> .\n"+
"}"; "}";
@ -273,11 +319,15 @@ public class PersonHasEducationalTraining extends VivoBaseGenerator implements
final static String trainingTypeQuery = final static String trainingTypeQuery =
"PREFIX vitro: <" + VitroVocabulary.vitroURI + "> \n" + "PREFIX vitro: <" + VitroVocabulary.vitroURI + "> \n" +
"SELECT ?existingTrainingType WHERE { \n" + "SELECT ?existingTrainingType WHERE { \n" +
" ?edTraining vitro:mostSpecificType ?existingTrainingType . }"; " ?edTraining vitro:mostSpecificType ?existingTrainingType . }";
final static String degreeQuery = final static String degreeTypeQuery =
"SELECT ?existingDegree WHERE {\n"+ "PREFIX core: <"+ vivoCore +"> \n"+
"?edTraining <"+ degreeEarned +"> ?existingDegree . }"; "SELECT ?existingDegreeType WHERE {\n"+
"?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?existingAwardedDegree . \n"+
"?existingAwardedDegree a core:AwardedDegree . \n"+
"?existingAwardedDegree core:relates ?existingDegreeType . \n" +
"?existingDegreeType a core:AcademicDegree }";
final static String majorFieldQuery = final static String majorFieldQuery =
"SELECT ?existingMajorField WHERE {\n"+ "SELECT ?existingMajorField WHERE {\n"+
@ -346,7 +396,7 @@ public class PersonHasEducationalTraining extends VivoBaseGenerator implements
final static String inverseTrainingAtOrgQuery = final static String inverseTrainingAtOrgQuery =
"PREFIX owl: <http://www.w3.org/2002/07/owl#>" "PREFIX owl: <http://www.w3.org/2002/07/owl#>"
+ " SELECT ?inverseTrainingAtOrg " + " SELECT ?inverseTrainingAtOrg "
+ " WHERE { ?inverseTrainingAtOrg owl:inverseOf <"+ trainingAtOrg +"> . } "; + " WHERE { ?inverseTrainingAtOrg owl:inverseOf <http://vivoweb.org/ontology/core#relates> . } ";
//Adding form specific data such as edit mode //Adding form specific data such as edit mode
@ -358,10 +408,7 @@ public class PersonHasEducationalTraining extends VivoBaseGenerator implements
public EditMode getEditMode(VitroRequest vreq) { public EditMode getEditMode(VitroRequest vreq) {
List<String> predicates = new ArrayList<String>(); List<String> predicates = new ArrayList<String>();
predicates.add(trainingAtOrg); predicates.add("http://vivoweb.org/ontology/core#relates");
return EditModeUtils.getEditMode(vreq, predicates); return EditModeUtils.getEditMode(vreq, predicates);
} }
} }

9
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/VivoBaseGenerator.java
View file

@ -18,16 +18,13 @@ public abstract class VivoBaseGenerator extends BaseEditConfigurationGenerator i
final static String label =rdfs+"label" ; final static String label =rdfs+"label" ;
final static String bibo = "http://purl.org/ontology/bibo/"; final static String bibo = "http://purl.org/ontology/bibo/";
final static String trainingClass = vivoCore+"EducationalTraining" ; final static String edProcessClass = vivoCore+"EducationalProcess" ;
final static String degreeClass =vivoCore+"AcademicDegree" ; final static String degreeTypeClass =vivoCore+"AcademicDegree" ;
final static String majorFieldPred =vivoCore+"majorField" ; final static String majorFieldPred =vivoCore+"majorField" ;
final static String deptPred =vivoCore+"departmentOrSchool" ; final static String deptPred =vivoCore+"departmentOrSchool" ;
final static String infoPred =vivoCore+"supplementalInformation" ; final static String infoPred =vivoCore+"supplementalInformation" ;
final static String degreeEarned =vivoCore+"degreeEarned" ;
final static String degreeOutcomeOf =vivoCore+"degreeOutcomeOf" ;
final static String trainingAtOrg =vivoCore+"trainingAtOrganization" ;
final static String authorRankPredicate = vivoCore + "authorRank"; final static String authorRankPredicate = vivoCore + "authorRank";
final static String linkedAuthorPredicate = vivoCore + "linkedAuthor"; final static String linkedAuthorPredicate = vivoCore + "relates";
final static String dateTimeValue =vivoCore+"dateTime"; final static String dateTimeValue =vivoCore+"dateTime";
final static String dateTimeValueType =vivoCore+"DateTimeValue"; final static String dateTimeValueType =vivoCore+"DateTimeValue";

2
src/org/vivoweb/webapp/util/ModelUtils.java
View file

@ -23,7 +23,7 @@ public class ModelUtils {
private static final String processPropertyURI = "http://purl.obolibrary.org/obo/BFO_0000054"; private static final String processPropertyURI = "http://purl.obolibrary.org/obo/BFO_0000054";
private static final String processPropertyInverseURI = "http://purl.obolibrary.org/obo/BFO_0000055"; private static final String processPropertyInverseURI = "http://purl.obolibrary.org/obo/BFO_0000055";
private static final String nonProcessPropertyURI = "http://vivoweb.org/ontology/core#relatedBy"; private static final String nonProcessPropertyURI = "http://vivoweb.org/ontology/core#relatedBy";
private static final String nonProcessPropertyInverseURI = "http://vivoweb.org/ontology/core#contributingRole"; private static final String nonProcessPropertyInverseURI = "http://purl.obolibrary.org/obo/RO_0000052";
private static Set<String> processClass = new HashSet<String>(); private static Set<String> processClass = new HashSet<String>();
static { static {