From fa15ed1f12751d34b75f0ef866514dafef0f625e Mon Sep 17 00:00:00 2001
From: bdc34 <bdc34@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 13 Jul 2010 20:24:41 +0000
Subject: [PATCH] Working on activity role forms and views. NIHVIVO-629
 NIHVIVO-630

---
 productMods/edit/forms/addClinicalRoleToPerson.jsp    |  5 ++++-
 productMods/edit/forms/addMemberRoleToPerson.jsp      |  5 ++++-
 .../edit/forms/addPresentationRoleToPerson.jsp        | 10 +++++++---
 .../edit/forms/addResearchActivityRoleToPerson.jsp    |  5 ++++-
 productMods/edit/forms/addRoleToPersonTwoStage.jsp    | 11 +++++++----
 .../edit/forms/addTeachingActivityRoleToPerson.jsp    |  7 +++++--
 6 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/productMods/edit/forms/addClinicalRoleToPerson.jsp b/productMods/edit/forms/addClinicalRoleToPerson.jsp
index 9a8c279f..a16d104b 100644
--- a/productMods/edit/forms/addClinicalRoleToPerson.jsp
+++ b/productMods/edit/forms/addClinicalRoleToPerson.jsp
@@ -5,5 +5,8 @@
 	<jsp:param name="sparqlForAcFilter" value="PREFIX core: <http://vivoweb.org/ontology/core#> SELECT ?pubUri WHERE {<${subjectUri}> core:authorInAuthorship ?authorshipUri .?authorshipUri core:linkedInformationResource ?pubUri .}" />	
 	<jsp:param name="roleActivityTypeLabel" value="clinical activity" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ClinicalRole" />
-	<jsp:param name="roleActivitySuperType" value="http://vivoweb.org/ontology/core#Process" />
+	
+	<jsp:param name="roleActivityType_optionsType" value="LITERALS" />
+	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
+	<jsp:param name="roleActivityType_literalOptions" value='["http://vivoweb.org/ontology/core#Project", "Project" ], [ "http://vivoweb.org/ontology/core#Service","Service"] ' />
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addMemberRoleToPerson.jsp b/productMods/edit/forms/addMemberRoleToPerson.jsp
index 1806d6bd..512c1ff1 100644
--- a/productMods/edit/forms/addMemberRoleToPerson.jsp
+++ b/productMods/edit/forms/addMemberRoleToPerson.jsp
@@ -5,5 +5,8 @@
 	<jsp:param name="sparqlForAcFilter" value="PREFIX core: <http://vivoweb.org/ontology/core#> SELECT ?pubUri WHERE {<${subjectUri}> core:authorInAuthorship ?authorshipUri .?authorshipUri core:linkedInformationResource ?pubUri .}" />	
 	<jsp:param name="roleActivityTypeLabel" value="membership" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#MemberRole" />
-	<jsp:param name="roleActivitySuperType" value="http://xmlns.com/foaf/0.1/Organization" />
+	
+	<jsp:param name="roleActivityType_optionsType" value="CHILD_VCLASSES" />
+	<jsp:param name="roleActivityType_objectClassUri" value="http://xmlns.com/foaf/0.1/Organization" /> 
+	<jsp:param name="roleActivityType_literalOptions" value="" />
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addPresentationRoleToPerson.jsp b/productMods/edit/forms/addPresentationRoleToPerson.jsp
index 6e7b166c..e08e1864 100644
--- a/productMods/edit/forms/addPresentationRoleToPerson.jsp
+++ b/productMods/edit/forms/addPresentationRoleToPerson.jsp
@@ -1,9 +1,13 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
+
 <%-- sparqlForAcFilter must be all one line for JavaScript. --%>
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
-	<jsp:param name="sparqlForAcFilter" value="PREFIX core: <http://vivoweb.org/ontology/core#> SELECT ?pubUri WHERE {<${subjectUri}> core:authorInAuthorship ?authorshipUri .?authorshipUri core:linkedInformationResource ?pubUri .}" />	
+	<jsp:param name="sparqlForAcFilter" value="PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; SELECT ?pubUri WHERE {&lt;${subjectUri}&gt; core:authorInAuthorship ?authorshipUri .?authorshipUri core:linkedInformationResource ?pubUri .}" />	
 	<jsp:param name="roleActivityTypeLabel" value="presentation" />
-	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#PresenterRole" />
-	<jsp:param name="roleActivitySuperType" value="http://vivoweb.org/ontology/core#Presentation" />
+	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#PresenterRole" />	
+	
+	<jsp:param name="roleActivityType_optionsType" value="LITERALS" />
+	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
+	<jsp:param name="roleActivityType_literalOptions" value='["http://vivoweb.org/ontology/core#Presentation", "Presentation" ], [ "http://vivoweb.org/ontology/core#InvitedTalk","Invited Talk"] ' />
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addResearchActivityRoleToPerson.jsp b/productMods/edit/forms/addResearchActivityRoleToPerson.jsp
index 4ca19640..aba8ea6e 100644
--- a/productMods/edit/forms/addResearchActivityRoleToPerson.jsp
+++ b/productMods/edit/forms/addResearchActivityRoleToPerson.jsp
@@ -5,5 +5,8 @@
 	<jsp:param name="sparqlForAcFilter" value="PREFIX core: <http://vivoweb.org/ontology/core#> SELECT ?pubUri WHERE {<${subjectUri}> core:authorInAuthorship ?authorshipUri .?authorshipUri core:linkedInformationResource ?pubUri .}" />	
 	<jsp:param name="roleActivityTypeLabel" value="research activity" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ResearcherRole" />
-	<jsp:param name="roleActivitySuperType" value="http://vivoweb.org/ontology/core#Agreement" />
+	
+	<jsp:param name="roleActivityType_optionsType" value="LITERALS" />
+	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
+	<jsp:param name="roleActivityType_literalOptions" value='["http://vivoweb.org/ontology/core#Grant", "Grant" ], [ "http://vivoweb.org/ontology/core#Project","Project"] ' />
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
index ca2792a2..32dd7fdd 100644
--- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp
+++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
@@ -59,7 +59,10 @@
 <c:set var="sparqlForAcFilter">${param.sparqlForAcFilter}</c:set>
 <c:set var="roleActivityTypeLabel">${param.roleActivityTypeLabel}</c:set>
 <c:set var="roleType">${param.roleType}</c:set>
-<c:set var="roleActivitySuperType">${param.roleActivitySuperType}</c:set>
+
+<c:set var="roleActivityType_optionsType" >${param.roleActivityType_optionsType}</c:set>
+<c:set var="roleActivityType_objectClassUri" >${param.roleActivityType_objectClassUri}</c:set> 
+<c:set var="roleActivityType_literalOptions" >${param.roleActivityType_literalOptions}</c:set>
 
 <%
     VitroRequest vreq = new VitroRequest(request);
@@ -153,10 +156,10 @@
       "roleActivityType" : {
          "newResource"      : "true",
          "validators"       : [ ],
-         "optionsType"      : "CHILD_VCLASSES",
-         "literalOptions"   : [ "Select one" ],
+         "optionsType"      : "${roleActivityType_optionsType}",
+         "literalOptions"   : [ ${roleActivityType_literalOptions } ],
          "predicateUri"     : "",
-         "objectClassUri"   : "${roleActivitySuperType}",
+         "objectClassUri"   : "${roleActivityType_objectClassUri}",
          "rangeDatatypeUri" : "",
          "rangeLang"        : "",
          "assertions"       : [ ]
diff --git a/productMods/edit/forms/addTeachingActivityRoleToPerson.jsp b/productMods/edit/forms/addTeachingActivityRoleToPerson.jsp
index c5cef117..036ebdd6 100644
--- a/productMods/edit/forms/addTeachingActivityRoleToPerson.jsp
+++ b/productMods/edit/forms/addTeachingActivityRoleToPerson.jsp
@@ -2,8 +2,11 @@
 
 <%-- sparqlForAcFilter must be all one line for JavaScript. --%>
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
-	<jsp:param name="sparqlForAcFilter" value="PREFIX core: <http://vivoweb.org/ontology/core#> SELECT ?pubUri WHERE {<${subjectUri}> core:authorInAuthorship ?authorshipUri .?authorshipUri core:linkedInformationResource ?pubUri .}" />	
+	<jsp:param name="sparqlForAcFilter" value="PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; SELECT ?pubUri WHERE {&lt;${subjectUri}&gt; core:authorInAuthorship ?authorshipUri .?authorshipUri core:linkedInformationResource ?pubUri .}" />	
 	<jsp:param name="roleActivityTypeLabel" value="teaching activity" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#TeacherRole" />
-	<jsp:param name="roleActivitySuperType" value="http://vivoweb.org/ontology/core#Event" />
+	
+	<jsp:param name="roleActivityType_optionsType" value="LITERALS" />
+	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
+	<jsp:param name="roleActivityType_literalOptions" value='["http://purl.org/ontology/bibo/Conference", "Conference" ], [ "http://vivoweb.org/ontology/core#Course","Course"], [ "http://purl.org/ontology/bibo/Workshop","Workshop"] ' />
 </jsp:include>
\ No newline at end of file