Changeset 804

Timestamp:

12-08-10 13:21:38 (4 years ago)

Author:

duh

Message:

- event template feedback was wrong
- made a generic change that both template fields as well as template headers:

• split combined words in the view (e.g. MyCoolFieldName? --> My Cool Field Name)
• capitalize seperate words in the view (e.g. My field name --> My Field Name)

Location:

trunk/grails-app

Files:

• taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (2 diffs)
• views/wizard/pages/_events.gsp (modified) (1 diff)

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

@@ -237 +237 @@
 
                 // render a form element
-                if (attrs.get('elementId')) {
-                out << '<div class="element" id="'+ attrs.remove('elementId') +'">'
-                } else {
-                        out << '<div class="element">'
-                }
+                out << '<div class="element"'+ ((attrs.get('elementId')) ? 'id="'+attrs.remove('elementId')+'"': '') + '>'
                 out << ' <div class="description">'
-                out << description
+                out << ((description) ? description.replaceAll(/[a-z][A-Z][a-z]/) { it[0] + ' ' + it[1..2] }.replaceAll(/\w+/) { it[0].toUpperCase() + ((it.size() > 1) ? it[1..-1] : '') } : '')
                 out << ' </div>'
                 out << ' <div class="input">'
                 out << renderedElement
-                if (helpText.size() > 0) {
-                        out << '        <div class="helpIcon"></div>'
-                }
+                out << ((helpText.size() > 0) ? '       <div class="helpIcon"></div>' : '')
 
                 // add an disabled input box for feedback purposes
@@ -850 +844 @@
                         // render template fields
                         entity.giveFields().each() {
-                                def ucName              = it.name[0].toUpperCase() + it.name.substring(1)
+                                // Format the column name by:
+                                // - separating combined names (SampleName --> Sample Name)
+                                // - capitalizing every seperate word
+                                def ucName = it.name.replaceAll(/[a-z][A-Z][a-z]/) {
+                                        it[0] + ' ' + it[1..2]
+                                }.replaceAll(/\w+/) {
+                                        it[0].toUpperCase() + ((it.size() > 1) ? it[1..-1] : '')
+                                }
 
                                 out << '<div class="' + attrs.get('class') + '">' + ucName + (it.unit ? " (${it.unit})" : '')

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

@@ -31 +31 @@
         </wizard:radioElement>
         <wizard:templateElement name="eventTemplate" elementId="eventTemplate" description="Event Template" value="${event?.template}" entity="${dbnp.studycapturing.Event}" addDummy="true" ajaxOnChange="switchTemplate" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" >
-                The template to use for this study
+                The template to use for this event
         </wizard:templateElement>
-        <wizard:templateElement name="sampleTemplate" elementId="sampleTemplate" description="Sample Template" value="${event?.template}" entity="${dbnp.studycapturing.SamplingEvent}" addDummy="true" ajaxOnChange="switchTemplate" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" >
-                The template to use for this study
+        <wizard:templateElement name="sampleTemplate" elementId="sampleTemplate" description="Sampling Event Template" value="${event?.template}" entity="${dbnp.studycapturing.SamplingEvent}" addDummy="true" ajaxOnChange="switchTemplate" url="[controller:'wizard',action:'pages']" update="[success:'wizardPage',failure:'wizardError']" afterSuccess="onWizardPage()" >
+                The template to use for this sampling event
         </wizard:templateElement>
         <g:if test="${event?.template}">