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

VIVO-552 updates for vivo:Contract

Browse source
This commit is contained in:
tworrall 2013-11-19 16:58:41 -05:00
parent 6aa8ed4ddd
commit 04e66272e9
3 changed files with 120 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
productMods/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml
View file

@ -27,7 +27,6 @@
?role a core:CoPrincipalInvestigatorRole . ?role a core:CoPrincipalInvestigatorRole .
OPTIONAL { ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . OPTIONAL { ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity .
?activity a core:Grant .
?activity rdfs:label ?activityLabel . ?activity rdfs:label ?activityLabel .
LET (?activityName := afn:localname(?activity)) LET (?activityName := afn:localname(?activity))
} }
@ -72,7 +71,6 @@
?subject ?property ?role . ?subject ?property ?role .
?role a core:CoPrincipalInvestigatorRole . ?role a core:CoPrincipalInvestigatorRole .
?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity .
?activity a core:Grant .
?role ?roleProperty ?roleValue . ?role ?roleProperty ?roleValue .
?activity rdfs:label ?activityLabel . ?activity rdfs:label ?activityLabel .
?activity core:assignedBy ?awardedBy . ?activity core:assignedBy ?awardedBy .
@ -112,6 +110,12 @@
?adminedByRole <http://purl.obolibrary.org/obo/RO_0000052> ?adminedBy . ?adminedByRole <http://purl.obolibrary.org/obo/RO_0000052> ?adminedBy .
?adminedBy a foaf:Organization . ?adminedBy a foaf:Organization .
?adminedBy rdfs:label ?adminedByLabel ?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
} }
} }
</query-construct> </query-construct>
@ -160,6 +164,7 @@
?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant .
?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant
} WHERE { } WHERE {
{
?subject ?property ?role . ?subject ?property ?role .
?role a core:CoPrincipalInvestigatorRole . ?role a core:CoPrincipalInvestigatorRole .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity . ?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
@ -167,6 +172,15 @@
?activity core:dateTimeInterval ?dateTimeIntervalGrant . ?activity core:dateTimeInterval ?dateTimeIntervalGrant .
?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant .
?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant
} UNION {
?subject ?property ?role .
?role a core:CoPrincipalInvestigatorRole .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
?activity a core:Contract .
?activity core:dateTimeInterval ?dateTimeIntervalGrant .
?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant .
?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant
}
} }
</query-construct> </query-construct>
@ -181,6 +195,7 @@
?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant .
?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant
} WHERE { } WHERE {
{
?subject ?property ?role . ?subject ?property ?role .
?role a core:CoPrincipalInvestigatorRole . ?role a core:CoPrincipalInvestigatorRole .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity . ?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
@ -188,6 +203,15 @@
?activity core:dateTimeInterval ?dateTimeIntervalGrant . ?activity core:dateTimeInterval ?dateTimeIntervalGrant .
?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant .
?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant
} UNION {
?subject ?property ?role .
?role a core:CoPrincipalInvestigatorRole .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
?activity a core:Contract .
?activity core:dateTimeInterval ?dateTimeIntervalGrant .
?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant .
?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant
}
} }
</query-construct> </query-construct>

29
productMods/config/listViewConfig-hasInvestigatorRole.xml
View file

@ -28,7 +28,6 @@
?role vitro:mostSpecificType ?subclass ?role vitro:mostSpecificType ?subclass
OPTIONAL { ?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity . OPTIONAL { ?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
?activity a core:Grant .
?activity rdfs:label ?activityLabel . ?activity rdfs:label ?activityLabel .
LET (?activityName := afn:localname(?activity)) LET (?activityName := afn:localname(?activity))
} }
@ -74,7 +73,6 @@
?subject ?property ?role . ?subject ?property ?role .
?role a core:InvestigatorRole . ?role a core:InvestigatorRole .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity . ?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
?activity a core:Grant .
?role ?roleProperty ?roleValue . ?role ?roleProperty ?roleValue .
?activity rdfs:label ?activityLabel . ?activity rdfs:label ?activityLabel .
?activity core:assignedBy ?awardedBy . ?activity core:assignedBy ?awardedBy .
@ -114,6 +112,12 @@
?adminedByRole &lt;http://purl.obolibrary.org/obo/RO_0000052&gt; ?adminedBy . ?adminedByRole &lt;http://purl.obolibrary.org/obo/RO_0000052&gt; ?adminedBy .
?adminedBy a foaf:Organization . ?adminedBy a foaf:Organization .
?adminedBy rdfs:label ?adminedByLabel ?adminedBy rdfs:label ?adminedByLabel
} UNION {
?subject ?property ?role .
?role a core:InvestigatorRole .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
?activity a core:Contract .
?activity rdfs:label ?activityLabel
} }
} }
</query-construct> </query-construct>
@ -162,6 +166,7 @@
?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant .
?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant
} WHERE { } WHERE {
{
?subject ?property ?role . ?subject ?property ?role .
?role a core:InvestigatorRole . ?role a core:InvestigatorRole .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity . ?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
@ -169,6 +174,15 @@
?activity core:dateTimeInterval ?dateTimeIntervalGrant . ?activity core:dateTimeInterval ?dateTimeIntervalGrant .
?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant .
?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant
} UNION {
?subject ?property ?role .
?role a core:InvestigatorRole .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
?activity a core:Contract .
?activity core:dateTimeInterval ?dateTimeIntervalGrant .
?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant .
?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant
}
} }
</query-construct> </query-construct>
@ -178,11 +192,11 @@
?subject ?property ?role . ?subject ?property ?role .
?role a core:InvestigatorRole . ?role a core:InvestigatorRole .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity . ?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
?activity a core:Grant .
?activity core:dateTimeInterval ?dateTimeIntervalGrant . ?activity core:dateTimeInterval ?dateTimeIntervalGrant .
?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant .
?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant
} WHERE { } WHERE {
{
?subject ?property ?role . ?subject ?property ?role .
?role a core:InvestigatorRole . ?role a core:InvestigatorRole .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity . ?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
@ -190,6 +204,15 @@
?activity core:dateTimeInterval ?dateTimeIntervalGrant . ?activity core:dateTimeInterval ?dateTimeIntervalGrant .
?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant .
?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant
} UNION {
?subject ?property ?role .
?role a core:InvestigatorRole .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
?activity a core:Contract .
?activity core:dateTimeInterval ?dateTimeIntervalGrant .
?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant .
?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant
}
} }
</query-construct> </query-construct>

28
productMods/config/listViewConfig-hasPrincipalInvestigatorRole.xml
View file

@ -27,7 +27,6 @@
?role a core:PrincipalInvestigatorRole . ?role a core:PrincipalInvestigatorRole .
OPTIONAL { ?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity . OPTIONAL { ?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
?activity a core:Grant .
?activity rdfs:label ?activityLabel . ?activity rdfs:label ?activityLabel .
LET (?activityName := afn:localname(?activity)) LET (?activityName := afn:localname(?activity))
} }
@ -72,7 +71,6 @@
?subject ?property ?role . ?subject ?property ?role .
?role a core:PrincipalInvestigatorRole . ?role a core:PrincipalInvestigatorRole .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity . ?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
?activity a core:Grant .
?role ?roleProperty ?roleValue . ?role ?roleProperty ?roleValue .
?activity rdfs:label ?activityLabel . ?activity rdfs:label ?activityLabel .
?activity core:assignedBy ?awardedBy . ?activity core:assignedBy ?awardedBy .
@ -112,6 +110,12 @@
?adminedByRole &lt;http://purl.obolibrary.org/obo/RO_0000052&gt; ?adminedBy . ?adminedByRole &lt;http://purl.obolibrary.org/obo/RO_0000052&gt; ?adminedBy .
?adminedBy a foaf:Organization . ?adminedBy a foaf:Organization .
?adminedBy rdfs:label ?adminedByLabel ?adminedBy rdfs:label ?adminedByLabel
} UNION {
?subject ?property ?role .
?role a core:PrincipalInvestigatorRole .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
?activity a core:Contract .
?activity rdfs:label ?activityLabel
} }
} }
</query-construct> </query-construct>
@ -160,6 +164,7 @@
?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant .
?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant
} WHERE { } WHERE {
{
?subject ?property ?role . ?subject ?property ?role .
?role a core:PrincipalInvestigatorRole . ?role a core:PrincipalInvestigatorRole .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity . ?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
@ -167,6 +172,15 @@
?activity core:dateTimeInterval ?dateTimeIntervalGrant . ?activity core:dateTimeInterval ?dateTimeIntervalGrant .
?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant .
?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant
} UNION {
?subject ?property ?role .
?role a core:PrincipalInvestigatorRole .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
?activity a core:Contract .
?activity core:dateTimeInterval ?dateTimeIntervalGrant .
?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant .
?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant
}
} }
</query-construct> </query-construct>
@ -181,6 +195,7 @@
?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant .
?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant
} WHERE { } WHERE {
{
?subject ?property ?role . ?subject ?property ?role .
?role a core:PrincipalInvestigatorRole . ?role a core:PrincipalInvestigatorRole .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity . ?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
@ -188,6 +203,15 @@
?activity core:dateTimeInterval ?dateTimeIntervalGrant . ?activity core:dateTimeInterval ?dateTimeIntervalGrant .
?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant .
?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant
} UNION {
?subject ?property ?role .
?role a core:PrincipalInvestigatorRole .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
?activity a core:Contract .
?activity core:dateTimeInterval ?dateTimeIntervalGrant .
?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant .
?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant
}
} }
</query-construct> </query-construct>