From dac03b1b8f1f90b340eecd29c6c42b27d8f6d53b Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 14 Jul 2010 22:44:53 +0000
Subject: [PATCH] NIHVIVO-799 Select list type HARDCODED_LITERALS allows
 specification of an empty value for a select list item.

---
 productMods/edit/forms/addClinicalRoleToPerson.jsp  |  4 ++--
 productMods/edit/forms/addHeadOfRoleToPerson.jsp    |  4 ++--
 productMods/edit/forms/addOutreachRoleToPerson.jsp  |  4 ++--
 productMods/edit/forms/addPresenterRoleToPerson.jsp |  4 ++--
 .../edit/forms/addResearcherRoleToPerson.jsp        |  4 ++--
 .../edit/forms/addServiceProviderRoleToPerson.jsp   |  4 ++--
 productMods/edit/forms/addTeacherRoleToPerson.jsp   |  4 ++--
 .../forms/js/customFormWithAdvanceTypeSelection.js  | 13 +++++--------
 8 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/productMods/edit/forms/addClinicalRoleToPerson.jsp b/productMods/edit/forms/addClinicalRoleToPerson.jsp
index dab841f2..5d94676c 100644
--- a/productMods/edit/forms/addClinicalRoleToPerson.jsp
+++ b/productMods/edit/forms/addClinicalRoleToPerson.jsp
@@ -4,7 +4,7 @@
 	<jsp:param name="roleActivityTypeLabel" value="clinical activity" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ClinicalRole" />
 	
-	<jsp:param name="roleActivityType_optionsType" value="UNSORTED_LITERALS" />
+	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
-	<jsp:param name="roleActivityType_literalOptions" value='["Select one"], ["http://vivoweb.org/ontology/core#Project", "Project" ], [ "http://vivoweb.org/ontology/core#Service","Service"] ' />
+	<jsp:param name="roleActivityType_literalOptions" value='["", "Select one"], ["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/addHeadOfRoleToPerson.jsp b/productMods/edit/forms/addHeadOfRoleToPerson.jsp
index a6316bc9..50a7e632 100644
--- a/productMods/edit/forms/addHeadOfRoleToPerson.jsp
+++ b/productMods/edit/forms/addHeadOfRoleToPerson.jsp
@@ -4,11 +4,11 @@
 	<jsp:param name="roleActivityTypeLabel" value="head of" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#LeaderRole" />
 	
-	<jsp:param name="roleActivityType_optionsType" value="UNSORTED_LITERALS" />
+	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" />
 	 
 	<jsp:param name="roleActivityType_literalOptions" 
-	value='["Select one"],	
+	value='["", "Select one"],	
 	       ["http://purl.org/NET/c4dm/event.owl#Event", "Event" ], 
 	       ["http://xmlns.com/foaf/0.1/Organization", "Organization" ],
 	       ["http://vivoweb.org/ontology/core#Project", "Project" ],
diff --git a/productMods/edit/forms/addOutreachRoleToPerson.jsp b/productMods/edit/forms/addOutreachRoleToPerson.jsp
index 8fc67d33..3b43caac 100644
--- a/productMods/edit/forms/addOutreachRoleToPerson.jsp
+++ b/productMods/edit/forms/addOutreachRoleToPerson.jsp
@@ -4,10 +4,10 @@
 	<jsp:param name="roleActivityTypeLabel" value="outreach & community service" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#OutreachProviderRole" />
 	
-	<jsp:param name="roleActivityType_optionsType" value="UNSORTED_LITERALS" />
+	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
 	<jsp:param name="roleActivityType_literalOptions" 
-	value='["Select one"],
+	value='["", "Select one"],
 	       ["http://purl.org/NET/c4dm/event.owl#Event", "Event" ], 
 	       ["http://xmlns.com/foaf/0.1/Organization", "Organization" ],
 	       ["http://vivoweb.org/ontology/core#Project", "Project" ],
diff --git a/productMods/edit/forms/addPresenterRoleToPerson.jsp b/productMods/edit/forms/addPresenterRoleToPerson.jsp
index 9c276a1c..783155fe 100644
--- a/productMods/edit/forms/addPresenterRoleToPerson.jsp
+++ b/productMods/edit/forms/addPresenterRoleToPerson.jsp
@@ -5,7 +5,7 @@
 	<jsp:param name="roleActivityTypeLabel" value="presentation" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#PresenterRole" />	
 	
-	<jsp:param name="roleActivityType_optionsType" value="UNSORTED_LITERALS" />
+	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
-	<jsp:param name="roleActivityType_literalOptions" value='["Select one"], ["http://vivoweb.org/ontology/core#Presentation", "Presentation" ], [ "http://vivoweb.org/ontology/core#InvitedTalk","Invited Talk"] ' />
+	<jsp:param name="roleActivityType_literalOptions" value='["", "Select one"], ["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/addResearcherRoleToPerson.jsp b/productMods/edit/forms/addResearcherRoleToPerson.jsp
index d08052c4..e075311c 100644
--- a/productMods/edit/forms/addResearcherRoleToPerson.jsp
+++ b/productMods/edit/forms/addResearcherRoleToPerson.jsp
@@ -4,7 +4,7 @@
 	<jsp:param name="roleActivityTypeLabel" value="research activity" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ResearcherRole" />
 	
-	<jsp:param name="roleActivityType_optionsType" value="UNSORTED_LITERALS" />
+	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
-	<jsp:param name="roleActivityType_literalOptions" value='["Select one"], ["http://vivoweb.org/ontology/core#Grant", "Grant" ], [ "http://vivoweb.org/ontology/core#Project","Project"] ' />
+	<jsp:param name="roleActivityType_literalOptions" value='["", "Select one"], ["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/addServiceProviderRoleToPerson.jsp b/productMods/edit/forms/addServiceProviderRoleToPerson.jsp
index cdcafcf6..a7cddffa 100644
--- a/productMods/edit/forms/addServiceProviderRoleToPerson.jsp
+++ b/productMods/edit/forms/addServiceProviderRoleToPerson.jsp
@@ -4,10 +4,10 @@
 	<jsp:param name="roleActivityTypeLabel" value="service to the profession" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ServiceProviderRole" />
 	
-	<jsp:param name="roleActivityType_optionsType" value="UNSORTED_LITERALS" />
+	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 	
 	<jsp:param name="roleActivityType_literalOptions" 
-	value='["Select one"],
+	value='["", "Select one"],
 	       ["http://purl.org/NET/c4dm/event.owl#Event", "Event" ], 
 	       ["http://xmlns.com/foaf/0.1/Organization", "Organization" ],
 	       ["http://vivoweb.org/ontology/core#Project", "Project" ],
diff --git a/productMods/edit/forms/addTeacherRoleToPerson.jsp b/productMods/edit/forms/addTeacherRoleToPerson.jsp
index 9253c874..adc333d1 100644
--- a/productMods/edit/forms/addTeacherRoleToPerson.jsp
+++ b/productMods/edit/forms/addTeacherRoleToPerson.jsp
@@ -4,7 +4,7 @@
 	<jsp:param name="roleActivityTypeLabel" value="teaching activity" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#TeacherRole" />
 	
-	<jsp:param name="roleActivityType_optionsType" value="UNSORTED_LITERALS" />
+	<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
-	<jsp:param name="roleActivityType_literalOptions" value='["Select one"], ["http://purl.org/ontology/bibo/Conference", "Conference" ], [ "http://vivoweb.org/ontology/core#Course","Course"], [ "http://purl.org/ontology/bibo/Workshop","Workshop"] ' />
+	<jsp:param name="roleActivityType_literalOptions" value='["", "Select one"], ["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
diff --git a/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js b/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js
index 401d7325..03d0515d 100644
--- a/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js
+++ b/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js
@@ -78,14 +78,11 @@ var customForm = {
         // If type is already selected when the page loads (Firefox retains value
         // on a refresh), go directly to full view. Otherwise user has to reselect
         // twice to get to full view.
-// RY Can't do this now: role forms don't have an empy option at the top (and can't at the
-// moment, since there's no way to specify literal options without having them sorted).
-// So when the page loads there's already a value selected.
-//        else if (typeVal.length) {
-//            this.acType = typeVal;
-//            this.setLabelFieldLabel();
-//            this.initFormFullView();
-//        }
+        else if (typeVal.length) {
+            this.acType = typeVal;
+            this.setLabelFieldLabel();
+            this.initFormFullView();
+        }
         else {
             this.initFormTypeView();
         }