From 48860c454f7bd28b059430a6aedb7835dd2cc5cf Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Fri, 23 Dec 2022 12:09:25 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D1=80=D0=B0=D1=88=D0=B8=D0=B2=D0=B0=D1=8E?=
 =?UTF-8?q?=D1=82=D1=81=D1=8F=20=D0=BF=D0=BE=20=D1=82=D0=B5=D0=BA=D1=83?=
 =?UTF-8?q?=D1=89=D0=B5=D0=BC=D1=83=20=D0=B4=D0=BD=D1=8E=20=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B4=D0=B0=D1=80=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/calendar/TheCalendar.vue                    | 11 ++++++++++-
 .../calendar/components/CalendarFormAddEvent.vue      |  4 ++--
 src/pages/calendar/components/CalendarSchedule.vue    |  8 +-------
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue
index cb83d7b..3c0a56e 100644
--- a/src/pages/calendar/TheCalendar.vue
+++ b/src/pages/calendar/TheCalendar.vue
@@ -167,7 +167,15 @@ export default {
     },
     fetchEventsData() {
       fetchWrapper
-        .get("registry/event/?limit=100")
+        .get(
+          `registry/event/?limit=100&start=${this.currentDate.format(
+            "YYYY-MM-DD"
+          )}T${
+            this.timeInformation.dayStartTime
+          }:00Z&end=${this.currentDate.format("YYYY-MM-DD")}T${
+            this.timeInformation.dayEndTime
+          }:00Z`
+        )
         .then((res) => this.saveEventsData(res));
     },
     changeWidth(value) {
@@ -210,6 +218,7 @@ export default {
     },
     currentDate() {
       this.fetchSchedulesData();
+      this.fetchEventsData();
     },
   },
   mounted() {
diff --git a/src/pages/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue
index 21a0d0f..fd0f0fa 100644
--- a/src/pages/calendar/components/CalendarFormAddEvent.vue
+++ b/src/pages/calendar/components/CalendarFormAddEvent.vue
@@ -207,12 +207,12 @@ export default {
     startDate() {
       return this.selectedEventData.start
         ? moment.parseZone(this.selectedEventData.start)
-        : moment();
+        : this.currentDate;
     },
     endDate() {
       return this.selectedEventData.end
         ? moment.parseZone(this.selectedEventData.end)
-        : moment();
+        : this.currentDate;
     },
     eventEmployee() {
       if (this.selectedEventData.employees) {
diff --git a/src/pages/calendar/components/CalendarSchedule.vue b/src/pages/calendar/components/CalendarSchedule.vue
index 8d67086..a05182a 100644
--- a/src/pages/calendar/components/CalendarSchedule.vue
+++ b/src/pages/calendar/components/CalendarSchedule.vue
@@ -185,12 +185,6 @@ export default {
     ownersCount() {
       return this.filteredOwners.length;
     },
-    filteredEventsByDate() {
-      return this.eventsData.filter(
-        ({ start }) =>
-          start.slice(0, 10) === this.currentDate.format("YYYY-MM-DD")
-      );
-    },
     columnHeight() {
       return (
         (this.timeCoil.length - 1) * this.pixelsPerHour +
@@ -301,7 +295,7 @@ export default {
     },
     filterEventsByOwner(owner) {
       let filteredArray = [];
-      this.filteredEventsByDate.forEach((item) => {
+      this.eventsData.forEach((item) => {
         let foundEvent = item.employees.find(
           (elem) => elem.employee.id === owner.id && elem.role === "owner"
         );