Changeset 250

Timestamp:

Mar 9, 2010, 2:16:07 PM (13 years ago)

Author:

duh

Message:

• date and datetimefields are now handled independent of naming but by field type (a rel='date' and rel='datetime' argument is added to the rendered input element)
• client side error reporting did not work properly for select elements
• dynamically inserted javascript confirmation warning in the DOM-anchors outside of the wizard (navigating away from the wizard without saving causes loss of data and work)

Location:

trunk

Files:

• grails-app/controllers/dbnp/studycapturing/WizardController.groovy (modified) (1 diff)
• grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (6 diffs)
• grails-app/views/wizard/common/_error.gsp (modified) (3 diffs)
• web-app/js/wizard.js (modified) (4 diffs)

trunk/grails-app/controllers/dbnp/studycapturing/WizardController.groovy

@@ -580 +580 @@
                                         def value = params.get('subject_' + subjectId + '_' + subjectField.name)
 
-// TODO: UNCOMMENT THIS         if (value) flow.subjects[ subjectId ].setFieldValue(subjectField.name, value)
+                                        if (value) flow.subjects[ subjectId ].setFieldValue(subjectField.name, value)
                                 }
 

trunk/grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy

@@ -343 +343 @@
                 }
 
+                // add 'rel' field to identity the datefield using javascript
+                attrs.rel = 'date'
+
                 // set some textfield values
                 attrs.maxlength = (attrs.maxlength) ? attrs.maxlength : 10
@@ -367 +370 @@
                         attrs.value = String.format('%td/%<tm/%<tY %<tH:%<tM', attrs.value)
                 }
+
+                // add 'rel' field to identity the field using javascript
+                attrs.rel = 'datetime'
 
                 attrs.addExampleElement = true
@@ -581 +587 @@
                         out << '<div class="' + attrs.get('class') + '">'
 
-                        switch (it.type) {
+                        switch (it.type.toString()) {
+                                case ['STRING', 'TEXT', 'INTEGER', 'FLOAT', 'DOUBLE']:
+                                        out << textField(
+                                                name: attrs.name + '_' + it.name,
+                                                value: (intFields) ? intFields.get(it.name) : ''
+                                        )
+                                        break
                                 case 'STRINGLIST':
                                         // render stringlist subjectfield
@@ -593 +605 @@
                                                 out << '<span class="warning">no values!!</span>'
                                         }
-                                        break;
-                                case 'INTEGER':
-                                        // render integer subjectfield
-                                        out << textField(
-                                                name: attrs.name + '_' + it.name,
-                                                value: (intFields) ? intFields.get(it.name) : ''
-                                        )
-                                        break;
-                                case 'FLOAT':
-                                        // render float subjectfield
-                                        out << textField(
-                                                name: attrs.name + '_' + it.name,
-                                                value: (floatFields) ? floatFields.get(it.name) : ''
-                                        )
-                                        break;
+                                        break
                                 default:
                                         // unsupported field type
@@ -632 +630 @@
                         // render template fields
                         template.fields.each() {
-                                switch (it.type) {
+                                switch (it.type.toString()) {
+                                        case ['STRING', 'TEXT', 'INTEGER', 'FLOAT', 'DOUBLE']:
+                                                out << textFieldElement(
+                                                        description: it.name,
+                                                        name: it.name
+                                                )
+                                                break
                                         case 'STRINGLIST':
                                                 if (!it.listEntries.isEmpty()) {
@@ -645 +649 @@
                                                 }
                                                 break
-                                        case 'STRING':
-                                                out << textFieldElement(
-                                                        description: it.name,
-                                                        name: it.name
-                                                )
-                                                break
                                         case 'DATE':
                                                 out << dateElement(
-                                                        description: it.name,
-                                                        name: it.name
-                                                )
-                                                break
-                                        case 'INTEGER':
-                                                out << textFieldElement(
-                                                        description: it.name,
-                                                        name: it.name
-                                                )
-                                                break
-                                        case 'DOUBLE':
-                                                out << textFieldElement(
                                                         description: it.name,
                                                         name: it.name

trunk/grails-app/views/wizard/common/_error.gsp

@@ -21 +21 @@
                                 <g:if test="${!e}"><span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 50px 0;"></span></g:if>
                                 ${error.value['key']} &rarr; ${error.value['value']}
+${error.value['dynamic']}
                         </p>
                 </g:each>
@@ -28 +29 @@
                 <g:each in="${errors}" var="error">
                 <g:if test="${error.value['dynamic']}">
-                $("input:[name='${error.key}']").addClass('error');
+                $("input:[name='${error.key}'], select:[name='${error.key}']").addClass('error');
                 </g:if><g:else>
-                $("input:[name='${error.key}']").parent().parent().addClass('error');
+                $("input:[name='${error.key}'], select:[name='${error.key}']").parent().parent().addClass('error');
                 </g:else>
                 </g:each>
@@ -37 +38 @@
                 $(function() {
                         $("div#wizardError").dialog({
-                                bgiframe: true,
                                 modal: true,
                                 width: 600,

trunk/web-app/js/wizard.js

@@ -26 +26 @@
 
     // attach Tooltips
+    insertOnRedirectWarning();
     onWizardPage();
 });
@@ -44 +45 @@
     // accordeon(s)
     $("#accordion").accordion();
+}
+
+// insert a redirect confirmation dialogue to all anchors leading the
+// user away from the wizard
+function insertOnRedirectWarning() {
+    // find all anchors that lie outside the wizard
+    $('a').each(function() {
+        var element = $(this)
+        var re = /^#/gi;
+
+        if (!element.attr('href').match(/^#/gi) && !element.attr('href').match(/\/([^\/]+)\/wizard\/pages/gi)) {
+            // bind a warning to the onclick event
+            element.bind('click',function() {
+                return confirm('Warning: navigating away from the wizard causes loss of work and unsaved data. Are you sure you want to continue?');
+            })
+        }
+    })
 }
 
@@ -117 +135 @@
 // add datepickers to date fields
 function attachDatePickers() {
-    $('div#wizard').find("input[type=text][name$='Date']").each(function() {
+    $('div#wizard').find("input[type=text][rel$='date']").each(function() {
         $(this).datepicker({
             dateFormat  : 'dd/mm/yy',
@@ -128 +146 @@
 // add datetimepickers to date fields
 function attachDateTimePickers() {
-    $('div#wizard').find("input[type=text][name$='Time']").each(function() {
+    $('div#wizard').find("input[type=text][rel$='datetime']").each(function() {
         $(this).datepicker({
             dateFormat      : 'dd/mm/yy',