diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue index aa9c410..f175704 100644 --- a/src/pages/calendar/TheCalendar.vue +++ b/src/pages/calendar/TheCalendar.vue @@ -28,7 +28,6 @@ calendar-form-add-event( v-if="isOpenForm", :close-form="closeFormCreateEvent", - :owners-data="employeesData", :selected-event-data="selectedEvent", :event-statuses="eventStatuses", :time-information="timeInformation", @@ -76,7 +75,7 @@ export default { showModal: false, timeInformation: { dayStartTime: "08:00", - dayEndTime: "20:00", + dayEndTime: "22:00", }, eventsData: [], employeesData: [], @@ -146,7 +145,7 @@ export default { }, fetchEmployeesData() { fetchWrapper - .get("general/employee/") + .get(`general/employee/?date=${this.currentDate.format("YYYY-MM-DD")}`) .then((res) => this.saveEmployeesData(res)); }, fetchEventsData() { @@ -192,6 +191,9 @@ export default { this.clearSelectedEvent(); } }, + currentDate() { + this.fetchEmployeesData(); + }, }, mounted() { this.fetchEmployeesData(); diff --git a/src/pages/calendar/components/CalendarColumn.vue b/src/pages/calendar/components/CalendarColumn.vue index 6f648a0..39ae25e 100644 --- a/src/pages/calendar/components/CalendarColumn.vue +++ b/src/pages/calendar/components/CalendarColumn.vue @@ -12,7 +12,8 @@ span.owner-name.font-medium.text-base.mr-6 {{ ownerName }} img.icon-wrapper.cursor-pointer(src="@/assets/icons/lock.svg") column-header-checkbox - .body.pl-1.h-full(@dblclick="clickOnBackground") + .body(@dblclick="clickOnBackground") + .nonworking-time(:style="nonworkingStartTime") transition-group(name="card") calendar-event-card( v-for="event, index in dayEvents", @@ -27,18 +28,23 @@ @delete-event="transmitDeleteEvent", :schedule-body-ref="scheduleBodyRef", ) + .nonworking-time.absolute(:style="nonworkingEndTime")