From 86b0cb66bcf761bd65a33a85be2fa6c5c14fd437 Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Tue, 25 Oct 2022 16:49:48 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=D0=B0=20=D0=BD=D0=B5=D0=B9=D0=BC=D0=B8=D0=BD=D0=B3=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD=D1=8B=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/CalendarBackground.vue | 10 +++---- .../components/CalendarClockColumn.vue | 4 +-- .../calendar/components/CalendarSchedule.vue | 28 +++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/pages/calendar/components/CalendarBackground.vue b/src/pages/calendar/components/CalendarBackground.vue index 030ee5f..648f7ba 100644 --- a/src/pages/calendar/components/CalendarBackground.vue +++ b/src/pages/calendar/components/CalendarBackground.vue @@ -17,7 +17,7 @@ ) .line-wrapper .line.flex.items-center( - v-for="hour in hoursArray" + v-for="hour in timeCoil" :key="hour" ) .middle-line @@ -29,7 +29,7 @@ export default { name: "CalendarBackground", components: { CalendarColumn }, props: { - hoursArray: Array, + timeCoil: Array, eventsData: Array, currentDate: Object, sidebarWidth: String, @@ -57,7 +57,7 @@ export default { }; }, backgroundHeight() { - return (this.hoursArray.length - 1) * this.pixelsPerHour + 48; + return (this.timeCoil.length - 1) * this.pixelsPerHour + 48; }, horizontalScrollPresence() { return { @@ -74,11 +74,11 @@ export default { }; this.eventsData.forEach(({ employees }) => { let findedElement = employees.find((elem) => elem.role === "owner"); - let emptyObjectPresence = this.findObjectInArray( + let emptyDataPresence = this.findObjectInArray( filteredArray, ownerAbsence ); - if (!findedElement && !emptyObjectPresence) { + if (!findedElement && !emptyDataPresence) { filteredArray.push(ownerAbsence); } if (findedElement) { diff --git a/src/pages/calendar/components/CalendarClockColumn.vue b/src/pages/calendar/components/CalendarClockColumn.vue index 5e6c424..8abc504 100644 --- a/src/pages/calendar/components/CalendarClockColumn.vue +++ b/src/pages/calendar/components/CalendarClockColumn.vue @@ -1,7 +1,7 @@