From 40f12a6cc1e5aaec4792c9bb403f3ee31b491b5f Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Sat, 20 Jun 2020 20:26:42 +0000
Subject: [PATCH]

---
 ayanova/devdocs/todo.txt                      |   4 +
 .../src/components/date-time-v2-control.vue   | 150 ++++++++----------
 2 files changed, 70 insertions(+), 84 deletions(-)

diff --git a/ayanova/devdocs/todo.txt b/ayanova/devdocs/todo.txt
index 79f82a80..3680de64 100644
--- a/ayanova/devdocs/todo.txt
+++ b/ayanova/devdocs/todo.txt
@@ -8,6 +8,10 @@ WIFI change 5g channel to 52,56,60 and 2g channel to 8
 
 todo: datetime should support keyboard entry if typing
 
+todo: server error not displaying properly for broken rules?
+	widget start date invalid format or missing I guess was the issue but no feedback
+	{"error":{"code":"2200","details":[{"target":"StartDate","error":"2201"}],"message":"Object did not pass validation"}}
+
 todo: if dbid in url query parameter of contact form on server it should include that in the message
 	also something needs to be fixed there, it's been in notes forever
 
diff --git a/ayanova/src/components/date-time-v2-control.vue b/ayanova/src/components/date-time-v2-control.vue
index 5e008ee6..54182cc5 100644
--- a/ayanova/src/components/date-time-v2-control.vue
+++ b/ayanova/src/components/date-time-v2-control.vue
@@ -1,33 +1,38 @@
 <template>
   <div>
-    <!-- <div>
-      Value:{{ value }}, dateValue: {{ dateValue }}, timeValue: {{ timeValue }}
-    </div> -->
-    <v-text-field
-      ref="dateField"
-      :value="dateControlFormat()"
-      @input="handleDateInput"
-      :readonly="readonly"
-      :disabled="disabled"
-      :label="label"
-      :rules="rules"
-      type="date"
-    ></v-text-field>
-
-    <v-text-field
-      ref="timeField"
-      :value="timeControlFormat()"
-      @input="handleTimeInput"
-      :readonly="readonly"
-      :disabled="disabled"
-      :label="label"
-      :rules="rules"
-      type="time"
-    ></v-text-field>
-
-    <p v-show="error" class="form__error v-messages theme--light error--text">
-      {{ error }}
-    </p>
+    <v-row>
+      {{ internalValue }}
+      <v-col cols="6">
+        <v-text-field
+          ref="dateField"
+          :value="dateControlFormat()"
+          @input="handleDateInput"
+          :readonly="readonly"
+          :disabled="disabled"
+          :label="label"
+          :rules="rules"
+          type="date"
+        ></v-text-field>
+      </v-col>
+      <v-col cols="6">
+        <v-text-field
+          ref="timeField"
+          :value="timeControlFormat()"
+          @input="handleTimeInput"
+          :readonly="readonly"
+          :disabled="disabled"
+          type="time"
+        ></v-text-field>
+      </v-col>
+      <v-col cols="12">
+        <p
+          v-show="error"
+          class="form__error v-messages theme--light error--text"
+        >
+          {{ error }}
+        </p>
+      </v-col>
+    </v-row>
   </div>
 </template>
 <script>
@@ -81,68 +86,45 @@ export default {
       );
     },
     handleDateInput(value) {
-      console.log("handle date input called with ", value);
-      //   //combine the time and dates into a consolidated value
-      //   let TimePortion = this.timeValue;
-      //   if (!TimePortion) {
-      //     TimePortion = "00:00:00";
-      //   }
+      //combine the time and dates into a consolidated value
+      let TimePortion = window.$gz.locale.utcDateStringToLocal8601TimeOnlyString(
+        this.internalValue,
+        this.timeZoneName
+      );
+      let newValue = window.$gz.locale.localTimeDateStringToUTC8601String(
+        value + "T" + TimePortion,
+        this.timeZoneName
+      );
 
-      //   let DatePortion = this.dateValue;
-      //   if (!DatePortion) {
-      //     let v = new Date();
-      //     let fullYear = v.getFullYear();
-      //     let fullMonth = v.getMonth() + 1;
-      //     if (fullMonth < 10) {
-      //       fullMonth = "0" + fullMonth.toString();
-      //     }
-      //     let fullDay = v.getDate();
-      //     if (fullDay < 10) {
-      //       fullDay = "0" + fullDay.toString();
-      //     }
-
-      //     DatePortion = fullYear + "-" + fullMonth + "-" + fullDay;
-      //   }
-
-      //   let fullValue = window.$gz.locale.localTimeDateStringToUTC8601String(
-      //     DatePortion + "T" + value,
-      //     this.timeZoneName
-      //   );
-      //   console.log("handle input emitting ", fullValue);
-      //   this.$emit("input", fullValue);
-      //   // this.internalValue = value;
-      //   // this.formattedValue = value;
+      this.$emit("input", newValue);
     },
     handleTimeInput(value) {
       console.log("handle time input called with ", value);
-      //   //combine the time and dates into a consolidated value
-      //   let TimePortion = this.timeValue;
-      //   if (!TimePortion) {
-      //     TimePortion = "00:00:00";
-      //   }
+      let DatePortion = window.$gz.locale.utcDateStringToLocal8601DateOnlyString(
+        this.internalValue,
+        this.timeZoneName
+      );
+      if (!DatePortion) {
+        let v = new Date();
+        let fullYear = v.getFullYear();
+        let fullMonth = v.getMonth() + 1;
+        if (fullMonth < 10) {
+          fullMonth = "0" + fullMonth.toString();
+        }
+        let fullDay = v.getDate();
+        if (fullDay < 10) {
+          fullDay = "0" + fullDay.toString();
+        }
 
-      //   let DatePortion = this.dateValue;
-      //   if (!DatePortion) {
-      //     let v = new Date();
-      //     let fullYear = v.getFullYear();
-      //     let fullMonth = v.getMonth() + 1;
-      //     if (fullMonth < 10) {
-      //       fullMonth = "0" + fullMonth.toString();
-      //     }
-      //     let fullDay = v.getDate();
-      //     if (fullDay < 10) {
-      //       fullDay = "0" + fullDay.toString();
-      //     }
+        DatePortion = fullYear + "-" + fullMonth + "-" + fullDay;
+      }
 
-      //     DatePortion = fullYear + "-" + fullMonth + "-" + fullDay;
-      //   }
-
-      //   let fullValue = window.$gz.locale.localTimeDateStringToUTC8601String(
-      //     DatePortion + "T" + value,
-      //     this.timeZoneName
-      //   );
-      //   console.log("handle input emitting ", fullValue);
-      //   this.$emit("input", fullValue);
+      let newValue = window.$gz.locale.localTimeDateStringToUTC8601String(
+        DatePortion + "T" + value,
+        this.timeZoneName
+      );
+      //console.log("handle input emitting ", newValue);
+      this.$emit("input", newValue);
       //   // this.internalValue = value;
       //   // this.formattedValue = value;
     }