commit updates #1895

Author: salomon-j

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

@@ -78,16 +78,19 @@
 //  a JS Date object - useful with datepicker; and
 //  a simple formatted date of the form dd-mm-yyyy useful for display.
 // The formatted date will include hh:MM if the includeTime argument is true
-ko.extenders.simpleDate = function (target, options) {
-    var includeTime = false;
-    var isReadOnly = false;
-    if (_.isObject(options)) {
-        includeTime = options.includeTime || false;
-        isReadOnly = options.readOnly || false;
-    }
-    else {
-        includeTime = options || false;
-    }
+    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 () {
@@ -106,20 +109,19 @@ ko.extenders.simpleDate = function (target, options) {
                         target(valueToWrite);
                     }
                 } else {
-                    // date has been cleared
                     target("");
                 }
             }
         });
         target.formattedDate = ko.computed({
             read: function () {
-                return convertToSimpleDate(target(), includeTime);
+                return convertToSimpleDate(target(), includeTime, showInUserTimeZone);
             },
 
             write: function (newValue) {
-            if (isReadOnly) {
-                return;
-            }
+                if (isReadOnly) {
+                    return;
+                }
                 if (newValue) {
                     var current = target(),
                         valueToWrite = convertToIsoDate(newValue);
@@ -130,6 +132,7 @@ ko.extenders.simpleDate = function (target, options) {
                 }
             }
         });
+
         target.date(target());
         target.formattedDate(target());
 

grails-app/assets/javascripts/utils.js

@@ -81,17 +81,21 @@ 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 timezone = "Australia/Sydney";
+    if (showInUserTimeZone === true) {
+        timezone = Intl.DateTimeFormat().resolvedOptions().timeZone || timezone;
+    }
+
+    var date = moment.tz(isoDate, timezone);
     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 {