Changeset 103

Timestamp:

Jan 21, 2010, 1:56:10 PM (13 years ago)

Author:

duh

Message:

• added error handling to the wizard
• changed jquery-ui interface style to Redmond

Location:

trunk

Files:

• grails-app/controllers/dbnp/studycapturing/WizardController.groovy (modified) (5 diffs)
• grails-app/domain/dbnp/studycapturing/Study.groovy (modified) (3 diffs)
• grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (1 diff)
• grails-app/views/wizard/common/_error.gsp (modified) (1 diff)
• grails-app/views/wizard/common/_wizard.gsp (modified) (1 diff)
• grails-app/views/wizard/elements (deleted)
• grails-app/views/wizard/pages/_study.gsp (moved) (moved from trunk/grails-app/views/wizard/pages/_one.gsp)
• web-app/css/jquery-ui/images (deleted)
• web-app/css/jquery-ui/jquery-ui-1.7.2.custom.css (added)

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

@@ -48 +48 @@
                         flow.page = 0
                         flow.pages = [
-                                [title: 'Een'],
+                                [title: 'Study'],
                                 [title: 'Twoooo'],
                                 [title: 'Trois']
@@ -61 +61 @@
                                 flow.page = 1
                         }
-                        on("next").to "pageOne"
+                        on("next").to "study"
                 }
 
-                pageOne {
-                        render(view: "_one")
+                study {
+                        render(view: "_study")
                         onRender {
                                 println "render page one"
@@ -72 +72 @@
                         on("next") {
                                 // create a study instance
-                                /*
                                 println params
-                                def study = new Study(params)
+                                flow.study = new Study(params)
 
-                                
-                                if (study.validate()) {
+                                // validate study
+                                if (flow.study.validate()) {
                                         println "study validates"
                                 } else {
+                                        // validation failed, feedback errors
+                                        flash.errors = new LinkedHashMap()
+                                        this.appendErrors(flow.study,flash.errors)
                                         println "errorrrs"
+                                        println flash.errors
                                         error()
                                 }
-                                */
                         }.to "pageTwo"
                 }
@@ -99 +101 @@
                         on("previous") {
                                 println "previous page!"
-                        }.to "pageOne"
+                        }.to "study"
                 }
 
@@ -114 +116 @@
                 }
         }
+
+        /**
+         * transform domain class validation errors into a human readable
+         * linked hash map
+         * @param object validated domain class
+         * @returns object  linkedHashMap
+         */
+        def getHumanReadableErrors(object) {
+                def errors = new LinkedHashMap()
+
+                object.errors.getAllErrors().each() {
+                        errors[it.getArguments()[0]] = it.getDefaultMessage()
+                }
+
+                return errors
+        }
+
+        /**
+         * append errors of a particular object to a map
+         * @param object
+         * @param map linkedHashMap
+         * @void
+         */
+        def appendErrors(object, map) {
+                this.appendErrorMap(this.getHumanReadableErrors(object), map)
+        }
+
+        /**
+         * append errors of one map to another map
+         * @param map linkedHashMap
+         * @param map linkedHashMap
+         * @void
+         */
+        def appendErrorMap(map, mapToExtend) {
+                map.each() {key, value ->
+                        mapToExtend[key] = value
+                }
+        }
+
 }

trunk/grails-app/domain/dbnp/studycapturing/Study.groovy

@@ -3 +3 @@
 /**
  * Domain class describing the basic entity in the study capture part: the Study class.
+ *
+ * Revision information:
+ * $Rev$
+ * $Author$
+ * $Date$
  */
-class Study {
+class Study implements Serializable {
         nimble.User owner
         String title
@@ -16 +21 @@
         Template template
 
-        static hasMany = [editors: nimble.User, readers: nimble.User,
-                subjects: Subject, groups: SubjectGroup,
-                events: Event, samplingEvents: SamplingEvent]
+        static hasMany = [      editors:                nimble.User,
+                                                readers:                nimble.User,
+                                                subjects:               Subject,
+                                                groups:                 SubjectGroup,
+                                                events:                 Event,
+                                                samplingEvents: SamplingEvent
+        ]
 
         static constraints = {
@@ -31 +40 @@
         }
 
-  def String toString() {
-    return title;
-  }
-
-
+        def String toString() {
+                return title;
+        }
 }

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

@@ -182 +182 @@
                 out << '</div>'
                 out << render(template: "/wizard/common/navigation")
+                out << render(template: "/wizard/common/error")
         }
 

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

@@ -1 +1 @@
 <%
-/**
- * Wizard error template
- *
- * @author  Jeroen Wesbeek
- * @since   20100114
- * @package wizard
- * @see     dbnp.studycapturing.WizardTagLib
- * @see     dbnp.studycapturing.WizardController
- *
- * Revision information:
- * $Rev$
- * $Author$
- * $Date$
- */
+        /**
+         * Wizard error template
+         *
+         * @author Jeroen Wesbeek
+         * @since 20100114
+         * @package wizard
+         * @see dbnp.studycapturing.WizardTagLib
+         * @see dbnp.studycapturing.WizardController
+         *
+         * Revision information:
+         * $Rev$
+         * $Author$
+         * $Date$
+         */
 %>
-<div id="wizardError" class="error"/>
+<g:if test="${errors}">
+        <div id="wizardError" class="error" title="errors">
+                <g:each in="${errors}" var="error" status="e">
+                        <p>
+                                <g:if test="${!e}"><span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 50px 0;"></span></g:if>
+                                ${error.key} &rarr; ${error.value}
+                        </p>
+                </g:each>
+        </div>
+        <script type="text/javascript">
+                $(function() {
+                        $("div#wizardError").dialog({
+                                bgiframe: true,
+                                modal: true,
+                                width: 600,
+                                buttons: {
+                                        Ok: function() {
+                                                $(this).dialog('close');
+                                        }
+                                }
+                        });
+                });
+        </script>
+</g:if>

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:render template="common/error"//-->
         </g:form>
 </div>