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

Fix hiding of Principal / Co-Principal Investigator roles

Browse source
This commit is contained in:
grahamtriggs 2015-10-14 14:25:13 +01:00
parent 7bbf75d800
commit 740ad18542
2 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -71,6 +71,7 @@
?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 .
?role core:hideFromDisplay ?hideThis .
?activity rdfs:label ?activityLabel . ?activity rdfs:label ?activityLabel .
?activity core:assignedBy ?awardedBy . ?activity core:assignedBy ?awardedBy .
?awardedBy rdfs:label ?awardedByLabel . ?awardedBy rdfs:label ?awardedByLabel .
@ -80,7 +81,11 @@
} WHERE { } WHERE {
{ {
?subject ?property ?role . ?subject ?property ?role .
?role a core:CoPrincipalInvestigatorRole . ?role a core:CoPrincipalInvestigatorRole .
} UNION {
?subject ?property ?role .
?role a core:CoPrincipalInvestigatorRole .
?role core:hideFromDisplay ?hideThis .
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role a core:CoPrincipalInvestigatorRole . ?role a core:CoPrincipalInvestigatorRole .

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

@ -62,7 +62,13 @@
OPTIONAL { ?role core:hideFromDisplay ?hideThis } OPTIONAL { ?role core:hideFromDisplay ?hideThis }
} ORDER BY DESC(?dateTimeEndRole) DESC(?dateTimeStartRole) DESC(?dateTimeEndGrant) DESC(?dateTimeStartGrant) ?activityLabel ?activityName } ORDER BY DESC(?dateTimeEndRole) DESC(?dateTimeStartRole) DESC(?dateTimeEndGrant) DESC(?dateTimeStartGrant) ?activityLabel ?activityName
</query-select> </query-select>
<!--
?role rdfs:label ?roleLabel .
} UNION {
?subject ?property ?role .
?role a core:PrincipalInvestigatorRole .
?role rdfs:label ?roleLabel .
-->
<query-construct> <query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&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;
@ -71,7 +77,7 @@
?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 .
?role ?roleProperty ?roleValue . ?role core:hideFromDisplay ?hideThis .
?activity rdfs:label ?activityLabel . ?activity rdfs:label ?activityLabel .
?activity core:assignedBy ?awardedBy . ?activity core:assignedBy ?awardedBy .
?awardedBy rdfs:label ?awardedByLabel . ?awardedBy rdfs:label ?awardedByLabel .
@ -85,7 +91,7 @@
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role a core:PrincipalInvestigatorRole . ?role a core:PrincipalInvestigatorRole .
?role ?roleProperty ?roleValue ?role core:hideFromDisplay ?hideThis .
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role a core:PrincipalInvestigatorRole . ?role a core:PrincipalInvestigatorRole .