From 169b6c54a68563c1092512b3c278854d5ed661d3 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 30 Nov 2020 20:29:22 +0000
Subject: [PATCH]

---
 ayanova/src/components/date-time-control.vue | 10 ++++-
 ayanova/src/components/time-control.vue      |  2 +-
 ayanova/src/views/adm-user.vue               | 12 ++++++
 ayanova/src/views/cust-user.vue              | 12 ++++++
 ayanova/src/views/home-user-settings.vue     | 43 ++++++++------------
 5 files changed, 52 insertions(+), 27 deletions(-)

diff --git a/ayanova/src/components/date-time-control.vue b/ayanova/src/components/date-time-control.vue
index ef460509..74fae63c 100644
--- a/ayanova/src/components/date-time-control.vue
+++ b/ayanova/src/components/date-time-control.vue
@@ -37,7 +37,7 @@
           <template v-slot:activator="{ on }">
             <v-text-field
               v-on="on"
-              :value="timeValue"
+              :value="readonlyTimeFormat()"
               label
               prepend-icon="$ayiClock"
               @click:prepend="dlgtime = true"
@@ -137,6 +137,14 @@ export default {
         this.hour12
       );
     },
+    readonlyTimeFormat() {
+      return window.$gz.locale.utcDateToShortTimeLocalized(
+        this.value,
+        this.timeZoneName,
+        this.languageName,
+        this.hour12
+      );
+    },
     updateTimeValue(v) {
       this.updateValue(this.dateValue, v);
     },
diff --git a/ayanova/src/components/time-control.vue b/ayanova/src/components/time-control.vue
index f9628e2a..ffa4025f 100644
--- a/ayanova/src/components/time-control.vue
+++ b/ayanova/src/components/time-control.vue
@@ -6,7 +6,7 @@
           <template v-slot:activator="{ on }">
             <v-text-field
               v-on="on"
-              :value="timeValue"
+              :value="readonlyFormat()"
               v-bind:label="label"
               prepend-icon="$ayiClock"
               @click:prepend="dlgtime = true"
diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue
index 68d016f1..aea92eba 100644
--- a/ayanova/src/views/adm-user.vue
+++ b/ayanova/src/views/adm-user.vue
@@ -352,6 +352,17 @@
                   ></v-text-field>
                 </v-col>
 
+                <v-col cols="12" sm="6" lg="4" xl="3">
+                  <v-checkbox
+                    v-model="optionsObj.hour12"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('Hour12')"
+                    ref="hour12"
+                    :error-messages="form().serverErrors(this, 'hour12')"
+                    @change="fieldValueChanged('hour12')"
+                  ></v-checkbox>
+                </v-col>
+
                 <v-col cols="12" sm="6" lg="4" xl="3">
                   <v-text-field
                     v-model="optionsObj.languageOverride"
@@ -1097,6 +1108,7 @@ async function fetchTranslatedText(vm) {
     "CurrencyCode",
     "LanguageCode",
     "TimeZone",
+    "Hour12",
     "UserEmailAddress",
     "UserColor",
     "Translation",
diff --git a/ayanova/src/views/cust-user.vue b/ayanova/src/views/cust-user.vue
index 87645d21..98cb633b 100644
--- a/ayanova/src/views/cust-user.vue
+++ b/ayanova/src/views/cust-user.vue
@@ -336,6 +336,17 @@
                   ></v-text-field>
                 </v-col>
 
+                <v-col cols="12" sm="6" lg="4" xl="3">
+                  <v-checkbox
+                    v-model="optionsObj.hour12"
+                    :readonly="formState.readOnly"
+                    :label="$ay.t('Hour12')"
+                    ref="hour12"
+                    :error-messages="form().serverErrors(this, 'hour12')"
+                    @change="fieldValueChanged('hour12')"
+                  ></v-checkbox>
+                </v-col>
+
                 <v-col cols="12" sm="6" lg="4" xl="3">
                   <v-text-field
                     v-model="optionsObj.languageOverride"
@@ -1099,6 +1110,7 @@ async function fetchTranslatedText(vm) {
     "CurrencyCode",
     "LanguageCode",
     "TimeZone",
+    "Hour12",
     "UserEmailAddress",
     "UserColor",
     "Translation",
diff --git a/ayanova/src/views/home-user-settings.vue b/ayanova/src/views/home-user-settings.vue
index 5b4b8cfb..c0bbada7 100644
--- a/ayanova/src/views/home-user-settings.vue
+++ b/ayanova/src/views/home-user-settings.vue
@@ -121,6 +121,17 @@
             ></v-text-field>
           </v-col>
 
+          <v-col cols="12" sm="6" lg="4" xl="3">
+            <v-checkbox
+              v-model="obj.hour12"
+              :readonly="formState.readOnly"
+              :label="$ay.t('Hour12')"
+              ref="hour12"
+              :error-messages="form().serverErrors(this, 'hour12')"
+              @change="fieldValueChanged('hour12')"
+            ></v-checkbox>
+          </v-col>
+
           <v-col cols="12" sm="6" lg="4" xl="3">
             <v-text-field
               v-model="obj.languageOverride"
@@ -381,32 +392,13 @@ export default {
 
             //Set values in store so they are updated immediately for user
             let l = vm.$store.state.userOptions;
-
-            if (vm.obj.languageOverride) {
-              l.languageOverride = vm.obj.languageOverride;
-            }
-
-            if (vm.obj.timeZoneOverride) {
-              l.timeZoneOverride = vm.obj.timeZoneOverride;
-            }
-
-            if (vm.obj.currencyName) {
-              l.currencyName = vm.obj.currencyName;
-            }
-
-            if (vm.obj.hour12) {
-              l.hour12 = vm.obj.hour12;
-            }
-
-            if (vm.obj.uiColor) {
-              l.uiColor = vm.obj.uiColor;
-            }
-            if (vm.obj.emailAddress) {
-              l.emailAddress = vm.obj.emailAddress;
-            }
-
+            l.languageOverride = vm.obj.languageOverride;
+            l.timeZoneOverride = vm.obj.timeZoneOverride;
+            l.currencyName = vm.obj.currencyName;
+            l.hour12 = vm.obj.hour12;
+            l.uiColor = vm.obj.uiColor;
+            l.emailAddress = vm.obj.emailAddress;
             l.mapUrlTemplate = vm.obj.mapUrlTemplate;
-
             window.$gz.store.commit("setUserOptions", l);
 
             if (
@@ -513,6 +505,7 @@ async function fetchTranslatedText(vm) {
     "CurrencyCode",
     "LanguageCode",
     "TimeZone",
+    "Hour12",
     "UserEmailAddress",
     "UserColor",
     "Translation",