Changeset 257

Timestamp:

Mar 11, 2010, 2:23:53 PM (13 years ago)

Author:

duh

Message:

• added limited auto parsing for DATE template entity values that are set as String instead of Date instances
• general improvements and bugfixes

Location:

trunk

Files:

• grails-app/controllers/dbnp/studycapturing/WizardController.groovy (modified) (1 diff)
• grails-app/domain/dbnp/studycapturing/TemplateEntity.groovy (modified) (2 diffs)
• grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (3 diffs)
• grails-app/views/wizard/index.gsp (modified) (1 diff)
• web-app/js/wizard.js (modified) (1 diff)

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

@@ -586 +586 @@
                                         def value = params.get('subject_' + subjectId + '_' + subjectField.name)
 
-                                        if (value) flow.subjects[ subjectId ].setFieldValue(subjectField.name, value)
+                                        if (value) {
+                                                flow.subjects[ subjectId ].setFieldValue(subjectField.name, value)
+                                        }
                                 }
 

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

@@ -90 +90 @@
                 }
                 else {
-                        TemplateField field = this.template.fields.find { it.name == fieldName} 
+                        TemplateField field = this.template.fields.find { it.name == fieldName}
                         if (field == null) {
                                 throw new NoSuchFieldException("Field ${fieldName} not found in class properties or template fields")
@@ -99 +99 @@
                                         value = field.listEntries.find { it.name == value }
                                 }
+
+                                // handle string values for date fields
+                                if (field.type == TemplateFieldType.DATE && value.class == String) {
+                                        // a string was given, attempt to transform it into a date instance
+                                        // and -for now- assume the dd/mm/yyyy format
+                                        def dateMatch = value =~ /^([0-9]{1,})([^0-9]{1,})([0-9]{1,})([^0-9]{1,})([0-9]{1,})((([^0-9]{1,})([0-9]{1,2}):([0-9]{1,2})){0,})/
+                                        if (dateMatch.matches()) {
+                                                // create limited 'autosensing' datetime parser
+                                                // assume dd mm yyyy  or dd mm yy
+                                                def parser = 'd' + dateMatch[0][2] + 'M' + dateMatch[0][4] + (((dateMatch[0][5] as int) > 999) ? 'yyyy' : 'yy')
+
+                                                // add time as well?
+                                                if (dateMatch[0][7] != null) {
+                                                        parser += dateMatch[0][6] + 'HH:mm'
+                                                }
+
+                                                value = new Date().parse(parser, value)
+                                        }
+                                }
+
                                 // Caution: this assumes that all template...Field Maps are already initialized
                                 // Otherwise, the results are pretty much unpredictable!

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

@@ -584 +584 @@
                 // output columns for these subjectFields
                 template.fields.each() {
+                        def fieldValue = subject.getFieldValue(it.name)
+
                         // output div
                         out << '<div class="' + attrs.get('class') + '">'
 
+                        // handle field types
                         switch (it.type.toString()) {
                                 case ['STRING', 'TEXT', 'INTEGER', 'FLOAT', 'DOUBLE']:
                                         out << textField(
                                                 name: attrs.name + '_' + it.name,
-                                                value: (intFields) ? intFields.get(it.name) : ''
+                                                value: fieldValue
                                         )
                                         break
@@ -600 +603 @@
                                                         name: attrs.name + '_' + it.name,
                                                         from: it.listEntries,
-                                                        value: (stringFields) ? stringFields.get(it.name) : ''
+                                                        value: fieldValue
                                                 )
                                         } else {
@@ -606 +609 @@
                                         }
                                         break
+                                case 'DATE':
+                                        // transform value?
+                                        if (fieldValue instanceof Date) {
+                                                if (fieldValue.getHours() == 0 && fieldValue.getMinutes() == 0) {
+                                                        // transform date instance to formatted string (dd/mm/yyyy)
+                                                        fieldValue = String.format('%td/%<tm/%<tY', fieldValue)
+                                                } else {
+                                                        // transform to date + time
+                                                        fieldValue = String.format('%td/%<tm/%<tY %<tH:%<tM', fieldValue)
+                                                }
+                                        }
+
+                                        // output a date field (not the 'rel' which makes the
+                                        // javascript front-end bind the jquery-ui datepicker)
+                                        out << textField(
+                                                name: attrs.name + '_' + it.name,
+                                                value: fieldValue,
+                                                rel: 'date'
+                                        )
+                                        break
+                                case 'ONTOLOGYTERM':
+                                        out << it.getClass()
+                                        break
                                 default:
                                         // unsupported field type
                                         out << '<span class="warning">!' + it.type + '</span>'
-                                        //out << subject.getFieldValue(it.name)
-                                        break;
+                                        break
                         }
 

trunk/grails-app/views/wizard/index.gsp

@@ -22 +22 @@
         <script type="text/javascript" src="${resource(dir: 'js', file: 'jquery.qtip-1.0.0-rc3.min.js')}"></script>
         <script type="text/javascript" src="${resource(dir: 'js', file: 'swfobject.js')}"></script>
-        <script type="text/javascript" src="${resource(dir: 'js', file: 'grouping.js')}"></script>
         <script type="text/javascript" src="${resource(dir: 'js', file: 'table-editor.js')}"></script>
         <script type="text/javascript" src="${resource(dir: 'js', file: 'timepicker-0.2.1.js')}"></script>
         <script type="text/javascript" src="${resource(dir: 'js', file: 'wizard.js')}"></script>
+        <script type="text/javascript" src="http://bioportal.bioontology.org/javascripts/widgets/form_complete.js"></script>
 </head>
 <body>

trunk/web-app/js/wizard.js

@@ -55 +55 @@
         var re = /^#/gi;
 
+        // bind to the anchor?
         if (!element.attr('href').match(/^#/gi) && !element.attr('href').match(/\/([^\/]+)\/wizard\/pages/gi)) {
             // bind a warning to the onclick event
-            element.bind('click',function() {
-                return confirm('Warning: navigating away from the wizard causes loss of work and unsaved data. Are you sure you want to continue?');
-            })
+            element.bind('click',function() { return onDirectWarning(); });
         }
     })
+}
+
+function onDirectWarning() {
+    return confirm('Warning: navigating away from the wizard causes loss of work and unsaved data. Are you sure you want to continue?');
 }