From e683208e959e18acdc13409b4cb9aa421eeaab22 Mon Sep 17 00:00:00 2001
From: stellamit <stellamit@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 17 Jun 2011 17:08:12 +0000
Subject: [PATCH] NIHVIVO-2683 (refactored addRoleToPersonTwoStage.jsp to have
 default values (of roleIn/relatedRole) for activityToRolePredicate and
 roleToActivityPredicate)

---
 .../edit/forms/addClinicalRoleToPerson.jsp     |  2 --
 .../edit/forms/addHeadOfRoleToPerson.jsp       |  2 --
 .../edit/forms/addMemberRoleToPerson.jsp       |  2 --
 .../edit/forms/addOrganizerRoleToPerson.jsp    |  2 --
 .../edit/forms/addOutreachRoleToPerson.jsp     |  2 --
 .../edit/forms/addPresenterRoleToPerson.jsp    |  2 --
 .../edit/forms/addResearcherRoleToPerson.jsp   |  2 --
 .../edit/forms/addRoleToPersonTwoStage.jsp     | 18 ++++++++++--------
 .../forms/addServiceProviderRoleToPerson.jsp   |  2 --
 .../edit/forms/addTeacherRoleToPerson.jsp      |  2 --
 10 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/productMods/edit/forms/addClinicalRoleToPerson.jsp b/productMods/edit/forms/addClinicalRoleToPerson.jsp
index cee0dab0..2390270d 100644
--- a/productMods/edit/forms/addClinicalRoleToPerson.jsp
+++ b/productMods/edit/forms/addClinicalRoleToPerson.jsp
@@ -3,8 +3,6 @@
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
 	<jsp:param name="roleActivityTypeLabel" value="clinical activity" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ClinicalRole" />
-	<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
-    <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
 	<jsp:param name="roleActivityType_literalOptions" 
diff --git a/productMods/edit/forms/addHeadOfRoleToPerson.jsp b/productMods/edit/forms/addHeadOfRoleToPerson.jsp
index eb497e6b..89b67b13 100644
--- a/productMods/edit/forms/addHeadOfRoleToPerson.jsp
+++ b/productMods/edit/forms/addHeadOfRoleToPerson.jsp
@@ -3,8 +3,6 @@
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
 	<jsp:param name="roleActivityTypeLabel" value="head of" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#LeaderRole" />
-	<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
-    <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" />
 	 
diff --git a/productMods/edit/forms/addMemberRoleToPerson.jsp b/productMods/edit/forms/addMemberRoleToPerson.jsp
index 01ee33d3..e1e79e7f 100644
--- a/productMods/edit/forms/addMemberRoleToPerson.jsp
+++ b/productMods/edit/forms/addMemberRoleToPerson.jsp
@@ -3,8 +3,6 @@
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
 	<jsp:param name="roleActivityTypeLabel" value="membership" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#MemberRole" />
-	<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
-    <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />	
 	<jsp:param name="roleActivityType_optionsType" value="VCLASSGROUP" />
 	<jsp:param name="roleActivityType_objectClassUri" value="http://vivoweb.org/ontology#vitroClassGrouporganizations" /> 
 	<jsp:param name="roleActivityType_literalOptions" value="[ 'Select one' ]" />
diff --git a/productMods/edit/forms/addOrganizerRoleToPerson.jsp b/productMods/edit/forms/addOrganizerRoleToPerson.jsp
index 5873b078..c9beec5c 100644
--- a/productMods/edit/forms/addOrganizerRoleToPerson.jsp
+++ b/productMods/edit/forms/addOrganizerRoleToPerson.jsp
@@ -3,8 +3,6 @@
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
 	<jsp:param name="roleActivityTypeLabel" value="organizer of" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#OrganizerRole" />	
-	<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
-    <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
 	<jsp:param name="roleActivityType_literalOptions" 
diff --git a/productMods/edit/forms/addOutreachRoleToPerson.jsp b/productMods/edit/forms/addOutreachRoleToPerson.jsp
index 185bdf22..9e062b4e 100644
--- a/productMods/edit/forms/addOutreachRoleToPerson.jsp
+++ b/productMods/edit/forms/addOutreachRoleToPerson.jsp
@@ -3,8 +3,6 @@
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
 	<jsp:param name="roleActivityTypeLabel" value="outreach & community service" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#OutreachProviderRole" />
-	<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
-    <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />		
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
 	<jsp:param name="roleActivityType_literalOptions" 
diff --git a/productMods/edit/forms/addPresenterRoleToPerson.jsp b/productMods/edit/forms/addPresenterRoleToPerson.jsp
index f8549953..f34fb459 100644
--- a/productMods/edit/forms/addPresenterRoleToPerson.jsp
+++ b/productMods/edit/forms/addPresenterRoleToPerson.jsp
@@ -5,8 +5,6 @@
 	<jsp:param name="roleActivityTypeLabel" value="presentation" />
 	<jsp:param name="buttonLabel" value="presentation role" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#PresenterRole" />
-	<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
-    <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />			
 	<jsp:param name="numDateFields" value="1" />
 	<jsp:param name="roleExamples" value="Moderator, Speaker, Panelist" />
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
diff --git a/productMods/edit/forms/addResearcherRoleToPerson.jsp b/productMods/edit/forms/addResearcherRoleToPerson.jsp
index 8102cb52..00096a0f 100644
--- a/productMods/edit/forms/addResearcherRoleToPerson.jsp
+++ b/productMods/edit/forms/addResearcherRoleToPerson.jsp
@@ -3,8 +3,6 @@
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
 	<jsp:param name="roleActivityTypeLabel" value="research activity" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ResearcherRole" />
-	<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
-    <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />		
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
 	<jsp:param name="roleActivityType_literalOptions" 
diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
index 351fbd58..32738bf4 100644
--- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp
+++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
@@ -68,12 +68,14 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
 
 <%--
   These are the parameters that MUST be set of this form:
-   role type
-   predicate inverse          
-   role activity type label (should be singular)
-   super type of role types for roleActivityType select list generation
-   roleToActivityPredicate 
-   activityToRolePredicate
+     role type
+     predicate inverse          
+     role activity type label (should be singular)
+     super type of role types for roleActivityType select list generation
+     
+  These are optional parameters:
+     roleToActivityPredicate (default value is http://vivoweb.org/ontology/core#roleIn)
+     activityToRolePredicate (default value is http://vivoweb.org/ontology/core#relatedRole) 
 --%>
 
 <c:set var="roleActivityTypeLabel">${param.roleActivityTypeLabel}</c:set>
@@ -83,8 +85,8 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
 <c:set var="roleActivityType_objectClassUri" >${param.roleActivityType_objectClassUri}</c:set> 
 <c:set var="roleActivityType_literalOptions" >${param.roleActivityType_literalOptions}</c:set>
 <c:set var="numDateFields">${! empty param.numDateFields ? param.numDateFields : 2 }</c:set>
-<c:set var="roleToActivityPredicate" scope="request">${param.roleToActivityPredicate}</c:set>
-<c:set var="activityToRolePredicate">${param.activityToRolePredicate}</c:set>
+<c:set var="roleToActivityPredicate" scope="request">${! empty param.roleToActivityPredicate ? param.roleToActivityPredicate : "http://vivoweb.org/ontology/core#roleIn"}</c:set>
+<c:set var="activityToRolePredicate">${! empty param.activityToRolePredicate ? param.activityToRolePredicate : "http://vivoweb.org/ontology/core#relatedRole"}</c:set>
 
 <%
     VitroRequest vreq = new VitroRequest(request);
diff --git a/productMods/edit/forms/addServiceProviderRoleToPerson.jsp b/productMods/edit/forms/addServiceProviderRoleToPerson.jsp
index 844ae0c5..ccab85c6 100644
--- a/productMods/edit/forms/addServiceProviderRoleToPerson.jsp
+++ b/productMods/edit/forms/addServiceProviderRoleToPerson.jsp
@@ -3,8 +3,6 @@
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
 	<jsp:param name="roleActivityTypeLabel" value="service to the profession" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ServiceProviderRole" />
-	<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
-    <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />	
 	
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 	
diff --git a/productMods/edit/forms/addTeacherRoleToPerson.jsp b/productMods/edit/forms/addTeacherRoleToPerson.jsp
index 7d1757d8..3ea87099 100644
--- a/productMods/edit/forms/addTeacherRoleToPerson.jsp
+++ b/productMods/edit/forms/addTeacherRoleToPerson.jsp
@@ -3,8 +3,6 @@
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
 	<jsp:param name="roleActivityTypeLabel" value="teaching activity" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#TeacherRole" />
-	<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
-    <jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />	
 	<jsp:param name="roleExamples" value="Instructor, Facilitator, Assistant" />
 	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" />