From 55670d67dd0430c60004ff616f08cef152ec1dad Mon Sep 17 00:00:00 2001 From: tworrall Date: Mon, 21 Oct 2013 15:16:44 -0400 Subject: [PATCH] VIVO-386 and VIVO-385 --- .../listViewConfig-personInPosition.xml | 342 +++++++++--------- rdf/display/everytime/PropertyConfig.n3 | 12 +- 2 files changed, 180 insertions(+), 174 deletions(-) diff --git a/productMods/config/listViewConfig-personInPosition.xml b/productMods/config/listViewConfig-personInPosition.xml index 6c161705..6922110b 100644 --- a/productMods/config/listViewConfig-personInPosition.xml +++ b/productMods/config/listViewConfig-personInPosition.xml @@ -1,168 +1,174 @@ - - - - - - - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> - PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> - - SELECT DISTINCT ?subclass - ?position - ?positionTitle - ?hrJobTitle - ?rank - ?org ?orgName - ?middleOrg ?middleOrgName - ?outerOrg ?outerOrgName - ?dateTimeStart ?dateTimeEnd WHERE { - ?subject ?property ?position - OPTIONAL { ?position core:relates ?org . - ?org rdfs:label ?orgName - OPTIONAL { ?org core:subOrganizationWithin ?middleOrg . - ?middleOrg rdfs:label ?middleOrgName - OPTIONAL { ?middleOrg core:subOrganizationWithin ?outerOrg . - ?outerOrg rdfs:label ?outerOrgName - } - } - } - OPTIONAL { ?position rdfs:label ?positionTitle } - OPTIONAL { ?position core:hrJobTitle ?hrJobTitle } - OPTIONAL { ?position core:rank ?rank } - OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval - OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } - OPTIONAL { ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } - } - - OPTIONAL { ?position vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf core:Position - } - - - FILTER ( bound(?org) ) - - } ORDER BY ?subclass DESC(?dateTimeEnd) ?rank - - - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> - CONSTRUCT { - ?subject ?property ?position . - ?position vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf core:Position - } WHERE { - ?subject ?property ?position . - ?position a core:Position . - ?position vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf core:Position - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX foaf: <http://xmlns.com/foaf/0.1/> - CONSTRUCT { - ?subject ?property ?position . - ?position a core:Position . - ?position ?positionProperty ?positionValue . - ?org rdfs:label ?orgName . - ?org core:subOrganizationWithin ?middleOrg . - ?middleOrg rdfs:label ?middleOrgName . - ?middleOrg core:subOrganizationWithin ?outerOrg . - ?outerOrg rdfs:label ?outerOrgName - } WHERE { - { - ?subject ?property ?position . - ?position a core:Position . - } UNION { - ?subject ?property ?position . - ?position a core:Position . - ?position ?positionProperty ?positionValue - } UNION { - ?subject ?property ?position . - ?position a core:Position . - ?position core:rank ?rank - } UNION { - ?subject ?property ?position . - ?position a core:Position . - ?position core:relates ?org . - ?org a foaf:Organization . - ?org rdfs:label ?orgName - } UNION { - ?subject ?property ?position . - ?position a core:Position . - ?position core:relates ?org . - ?org a foaf:Organization . - ?org core:subOrganizationWithin ?middleOrg - } UNION { - ?subject ?property ?position . - ?position a core:Position . - ?position core:relates ?org . - ?org a foaf:Organization . - ?org core:subOrganizationWithin ?middleOrg . - ?middleOrg rdfs:label ?middleOrgName - } UNION { - ?subject ?property ?position . - ?position a core:Position . - ?position core:relates ?org . - ?org a foaf:Organization . - ?org core:subOrganizationWithin ?middleOrg . - ?middleOrg core:subOrganizationWithin ?outerOrg - } UNION { - ?subject ?property ?position . - ?position a core:Position . - ?position core:positionInOrganization ?org . - ?org a foaf:Organization . - ?org core:subOrganizationWithin ?middleOrg . - ?middleOrg core:subOrganizationWithin ?outerOrg . - ?outerOrg rdfs:label ?outerOrgName - } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?position . - ?position a core:Position . - ?position core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } WHERE { - ?subject ?property ?position . - ?position a core:Position . - ?position core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?position . - ?position a core:Position . - ?position core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } WHERE { - ?subject ?property ?position . - ?position a core:Position . - ?position core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } - - - - + + + + + + + + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + PREFIX core: <http://vivoweb.org/ontology/core#> + PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> + PREFIX obo: <http://purl.obolibrary.org/obo/> + + SELECT DISTINCT ?subclass + ?position + ?positionTitle + ?hrJobTitle + ?rank + ?org ?orgName + ?middleOrg ?middleOrgName + ?outerOrg ?outerOrgName + ?dateTimeStart ?dateTimeEnd WHERE { + ?subject ?property ?position + OPTIONAL { ?position core:relates ?org . + ?org rdfs:label ?orgName + OPTIONAL { ?org obo:BFO_0000050 ?middleOrg . + ?middleOrg rdfs:label ?middleOrgName + OPTIONAL { ?middleOrg obo:BFO_0000050 ?outerOrg . + ?outerOrg rdfs:label ?outerOrgName + } + } + } + OPTIONAL { ?position rdfs:label ?positionTitle } + OPTIONAL { ?position core:hrJobTitle ?hrJobTitle } + OPTIONAL { ?position core:rank ?rank } + OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval + OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart + } + OPTIONAL { ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd + } + } + + OPTIONAL { ?position vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf core:Position + } + + + FILTER ( bound(?org) ) + + } ORDER BY ?subclass DESC(?dateTimeEnd) ?rank + + + + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + PREFIX core: <http://vivoweb.org/ontology/core#> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> + CONSTRUCT { + ?subject ?property ?position . + ?position vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf core:Position + } WHERE { + ?subject ?property ?position . + ?position a core:Position . + ?position vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf core:Position + } + + + + PREFIX core: <http://vivoweb.org/ontology/core#> + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + PREFIX foaf: <http://xmlns.com/foaf/0.1/> + PREFIX obo: <http://purl.obolibrary.org/obo/> + CONSTRUCT { + ?subject ?property ?position . + ?position a core:Position . + ?position ?positionProperty ?positionValue . + ?org rdfs:label ?orgName . + ?org obo:BFO_0000050 ?middleOrg . + ?middleOrg rdfs:label ?middleOrgName . + ?middleOrg obo:BFO_0000050 ?outerOrg . + ?outerOrg rdfs:label ?outerOrgName + } WHERE { + { + ?subject ?property ?position . + ?position a core:Position . + } UNION { + ?subject ?property ?position . + ?position a core:Position . + ?position ?positionProperty ?positionValue + } UNION { + ?subject ?property ?position . + ?position a core:Position . + ?position core:rank ?rank + } UNION { + ?subject ?property ?position . + ?position a core:Position . + ?position core:relates ?org . + ?org a foaf:Organization . + ?org rdfs:label ?orgName + } UNION { + ?subject ?property ?position . + ?position a core:Position . + ?position core:relates ?org . + ?org a foaf:Organization . + ?org obo:BFO_0000050 ?middleOrg + } UNION { + ?subject ?property ?position . + ?position a core:Position . + ?position core:relates ?org . + ?org a foaf:Organization . + ?org obo:BFO_0000050 ?middleOrg . + ?middleOrg rdfs:label ?middleOrgName + } UNION { + ?subject ?property ?position . + ?position a core:Position . + ?position core:relates ?org . + ?org a foaf:Organization . + ?org obo:BFO_0000050 ?middleOrg . + ?middleOrg obo:BFO_0000050 ?outerOrg + } UNION { + ?subject ?property ?position . + ?position a core:Position . + ?position core:positionInOrganization ?org . + ?org a foaf:Organization . + ?org obo:BFO_0000050 ?middleOrg . + ?middleOrg obo:BFO_0000050 ?outerOrg . + ?outerOrg rdfs:label ?outerOrgName + } + } + + + + PREFIX core: <http://vivoweb.org/ontology/core#> + CONSTRUCT { + ?subject ?property ?position . + ?position a core:Position . + ?position core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd + } WHERE { + ?subject ?property ?position . + ?position a core:Position . + ?position core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd + } + + + + diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3 index 22793314..7f2b7bd0 100644 --- a/rdf/display/everytime/PropertyConfig.n3 +++ b/rdf/display/everytime/PropertyConfig.n3 @@ -69,7 +69,7 @@ local:hasServiceProviderRoleContext a :ConfigContext ; local:hasServiceProviderRoleConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ; :displayName "service to the profession" ; - vitro:displayRankAnnot 1; + vitro:displayRankAnnot 20; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddServiceProviderRoleToPersonGenerator"^^ ; @@ -129,7 +129,7 @@ local:hasTeacherRoleContext a :ConfigContext ; local:hasTeacherRoleConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ; :displayName "teaching activities" ; - vitro:displayRankAnnot 1; + vitro:displayRankAnnot 20; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddTeacherRoleToPersonGenerator"^^ ; @@ -219,7 +219,7 @@ local:hasResearcherRoleContext a :ConfigContext ; local:hasResearcherRoleConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ; :displayName "research activities" ; - vitro:displayRankAnnot 10; + vitro:displayRankAnnot 15; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddResearcherRoleToPersonGenerator"^^ ; @@ -234,7 +234,7 @@ local:hasInvestigatorRoleContext a :ConfigContext ; local:hasInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ; :displayName "investigator on" ; - vitro:displayRankAnnot 25; + vitro:displayRankAnnot 30; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddGrantRoleToPersonGenerator"^^ ; @@ -249,7 +249,7 @@ local:hasPrincipalInvestigatorRoleContext a :ConfigContext ; local:hasPrincipalInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ; :displayName "principal investigator on" ; - vitro:displayRankAnnot 15; + vitro:displayRankAnnot 20; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddGrantRoleToPersonGenerator"^^ ; @@ -264,7 +264,7 @@ local:hasCo-PrincipalInvestigatorRoleContext a :ConfigContext ; local:hasCo-PrincipalInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ; :listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ; :displayName "co-principal investigator on" ; - vitro:displayRankAnnot 20; + vitro:displayRankAnnot 25; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddGrantRoleToPersonGenerator"^^ ;