Changeset 180

Timestamp:

Feb 9, 2010, 3:22:46 PM (14 years ago)

Author:

duh

Message:

• wizard subject page now mainains state and stores form data in flow scope

Location:

trunk

Files:

• grails-app/controllers/dbnp/studycapturing/WizardController.groovy (modified) (3 diffs)
• grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (3 diffs)
• grails-app/views/wizard/pages/_groups.gsp (modified) (1 diff)
• grails-app/views/wizard/pages/_subjects.gsp (modified) (1 diff)
• web-app/js/grouping.js (modified) (4 diffs)

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

@@ -94 +94 @@
                                         // validation failed, feedback errors
                                         flash.errors = new LinkedHashMap()
-                                        this.appendErrors(flow.study,flash.errors)
+                                        this.appendErrors(flow.study, flash.errors)
                                         error()
                                 }
@@ -110 +110 @@
                                 }
                         }
-                        on ("add") {
+                        on("add") {
                                 // fetch species by name (as posted by the form)
                                 def speciesTerm = Term.findByName(params.addSpecies)
-                                
+
                                 // add x subject of species y
                                 (params.addNumber as int).times {
                                         def increment = flow.subjects.size()
-                                        flow.subjects[ increment ] = new Subject(
-                                                name: 'Subject ' + (increment+1),
-                                                species: speciesTerm
+                                        flow.subjects[increment] = new Subject(
+                                                name: 'Subject ' + (increment + 1),
+                                                species: speciesTerm,
+                                                template: flow.study.template
                                         )
                                 }
                         }.to "subjects"
                         on("next") {
+                                def errors = false
+                                flash.errors = new LinkedHashMap()
+
                                 // got one or more subjects?
                                 if (flow.subjects.size() < 1) {
+                                        errors = true;
+                                } else {
+                                        // handle form data
+                                        def id = 0;
+                                        flow.subjects.each() {
+                                                // store subject properties
+                                                it.name = params.get('subject_' + id + '_name')
+                                                it.species = Term.findByName(params.get('subject_' + id + '_species'))
+
+                                                // clear lists
+                                                def stringList = new LinkedHashMap();
+                                                def intList = new LinkedHashMap();
+
+                                                // get all template fields
+                                                flow.study.template.subjectFields.each() {
+                                                        // get value
+                                                        def value = params.get('subject_' + id + '_' + it.name);
+                                                        if (value) {
+                                                                // add to template parameters
+                                                                switch (it.type) {
+                                                                        case 'STRINGLIST':
+                                                                                stringList[it.name] = value
+                                                                                break;
+                                                                        case 'INTEGER':
+                                                                                intList[ it.name ] = value
+                                                                                break;
+                                                                        default:
+                                                                                // unsupported type?
+                                                                                println "ERROR: unsupported type: "+it.type
+                                                                                break;
+                                                                }
+                                                        }
+                                                }
+
+                                                // set field data
+                                                it.templateStringFields         = stringList
+                                                it.templateIntegerFields        = intList
+
+                                                // validate subject
+                                                if (!it.validate()) {
+                                                        errors = true
+                                                        //println id + ' :: ' + it.errors.getAllErrors()
+                                                        this.appendErrors(it, flash.errors)
+                                                }
+
+                                                id++;
+                                        }
+                                }
+
+                                // got errors?
+                                if (errors) {
+                                        println flash.errors
                                         error()
-                                }
-                                println params
+                                } else {
+                                        success()
+                                }
                         }.to "groups"
                         on("previous") {
@@ -146 +203 @@
                         on("add") {
                                 def increment = flow.groups.size()
-                                flow.groups[ increment ] = new SubjectGroup(params)
+                                flow.groups[increment] = new SubjectGroup(params)
 
                                 println flow.groups

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

@@ -352 +352 @@
          */
         def templateColumns = { attrs, body ->
-                def subjectId = attrs.remove('id')
-                def template = attrs.remove('template')
+                def subject                     = attrs.remove('subject')
+                def subjectId           = attrs.remove('id')
+                def template            = attrs.remove('template')
+                def intFields           = subject.templateIntegerFields
+                def stringFields        = subject.templateStringFields
 
                 // output columns for these subjectFields
                 template.subjectFields.each() {
+                        // output div
                         out << '<div class="' + attrs.get('class') + '">'
 
@@ -364 +368 @@
                                         if (!it.listEntries.isEmpty()) {
                                                 out << select(
-                                                        name: it.name,
-                                                        from: it.listEntries
+                                                        name: attrs.name + '_' + it.name,
+                                                        from: it.listEntries,
+                                                        value: (stringFields) ? stringFields.get(it.name) : ''
                                                 )
                                         } else {
@@ -374 +379 @@
                                         // render integer subjectfield
                                         out << textField(
-                                                name: it.name
+                                                name: attrs.name + '_' + it.name,
+                                                value: (intFields) ? intFields.get(it.name) : ''
                                         )
                                         break;

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

@@ -32 +32 @@
                                 <div class="label">${group.name}</div>
                                 <div class="subjects">
+                                        <div class="subject">test subject 1</div>
+                                        <div class="subject">test subject 2</div>
+                                        <div class="subject">test subject 3</div>
                                 </div>
                         </div>

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

@@ -35 +35 @@
                         <wizard:speciesSelect value="${subject.species}" name="subject_${i}_species" />
                 </div>
-                <wizard:templateColumns id="${i}" template="${study.template}" class="column" />
+                <wizard:templateColumns id="${i}" template="${study.template}" name="subject_${i}" class="column" subject="${subject}" />
         </div>
 </g:each>

trunk/web-app/js/grouping.js

@@ -14 +14 @@
 function Grouping() {
 }
+/*
 Grouping.prototype = {
     itemsIdentifier:    null,
-    itemIdentifier:    null,
+    itemIdentifier:     null,
     groupsIdentifier:   null,
-    groupIdentifier:   null,
+    groupIdentifier:    null,
+
+    init: function(itemsIdentifier, itemIdentifier, groupsIdentifier, groupIdentifier) {
+        var that = this;
+
+        this.itemsIdentifier    = itemsIdentifier;
+        this.itemIdentifier     = itemIdentifier;
+        this.groupsIdentifier   = groupsIdentifier;
+        this.groupIdentifier    = groupIdentifier;
+
+        this.initItems();
+    },
+
+    initItems: function() {
+        $(this.itemsIdentifier).
+    }
+}
+*/
+
+Grouping.prototype = {
+    itemsIdentifier:    null,
+    itemIdentifier:     null,
+    groupsIdentifier:   null,
+    groupIdentifier:    null,
 
     init: function(itemsIdentifier, itemIdentifier, groupsIdentifier, groupIdentifier) {
@@ -36 +60 @@
 
         // make all items selectable
+        console.log($(this.itemsIdentifier))
         $(this.itemsIdentifier).selectable({
             filter: that.itemIdentifier,
@@ -62 +87 @@
                     $('.ui-selected', $(that.itemsIdentifier)).each(function() {
                         var E = $(this);
-                        
+
                         // add to list
                         E.appendTo(list);
@@ -132 +157 @@
 }
 
-