From 6c1e4835c26772d90ff4f5ebdbde6fdb7873c94e Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Mon, 20 Mar 2023 18:04:57 +0300 Subject: [PATCH] =?UTF-8?q?WIP=20=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=B8=D0=BB=D0=B0=20=D0=BE=D1=87=D0=B8=D1=81=D1=82=D0=BA=D1=83?= =?UTF-8?q?=20=D0=B2=20=D1=84=D0=BE=D1=80=D0=BC=D0=B5=20=D1=81=D0=BE=D0=B7?= =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BF=D1=80=D0=B8=D0=B5=D0=BC?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/calendar/TheCalendar.vue | 17 ++++------ .../calendar/components/CalendarColumn.vue | 8 ++--- .../calendar/components/CalendarEventCard.vue | 6 ++-- .../components/CalendarFormAddEvent.vue | 32 +++++++++---------- .../calendar/components/CalendarSchedule.vue | 8 ++--- 5 files changed, 32 insertions(+), 39 deletions(-) diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue index 8d5f0bc..797c08d 100644 --- a/src/pages/calendar/TheCalendar.vue +++ b/src/pages/calendar/TheCalendar.vue @@ -15,24 +15,20 @@ :events-data="eventsData", :sidebar-width="sidebarWidth", :event-statuses="eventStatuses", - :change-form-was-closed="changeFormWasClosed", @previous-date="switchPreviousDate", @next-date="switchNextDate", @selected-layout="changeCalendarLayout", - @reset-change-form="resetChangeFormState", @selected-event="writeEventData", @delete-event="openModal", :open-form-create-event="openFormCreateEvent" ) calendar-form-add-event( - v-model="isOpenForm" - :close-form="closeFormCreateEvent", + v-model="isOpenForm", :selected-event-data="selectedEvent", :event-statuses="eventStatuses", :time-information="timeInformation", :current-date="currentDate", - @clear-selected-event-data="clearSelectedEvent", - @close-change-form="setChangeFormState" + @clear-event-data="clearSelectedEvent" ) base-modal( v-model="showModal", @@ -84,7 +80,7 @@ export default { schedulesData: [], isOpenForm: false, WORKING_STATUS: "WORKS", - changeFormWasClosed: false, + //changeFormWasClosed: false, eventStatuses: statusesConfig, }; }, @@ -147,18 +143,19 @@ export default { this.isOpenForm = false; this.fetchEventsData(); }, - setChangeFormState() { + /*setChangeFormState() { this.changeFormWasClosed = true; }, resetChangeFormState() { this.changeFormWasClosed = false; - }, + },*/ writeEventData(eventData) { this.selectedEvent = eventData; this.openFormCreateEvent(); }, clearSelectedEvent() { this.selectedEvent = {}; + this.closeFormCreateEvent(); }, openModal(eventData) { this.selectedEvent = eventData; @@ -171,7 +168,7 @@ export default { watch: { showModal: function () { if (this.showModal === false) { - this.setChangeFormState(); + //this.setChangeFormState(); this.clearSelectedEvent(); } }, diff --git a/src/pages/calendar/components/CalendarColumn.vue b/src/pages/calendar/components/CalendarColumn.vue index 6854179..fa0c803 100644 --- a/src/pages/calendar/components/CalendarColumn.vue +++ b/src/pages/calendar/components/CalendarColumn.vue @@ -22,9 +22,7 @@ :ownerEvent="event", :event-statuses="eventStatuses", :style="eventCardPosition(event.start, event.end)", - :change-form-was-closed="changeFormWasClosed", @selected-event="transmitEventData", - @reset-change-form="transmitResetChangeForm", @delete-event="transmitDeleteEvent", :schedule-body-ref="scheduleBodyRef", ) @@ -52,7 +50,7 @@ export default { dayEndTime: Number, dayStartTime: Number, eventStatuses: Array, - changeFormWasClosed: Boolean, + //changeFormWasClosed: Boolean, scheduleBodyRef: Node, url: String, openFormCreateEvent: Function, @@ -165,9 +163,9 @@ export default { transmitEventData(eventData) { this.$emit("selected-event", eventData); }, - transmitResetChangeForm() { + /*transmitResetChangeForm() { this.$emit("reset-change-form"); - }, + },*/ transmitDeleteEvent(eventData) { this.$emit("delete-event", eventData); }, diff --git a/src/pages/calendar/components/CalendarEventCard.vue b/src/pages/calendar/components/CalendarEventCard.vue index afa664a..18c8d51 100644 --- a/src/pages/calendar/components/CalendarEventCard.vue +++ b/src/pages/calendar/components/CalendarEventCard.vue @@ -40,7 +40,7 @@ export default { name: "CalendarEventCard", components: { CalendarEventDescriptionCard }, props: { - changeFormWasClosed: Boolean, + //changeFormWasClosed: Boolean, ownerEvent: Object, eventStatuses: { type: Array, @@ -244,7 +244,7 @@ export default { this.setDefaultTheme(); }, }, - watch: { + /*watch: { changeFormWasClosed: { immediate: true, handler(newValue) { @@ -254,7 +254,7 @@ export default { } }, }, - }, + },*/ }; diff --git a/src/pages/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue index 4466a1c..c0ee584 100644 --- a/src/pages/calendar/components/CalendarFormAddEvent.vue +++ b/src/pages/calendar/components/CalendarFormAddEvent.vue @@ -93,21 +93,16 @@ export default { TheNotificationProvider, }, mixins: [v_model], - emits: ["clear-selected-event-data", "close-change-form"], + //emits: ["clear-selected-event-data", "close-change-form"], + emits: ["clear-event-data"], props: { - closeForm: Function, + //closeForm: Function, selectedEventData: { type: Object, default() { return {}; }, }, - eventStatuses: { - type: Array, - default() { - return []; - }, - }, timeInformation: { type: Object, default() { @@ -134,7 +129,7 @@ export default { eventDate: Date, status: { label: "Планируется прием", id: null }, id: null, - ifClearedForm: true, + //ifClearedForm: true, membersData: [], ownersData: [], WORKING_STATUS: "WORKS", @@ -401,6 +396,7 @@ export default { }; await this.postCreateEvent(this.eventData); this.eventData = {}; + this.value = false; }, async updateEventData() { if (!this.checkTime()) return; @@ -422,17 +418,18 @@ export default { }; await this.postUpdateEvent(this.id, this.eventData); this.eventData = {}; + this.value = false; } else this.addErrorNotification( "Событие не может быть изменено", "Клиент был удален" ); }, - clearForm() { - if (this.selectedEventData.id) this.$emit("close-change-form"); - this.$emit("clear-selected-event-data"); - this.closeForm(); - }, + //clearForm() { + // if (this.selectedEventData.id) this.$emit("close-change-form"); + // this.$emit("clear-selected-event-data"); + // this.closeForm(); + //}, mergeDate(eventDate, time) { let parseTime = time.split(":"); return moment(eventDate.setHours(parseTime[0], parseTime[1]), 0).format( @@ -466,7 +463,7 @@ export default { ); } else { this.addSuccessNotification("Событие успешно создано"); - this.clearForm(); + //this.clearForm(); } }, async postUpdateEvent(id, event) { @@ -481,7 +478,7 @@ export default { ); } else { this.addSuccessNotification("Изменения успешно сохранены"); - this.clearForm(); + //this.clearForm(); } }, personId(object, field) { @@ -601,6 +598,9 @@ export default { } }, }, + value(newValue) { + if (newValue === false) this.$emit("clear-event-data"); + }, }, mounted() { this.fetchOwnersData(); diff --git a/src/pages/calendar/components/CalendarSchedule.vue b/src/pages/calendar/components/CalendarSchedule.vue index a05182a..00782d7 100644 --- a/src/pages/calendar/components/CalendarSchedule.vue +++ b/src/pages/calendar/components/CalendarSchedule.vue @@ -26,9 +26,7 @@ :day-end-time="validateEndTime", :style="columnSize", :event-statuses="eventStatuses", - :change-form-was-closed="changeFormWasClosed", @selected-event="transmitEventData", - @reset-change-form="transmitResetChangeForm", @delete-event="transmitDeleteEvent", :schedule-body-ref="$refs.scheduleBody", :open-form-create-event="openFormCreateEvent", @@ -74,7 +72,7 @@ export default { props: { openFormCreateEvent: Function, url: String, - changeFormWasClosed: Boolean, + //changeFormWasClosed: Boolean, currentDate: { type: Object, default() { @@ -314,9 +312,9 @@ export default { }) ); }, - transmitResetChangeForm() { + /*transmitResetChangeForm() { this.$emit("reset-change-form"); - }, + },*/ transmitEventData(eventData) { this.$emit("selected-event", eventData); },