Merge pull request #346 from AtlasOfLivingAustralia/feature/biocollect1895

commit updates #1895

Author: temi

grails-app/assets/javascripts/knockout-dates.js

@@ -81,58 +81,61 @@
 ko.extenders.simpleDate = function (target, options) {
     var includeTime = false;
     var isReadOnly = false;
+    var showInUserTimeZone = false;
+
     if (_.isObject(options)) {
         includeTime = options.includeTime || false;
         isReadOnly = options.readOnly || false;
+        showInUserTimeZone = options.showInUserTimeZone || false;
     }
     else {
         includeTime = options || false;
     }
 
-        target.date = ko.computed({
-            read: function () {
-                return Date.fromISO(target());
-            },
+    target.date = ko.computed({
+        read: function () {
+            return Date.fromISO(target());
+        },
 
-            write: function (newValue) {
+        write: function (newValue) {
             if (isReadOnly) {
                 return;
             }
-                if (newValue) {
-                    var current = target(),
-                        valueToWrite = convertToIsoDate(newValue);
-
-                    if (valueToWrite !== current) {
-                        target(valueToWrite);
-                    }
-                } else {
-                    // date has been cleared
-                    target("");
+            if (newValue) {
+                var current = target(),
+                    valueToWrite = convertToIsoDate(newValue);
+
+                if (valueToWrite !== current) {
+                    target(valueToWrite);
                 }
+            } else {
+                target("");
             }
-        });
-        target.formattedDate = ko.computed({
-            read: function () {
-                return convertToSimpleDate(target(), includeTime);
-            },
+        }
+    });
+    target.formattedDate = ko.computed({
+        read: function () {
+            return convertToSimpleDate(target(), includeTime, showInUserTimeZone);
+        },
 
-            write: function (newValue) {
+        write: function (newValue) {
             if (isReadOnly) {
                 return;
             }
-                if (newValue) {
-                    var current = target(),
-                        valueToWrite = convertToIsoDate(newValue);
+            if (newValue) {
+                var current = target(),
+                    valueToWrite = convertToIsoDate(newValue);
 
-                    if (valueToWrite !== current) {
-                        target(valueToWrite);
-                    }
+                if (valueToWrite !== current) {
+                    target(valueToWrite);
                 }
             }
-        });
-        target.date(target());
-        target.formattedDate(target());
+        }
+    });
 
-        return target;
-    };
+    target.date(target());
+    target.formattedDate(target());
+
+    return target;
+};
 }());

grails-app/assets/javascripts/utils.js

@@ -81,17 +81,25 @@ function isValidDate(d) {
     return !isNaN(d.getTime());
 }
 
-function convertToSimpleDate(isoDate, includeTime) {
+function convertToSimpleDate(isoDate, includeTime, showInUserTimeZone) {
     if (!isoDate) { return ''}
     if (typeof isoDate === 'object') {
         // assume a date object
         if (!isValidDate(isoDate)) {
             return '';
         }
     }
-    // Format the stage labels using Melbourne/Sydney/Canberra time to avoid problems where the date starts
-    // at midnight and displays as the previous day in other timezones.
-    var date = moment.tz(isoDate, "Australia/Sydney");
+
+    var date;
+    if (showInUserTimeZone === true) {
+        // default to user's local timezone
+        date = moment(isoDate);
+    }
+    else {
+        // use existing behaviour
+        date = moment.tz(isoDate, "Australia/Sydney");
+    }
+
     var format = includeTime ? "DD-MM-YYYY HH:mm" : "DD-MM-YYYY";
     return date.format(format);
 }

grails-app/taglib/au/org/ala/ecodata/forms/ModelJSTagLib.groovy

@@ -626,9 +626,20 @@ class ModelJSTagLib {
     }
 
     def dateViewModel(JSModelRenderContext ctx) {
-        List extenders =  ["{simpleDate: {includeTime:false}}"]
+        def options = ["includeTime:false"]
+
+        if (ctx.dataModel.computed) {
+            options << "readOnly:true"
+        }
+
+        if (ctx.dataModel.showInUserTimeZone) {
+            options << "showInUserTimeZone:true"
+        }
+
+        def extender = "{simpleDate: {${options.join(', ')}}}"
+        List extenders = [extender]
+
         if (ctx.dataModel.computed) {
-            extenders = ["{simpleDate: {includeTime:false, readOnly:true}}"]
             computedModel(ctx, extenders)
         }
         else {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlasoflivingaustralia/ecodata-client-plugin",
-  "version": "8.5.0-snapshot",
+  "version": "8.5.1-snapshot",
   "repository": {
     "type": "git",
     "url": "https://github.com/AtlasOfLivingAustralia/ecodata-client-plugin.git"