From aa045b7abcc57594f2a796d06d0407fa56f11851 Mon Sep 17 00:00:00 2001
From: Patrick Donelan <pat@patspam.com>
Date: Tue, 28 Apr 2009 00:37:51 +0000
Subject: [PATCH] Improved Survey template so that bottom of page/submit button
 can be skinned when questions don't validate. Added js to scroll page to
 highest invalid question (e.g. lowest y-coord)

---
 ...root_import_survey_default-questions.wgpkg | Bin 0 -> 2916 bytes
 www/extras/wobject/Survey/administersurvey.js |  45 +++++++++++++++---
 2 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 docs/upgrades/packages-7.7.5/root_import_survey_default-questions.wgpkg

diff --git a/docs/upgrades/packages-7.7.5/root_import_survey_default-questions.wgpkg b/docs/upgrades/packages-7.7.5/root_import_survey_default-questions.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..51e6102b0e3ccce43dfee8ffeb8ef12ee7733920
GIT binary patch
literal 2916
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
Of&T#$I(;SpHUI$D_?TA!

literal 0
HcmV?d00001

diff --git a/www/extras/wobject/Survey/administersurvey.js b/www/extras/wobject/Survey/administersurvey.js
index 6e6ceb379..8475d7c2d 100644
--- a/www/extras/wobject/Survey/administersurvey.js
+++ b/www/extras/wobject/Survey/administersurvey.js
@@ -5,8 +5,9 @@ if (typeof Survey === "undefined") {
 
 (function(){
 	
-	var CLASS_INVALID = 'survey-invalid'; // For elements that fail input validation
-	var CLASS_INVALID_MARKER = 'survey-invalid-marker'; // For default '*' invalid field marker
+	var INVALID_QUESTION_CLASS = 'survey-invalid'; // CSS class for questions that fail input validation
+	var INVALID_SUBMIT_CLASS = 'survey-submit-invalid'; // CSS class for submit div when questions don't validate
+	var INVALID_QUESTION_MARKER = 'survey-invalid-marker'; // For default '*' invalid field marker
 	
     // All specially-handled question types are listed here
     // (anything else is assumed to be a multi-choice bundle)
@@ -50,6 +51,7 @@ if (typeof Survey === "undefined") {
     
     function formsubmit(event){
         var submit = 1;//boolean for if all was good or not
+        var lowestInvalidY = 0;
         for (var i in toValidate) {
             if (YAHOO.lang.hasOwnProperty(toValidate, i)) {
                 var answered = 0;
@@ -111,22 +113,36 @@ if (typeof Survey === "undefined") {
                 if (!answered) {
                     submit = 0;
 					
-					// Apply CLASS_INVALID to the parent question div for people who want to skin Survey
-                    YAHOO.util.Dom.addClass(q_parent_node, CLASS_INVALID);
+					// Apply INVALID_QUESTION_CLASS to the parent question div for people who want to skin Survey
+                    YAHOO.util.Dom.addClass(q_parent_node, INVALID_QUESTION_CLASS);
 					
 					// Insert default '*' marker (can be hidden via CSS for those who want something different)
-					node.innerHTML = "<span class='" + CLASS_INVALID_MARKER + "'>*</span>";
+					node.innerHTML = "<span class='" + INVALID_QUESTION_MARKER + "'>*</span>";
+                    
+                    // Keep track of the lowest y-coord invalid question (to scroll to)
+                    var qY = YAHOO.util.Dom.getY(q_parent_node);
+                    lowestInvalidY = lowestInvalidY && lowestInvalidY < qY ? lowestInvalidY : qY;
                 }
                 else {
-                    YAHOO.util.Dom.removeClass(q_parent_node, CLASS_INVALID);
+                    YAHOO.util.Dom.removeClass(q_parent_node, INVALID_QUESTION_CLASS);
 					node.innerHTML = '';
                 }
             }
         }
+        var submitButton = document.getElementById('submitbutton');
+        var submitDiv = submitButton && YAHOO.util.Dom.getAncestorByTagName(submitButton, 'div');
+        
         if (submit) {
+            submitDiv && YAHOO.util.Dom.removeClass(submitDiv, INVALID_SUBMIT_CLASS);
             YAHOO.log("Submitting");
             Survey.Comm.callServer('', 'submitQuestions', 'surveyForm', hasFile);
         }
+        else {
+            submitDiv && YAHOO.util.Dom.addClass(submitDiv, INVALID_SUBMIT_CLASS);
+            
+            // Scroll page to the y-coord of the lowest invalid question
+            lowestInvalidY && scrollPage(lowestInvalidY, 1.5, YAHOO.util.Easing.easeOut);
+        }
     }
     
     function goBack(event){
@@ -134,6 +150,23 @@ if (typeof Survey === "undefined") {
         Survey.Comm.callServer('', 'goBack');
     }
     
+    function scrollPage(to, dur, ease) {
+        var setAttr = function(a, v, u) {
+            window.scroll(0, v);
+        };
+    
+        var anim = new YAHOO.util.Anim(null,
+            { 'scroll' : {
+                from : YAHOO.util.Dom.getDocumentScrollTop(),
+                to : to }
+            },
+            dur, ease
+        );
+        anim.setAttribute = setAttr;
+        anim.animate();
+    }
+
+    
     function numberHandler(event, objs){
         
         var keycode = event.keyCode;