From 82749eb98b248ab0524dd0c876fceff8f24e7e6a Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 23 Dec 2020 23:02:26 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt                      |  11 --
 ayanova/src/components/date-control.vue       |   1 -
 .../src/components/date-native-control.vue    |   1 -
 ayanova/src/components/date-time-control.vue  | 184 +++++++++---------
 .../components/date-time-native-control.vue   |   1 -
 ayanova/src/components/time-control.vue       |   1 -
 .../src/components/time-native-control.vue    |   1 -
 ayanova/src/views/adm-user.vue                |   1 -
 ayanova/src/views/cust-user.vue               |   1 -
 ayanova/src/views/widget.vue                  |  10 +-
 10 files changed, 100 insertions(+), 112 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index ab1a91c5..ab76fb88 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -6,17 +6,6 @@
 MISC ITEMS THAT CAME UP
 
 
-todo: time picker no way to select NOW
-todo: time picker defaults to 12:00am when date is selected, how about current time instead?
-todo: date picker component add drop down quick pick:
-	i.e. Hour from now, Day from now, Week from now, Month from now.
-
-todo: datetime picker read only mode is grayed out, should not be?
-	probably still setting both readonly and disabled like old times
-
-
-
-
 todo: Server returned broken rules not showing in form beside the field in Question	
 	test on widget form to confirm
 todo: incorrect creds on login get "res is not defined" instead of proper error
diff --git a/ayanova/src/components/date-control.vue b/ayanova/src/components/date-control.vue
index f4a9f849..2b646297 100644
--- a/ayanova/src/components/date-control.vue
+++ b/ayanova/src/components/date-control.vue
@@ -38,7 +38,6 @@
         :value="readonlyFormat()"
         :label="label"
         readonly
-        disabled
         prepend-icon="$ayiCalendarAlt"
       ></v-text-field>
       <p v-show="error" class="form__error v-messages theme--light error--text">
diff --git a/ayanova/src/components/date-native-control.vue b/ayanova/src/components/date-native-control.vue
index e450bd62..fda4a3e1 100644
--- a/ayanova/src/components/date-native-control.vue
+++ b/ayanova/src/components/date-native-control.vue
@@ -19,7 +19,6 @@
         :value="readonlyFormat()"
         :label="label"
         readonly
-        disabled
       ></v-text-field>
     </template>
   </div>
diff --git a/ayanova/src/components/date-time-control.vue b/ayanova/src/components/date-time-control.vue
index 9e6b3dcb..157b160f 100644
--- a/ayanova/src/components/date-time-control.vue
+++ b/ayanova/src/components/date-time-control.vue
@@ -1,87 +1,92 @@
 <template>
-  <v-row>
-    <template v-if="!readonly">
-      <v-col xs6>
-        <v-dialog v-model="dlgdate" width="290px">
-          <template v-slot:activator="{ on }">
-            <v-text-field
-              v-on="on"
-              prepend-icon="$ayiCalendarAlt"
-              @click:prepend="dlgdate = true"
-              :value="dateValue"
-              v-bind:label="label"
-              v-bind:rules="rules"
-              readonly
-              :error="!!error"
-              :data-cy="'dtfpick:' + testId"
-            ></v-text-field>
-          </template>
-          <v-date-picker
-            :value="dateValue"
-            @input="updateDateValue"
-            :locale="defaultLocale"
-            :data-cy="'dpick:' + testId"
-          >
-            <v-btn text color="primary" @click="$emit('input', null)">{{
-              $ay.t("Delete")
-            }}</v-btn>
-            <v-spacer></v-spacer>
-            <v-btn text color="primary" @click="dlgdate = false">{{
-              $ay.t("OK")
-            }}</v-btn>
-          </v-date-picker>
-        </v-dialog>
-      </v-col>
-      <v-col xs6>
-        <v-dialog v-model="dlgtime" width="300px">
-          <template v-slot:activator="{ on }">
-            <v-text-field
-              v-on="on"
-              :value="readonlyTimeFormat()"
-              label
-              prepend-icon="$ayiClock"
-              @click:prepend="dlgtime = true"
-              readonly
-              :error="!!error"
-              :data-cy="'ttfpick:' + testId"
-            ></v-text-field>
-          </template>
-          <v-time-picker
-            scrollable
-            ampm-in-title
-            :format="hour12 ? 'ampm' : '24hr'"
-            :value="timeValue"
-            @input="updateTimeValue"
-            :data-cy="'tpick:' + testId"
-          >
-            <v-btn text color="primary" @click="$emit('input', null)">{{
-              $ay.t("Delete")
-            }}</v-btn>
-            <v-spacer></v-spacer>
-            <v-btn text color="primary" @click="setNow()">{{
-              $ay.t("Now")
-            }}</v-btn>
-            <v-spacer></v-spacer>
-            <v-btn text color="primary" @click="dlgtime = false">{{
-              $ay.t("OK")
-            }}</v-btn>
-          </v-time-picker>
-        </v-dialog>
-      </v-col>
-    </template>
-    <template v-else>
-      <v-text-field
-        :value="readonlyFormat()"
-        :label="label"
-        readonly
-        disabled
-        prepend-icon="$ayiCalendarAlt"
-      ></v-text-field>
-      <p v-show="error" class="form__error v-messages theme--light error--text">
-        {{ error }}
-      </p>
-    </template>
-  </v-row>
+  <div>
+    <div>
+      <v-row>
+        <template v-if="!readonly">
+          <v-col xs6>
+            <v-dialog v-model="dlgdate" width="290px">
+              <template v-slot:activator="{ on }">
+                <v-text-field
+                  v-on="on"
+                  prepend-icon="$ayiCalendarAlt"
+                  @click:prepend="dlgdate = true"
+                  :value="dateValue"
+                  v-bind:label="label"
+                  v-bind:rules="rules"
+                  readonly
+                  :error="!!hasErrors"
+                  :data-cy="'dtfpick:' + testId"
+                ></v-text-field>
+              </template>
+              <v-date-picker
+                :value="dateValue"
+                @input="updateDateValue"
+                :locale="defaultLocale"
+                :data-cy="'dpick:' + testId"
+              >
+                <v-btn text color="primary" @click="$emit('input', null)">{{
+                  $ay.t("Delete")
+                }}</v-btn>
+                <v-spacer></v-spacer>
+                <v-btn text color="primary" @click="dlgdate = false">{{
+                  $ay.t("OK")
+                }}</v-btn>
+              </v-date-picker>
+            </v-dialog>
+          </v-col>
+          <v-col xs6>
+            <v-dialog v-model="dlgtime" width="300px">
+              <template v-slot:activator="{ on }">
+                <v-text-field
+                  v-on="on"
+                  :value="readonlyTimeFormat()"
+                  label
+                  prepend-icon="$ayiClock"
+                  @click:prepend="dlgtime = true"
+                  readonly
+                  :error="!!hasErrors"
+                  :data-cy="'ttfpick:' + testId"
+                ></v-text-field>
+              </template>
+              <v-time-picker
+                scrollable
+                ampm-in-title
+                :format="hour12 ? 'ampm' : '24hr'"
+                :value="timeValue"
+                @input="updateTimeValue"
+                :data-cy="'tpick:' + testId"
+              >
+                <v-btn text color="primary" @click="$emit('input', null)">{{
+                  $ay.t("Delete")
+                }}</v-btn>
+                <v-spacer></v-spacer>
+                <v-btn text color="primary" @click="setNow()">{{
+                  $ay.t("Now")
+                }}</v-btn>
+                <v-spacer></v-spacer>
+                <v-btn text color="primary" @click="dlgtime = false">{{
+                  $ay.t("OK")
+                }}</v-btn>
+              </v-time-picker>
+            </v-dialog>
+          </v-col>
+        </template>
+        <template v-else>
+          <v-text-field
+            :value="readonlyFormat()"
+            :label="label"
+            readonly
+            prepend-icon="$ayiCalendarAlt"
+          ></v-text-field>
+        </template>
+      </v-row>
+    </div>
+    <div class="v-messages theme--light error--text mt-n5" role="alert">
+      <div class="v-messages__wrapper">
+        <div class="v-messages__message">{{ allErrors() }}</div>
+      </div>
+    </div>
+  </div>
 </template>
 <script>
 /*  Xeslint-disable */
@@ -98,17 +103,16 @@ export default {
   props: {
     label: String,
     rules: Array,
-    "error-messages": { type: Array, default: null },
+    errorMessages: { type: Array, default: null },
     value: String,
     readonly: { type: Boolean, default: false },
     disabled: { type: Boolean, default: false },
-    error: {
-      type: String,
-      required: false
-    },
     testId: String
   },
   computed: {
+    hasErrors() {
+      return this.errorMessages != null && this.errorMessages.length > 0;
+    },
     timeValue() {
       return window.$gz.locale.utcDateStringToLocal8601TimeOnlyString(
         this.value,
@@ -130,9 +134,7 @@ export default {
     },
     allErrors() {
       let ret = "";
-      if (this.error != null) {
-        ret = this.error;
-      }
+
       if (this.errorMessages != null && this.errorMessages.length > 0) {
         ret += this.errorMessages.toString();
       }
diff --git a/ayanova/src/components/date-time-native-control.vue b/ayanova/src/components/date-time-native-control.vue
index f8357c73..27cf96cb 100644
--- a/ayanova/src/components/date-time-native-control.vue
+++ b/ayanova/src/components/date-time-native-control.vue
@@ -32,7 +32,6 @@
         :value="readonlyFormat()"
         :label="label"
         readonly
-        disabled
       ></v-text-field>
     </template>
   </v-row>
diff --git a/ayanova/src/components/time-control.vue b/ayanova/src/components/time-control.vue
index ec01d3a8..eace2056 100644
--- a/ayanova/src/components/time-control.vue
+++ b/ayanova/src/components/time-control.vue
@@ -42,7 +42,6 @@
         :value="readonlyFormat()"
         :label="label"
         prepend-icon="$ayiClock"
-        disabled
         readonly
       ></v-text-field>
       <p v-show="error" class="form__error v-messages theme--light error--text">
diff --git a/ayanova/src/components/time-native-control.vue b/ayanova/src/components/time-native-control.vue
index 7966b81e..ef4c1695 100644
--- a/ayanova/src/components/time-native-control.vue
+++ b/ayanova/src/components/time-native-control.vue
@@ -19,7 +19,6 @@
         :value="readonlyFormat()"
         :label="label"
         readonly
-        disabled
       ></v-text-field>
     </template>
   </div>
diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue
index 6a5f8f90..931d0629 100644
--- a/ayanova/src/views/adm-user.vue
+++ b/ayanova/src/views/adm-user.vue
@@ -152,7 +152,6 @@
                     :label="$ay.t('LastLogin')"
                     v-model="obj.lastLogin"
                     readonly
-                    disabled
                     ref="lastLogin"
                     testId="lastLogin"
                   ></gz-date-time-picker>
diff --git a/ayanova/src/views/cust-user.vue b/ayanova/src/views/cust-user.vue
index 3ad7b0a4..ce14afad 100644
--- a/ayanova/src/views/cust-user.vue
+++ b/ayanova/src/views/cust-user.vue
@@ -142,7 +142,6 @@
                     :label="$ay.t('LastLogin')"
                     v-model="obj.lastLogin"
                     readonly
-                    disabled
                     ref="lastLogin"
                     testId="lastLogin"
                   ></gz-date-time-picker>
diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue
index dccdc9b6..ded79a88 100644
--- a/ayanova/src/views/widget.vue
+++ b/ayanova/src/views/widget.vue
@@ -50,7 +50,8 @@
                 ref="count"
                 data-cy="count"
                 :rules="[form().integerValid(this, 'count')]"
-                :error-messages="form().serverErrors(this, 'count')"
+                :error-messages="['blah', 'blah2']"
+                :serror-messages="form().serverErrors(this, 'count')"
                 @input="fieldValueChanged('count')"
                 type="number"
               ></v-text-field>
@@ -85,11 +86,14 @@
                 :readonly="formState.readOnly"
                 ref="startDate"
                 testId="startDate"
-                :error-messages="form().serverErrors(this, 'startDate')"
+                :error-messages="[
+                  'blah',
+                  'blah2 teh quick brown fox jumped over teh six lazy dogs'
+                ]"
                 @input="fieldValueChanged('startDate')"
               ></gz-date-time-picker>
             </v-col>
-
+            <!-- :error-messages="form().serverErrors(this, 'startDate')" -->
             <v-col cols="12" sm="6" lg="4" xl="3">
               <gz-date-time-picker
                 :label="$ay.t('WidgetEndDate')"