From e100d805bc8ff4a7966adb076e4f18f4a7cbc764 Mon Sep 17 00:00:00 2001 From: tworrall Date: Tue, 19 Nov 2013 16:58:41 -0500 Subject: [PATCH] VIVO-552 updates for vivo:Contract --- ...wConfig-hasCoPrincipalInvestigatorRole.xml | 56 ++++++++++++------ .../listViewConfig-hasInvestigatorRole.xml | 57 +++++++++++++------ ...iewConfig-hasPrincipalInvestigatorRole.xml | 56 ++++++++++++------ 3 files changed, 120 insertions(+), 49 deletions(-) diff --git a/productMods/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml b/productMods/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml index 04b433fd..0106b629 100644 --- a/productMods/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml +++ b/productMods/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml @@ -27,7 +27,6 @@ ?role a core:CoPrincipalInvestigatorRole . OPTIONAL { ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . ?activity rdfs:label ?activityLabel . LET (?activityName := afn:localname(?activity)) } @@ -72,7 +71,6 @@ ?subject ?property ?role . ?role a core:CoPrincipalInvestigatorRole . ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . ?role ?roleProperty ?roleValue . ?activity rdfs:label ?activityLabel . ?activity core:assignedBy ?awardedBy . @@ -112,6 +110,12 @@ ?adminedByRole <http://purl.obolibrary.org/obo/RO_0000052> ?adminedBy . ?adminedBy a foaf:Organization . ?adminedBy rdfs:label ?adminedByLabel + } UNION { + ?subject ?property ?role . + ?role a core:CoPrincipalInvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Contract . + ?activity rdfs:label ?activityLabel } } @@ -160,13 +164,23 @@ ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant } WHERE { - ?subject ?property ?role . - ?role a core:CoPrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . - ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant + { + ?subject ?property ?role . + ?role a core:CoPrincipalInvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Grant . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . + ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant + } UNION { + ?subject ?property ?role . + ?role a core:CoPrincipalInvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Contract . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . + ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant + } } @@ -181,13 +195,23 @@ ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant } WHERE { - ?subject ?property ?role . - ?role a core:CoPrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . - ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant + { + ?subject ?property ?role . + ?role a core:CoPrincipalInvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Grant . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . + ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant + } UNION { + ?subject ?property ?role . + ?role a core:CoPrincipalInvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Contract . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . + ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant + } } diff --git a/productMods/config/listViewConfig-hasInvestigatorRole.xml b/productMods/config/listViewConfig-hasInvestigatorRole.xml index baecbdc1..50604248 100644 --- a/productMods/config/listViewConfig-hasInvestigatorRole.xml +++ b/productMods/config/listViewConfig-hasInvestigatorRole.xml @@ -28,7 +28,6 @@ ?role vitro:mostSpecificType ?subclass OPTIONAL { ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . ?activity rdfs:label ?activityLabel . LET (?activityName := afn:localname(?activity)) } @@ -74,7 +73,6 @@ ?subject ?property ?role . ?role a core:InvestigatorRole . ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . ?role ?roleProperty ?roleValue . ?activity rdfs:label ?activityLabel . ?activity core:assignedBy ?awardedBy . @@ -114,6 +112,12 @@ ?adminedByRole <http://purl.obolibrary.org/obo/RO_0000052> ?adminedBy . ?adminedBy a foaf:Organization . ?adminedBy rdfs:label ?adminedByLabel + } UNION { + ?subject ?property ?role . + ?role a core:InvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Contract . + ?activity rdfs:label ?activityLabel } } @@ -162,13 +166,23 @@ ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant } WHERE { - ?subject ?property ?role . - ?role a core:InvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . - ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant + { + ?subject ?property ?role . + ?role a core:InvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Grant . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . + ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant + } UNION { + ?subject ?property ?role . + ?role a core:InvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Contract . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . + ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant + } } @@ -178,18 +192,27 @@ ?subject ?property ?role . ?role a core:InvestigatorRole . ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . ?activity core:dateTimeInterval ?dateTimeIntervalGrant . ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant } WHERE { - ?subject ?property ?role . - ?role a core:InvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . - ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant + { + ?subject ?property ?role . + ?role a core:InvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Grant . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . + ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant + } UNION { + ?subject ?property ?role . + ?role a core:InvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Contract . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . + ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant + } } diff --git a/productMods/config/listViewConfig-hasPrincipalInvestigatorRole.xml b/productMods/config/listViewConfig-hasPrincipalInvestigatorRole.xml index 71a0c8f9..343e8920 100644 --- a/productMods/config/listViewConfig-hasPrincipalInvestigatorRole.xml +++ b/productMods/config/listViewConfig-hasPrincipalInvestigatorRole.xml @@ -27,7 +27,6 @@ ?role a core:PrincipalInvestigatorRole . OPTIONAL { ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . ?activity rdfs:label ?activityLabel . LET (?activityName := afn:localname(?activity)) } @@ -72,7 +71,6 @@ ?subject ?property ?role . ?role a core:PrincipalInvestigatorRole . ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . ?role ?roleProperty ?roleValue . ?activity rdfs:label ?activityLabel . ?activity core:assignedBy ?awardedBy . @@ -112,6 +110,12 @@ ?adminedByRole <http://purl.obolibrary.org/obo/RO_0000052> ?adminedBy . ?adminedBy a foaf:Organization . ?adminedBy rdfs:label ?adminedByLabel + } UNION { + ?subject ?property ?role . + ?role a core:PrincipalInvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Contract . + ?activity rdfs:label ?activityLabel } } @@ -160,13 +164,23 @@ ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant } WHERE { - ?subject ?property ?role . - ?role a core:PrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . - ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant + { + ?subject ?property ?role . + ?role a core:PrincipalInvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Grant . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . + ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant + } UNION { + ?subject ?property ?role . + ?role a core:PrincipalInvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Contract . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . + ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant + } } @@ -181,13 +195,23 @@ ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant } WHERE { - ?subject ?property ?role . - ?role a core:PrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . - ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant + { + ?subject ?property ?role . + ?role a core:PrincipalInvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Grant . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . + ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant + } UNION { + ?subject ?property ?role . + ?role a core:PrincipalInvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Contract . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . + ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant + } }