From 455cef805f087d9467ffdafc342e684e80771049 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Sun, 19 Sep 2021 23:09:41 +0000
Subject: [PATCH]

---
 ayanova/src/views/home-reminder.vue | 21 ++++++++++++++-------
 ayanova/src/views/home-schedule.vue | 28 +++++++++++++++++++---------
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/ayanova/src/views/home-reminder.vue b/ayanova/src/views/home-reminder.vue
index d39f977f..bfc00cc0 100644
--- a/ayanova/src/views/home-reminder.vue
+++ b/ayanova/src/views/home-reminder.vue
@@ -208,13 +208,20 @@ export default {
           )}`;
           setDirty = true;
         } else {
-          //----------------------------------------------------------
-          //NEW OBJECT DEFAULTS
-          let defaultDates = window.$gz.locale.defaultStartDateTime(
-            window.$gz.type.Reminder
-          );
-          vm.obj.startDate = defaultDates.start;
-          vm.obj.stopDate = defaultDates.end;
+          //Here from schedule with pre-filled dates?
+          if (this.$route.params.add) {
+            const n = this.$route.params.add;
+            vm.obj.startDate = n.start;
+            vm.obj.stopDate = n.end;
+          } else {
+            //----------------------------------------------------------
+            //NEW OBJECT DEFAULTS
+            let defaultDates = window.$gz.locale.defaultStartDateTime(
+              window.$gz.type.Reminder
+            );
+            vm.obj.startDate = defaultDates.start;
+            vm.obj.stopDate = defaultDates.end;
+          }
           //----------------------------------------------------------
         }
       }
diff --git a/ayanova/src/views/home-schedule.vue b/ayanova/src/views/home-schedule.vue
index 89f06405..b0ef532b 100644
--- a/ayanova/src/views/home-schedule.vue
+++ b/ayanova/src/views/home-schedule.vue
@@ -396,6 +396,14 @@ export default {
     newItem(atype) {
       let newEvent = this.events[this.events.length - 1];
       console.log("new item", { type: atype, event: newEvent });
+      const addStart = window.$gz.locale.localScheduleFormatToUTC8601String(
+        newEvent.start,
+        this.timeZoneName
+      );
+      const addEnd = window.$gz.locale.localScheduleFormatToUTC8601String(
+        newEvent.end,
+        this.timeZoneName
+      );
       switch (atype) {
         case this.$ay.ayt().WorkOrderItemScheduledUser:
           this.$router.push({
@@ -404,14 +412,8 @@ export default {
               recordid: 0,
               add: {
                 type: atype,
-                start: window.$gz.locale.localScheduleFormatToUTC8601String(
-                  newEvent.start,
-                  this.timeZoneName
-                ),
-                end: window.$gz.locale.localScheduleFormatToUTC8601String(
-                  newEvent.end,
-                  this.timeZoneName
-                ),
+                start: addStart,
+                end: addEnd,
                 userId: this.$store.state.userId,
                 name: this.$store.state.userName
               }
@@ -421,7 +423,15 @@ export default {
         case this.$ay.ayt().Reminder:
           this.$router.push({
             name: "reminder-edit",
-            params: { recordid: 0 }
+            params: {
+              recordid: 0,
+              add: {
+                start: addStart,
+                end: addEnd,
+                userId: this.$store.state.userId,
+                name: this.$store.state.userName
+              }
+            }
           });
           break;
       }