From 4db980657cb0954b47c9e697fe4e8bc0d4eee207 Mon Sep 17 00:00:00 2001
From: bdc34 <bdc34@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 14 Jul 2010 19:36:28 +0000
Subject: [PATCH] improving short views for roles NIHVIVO-630

---
 .../templates/entity/clinicalRoleShortView.jsp      |  1 +
 .../templates/entity/grantCoPiRoleShortView.jsp     |  3 ++-
 .../templates/entity/grantPiRoleShortView.jsp       |  1 +
 productMods/templates/entity/grantRoleShortView.jsp |  1 +
 .../templates/entity/headOfRoleShortView.jsp        |  1 +
 .../templates/entity/memberRoleShortView.jsp        |  1 +
 .../templates/entity/outreachRoleShortView.jsp      |  1 +
 .../templates/entity/presenterRoleShortView.jsp     |  1 +
 ...rtView.jsp => researchActivityRoleShortView.jsp} |  1 +
 productMods/templates/entity/roleShortView.jsp      | 13 ++++++++++---
 .../entity/serviceProviderRoleShortView.jsp         |  1 +
 ...rtView.jsp => teachingActivityRoleShortView.jsp} |  1 +
 12 files changed, 22 insertions(+), 4 deletions(-)
 rename productMods/templates/entity/{researcherRoleShortView.jsp => researchActivityRoleShortView.jsp} (89%)
 rename productMods/templates/entity/{teacherRoleShortView.jsp => teachingActivityRoleShortView.jsp} (89%)

diff --git a/productMods/templates/entity/clinicalRoleShortView.jsp b/productMods/templates/entity/clinicalRoleShortView.jsp
index c4b24838..275a6eb7 100644
--- a/productMods/templates/entity/clinicalRoleShortView.jsp
+++ b/productMods/templates/entity/clinicalRoleShortView.jsp
@@ -5,4 +5,5 @@
 	<jsp:param name="roleToPersonPredicate" value="http://vivoweb.org/ontology/core#clinicianRoleOf"/>
 	<jsp:param name="roleActivityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole"/>
 	<jsp:param name="roleActivityLabel" value="clinical role"/>
+	<jsp:param name="roleLabelForPerson" value="USE_MONIKER"/>
 </jsp:include>
diff --git a/productMods/templates/entity/grantCoPiRoleShortView.jsp b/productMods/templates/entity/grantCoPiRoleShortView.jsp
index 183230d4..5400b2f5 100644
--- a/productMods/templates/entity/grantCoPiRoleShortView.jsp
+++ b/productMods/templates/entity/grantCoPiRoleShortView.jsp
@@ -4,5 +4,6 @@
 	<jsp:param name="personToRolePredicate" value="http://vivoweb.org/ontology/core#hasCo-PrincipalInvestigatorRole"/>
 	<jsp:param name="roleToPersonPredicate" value="http://vivoweb.org/ontology/core#co-PrincipalInvestigatorRoleOf"/>
 	<jsp:param name="roleActivityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole"/>
-	<jsp:param name="roleActivityLabel" value="grant"/>	
+	<jsp:param name="roleActivityLabel" value="grant"/>
+	<jsp:param name="roleLabelForPerson" value="co-principal investigator"/>	
 </jsp:include>
diff --git a/productMods/templates/entity/grantPiRoleShortView.jsp b/productMods/templates/entity/grantPiRoleShortView.jsp
index 4119de06..2cce2ba1 100644
--- a/productMods/templates/entity/grantPiRoleShortView.jsp
+++ b/productMods/templates/entity/grantPiRoleShortView.jsp
@@ -5,4 +5,5 @@
 	<jsp:param name="roleToPersonPredicate" value="http://vivoweb.org/ontology/core#principalInvestigatorRoleOf"/>
 	<jsp:param name="roleActivityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole"/>
 	<jsp:param name="roleActivityLabel" value="grant"/>
+	<jsp:param name="roleLabelForPerson" value="principal investigator"/>
 </jsp:include>
diff --git a/productMods/templates/entity/grantRoleShortView.jsp b/productMods/templates/entity/grantRoleShortView.jsp
index 8aacd17b..4390e130 100644
--- a/productMods/templates/entity/grantRoleShortView.jsp
+++ b/productMods/templates/entity/grantRoleShortView.jsp
@@ -5,4 +5,5 @@
 	<jsp:param name="roleToPersonPredicate" value="http://vivoweb.org/ontology/core#investigatorRoleOf"/>
 	<jsp:param name="roleActivityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole"/>
 	<jsp:param name="roleActivityLabel" value="grant"/>
+    <jsp:param name="roleLabelForPerson" value="investigator"/>
 </jsp:include>
diff --git a/productMods/templates/entity/headOfRoleShortView.jsp b/productMods/templates/entity/headOfRoleShortView.jsp
index bb6ce9d5..fd6b8089 100644
--- a/productMods/templates/entity/headOfRoleShortView.jsp
+++ b/productMods/templates/entity/headOfRoleShortView.jsp
@@ -5,4 +5,5 @@
 	<jsp:param name="roleToPersonPredicate" value="http://vivoweb.org/ontology/core#leaderRoleOf"/>
 	<jsp:param name="roleActivityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole"/>
 	<jsp:param name="roleActivityLabel" value="leadership role"/>
+    <jsp:param name="roleLabelForPerson" value="leader"/>
 </jsp:include>
diff --git a/productMods/templates/entity/memberRoleShortView.jsp b/productMods/templates/entity/memberRoleShortView.jsp
index 775c94ff..8e966d00 100644
--- a/productMods/templates/entity/memberRoleShortView.jsp
+++ b/productMods/templates/entity/memberRoleShortView.jsp
@@ -5,4 +5,5 @@
 	<jsp:param name="roleToPersonPredicate" value="http://vivoweb.org/ontology/core#memberRoleOf"/>
 	<jsp:param name="roleActivityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole"/>
 	<jsp:param name="roleActivityLabel" value="member role"/>
+    <jsp:param name="roleLabelForPerson" value="member"/>
 </jsp:include>
diff --git a/productMods/templates/entity/outreachRoleShortView.jsp b/productMods/templates/entity/outreachRoleShortView.jsp
index 31a87784..591734a0 100644
--- a/productMods/templates/entity/outreachRoleShortView.jsp
+++ b/productMods/templates/entity/outreachRoleShortView.jsp
@@ -5,4 +5,5 @@
 	<jsp:param name="roleToPersonPredicate" value="http://vivoweb.org/ontology/core#outreachProviderRoleOf"/>
 	<jsp:param name="roleActivityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole"/>
 	<jsp:param name="roleActivityLabel" value="outreach role"/>
+    <jsp:param name="roleLabelForPerson" value="USE_MONIKER"/>
 </jsp:include>
diff --git a/productMods/templates/entity/presenterRoleShortView.jsp b/productMods/templates/entity/presenterRoleShortView.jsp
index 1e0a8af5..0d9ec7e0 100644
--- a/productMods/templates/entity/presenterRoleShortView.jsp
+++ b/productMods/templates/entity/presenterRoleShortView.jsp
@@ -5,5 +5,6 @@
 	<jsp:param name="roleToPersonPredicate" value="http://vivoweb.org/ontology/core#presenterRoleOf"/>
 	<jsp:param name="roleActivityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole"/>
 	<jsp:param name="roleActivityLabel" value="presenter role"/>
+    <jsp:param name="roleLabelForPerson" value="presenter"/>
 </jsp:include>
 
diff --git a/productMods/templates/entity/researcherRoleShortView.jsp b/productMods/templates/entity/researchActivityRoleShortView.jsp
similarity index 89%
rename from productMods/templates/entity/researcherRoleShortView.jsp
rename to productMods/templates/entity/researchActivityRoleShortView.jsp
index 5f19ff8e..7f9e4da3 100644
--- a/productMods/templates/entity/researcherRoleShortView.jsp
+++ b/productMods/templates/entity/researchActivityRoleShortView.jsp
@@ -5,4 +5,5 @@
 	<jsp:param name="roleToPersonPredicate" value="http://vivoweb.org/ontology/core#researcherRoleOf"/>
 	<jsp:param name="roleActivityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole"/>
 	<jsp:param name="roleActivityLabel" value="researcher role"/>
+    <jsp:param name="roleLabelForPerson" value="USE_MONIKER"/>
 </jsp:include>
diff --git a/productMods/templates/entity/roleShortView.jsp b/productMods/templates/entity/roleShortView.jsp
index acc8627f..1731c9f7 100644
--- a/productMods/templates/entity/roleShortView.jsp
+++ b/productMods/templates/entity/roleShortView.jsp
@@ -10,8 +10,10 @@
  The following vars should be set by the jsp that is calling this short view 
  personToRolePredicate: URI of the person to role predicate.
  roleToPersonPredicate: URI of the role to person predicate. 
- roleActivityToRolePredicate: URI of the activity to role predicate. 
- roleActivityLabel: human readable label of activity.   --%>
+ roleActivityToRolePredicate: URI of the activity to role predicate.
+ roleLabelForPerson: human readable label for person when viewing from non-person side of role 
+ roleActivityLabel: human readable label of activity used for error messages   
+ --%>
  
 <c:choose>
 	<c:when test="${!empty individual}"><%-- individual is the OBJECT of the property referenced -- the Role individual, not the Person or grant --%>
@@ -52,7 +54,12 @@
 				    		<c:when test="${!empty individual.objectPropertyMap[ param.roleToPersonPredicate ]}">				    		
 				    		    <c:set var="person" value="${individual.objectPropertyMap[ param.roleToPersonPredicate ].objectPropertyStatements[0].object}" />
 					    		<c:set var="name" value="${person.name}"/>
-<%--                                <c:set var="label" value="${person.dataPropertyMap['http://vivoweb.org/ontology/core#preferredTitle'].dataPropertyStatements[0].data}" />  --%>
+                                <c:if test="${param.roleLabelForPerson == 'USE_MONIKER'}">
+                                    <c:set var="label" value="${person.moniker}" />
+                                </c:if>  
+                                <c:if test="${param.roleLabelForPerson != 'USE_MONIKER'}">
+                                    <c:set var="label" value="${param.roleLabelForPerson}" />
+                                </c:if>
                                 <c:set var="uri" value="${person.URI}"/>
 					    	</c:when>					    						    	
 					    	
diff --git a/productMods/templates/entity/serviceProviderRoleShortView.jsp b/productMods/templates/entity/serviceProviderRoleShortView.jsp
index ef90c5cc..12ce62b0 100644
--- a/productMods/templates/entity/serviceProviderRoleShortView.jsp
+++ b/productMods/templates/entity/serviceProviderRoleShortView.jsp
@@ -5,4 +5,5 @@
 	<jsp:param name="roleToPersonPredicate" value="http://vivoweb.org/ontology/core#serviceProviderRoleOf"/>
 	<jsp:param name="roleActivityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole"/>
 	<jsp:param name="roleActivityLabel" value="service to profession role"/>
+	<jsp:param name="roleLabelForPerson" value="provider of service"/>
 </jsp:include>
diff --git a/productMods/templates/entity/teacherRoleShortView.jsp b/productMods/templates/entity/teachingActivityRoleShortView.jsp
similarity index 89%
rename from productMods/templates/entity/teacherRoleShortView.jsp
rename to productMods/templates/entity/teachingActivityRoleShortView.jsp
index e147fde5..f7401541 100644
--- a/productMods/templates/entity/teacherRoleShortView.jsp
+++ b/productMods/templates/entity/teachingActivityRoleShortView.jsp
@@ -5,4 +5,5 @@
 	<jsp:param name="roleToPersonPredicate" value="http://vivoweb.org/ontology/core#teacherRoleOf"/>
 	<jsp:param name="roleActivityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole"/>
 	<jsp:param name="roleActivityLabel" value="teaching role"/>
+	<jsp:param name="roleLabelForPerson" value="teacher"/>	
 </jsp:include>