From ca1b452cfaa950eb0be8940594a0430568e46e7e Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Wed, 16 Nov 2022 12:50:49 +0300
Subject: [PATCH] =?UTF-8?q?WIP=20=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D0=B7=D0=B0=D0=BF=D1=80=D0=BE=D1=81=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/calendar/TheCalendar.vue            |  4 ++--
 .../components/CalendarFormAddEvent.vue       | 23 ++++++++-----------
 src/shared/fetchWrapper.js                    |  1 -
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue
index 198af2b..f68a5c5 100644
--- a/src/pages/calendar/TheCalendar.vue
+++ b/src/pages/calendar/TheCalendar.vue
@@ -31,7 +31,6 @@
       :selected-event-data="selectedEvent"
       :event-types="eventTypes"
       @clear-selected-event-data="clearSelectedEvent"
-      @update-events="fetchEventsData"
       @close-change-form="setChangeFormState"
     )
     base-modal(
@@ -71,7 +70,7 @@ export default {
       showModal: false,
       timeInformation: {
         dayStartTime: "08:00",
-        dayEndTime: "20:00",
+        dayEndTime: "24:00",
       },
       eventsData: [],
       employeesData: [],
@@ -126,6 +125,7 @@ export default {
     },
     closeFormCreateEvent() {
       this.isOpenForm = false;
+      this.fetchEventsData();
     },
     setChangeFormState() {
       this.changeFormWasClosed = true;
diff --git a/src/pages/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue
index e4e5879..f365dba 100644
--- a/src/pages/calendar/components/CalendarFormAddEvent.vue
+++ b/src/pages/calendar/components/CalendarFormAddEvent.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  .flex.flex-col.gap-y-6.pt-6.pb-7.px-8.event-form.fixed.right-0.bottom-4(v-click-outside="clearForm")
+  .flex.flex-col.gap-y-6.pt-6.pb-7.px-8.event-form.fixed.right-0.bottom-4
     .flex.justify-between
       span.title.text-xl.font-bold {{!selectedEventData.id ? "Назначение события" : "Изменение события"}}
       .flex.pt-2
@@ -79,6 +79,7 @@ export default {
     BaseInputTime,
     BaseCustomSelect,
   },
+  emits: ["clear-selected-event-data", "close-change-form"],
   props: {
     closeForm: Function,
     ownersData: {
@@ -287,7 +288,7 @@ export default {
     trimMemberName(lastName, firsName, patronymic) {
       return `${lastName} ${firsName} ${patronymic}`;
     },
-    sendEventData() {
+    async sendEventData() {
       this.eventData = {
         start: this.mergeDate(this.eventDate, this.startTime),
         end: this.mergeDate(this.eventDate, this.endTime),
@@ -297,11 +298,11 @@ export default {
         ],
         members: [this.findPerson(this.membersData, this.members, "person")],
       };
-      this.postCreateEvent(this.eventData);
+      await this.postCreateEvent(this.eventData);
       this.clearForm();
       this.eventData = {};
     },
-    updateEventData() {
+    async updateEventData() {
       this.eventData = {
         start: this.mergeDate(this.eventDate, this.startTime),
         end: this.mergeDate(this.eventDate, this.endTime),
@@ -311,7 +312,7 @@ export default {
         ],
         members: [this.findPerson(this.membersData, this.members, "person")],
       };
-      this.postUpdateEvent(this.id, this.eventData);
+      await this.postUpdateEvent(this.id, this.eventData);
       this.clearForm();
       this.eventData = {};
     },
@@ -338,15 +339,11 @@ export default {
       if (object.id) returnedData.id = object.id;
       return returnedData;
     },
-    postCreateEvent(event) {
-      fetchWrapper
-        .post("registry/event/create/", event)
-        .then(this.$emit("update-events"));
+    async postCreateEvent(event) {
+      await fetchWrapper.post("registry/event/create/", event);
     },
-    postUpdateEvent(id, event) {
-      fetchWrapper
-        .post(`registry/event/${id}/update/`, event)
-        .then(this.$emit("update-events"));
+    async postUpdateEvent(id, event) {
+      await fetchWrapper.post(`registry/event/${id}/update/`, event);
     },
   },
   watch: {
diff --git a/src/shared/fetchWrapper.js b/src/shared/fetchWrapper.js
index 073c009..1e62fdc 100644
--- a/src/shared/fetchWrapper.js
+++ b/src/shared/fetchWrapper.js
@@ -13,7 +13,6 @@ function handleRequest(method, url, headers, attempts, body) {
   })
     .then((res) => {
       if (res._bodyText) return res.json();
-      return res.ok;
     })
     .catch((err) => {
       console.log(err);