Changeset 105

Timestamp:

Jan 22, 2010, 12:37:14 PM (14 years ago)

Author:

duh

Message:

• Firefox 3.6 + firebug's XMLHttpRequest option break the wizard, submitted a bug report and added some feedback to the wizard for this particular bug
• Some wizard changes

Location:

trunk

Files:

• grails-app/controllers/dbnp/studycapturing/WizardController.groovy (modified) (5 diffs)
• grails-app/views/wizard/common/_error.gsp (modified) (1 diff)
• grails-app/views/wizard/common/_wizard.gsp (modified) (1 diff)
• grails-app/views/wizard/pages/_study.gsp (modified) (1 diff)
• web-app/js/wizard.js (modified) (1 diff)

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

@@ -48 +48 @@
                         flow.page = 0
                         flow.pages = [
-                                [title: 'Study'],
+                                [title: 'Study'],               // study
                                 [title: 'Twoooo'],
                                 [title: 'Trois']
@@ -55 +55 @@
                 }
 
-                // render the main wizard page
+                // render the main wizard page which immediately
+                // triggers the 'next' action (hence, the main
+                // page dynamically renders the study template
+                // and makes the flow jump to the study logic)
                 mainPage {
                         render(view: "/wizard/index")
@@ -64 +67 @@
                 }
 
+                // render the study page and handle study logic
                 study {
                         render(view: "_study")
@@ -72 +76 @@
                         on("next") {
                                 // create a study instance
-                                println params
                                 flow.study = new Study(params)
 
                                 // validate study
                                 if (flow.study.validate()) {
-                                        println "study validates"
+                                        success()
                                 } else {
                                         // validation failed, feedback errors
                                         flash.errors = new LinkedHashMap()
                                         this.appendErrors(flow.study,flash.errors)
-                                        println "errorrrs"
-                                        println flash.errors
                                         error()
                                 }
@@ -154 +155 @@
                 }
         }
-
 }

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

@@ -25 +25 @@
         </div>
         <script type="text/javascript">
+                // show error dialog
                 $(function() {
                         $("div#wizardError").dialog({

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

@@ -21 +21 @@
                         <wizard:ajaxFlowRedirect form="form#wizardForm" name="next" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="attachHelpTooltips()" />
                 </div>
-                <!--g:render template="common/error"//-->
         </g:form>
 </div>

trunk/grails-app/views/wizard/pages/_study.gsp

@@ -16 +16 @@
 %>
 <wizard:pageContent>
-        <wizard:textFieldElement name="studyTitle" description="Title">
+        <wizard:textFieldElement name="studyTitle" description="Title" error="title" value="${study?.title}">
                 The title of the study you are creating
         </wizard:textFieldElement>
-        <wizard:textFieldElement name="studyCode" description="Code">
+        <wizard:textFieldElement name="studyCode" description="Code" error="code">
                 A code to reference your study by
         </wizard:textFieldElement>
-        <wizard:textFieldElement name="studyResearchQuestion" description="Research Question">
+        <wizard:textFieldElement name="studyResearchQuestion" description="Research Question" error="researchQuestion">
                 The research question
         </wizard:textFieldElement>
-        <wizard:textFieldElement name="studyDescription" description="Description" />
-        <wizard:textFieldElement name="studyEcCode" description="Ethical Committee Code" />
+        <wizard:textFieldElement name="studyDescription" description="Description" error="description" />
+        <wizard:textFieldElement name="studyEcCode" description="Ethical Committee Code" error="ecCode" />
 </wizard:pageContent>

trunk/web-app/js/wizard.js

@@ -14 +14 @@
  */
 $(document).ready(function() {
+    re = /Firefox\/3\.6/gi;
+    if (navigator.userAgent.match(re)) {
+        // http://code.google.com/p/fbug/issues/detail?id=1899
+        var wizard = $('div#wizard')
+        wizard.html('<span style="color:red;font-size:8px;">You are using firefox 3.6, note that firefox 3.6 in combination with firebug (latest 1.6X.0a3) and XMLHttpRequest enabled in the console, break the workings of this wizard... Either disable console XMLHttpRequests, disable firebug altogether or downgrade to Firefox 3.5.7 instead</span>' + wizard.html())
+    }
+
+    // attach Tooltips
     attachHelpTooltips();
 });
 
+// attach help tooltips
 function attachHelpTooltips() {
     // attach help action on all wizard help icons