From 740ad18542792e317ce4f27154e7aabfb992c4c4 Mon Sep 17 00:00:00 2001
From: grahamtriggs <grahamtriggs@gmail.com>
Date: Wed, 14 Oct 2015 14:25:13 +0100
Subject: [PATCH] Fix hiding of Principal / Co-Principal Investigator roles

---
 ...listViewConfig-hasCoPrincipalInvestigatorRole.xml |  7 ++++++-
 .../listViewConfig-hasPrincipalInvestigatorRole.xml  | 12 +++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/productMods/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml b/productMods/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml
index 13aa43bd..102989af 100644
--- a/productMods/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml
+++ b/productMods/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml
@@ -71,6 +71,7 @@
             ?subject ?property ?role .
             ?role a core:CoPrincipalInvestigatorRole .
             ?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
+            ?role core:hideFromDisplay ?hideThis .
             ?activity rdfs:label ?activityLabel .
             ?activity core:assignedBy ?awardedBy .
             ?awardedBy rdfs:label ?awardedByLabel .
@@ -80,7 +81,11 @@
         } WHERE {
             {
                 ?subject ?property ?role .
-                ?role a core:CoPrincipalInvestigatorRole . 
+                ?role a core:CoPrincipalInvestigatorRole .
+            } UNION {
+                ?subject ?property ?role .
+                ?role a core:CoPrincipalInvestigatorRole .
+                ?role core:hideFromDisplay ?hideThis .
             } UNION {
                 ?subject ?property ?role .
                 ?role a core:CoPrincipalInvestigatorRole .
diff --git a/productMods/config/listViewConfig-hasPrincipalInvestigatorRole.xml b/productMods/config/listViewConfig-hasPrincipalInvestigatorRole.xml
index 92a0a379..ac71e9b6 100644
--- a/productMods/config/listViewConfig-hasPrincipalInvestigatorRole.xml
+++ b/productMods/config/listViewConfig-hasPrincipalInvestigatorRole.xml
@@ -62,7 +62,13 @@
             OPTIONAL { ?role core:hideFromDisplay ?hideThis }
         } ORDER BY DESC(?dateTimeEndRole) DESC(?dateTimeStartRole) DESC(?dateTimeEndGrant) DESC(?dateTimeStartGrant) ?activityLabel ?activityName
     </query-select>
-
+<!--
+            ?role rdfs:label ?roleLabel .
+            } UNION {
+                ?subject ?property ?role .
+                ?role a core:PrincipalInvestigatorRole .
+                ?role rdfs:label ?roleLabel .
+-->
     <query-construct>
         PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
         PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt; 
@@ -71,7 +77,7 @@
             ?subject ?property ?role .
             ?role a core:PrincipalInvestigatorRole .
             ?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
-            ?role ?roleProperty ?roleValue . 
+            ?role core:hideFromDisplay ?hideThis .
             ?activity rdfs:label ?activityLabel .
             ?activity core:assignedBy ?awardedBy .
             ?awardedBy rdfs:label ?awardedByLabel .
@@ -85,7 +91,7 @@
             } UNION {
                 ?subject ?property ?role .
                 ?role a core:PrincipalInvestigatorRole .
-                ?role ?roleProperty ?roleValue 
+                ?role core:hideFromDisplay ?hideThis .
             } UNION {
                 ?subject ?property ?role .
                 ?role a core:PrincipalInvestigatorRole .