From d9033afb0294f2bcf7b43e4c9b41f2008d21ef26 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 9 Jul 2010 18:17:28 +0000
Subject: [PATCH] NIHVIVO-647 Server-side validation of publication form.
 Javascript event listeners.

---
 .../js/customFormWithAdvanceTypeSelection.js  | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js b/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js
index b9f4514a..3db79e88 100644
--- a/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js
+++ b/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js
@@ -24,6 +24,12 @@ var customForm = {
         this.button = $('#submit');
         this.requiredLegend = $('#requiredLegend');
         this.typeSelector = this.form.find('#typeSelector');
+
+        // This is the label element for the field with name 'label'
+        this.labelFieldLabel = $('label[for=' + $('#label').attr('id') + ']');        
+        // Get this on page load, so we can prepend to it. We can't just prepend to the current label text,
+        // because it may have already been modified for a previous selection.
+        this.baseLabelText = this.labelFieldLabel.html();
         
         this.or = $('span.or');       
         this.cancel = this.form.find('.cancel');
@@ -37,9 +43,15 @@ var customForm = {
     // Set up the form on page load
     initPage: function() {
         
-        this.initFormTypeView();
         this.bindEventListeners();
-        //this.initAutocomplete();
+        
+        this.initAutocomplete();
+        
+        if (this.findValidationErrors()) {
+            this.initFormFullView();
+        } else {
+            this.initFormTypeView();
+        }
  
     },
     
@@ -64,34 +76,24 @@ var customForm = {
         
         this.cancel.unbind('click');
         this.cancel.click(function() {
+            customForm.clearFormData(); // clear any input and validation errors
             customForm.initFormTypeView();
             return false;            
         });        
     },
     
-    // Bind event listeners that can persist over the life of the page.
+    // Bind event listeners that persist over the life of the page.
     bindEventListeners: function() {
         
         this.typeSelector.change(function() {
-            var labelField,
-                labelFieldLabel,
-                labelText,
-                selectedText;
-                
-            if ($(this).val().length) {
-                
-                // Set label for label field
-                labelField = $('#label');
-                labelFieldLabel = $('label[for=' + labelField.attr('id') + ']');
-                labelText = labelFieldLabel.html();
-                labelFieldLabel.html(customForm.getSelectedTypeName() + ' ' + labelText);
-                
+            if ($(this).val().length) {                
+                customForm.labelFieldLabel.html(customForm.getSelectedTypeName() + ' ' + customForm.baseLabelText);
                 customForm.initFormFullView();
                 
-                // set ac type 
+                // *** set ac type 
             }            
             // do we need else case? i.e. if user has set back to "select one", we should undo
-            // above settings?
+            // above settings? YES - undo ac type and label field label
         });        
     },