diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue index 234e5d2..f16b92a 100644 --- a/src/pages/calendar/TheCalendar.vue +++ b/src/pages/calendar/TheCalendar.vue @@ -30,8 +30,7 @@ export default { "Захарова А.О.", "Константинопольская Ю.В.", "Коломойцев И.К.", - "Ситников А.Г.", - null, + "Зайцев В.С.", ], }, }; diff --git a/src/pages/calendar/components/CalendarBackground.vue b/src/pages/calendar/components/CalendarBackground.vue index 39f11c6..ae7dcf8 100644 --- a/src/pages/calendar/components/CalendarBackground.vue +++ b/src/pages/calendar/components/CalendarBackground.vue @@ -9,63 +9,35 @@ :style="calculateColumnPosition(index)" ) .header(:style="backgroundExtendedWidth") - .body.flex.flex-col(:style="backgroundExtendedWidth") + .body.flex.flex-col( + :style="backgroundExtendedWidth" + ) .line-wrapper .line.flex.items-center( v-for="hour in hoursArray" :key="hour" ) .middle-line - .time-circle-indicator.-left-6px( - v-if="isShownIndicator" - :style="circleIndicatorLocation" - ) - span.time-line-indicator.block( - v-if="isShownIndicator" - :style="lineIndicatorLocation" - ) @@ -25,7 +24,6 @@ export default { .calendar-column-wrapper position: absolute border-right: 1px solid var(--border-light-grey-color) - height: calc(100% - 54px) .header height: 48px diff --git a/src/pages/calendar/components/CalendarSchedule.vue b/src/pages/calendar/components/CalendarSchedule.vue index 68e8022..d2ca793 100644 --- a/src/pages/calendar/components/CalendarSchedule.vue +++ b/src/pages/calendar/components/CalendarSchedule.vue @@ -17,12 +17,16 @@ ) calendar-background( :hours-array="hoursArray" - :current-time="currentTime" - :current-date="currentDate" - :day-start-time="validateStartTime" - :day-end-time="validateEndTime" :column-information="columnInformation" ) + .time-circle-indicator.left-74px( + v-if="isShownIndicator" + :style="circleIndicatorLocation" + ) + span.time-line-indicator.block.left-20( + v-if="isShownIndicator" + :style="lineIndicatorLocation" + )