Changeset 603

Timestamp:

23-06-10 15:51:12 (6 years ago)

Author:

duh

Message:

• development commit

Location:

trunk/grails-app

Files:

• controllers/dbnp/studycapturing/WizardController.groovy (modified) (4 diffs)
• taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (7 diffs)
• views/layouts/main.gsp (modified) (2 diffs)
• views/wizard/pages/_samples.gsp (modified) (1 diff)

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

@@ -621 +621 @@
                                                                 def sampleName = (this.ucwords(subject.name) + '_' + eventName + '_' + new RelTime( event.startTime ).toString()).replaceAll("([ ]{1,})", "")
 
-                                                                println sampleName
                                                                 flow.samples[ flow.samples.size() ] = [
                                                                         sample          : new Sample(
@@ -642 +641 @@
                                 success()
                         }
+                        on("switchTemplate") {
+                                println "switch that template!"
+                                handleSamples(flow, flash, params)
+                                succes()
+                        }.to "samples"
+                        on("refresh") {
+                                success()
+                        }.to "samples"
                         on("previous") {
                                 success()
@@ -647 +654 @@
                         on("next") {
                                 success()
-                        }.to "samples"
+                        }.to "confirm"
                         on("quickSave") {
                                 success()
@@ -1166 +1173 @@
         }
 
+
+        /**
+         * re-usable code for handling samples
+         * @param Map LocalAttributeMap (the flow scope)
+         * @param Map localAttributeMap (the flash scope)
+         * @param Map GrailsParameterMap (the flow parameters = form data)
+         * @return boolean
+         */
+        def handleSamples(flow, flash, params) {
+                println "handling samples"
+                println "params:"
+                println params
+                println "samples:"
+                def id = 0
+                flow.samples.each() { sample ->
+                        println id + " : " + sample
+                        sample.template = Template.findByName( params.get('template_'+id) )
+
+println sample
+                        id++
+                }
+        }
+
         /**
          * groovy / java equivalent of php's ucwords function

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

@@ -220 +220 @@
 println ".rendering [" + inputElement + "] with name [" + attrs.get('name') + "] and value [" + ((attrs.value) ? attrs.get('value').toString() : "-") + "]"
                 // work variables
-                def internetExplorer = (request.getHeader("User-Agent") =~ /MSIE/)
                 def description = attrs.remove('description')
                 def addExampleElement = attrs.remove('addExampleElement')
@@ -226 +225 @@
                 def helpText = help().trim()
 
-                // got an ajax onchange action?
+                // execute inputElement call
+                def renderedElement = "$inputElement"(attrs)
+
+                // if false, then we skip this element
+                if (!renderedElement) return false
+
+                // render a form element
+                if (attrs.get('elementId')) {
+                out << '<div class="element" id="'+ attrs.remove('elementId') +'">'
+                } else {
+                        out << '<div class="element">'
+                }
+                out << ' <div class="description">'
+                out << description
+                out << ' </div>'
+                out << ' <div class="input">'
+                out << renderedElement
+                if (helpText.size() > 0) {
+                        out << '        <div class="helpIcon"></div>'
+                }
+
+                // add an disabled input box for feedback purposes
+                // @see dateElement(...)
+                if (addExampleElement) {
+                        def exampleAttrs = new LinkedHashMap()
+                        exampleAttrs.name = attrs.get('name') + 'Example'
+                        exampleAttrs.class = 'isExample'
+                        exampleAttrs.disabled = 'disabled'
+                        exampleAttrs.size = 30
+                        out << textField(exampleAttrs)
+                }
+
+                // add an disabled input box for feedback purposes
+                // @see dateElement(...)
+                if (addExample2Element) {
+                        def exampleAttrs = new LinkedHashMap()
+                        exampleAttrs.name = attrs.get('name') + 'Example2'
+                        exampleAttrs.class = 'isExample'
+                        exampleAttrs.disabled = 'disabled'
+                        exampleAttrs.size = 30
+                        out << textField(exampleAttrs)
+                }
+
+                out << ' </div>'
+
+                // add help content if it is available
+                if (helpText.size() > 0) {
+                        out << '  <div class="helpContent">'
+                        out << '    ' + helpText
+                        out << '  </div>'
+                }
+
+                out << '</div>'
+        }
+
+        /**
+         * bind an ajax submit to an onChange event
+         * @param attrs
+         * @return attrs
+         */
+        private getAjaxOnChange = { attrs ->
+                // work variables
+                def internetExplorer = (request.getHeader("User-Agent") =~ /MSIE/)
                 def ajaxOnChange = attrs.remove('ajaxOnChange')
-                if (ajaxOnChange) {
+
+                // is ajaxOnChange defined
+                if ( ajaxOnChange ) {
                         if (!attrs.onChange) attrs.onChange = ''
 
@@ -265 +328 @@
                 }
 
-                // execute inputElement call
-                def renderedElement = "$inputElement"(attrs)
-
-                // if false, then we skip this element
-                if (!renderedElement) return false
-
-                // render a form element
-                if (attrs.get('elementId')) {
-                out << '<div class="element" id="'+ attrs.remove('elementId') +'">'
-                } else {
-                        out << '<div class="element">'
-                }
-                out << ' <div class="description">'
-                out << description
-                out << ' </div>'
-                out << ' <div class="input">'
-                out << renderedElement
-                if (helpText.size() > 0) {
-                        out << '        <div class="helpIcon"></div>'
-                }
-
-                // add an disabled input box for feedback purposes
-                // @see dateElement(...)
-                if (addExampleElement) {
-                        def exampleAttrs = new LinkedHashMap()
-                        exampleAttrs.name = attrs.get('name') + 'Example'
-                        exampleAttrs.class = 'isExample'
-                        exampleAttrs.disabled = 'disabled'
-                        exampleAttrs.size = 30
-                        out << textField(exampleAttrs)
-                }
-
-                // add an disabled input box for feedback purposes
-                // @see dateElement(...)
-                if (addExample2Element) {
-                        def exampleAttrs = new LinkedHashMap()
-                        exampleAttrs.name = attrs.get('name') + 'Example2'
-                        exampleAttrs.class = 'isExample'
-                        exampleAttrs.disabled = 'disabled'
-                        exampleAttrs.size = 30
-                        out << textField(exampleAttrs)
-                }
-
-                out << ' </div>'
-
-                // add help content if it is available
-                if (helpText.size() > 0) {
-                        out << '  <div class="helpContent">'
-                        out << '    ' + helpText
-                        out << '  </div>'
-                }
-
-                out << '</div>'
+                return attrs
         }
 
@@ -577 +588 @@
                         attrs.rel = 'term'
 
+                        // got an ajaxOnChange defined?
+                        attrs = getAjaxOnChange.call(
+                                attrs
+                        )
+
                         out << select(attrs)
                 } else {
@@ -656 +672 @@
          */
         def templateElement = { attrs, body ->
-                // add a rel element if it does not exist
-                if (!attrs.rel) {
-                        attrs.rel = 'template'
-                }
-                
                 // render template element
                 baseElement.call(
@@ -700 +711 @@
                 }
 
+                // add a rel element if it does not exist
+                if (!attrs.rel) {
+                        attrs.rel = 'template'
+                }
+
+                // got an ajaxOnChange defined?
+                attrs = getAjaxOnChange.call(
+                        attrs
+                )
+
                 // got result?
                 if (attrs.from.size() > 0 || attrs.get('addDummy')) {
@@ -858 +879 @@
                 def inputElement= null
                 def addDummy    = (attrs.get('addDummy')) ? true : false
+println "template: "
+println template
 
                 // got a template?

trunk/grails-app/views/layouts/main.gsp

@@ -15 +15 @@
         <script type="text/javascript" src="${resource(dir: 'js', file: 'login_panel.js')}"></script>
         <script type="text/javascript" src="${resource(dir: 'js', file: 'topnav.js')}"></script>
-        <g:if env="development"><script type="text/javascript" src="${resource(dir: 'js', file: 'development.js')}"></script><% if (meta(name: new String("YXBwLnZlcnNpb24=".toString().decodeBase64())) == (new String("MC4zLjM=".toString().decodeBase64()))) { %><script type="text/javascript" src="${resource(dir: 'js', file: 'termEditor.js')}"></script><% } %></g:if>
+        <g:if env="development"><script type="text/javascript" src="${resource(dir: 'js', file: 'development.js')}"></script><% if (meta(name: new String("YXBwLnZlcnNpb24=".toString().decodeBase64())) =~ (new String("MC45".toString().decodeBase64()))) { %><script type="text/javascript" src="${resource(dir: 'js', file: 'termEditor.js')}"></script><% } %></g:if>
 </head>
 <body>
@@ -25 +25 @@
         <div id="content"><g:layoutBody/></div>
         <div id="footer">
-                Copyright © 2008 - <g:formatDate format="yyyy" date="${new Date()}"/> NMC & NuGO. All rights reserved.
+=               Copyright © 2008 - <g:formatDate format="yyyy" date="${new Date()}"/> NMC & NuGO. All rights reserved.
                 ( style: <%=session.style%> )
         </div>

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

@@ -24 +24 @@
         <g:if test="${samples}">
                 <div class="table">
-                <g:each var="sampleData" in="${samples}">
+                <g:each status="s" var="sampleData" in="${samples}">
                         <div class="row">
-                                ${sampleData}<br/>
+                                <wizard:templateSelect name="template_${s}" entity="${dbnp.studycapturing.Sample}" addDummy="true" ajaxOnChange="switchTemplate" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" />
                                 <wizard:templateColumns class="column" id="1" entity="${sampleData['sample']}"/>
                                 <% /*