Changeset 238 for trunk/grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy

Timestamp:

Mar 5, 2010, 3:21:52 PM (12 years ago)

Author:

duh

Message:

Refectored version of the wizard

• initial template page has been removed, now is a generic 'start' page where one (in the future) may create a new study, or load and modify an already stored study
• study page incorporates study template select element, but does not yet incorporate the study template fields
• subjects page now allows creation of subjects based on a template. This change also implied the study page altogether had to change into a seperate table entity. Now the the page lists as many tables as unique templates have been selected. These tables contain all subjects that were added using that particular template. NOTE: data is not stored yet, due to the fact that templateEntity does not work properly yey (key/value pairs need to be set correctly when calling the setTemplate method)
• the JavaScript? now handles multiple tables in a page as well, and automatically initializes any underlying slider div if that is required

File:

• trunk/grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (8 diffs)

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

@@ -200 +200 @@
                 def addExample2Element  = attrs.remove('addExample2Element')
 
+                // execute inputElement call
+                def renderedElement = "$inputElement"(attrs)
+
+                // if false, then we skip this element
+                if (!renderedElement) return false
+
                 // render a form element
                 out << '<div class="element">'
@@ -206 +212 @@
                 out << ' </div>'
                 out << ' <div class="input">'
-                out << "$inputElement"(attrs)
+                out << renderedElement
                 if(help()) {
                         out << '        <div class="helpIcon"></div>'
@@ -414 +420 @@
          */
         def templateSelect = { attrs ->
-                // fetch all templates
-                attrs.from = Template.findAll() // for now, all templates
+                def entity = attrs.remove('entity')
+
+                // fetch templates
+                attrs.from = (entity) ? Template.findAllByEntity(entity) : Template.findAll()
 
                 // got a name?
@@ -421 +429 @@
                         attrs.name = 'template'
                 }
-                
-                out << select(attrs)
+
+                // got result?
+                if (attrs.from.size() >0) {
+                        out << select(attrs)
+                } else {
+                        // no, return false to make sure this element
+                        // is not rendered in the template
+                        return false
+                }
         }
 
@@ -475 +490 @@
 
                 // output table headers for template fields
-                template.subjectFields.each() {
+                template.fields.each() {
                         out << '<div class="' + attrs.get('class') + '">' + it + '</div>'
                 }
@@ -494 +509 @@
 
                 // output columns for these subjectFields
-                template.subjectFields.each() {
+                template.fields.each() {
                         // output div
                         out << '<div class="' + attrs.get('class') + '">'
@@ -506 +521 @@
                                                         from: it.listEntries,
                                                         value: (stringFields) ? stringFields.get(it.name) : ''
-                                                )
+                                                )                                               
                                         } else {
                                                 out << '<span class="warning">no values!!</span>'
@@ -528 +543 @@
                                         // unsupported field type
                                         out << '<span class="warning">!'+it.type+'</span>'
+                                        //out << subject.getFieldValue(it.name)
                                         break;
                         }
+
                         out << '</div>'
                 }