From b1979d24c903ef093dd60fb3839675bdcb09eb3a Mon Sep 17 00:00:00 2001
From: grahamtriggs <grahamtriggs@gmail.com>
Date: Tue, 20 Oct 2015 13:38:13 +0100
Subject: [PATCH] [VIVO-1080] Add position information to manage people in
 organization

---
 .../forms/managePeopleForOrganization.ftl     |  2 +-
 ...ManagePeopleForOrganizationController.java | 21 ++++++++++++-------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/productMods/templates/freemarker/edit/forms/managePeopleForOrganization.ftl b/productMods/templates/freemarker/edit/forms/managePeopleForOrganization.ftl
index 6e55598e..c1115bb6 100644
--- a/productMods/templates/freemarker/edit/forms/managePeopleForOrganization.ftl
+++ b/productMods/templates/freemarker/edit/forms/managePeopleForOrganization.ftl
@@ -21,7 +21,7 @@ ${i18n().check_people_to_exclude}
         <ul >
             <#list peeps as person>
             <li>
-                <input type="checkbox" class="itemCheckbox" <#if person.hideThis??>checked</#if> />${person.name}
+                <input type="checkbox" class="itemCheckbox" <#if person.hideThis??>checked</#if> />${person.name}<#if person.positionLabel??> <span class="listEmphasis">${person.positionLabel}</span></#if>
             </li>
             <script type="text/javascript">
                 itemData.push({
diff --git a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java
index a4186eab..88223672 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/ManagePeopleForOrganizationController.java
@@ -68,17 +68,24 @@ public class ManagePeopleForOrganizationController extends FreemarkerHttpServlet
         + "PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> \n"
         + "PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> \n"
         + "PREFIX foaf: <http://xmlns.com/foaf/0.1/> \n"
-        + "SELECT DISTINCT ?subclass ?position (str(?label) as ?name) ?person ?hideThis WHERE { \n"
+        + "SELECT DISTINCT ?subclass ?position ?positionLabel (str(?label) as ?name) ?person ?hideThis WHERE { \n"
         + "    ?subject core:relatedBy ?position . \n"
         + "    ?position a core:Position . \n"
-        + "    OPTIONAL { ?position core:relates  ?person . " 
-        + "               ?person a foaf:Person . \n"
-        + "               ?person rdfs:label ?label } \n"
-        + "    OPTIONAL { ?position vitro:mostSpecificType ?subclass . \n"
-        + "               OPTIONAL { ?subclass vitro:displayRankAnnot ?displayRank } \n"
+        + "    ?position rdfs:label ?positionLabel . \n"
+        + "    OPTIONAL { \n"
+        + "        ?subject core:relatedBy ?position . \n"
+        + "        ?position a core:Position . \n"
+        + "        ?position core:relates  ?person . "
+        + "        ?person a foaf:Person . \n"
+        + "        ?person rdfs:label ?label } \n"
+        + "    OPTIONAL { \n"
+        + "        ?subject core:relatedBy ?position . \n"
+        + "        ?position a core:Position . \n"
+        + "        ?position vitro:mostSpecificType ?subclass . \n"
+        + "        OPTIONAL { ?subclass vitro:displayRankAnnot ?displayRank } \n"
 		+ "    } \n "
         + "    OPTIONAL { ?position core:hideFromDisplay ?hideThis } \n "
-        + "    FILTER ( ?displayRank < 500 )"
+        + "    FILTER ( !BOUND(?displayRank) || ?displayRank < 500 )"
         + "} ORDER BY ?subclass ?name";    
        
     HashMap<String, List<Map<String,String>>>  getPeople(String subjectUri, VitroRequest vreq) {