WIP Деактивировала карточку при закрытии формы

This commit is contained in:
Daria Golova
2022-11-14 12:02:34 +03:00
parent 81451daeb4
commit 90a8a54c6e
5 changed files with 39 additions and 0 deletions

View File

@@ -16,11 +16,14 @@
:close-form-create-event="closeFormCreateEvent" :close-form-create-event="closeFormCreateEvent"
:is-open-form="isOpenForm" :is-open-form="isOpenForm"
:event-types="eventTypes" :event-types="eventTypes"
:change-form-was-closed="changeFormWasClosed"
@previous-date="switchPreviousDate" @previous-date="switchPreviousDate"
@next-date="switchNextDate" @next-date="switchNextDate"
@selected-layout="changeCalendarLayout" @selected-layout="changeCalendarLayout"
@open-change-form="openFormCreateEvent" @open-change-form="openFormCreateEvent"
@update-events="fetchEventsData" @update-events="fetchEventsData"
@close-change-form="setChangeFormState"
@reset-change-form="resetChangeFormState"
) )
</template> </template>
@@ -49,6 +52,7 @@ export default {
eventsData: [], eventsData: [],
employeesData: [], employeesData: [],
isOpenForm: false, isOpenForm: false,
changeFormWasClosed: false,
membersData: [], membersData: [],
eventTypes: [ eventTypes: [
{ id: 1, label: "Встреча", color: "var(--bg-event-green-color)" }, { id: 1, label: "Встреча", color: "var(--bg-event-green-color)" },
@@ -99,6 +103,12 @@ export default {
closeFormCreateEvent() { closeFormCreateEvent() {
this.isOpenForm = false; this.isOpenForm = false;
}, },
setChangeFormState() {
this.changeFormWasClosed = true;
},
resetChangeFormState() {
this.changeFormWasClosed = false;
},
}, },
mounted() { mounted() {
this.fetchPersonsData(); this.fetchPersonsData();

View File

@@ -20,7 +20,9 @@
:ownerEvent="event" :ownerEvent="event"
:event-types="eventTypes" :event-types="eventTypes"
:style="eventCardPosition(event.start, event.end)" :style="eventCardPosition(event.start, event.end)"
:change-form-was-closed="changeFormWasClosed"
@selected-event="transmitEventData" @selected-event="transmitEventData"
@reset-change-form="transmitResetChangeForm"
) )
</template> </template>
@@ -41,6 +43,7 @@ export default {
dayEndTime: Number, dayEndTime: Number,
dayStartTime: Number, dayStartTime: Number,
eventTypes: Array, eventTypes: Array,
changeFormWasClosed: Boolean,
}, },
data() { data() {
return { return {
@@ -90,6 +93,9 @@ export default {
transmitEventData(eventData) { transmitEventData(eventData) {
this.$emit("selected-event", eventData); this.$emit("selected-event", eventData);
}, },
transmitResetChangeForm() {
this.$emit("reset-change-form");
},
}, },
}; };
</script> </script>

View File

@@ -39,6 +39,7 @@ export default {
name: "CalendarEventCard", name: "CalendarEventCard",
components: { CalendarEventDescriptionCard }, components: { CalendarEventDescriptionCard },
props: { props: {
changeFormWasClosed: Boolean,
ownerEvent: Object, ownerEvent: Object,
eventTypes: { eventTypes: {
type: Array, type: Array,
@@ -223,6 +224,17 @@ export default {
this.setDefaultTheme(); this.setDefaultTheme();
}, },
}, },
watch: {
changeFormWasClosed: {
immediate: true,
handler(newValue) {
if (newValue === true) {
this.setDefaultTheme();
this.$emit("reset-change-form");
}
},
},
},
}; };
</script> </script>

View File

@@ -320,6 +320,7 @@ export default {
this.eventData = {}; this.eventData = {};
}, },
clearForm() { clearForm() {
if (this.selectedEventData.id) this.$emit("close-change-form");
this.$emit("clear-selected-event-data"); this.$emit("clear-selected-event-data");
this.closeForm(); this.closeForm();
}, },

View File

@@ -21,7 +21,9 @@
:day-end-time="validateEndTime" :day-end-time="validateEndTime"
:style="columnSize" :style="columnSize"
:event-types="eventTypes" :event-types="eventTypes"
:change-form-was-closed="changeFormWasClosed"
@selected-event="writeEventData" @selected-event="writeEventData"
@reset-change-form="transmitResetChangeForm"
) )
.flex.w-full.relative .flex.w-full.relative
.time-coil-wrapper.left-0.-mt-12.pt-9 .time-coil-wrapper.left-0.-mt-12.pt-9
@@ -53,6 +55,7 @@
:event-types="eventTypes" :event-types="eventTypes"
@clear-selected-event-data="clearSelectedEvent" @clear-selected-event-data="clearSelectedEvent"
@update-events="transmitUpdateEvents" @update-events="transmitUpdateEvents"
@close-change-form="transmitCloseChangeForm"
) )
</template> </template>
@@ -73,6 +76,7 @@ export default {
CalendarFormAddEvent, CalendarFormAddEvent,
}, },
props: { props: {
changeFormWasClosed: Boolean,
currentDate: { currentDate: {
type: Object, type: Object,
default() { default() {
@@ -325,6 +329,9 @@ export default {
transmitUpdateEvents() { transmitUpdateEvents() {
this.$emit("update-events"); this.$emit("update-events");
}, },
transmitCloseChangeForm() {
this.$emit("close-change-form");
},
changeScrollingState(e) { changeScrollingState(e) {
this.isScrolling = e.target.scrollTop !== 0; this.isScrolling = e.target.scrollTop !== 0;
}, },
@@ -336,6 +343,9 @@ export default {
}) })
); );
}, },
transmitResetChangeForm() {
this.$emit("reset-change-form");
},
}, },
watch: { watch: {
currentTime() { currentTime() {