From ff5a150e713c62ccd3465815bef96670367bf859 Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Wed, 16 Nov 2022 16:18:58 +0300 Subject: [PATCH] =?UTF-8?q?WIP=20=D0=94=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B8=20=D0=BF?= =?UTF-8?q?=D0=BE=20id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/CalendarFormAddEvent.vue | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/pages/calendar/components/CalendarFormAddEvent.vue b/src/pages/calendar/components/CalendarFormAddEvent.vue index 7138814..25b337c 100644 --- a/src/pages/calendar/components/CalendarFormAddEvent.vue +++ b/src/pages/calendar/components/CalendarFormAddEvent.vue @@ -196,8 +196,10 @@ export default { this.startTime === start.format("HH:mm") && this.endTime === end.format("HH:mm") && this.kind.label === this.selectedEventData.kind && - this.employees.employee.id === this.eventEmployee.employee.id && - this.members.person.id === this.eventMember.person.id + this.employees.employee.id === + this.personId(this.selectedEventData.employees, "employee") && + this.members.person.id === + this.personId(this.selectedEventData.members, "person") ) { return true; } @@ -347,6 +349,24 @@ export default { async postUpdateEvent(id, event) { await fetchWrapper.post(`registry/event/${id}/update/`, event); }, + personId(object, field) { + if (object) { + let foundPerson = {}; + if (field === "employee") { + foundPerson = object.find(({ role }) => role === this.EMPLOYEE_TYPE); + } + if (field === "person") { + if (object.length > 1) { + foundPerson = object.find(({ role }) => role === this.MEMBER_TYPE); + } + foundPerson = object[0]; + } + let { + [field]: { id }, + } = foundPerson; + return id; + } + }, }, watch: { startDate: {