From 57a8cdcbe85fc3e5c8863f05a9f770e30eb53aea Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 12 Jul 2010 14:47:35 +0000
Subject: [PATCH] NIHVIVO-646 Using Javascript on page rather than hidden divs
 to pass information to the addAuthorsForm Javascript. Fix problems in
 DataPropertyComparator that were causing errors to be thrown on the page when
 no xsd datatype defined for an authorship rank.

---
 .../forms/addAuthorsToInformationResource.jsp | 19 ++++++++++++-------
 .../edit/forms/addGrantRoleToPerson.jsp       | 15 +++++++--------
 .../edit/forms/addPublicationToAuthor.jsp     |  8 ++++----
 .../css/addAuthorsToInformationResource.css   |  4 ----
 .../customFormWithAdvanceTypeSelection.css    |  5 -----
 .../js/addAuthorsToInformationResource.js     | 12 +++++++-----
 .../js/customFormWithAdvanceTypeSelection.js  |  7 ++++---
 7 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/productMods/edit/forms/addAuthorsToInformationResource.jsp b/productMods/edit/forms/addAuthorsToInformationResource.jsp
index 86bb336c..5af8b886 100644
--- a/productMods/edit/forms/addAuthorsToInformationResource.jsp
+++ b/productMods/edit/forms/addAuthorsToInformationResource.jsp
@@ -379,13 +379,6 @@ SPARQL queries for existing values. --%>
     <v:input type="submit" value="Add Author" id="showAddFormButton" cancel="true" cancelLabel="Return to Publication" cancelUrl="/individual" />
 </div> 
 
-<div id="infoForJs">
-    <span class="rankPred" id="${rankPred}"></span>
-    <span class="rankXsdType" id="${intDatatypeUri}"></span>
-    <span class="acUrl" id="<c:url value="/autocomplete?type=${foaf}Person&stem=false" />"></span>
-    <span class="reorderUrl" id="<c:url value="/edit/primitiveRdfEdit" />"></span>
-</div>
-
 <form id="addAuthorForm" action="<c:url value="/edit/processRdfForm2.jsp"/>" >
 
     <h3>Add an Author</h3>
@@ -408,5 +401,17 @@ SPARQL queries for existing values. --%>
     <p id="requiredLegend" class="requiredHint">* required fields</p>
 </form>
 
+<c:url var="baseAcUrl" value="/autocomplete?type=${foaf}Person&tokenize=false&stem=false" />
+<c:url var="reorderUrl" value="/edit/primitiveRdfEdit" />
+
+<script type="text/javascript">
+var customFormData = {
+	rankPred: '${rankPred}',
+	rankXsdType: '${intDatatypeUri}',
+	baseAcUrl: '${baseAcUrl}',
+	reorderUrl: '${reorderUrl}'
+};
+</script>
+
 <jsp:include page="${postForm}"/>
 
diff --git a/productMods/edit/forms/addGrantRoleToPerson.jsp b/productMods/edit/forms/addGrantRoleToPerson.jsp
index 358ab560..9b99dc06 100644
--- a/productMods/edit/forms/addGrantRoleToPerson.jsp
+++ b/productMods/edit/forms/addGrantRoleToPerson.jsp
@@ -124,7 +124,7 @@ PREFIX core: <${vivoCore}> SELECT ?individual WHERE {<${subjectUri}> core:hasPri
     "sparqlForExistingUris" : { },
     "fields" : {  
       "grant" : {
-         "newResource"      : "true",
+         "newResource"      : "false",
          "validators"       : [ ],
          "optionsType"      : "UNDEFINED",
          "literalOptions"   : [ ],
@@ -187,10 +187,6 @@ PREFIX core: <${vivoCore}> SELECT ?individual WHERE {<${subjectUri}> core:hasPri
 
 <jsp:include page="${preForm}" />
 
-<c:url var="acUrl" value="/autocomplete?stem=true" />
-<c:url var="sparqlQueryUrl" value="/admin/sparqlquery" />
-
-
 <h2>${formHeading}</h2>
 
 <form id="addGrantRoleToPerson" action="<c:url value="/edit/processRdfForm2.jsp"/>" >
@@ -200,7 +196,7 @@ PREFIX core: <${vivoCore}> SELECT ?individual WHERE {<${subjectUri}> core:hasPri
     <div class="acSelection">
         <p class="inline"><label></label><span class="acSelectionInfo"></span></p>
         <%-- bdc34: for some odd reason id and name should not be grant in this input element. --%>
-        <input type="hidden" class="acReceiver" value="" /> <!-- Field value populated by JavaScript -->
+        <input type="hidden" id="grant" name="grant" class="acReceiver" value="" /> <!-- Field value populated by JavaScript -->
     </div>
             
     <p class="submit"><v:input type="submit" id="submit" value="${submitButtonLabel}" cancel="true" /></p>
@@ -208,13 +204,16 @@ PREFIX core: <${vivoCore}> SELECT ?individual WHERE {<${subjectUri}> core:hasPri
     <p id="requiredLegend" class="requiredHint">* required fields</p>
 </form>
 
-<script>
+<c:url var="acUrl" value="/autocomplete?tokenize=true&stem=true" />
+<c:url var="sparqlQueryUrl" value="/admin/sparqlquery" />
+
+<script type="text/javascript">
 var customFormData  = {
     sparqlForAcFilter: '${sparqlForAcFilter}',
     sparqlQueryUrl: '${sparqlQueryUrl}',
     acUrl: '${acUrl}',
     acType: '${vivoCore}Grant'       
-}
+};
 </script>
 
 <jsp:include page="${postForm}"/>
\ No newline at end of file
diff --git a/productMods/edit/forms/addPublicationToAuthor.jsp b/productMods/edit/forms/addPublicationToAuthor.jsp
index 6066d0ab..f8c9d376 100644
--- a/productMods/edit/forms/addPublicationToAuthor.jsp
+++ b/productMods/edit/forms/addPublicationToAuthor.jsp
@@ -207,9 +207,6 @@ PREFIX core: <${vivoCore}> SELECT ?individual WHERE {<${subjectUri}> core:author
 
 <c:set var="requiredHint" value="<span class='requiredHint'> *</span>" />
 
-<c:url var="acUrl" value="/autocomplete?stem=true" />
-<c:url var="sparqlQueryUrl" value="/admin/sparqlquery" />
-
 <jsp:include page="${preForm}" />
 
 <h2>Create a new publication entry for <%= subjectName %></h2>
@@ -233,7 +230,10 @@ PREFIX core: <${vivoCore}> SELECT ?individual WHERE {<${subjectUri}> core:author
     <p id="requiredLegend" class="requiredHint">* required fields</p>
 </form>
 
-<script>
+<c:url var="acUrl" value="/autocomplete?tokenize=true&stem=true" />
+<c:url var="sparqlQueryUrl" value="/admin/sparqlquery" />
+
+<script type="text/javascript">
 var customFormData  = {
     sparqlForAcFilter: '${sparqlForAcFilter}',
     sparqlQueryUrl: '${sparqlQueryUrl}',
diff --git a/productMods/edit/forms/css/addAuthorsToInformationResource.css b/productMods/edit/forms/css/addAuthorsToInformationResource.css
index 11230af3..cab3bad8 100644
--- a/productMods/edit/forms/css/addAuthorsToInformationResource.css
+++ b/productMods/edit/forms/css/addAuthorsToInformationResource.css
@@ -32,10 +32,6 @@
     margin-left: 2em;
 }
 
-#infoForJs {
-    display: none;
-}
-
 form h3 {
     margin-bottom: .5em;
 }
diff --git a/productMods/edit/forms/css/customFormWithAdvanceTypeSelection.css b/productMods/edit/forms/css/customFormWithAdvanceTypeSelection.css
index 9f9b4763..de2b91b0 100644
--- a/productMods/edit/forms/css/customFormWithAdvanceTypeSelection.css
+++ b/productMods/edit/forms/css/customFormWithAdvanceTypeSelection.css
@@ -9,11 +9,6 @@
     display: none;
 }
 
-/* Always hidden, JS or no JS */
-#infoForJs {
-    display: none;
-}
-
 #content form p.inline label {
     display: inline;
     clear: none;
diff --git a/productMods/edit/forms/js/addAuthorsToInformationResource.js b/productMods/edit/forms/js/addAuthorsToInformationResource.js
index 8b5ffdbf..3c4d6913 100644
--- a/productMods/edit/forms/js/addAuthorsToInformationResource.js
+++ b/productMods/edit/forms/js/addAuthorsToInformationResource.js
@@ -13,6 +13,9 @@ var addAuthorForm = {
     mixIn: function() {
     	// Mix in the custom form utility methods
     	vitro.utils.borrowMethods(vitro.customFormUtils, this);
+        
+        // Get the custom form data from the page
+        $.extend(this, customFormData);
     },
     
     // On page load, create references for easy access to form elements.
@@ -157,8 +160,7 @@ var addAuthorForm = {
 
         // Make cache a property of this so we can access it after removing 
         // an author.
-        this.acCache = {};
-        this.baseAcUrl = $('.acUrl').attr('id');        
+        this.acCache = {};      
         this.setAcUrl();
         
         $('#lastName').autocomplete({
@@ -260,8 +262,8 @@ var addAuthorForm = {
     // Reorder authors. Called on page load and after author drag-and-drop.
     // Event and ui parameters are defined only in the case of drag-and-drop.
     reorderAuthors: function(event, ui) {
-        var predicateUri = '<' + $('.rankPred').attr('id') + '>',
-            rankXsdType = $('.rankXsdType').attr('id'),
+        var predicateUri = '<' + this.rankPred + '>',
+            rankXsdType = this.rankXsdType,
             additions = '',
             retractions = '',
             authorships = [];
@@ -305,7 +307,7 @@ var addAuthorForm = {
         // console.log('retractions: ' + retractions);
 
         $.ajax({
-            url: $('.reorderUrl').attr('id'),
+            url: addAuthorForm.reorderUrl,
             data: {
                 additions: additions,
                 retractions: retractions
diff --git a/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js b/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js
index b1f5ece5..d4c9b2f1 100644
--- a/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js
+++ b/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js
@@ -13,6 +13,9 @@ var customForm = {
     mixIn: function() {
         // Mix in the custom form utility methods
         vitro.utils.borrowMethods(vitro.customFormUtils, this);
+
+        // Get the custom form data from the page
+        $.extend(this, customFormData);
     },
     
     // On page load, create references for easy access to form elements.
@@ -39,8 +42,6 @@ var customForm = {
         this.acSelector = this.form.find('.acSelector');
         this.acSelection = this.form.find('.acSelection'); 
         this.acReceiver = this.form.find('.acReceiver');
-        
-        $.extend(this, customFormData);
     
     },
 
@@ -49,7 +50,7 @@ var customForm = {
 
         if (!this.typeSelector.length) {
             this.formSteps = 1;
-        // there's also going to be a 3-step form
+        // there's also going to be a 3-step form - look for this.subTypeSelector
         } else {
             this.formSteps = 2;
         }