From 2ccb622243e754a3dd2923a7346747aa5aeac833 Mon Sep 17 00:00:00 2001 From: Daria Golova Date: Fri, 14 Oct 2022 19:20:31 +0300 Subject: [PATCH] =?UTF-8?q?WIP=20=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB?= =?UTF-8?q?=D0=B0=20=D0=B8=D0=BD=D0=B4=D0=B8=D0=BA=D0=B0=D1=82=D0=BE=D1=80?= =?UTF-8?q?,=20=D1=82=D0=B0=D0=B9=D0=BC=D0=B5=D1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../calendar/components/CalendarColumn.vue | 14 ++++++- .../calendar/components/CalendarSchedule.vue | 38 +++++++++++++++---- 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/src/pages/calendar/components/CalendarColumn.vue b/src/pages/calendar/components/CalendarColumn.vue index e7d8d2f..120697a 100644 --- a/src/pages/calendar/components/CalendarColumn.vue +++ b/src/pages/calendar/components/CalendarColumn.vue @@ -7,7 +7,7 @@ img.icon-wrapper.cursor-pointer(src="@/assets/icons/lock.svg") base-doc-ok-button .flex.flex-col - span.block.time-indicator(:style="indicatorLocation") + span.block.time-indicator(v-if="isShownIndicator" :style="indicatorLocation") .line.flex.items-center(v-for="hour in hoursArray" :key="hour") .middle-line @@ -27,6 +27,11 @@ export default { hoursArray: Array, currentTime: String, }, + data() { + return { + isShownIndicator: true, + }; + }, computed: { indicatorLocation() { return { @@ -39,7 +44,12 @@ export default { let newTime = this.currentTime .split(":") .map((elem) => parseInt(elem, 10)); - return (newTime[0] - 7) * 60 + newTime[1]; + let result = (newTime[0] - 7) * 60.5 + newTime[1]; + if (result > 666) { + this.isShownIndicator = false; + return 0; + } + return result; }, }, }; diff --git a/src/pages/calendar/components/CalendarSchedule.vue b/src/pages/calendar/components/CalendarSchedule.vue index a70755f..e5c0246 100644 --- a/src/pages/calendar/components/CalendarSchedule.vue +++ b/src/pages/calendar/components/CalendarSchedule.vue @@ -7,7 +7,7 @@ @selected-layout="selectedLayout") .schedule-body.flex calendar-clock-column(:hoursArray="hoursArray") - calendar-column(:info="columnInfo" :hoursArray="hoursArray" :currentTime="currtentTime") + calendar-column(:info="columnInfo" :hoursArray="hoursArray" :currentTime="currentTime")