From 6bfda2e2a7ce5fa4e74c447857a79036ef203754 Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Mon, 20 Mar 2023 16:36:28 +0300
Subject: [PATCH] =?UTF-8?q?WIP=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=D0=B0=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81=D1=8B?=
 =?UTF-8?q?,=20=D0=BE=D1=87=D0=B8=D1=81=D1=82=D0=BA=D1=83=20=D1=84=D0=BE?=
 =?UTF-8?q?=D1=80=D0=BC=D1=83=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/base/BaseClientFormCreate.vue  | 19 ++++----
 src/pages/calendar/TheCalendar.vue            | 44 +++++--------------
 .../CalendarEventDescriptionCard.vue          |  6 +--
 .../components/CalendarFormAddEvent.vue       | 13 +++---
 ...tatusesDictionary.js => statusesConfig.js} |  2 +-
 5 files changed, 32 insertions(+), 52 deletions(-)
 rename src/pages/calendar/utils/{statusesDictionary.js => statusesConfig.js} (95%)

diff --git a/src/components/base/BaseClientFormCreate.vue b/src/components/base/BaseClientFormCreate.vue
index 3cb6dbf..14861a1 100644
--- a/src/components/base/BaseClientFormCreate.vue
+++ b/src/components/base/BaseClientFormCreate.vue
@@ -130,7 +130,7 @@ export default {
       networksSettings: column.find((el) => el.name === "networks")?.settings,
       prioritySettings: column.find((el) => el.name === "priority"),
       networkId: "",
-      infoClient: {
+      defaultInfoClient: {
         basic: {
           full_name: "",
           birth_date: null,
@@ -190,6 +190,7 @@ export default {
           },
         ],
       },
+      infoClient: {},
       forms: [
         {
           title: "Основное",
@@ -267,9 +268,6 @@ export default {
     closePopup() {
       this.showPopup = false;
     },
-    /*closeModal() {
-      !this.showModal ? this.closeForm() : null;
-    },*/
     async createIdentityDocument(id) {
       let doc = null;
       let filteredData = Object.keys(
@@ -370,6 +368,7 @@ export default {
               this.writeCreatedClientId(result.id);
               this.setUpdatedClients();
               this.addSuccessNotification();
+              this.value = false;
             });
           } else {
             this.addErrorNotification(
@@ -393,10 +392,7 @@ export default {
       this.infoClient.basic.priority = e.target.id;
     },
     saveClient() {
-      if (this.checkFormFullness()) {
-        this.postNewClient();
-        //this.closeForm();
-      }
+      if (this.checkFormFullness()) this.postNewClient();
     },
     changeOpenModal() {
       this.showModal = true;
@@ -483,6 +479,13 @@ export default {
         this.closeAddImage();
       }
     },
+    value(newValue) {
+      if (newValue === false)
+        this.infoClient = JSON.parse(JSON.stringify(this.defaultInfoClient));
+    },
+  },
+  mounted() {
+    this.infoClient = JSON.parse(JSON.stringify(this.defaultInfoClient));
   },
 };
 </script>
diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue
index 2edf473..8d5f0bc 100644
--- a/src/pages/calendar/TheCalendar.vue
+++ b/src/pages/calendar/TheCalendar.vue
@@ -24,17 +24,16 @@
       @delete-event="openModal",
       :open-form-create-event="openFormCreateEvent"
     )
-    transition(name="form")
-      calendar-form-add-event(
-        v-model="isOpenForm"
-        :close-form="closeFormCreateEvent",
-        :selected-event-data="selectedEvent",
-        :event-statuses="eventStatuses",
-        :time-information="timeInformation",
-        :current-date="currentDate",
-        @clear-selected-event-data="clearSelectedEvent",
-        @close-change-form="setChangeFormState"
-      )
+    calendar-form-add-event(
+      v-model="isOpenForm"
+      :close-form="closeFormCreateEvent",
+      :selected-event-data="selectedEvent",
+      :event-statuses="eventStatuses",
+      :time-information="timeInformation",
+      :current-date="currentDate",
+      @clear-selected-event-data="clearSelectedEvent",
+      @close-change-form="setChangeFormState"
+    )
     base-modal(
       v-model="showModal",
       title="Удаление события"
@@ -56,7 +55,7 @@ import CalendarSidebar from "./components/CalendarSidebar.vue";
 import CalendarFormAddEvent from "./components/CalendarFormAddEvent.vue";
 import BaseModal from "@/components/base/BaseModal.vue";
 import CalendarDeleteModal from "./components/CalendarDeleteModal.vue";
-import { statusesDictionary } from "@/pages/calendar/utils/statusesDictionary";
+import { statusesConfig } from "@/pages/calendar/utils/statusesConfig";
 
 export default {
   name: "TheCalendar",
@@ -86,7 +85,7 @@ export default {
       isOpenForm: false,
       WORKING_STATUS: "WORKS",
       changeFormWasClosed: false,
-      eventStatuses: statusesDictionary,
+      eventStatuses: statusesConfig,
     };
   },
   methods: {
@@ -191,23 +190,4 @@ export default {
 <style lang="sass" scoped>
 .calendar-container
   width: calc(100vw - 80px)
-
-.form-enter-from
-  opacity: 0
-  transform: translateY(300px)
-  pointer-events: none
-
-.form-enter-active
-  transition: 0.5s ease
-
-.form-leave-to
-  opacity: 0
-  transform: translateY(300px)
-  pointer-events: none
-
-.form-leave-active
-  transition: 0.5s ease
-
-.form-move
-  transition: 0.5s ease
 </style>
diff --git a/src/pages/calendar/components/CalendarEventDescriptionCard.vue b/src/pages/calendar/components/CalendarEventDescriptionCard.vue
index b25c8b4..f12f1b3 100644
--- a/src/pages/calendar/components/CalendarEventDescriptionCard.vue
+++ b/src/pages/calendar/components/CalendarEventDescriptionCard.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script>
-import { statusesDictionary } from "@/pages/calendar/utils/statusesDictionary";
+import { statusesConfig } from "@/pages/calendar/utils/statusesConfig";
 
 export default {
   name: "CalendarEventDescriptionCard",
@@ -48,14 +48,12 @@ export default {
     return {
       isCertainType: true,
       position: {},
-      calendarConfig: statusesDictionary,
     };
   },
   computed: {
     status() {
       return this.ownerEvent.status
-        ? this.calendarConfig.find((e) => e.value === this.ownerEvent.status)
-            .label
+        ? statusesConfig.find((e) => e.value === this.ownerEvent.status).label
         : "";
     },
     typeColor() {
diff --git a/src/pages/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue
index d2b7bf4..4466a1c 100644
--- a/src/pages/calendar/components/CalendarFormAddEvent.vue
+++ b/src/pages/calendar/components/CalendarFormAddEvent.vue
@@ -82,7 +82,7 @@ import BaseSelect from "@/components/base/BaseSelect.vue";
 import * as moment from "moment/moment";
 import BaseModal from "@/components/base/BaseModal.vue";
 import { v_model } from "@/shared/mixins/v-model";
-import { statusesDictionary } from "@/pages/calendar/utils/statusesDictionary";
+import { statusesConfig } from "@/pages/calendar/utils/statusesConfig";
 
 export default {
   name: "FormChangeEvent",
@@ -138,7 +138,6 @@ export default {
       membersData: [],
       ownersData: [],
       WORKING_STATUS: "WORKS",
-      calendarConfig: statusesDictionary,
     };
   },
   computed: {
@@ -178,7 +177,7 @@ export default {
     },
     statusesList() {
       let filteredArray = [];
-      this.calendarConfig.forEach((elem) => {
+      statusesConfig.forEach((elem) => {
         filteredArray.push({
           id: elem.id,
           label: elem.label,
@@ -290,22 +289,22 @@ export default {
     eventStatus() {
       return this.selectedEventData.status
         ? {
-            label: this.calendarConfig.find(
+            label: statusesConfig.find(
               (e) => e.value === this.selectedEventData.status
             ).label,
-            id: this.calendarConfig.find(
+            id: statusesConfig.find(
               (e) => e.value === this.selectedEventData.status
             ).id,
           }
         : {
-            label: this.calendarConfig.find((e) => e.value === "PLANNED").id,
+            label: statusesConfig.find((e) => e.value === "PLANNED").label,
             id: 0,
           };
     },
   },
   methods: {
     findStatus(value) {
-      return this.calendarConfig.find((e) => e.label === value)?.value;
+      return statusesConfig.find((e) => e.label === value)?.value;
     },
     checkTimeLimits(eventTime, scheduleTime, timeType) {
       if (timeType === "start")
diff --git a/src/pages/calendar/utils/statusesDictionary.js b/src/pages/calendar/utils/statusesConfig.js
similarity index 95%
rename from src/pages/calendar/utils/statusesDictionary.js
rename to src/pages/calendar/utils/statusesConfig.js
index 9fefe99..cc13253 100644
--- a/src/pages/calendar/utils/statusesDictionary.js
+++ b/src/pages/calendar/utils/statusesConfig.js
@@ -1,4 +1,4 @@
-export const statusesDictionary = [
+export const statusesConfig = [
   {
     id: 0,
     label: "Планируется прием",