improving short views for roles NIHVIVO-630

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>

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>

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>

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>

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>

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>

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>

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>
 

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>

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. 
+ roleActivityToRolePredicate: URI of the activity to role predicate.
- roleActivityLabel: human readable label of activity.   --%>
+ 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>					    						    	
 					    	

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>

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>