From cce6bdc8c6562b42e1383d5addae841f91331f72 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 6 Feb 2020 23:04:14 +0000 Subject: [PATCH] --- ayanova/src/api/initialize.js | 2 +- ayanova/src/components/date-time-control.vue | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/ayanova/src/api/initialize.js b/ayanova/src/api/initialize.js index 0a7bbea5..1c3ffbd5 100644 --- a/ayanova/src/api/initialize.js +++ b/ayanova/src/api/initialize.js @@ -784,7 +784,7 @@ export default function initialize() { window.$gz.store.commit("setLocale", { decimalSeparator: ".", currencySymbol: "$", - hour12: false, + hour12: true, // shortDate: "YYYY-MM-DD", // shortTime: "hh:mm:ss A", // shortDateAndTime: "YYYY-MM-DD hh:mm:ss A", diff --git a/ayanova/src/components/date-time-control.vue b/ayanova/src/components/date-time-control.vue index 3206adcc..45b19983 100644 --- a/ayanova/src/components/date-time-control.vue +++ b/ayanova/src/components/date-time-control.vue @@ -232,14 +232,7 @@ export default { //console.log(new Date().toLocaleTimeString('sv-SE',{timeZone:"America/Vancouver"})); //console.log(new Date().toLocaleTimeString('sv-SE',{timeZone:"UTC"})); get() { - if (this.value) { - //Ok, this looks weird but sv-SE is the same format as iso8601 format required so if this breaks that's why - return new Date(this.value).toLocaleTimeString("sv-SE", { - timeZone: this.timeZoneName - }); - } else { - return ""; - } + return window.$gz.locale.utcDateStringTo8601TimeOnlyString(this.value); }, set(value) { //this.value = value;