commit fix #1895

Author: salomon-j

grails-app/assets/javascripts/utils.js

@@ -91,13 +91,13 @@ function convertToSimpleDate(isoDate, includeTime, showInUserTimeZone) {
     }
 
     var date;
-    if (showInUserTimeZone === true) {
-        // use the user’s local timezone
-        date = moment(isoDate);
+    if (showInUserTimeZone === false) {
+        // keep the date in UTC
+        date = moment.utc(isoDate);
     }
     else {
-        // keep the date in UTC to avoid shifting it for other viewers
-        date = moment.utc(isoDate);
+        // default to user's local timezone
+        date = moment(isoDate);
     }
 
     var format = includeTime ? "DD-MM-YYYY HH:mm" : "DD-MM-YYYY";

src/integration-test/groovy/au/org/ala/ecodata/forms/DateSpec.groovy

@@ -54,10 +54,10 @@ class DateSpec extends GebReportingSpec {
         title == "Preview Date example"
 
         and: "The values from the data model are displayed"
-        $("span[data-bind*=date1").text() == "01-07-2019"
-        $("span[data-bind*=date2").text() == "01-08-2019"
-        $("span[data-bind*=date3")*.text() == ["01-09-2019", "01-11-2019"]
-        $("span[data-bind*=date4")*.text() == ["01-10-2019", '']
+        $("span[data-bind*=date1").text() == "02-07-2019"
+        $("span[data-bind*=date2").text() == "02-08-2019"
+        $("span[data-bind*=date3")*.text() == ["02-09-2019", "02-11-2019"]
+        $("span[data-bind*=date4")*.text() == ["02-10-2019", '']
     }
 
 }