Changeset 502 for trunk

Timestamp:

May 31, 2010, 1:53:03 PM (13 years ago)

Author:

roberth

Message:

RELTIME fields in the wizard now show the parsed text in blue when leaving the input field.

Location:

trunk

Files:

• grails-app/controllers/dbnp/studycapturing/WizardController.groovy (modified) (2 diffs)
• grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (1 diff)
• test/unit/dbnp/studycapturing/WizardControllerTests.groovy (modified) (1 diff)
• web-app/js/wizard.js (modified) (1 diff)

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

@@ -2 +2 @@
 
 import dbnp.data.*
+
+// Grails convertors is imported in order to create JSON objects
+import grails.converters.*
+
 
 /**
@@ -769 +773 @@
                 }
         }
+
+        /**
+         * Parses a RelTime string and returns a nice human readable string
+         *
+         * @returns Human Readable string or a HTTP response code 400 on error
+         */
+        def ajaxParseRelTime = {
+            if( params.reltime == null ) {
+                response.status = 400;
+                render( 'reltime parameter is expected' );
+            }
+
+            try {
+                def reltime = RelTime.parseRelTime( params.reltime );
+                render reltime.toPrettyString();
+            } catch( IllegalArgumentException e ) {
+                response.status = 400;
+                render( e.getMessage() );
+            }
+        }
 }

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

@@ -920 +920 @@
                                                         description: ucName,
                                                         name: prependName + it.escapedName(),
-                                                        value: new RelTime( fieldValue ).toString()
+                                                        value: new RelTime( fieldValue ).toString(),
+                                                        addExampleElement: true,
+                                                        onBlur: 'showExampleReltime(this)'
                                                 ){helpText}
                                                 break

trunk/test/unit/dbnp/studycapturing/WizardControllerTests.groovy

@@ -12 +12 @@
     }
 
-    void testSomething() {
+    void testAjaxParseRelTimeNonExistent() {
+        // Without parameters, the method should give an error
+        controller.ajaxParseRelTime();
+        assert controller.response.status == 400;
+    }
 
+    void testAjaxParseRelTimeEmpty() {
+        // With empty parameter, the method should work
+        controller.params.reltime = '';
+        controller.ajaxParseRelTime();
+        assert controller.response.status == 200
+        assert controller.response.contentAsString == ""
     }
+
+    void testAjaxParseRelTimeCorrect() {
+        // With simple parameter, the method should work
+        controller.params.reltime = '3d';
+        controller.ajaxParseRelTime();
+        assert controller.response.status == 200
+        assert controller.response.contentAsString == "3 days"
+    }
+
+    void testAjaxParseRelTimeIllegal() {
+        // With illegal parameter, the method should give status code 400
+        controller.params.reltime = 'no valid reltime';
+        controller.ajaxParseRelTime();
+        assert controller.response.status == 400;
+    }
+
 }

trunk/web-app/js/wizard.js

@@ -286 +286 @@
     });
 }
+
+// Show example of parsed data next to RelTime fields
+function showExampleReltime(inputfield) {
+    var fieldName = inputfield.name;
+
+    var successFunc = function(data, textStatus, request) {
+        if( request.status == 200 ) {
+            document.getElementById( fieldName + "Example" ).value = data;
+        }
+    };
+
+    var errorFunc = function( request, textStatus, errorThrown ) {
+        // On error, clear the example field
+        document.getElementById( fieldName + "Example" ).value = "";
+    };
+        
+    $.ajax({
+        url     : baseUrl + '/wizard/ajaxParseRelTime?reltime=' + inputfield.value,
+        success : successFunc,
+        error   : errorFunc
+    });
+}