VIVO-552 updates for vivo:Contract
This commit is contained in:
parent
6aa8ed4ddd
commit
04e66272e9
3 changed files with 120 additions and 49 deletions
|
@ -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
|
||||
}
|
||||
}
|
||||
</query-construct>
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
</query-construct>
|
||||
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
</query-construct>
|
||||
|
||||
|
|
|
@ -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
|
||||
}
|
||||
}
|
||||
</query-construct>
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
</query-construct>
|
||||
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
</query-construct>
|
||||
|
||||
|
|
|
@ -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
|
||||
}
|
||||
}
|
||||
</query-construct>
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
</query-construct>
|
||||
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
</query-construct>
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue