From a81dba842984a70e9d849548f3b871d556c7eb56 Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Mon, 6 Mar 2023 12:01:03 +0300 Subject: [PATCH 1/2] =?UTF-8?q?[WIP]=20=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B1?= =?UTF-8?q?=D0=B0=D0=B3=D0=B0=20=D1=81=D0=B1=D1=80=D0=BE=D1=81=D0=B0=20?= =?UTF-8?q?=D0=B4=D0=BD=D0=B5=D0=B9=20=D0=B8=20=D1=81=D1=82=D0=B8=D0=BB?= =?UTF-8?q?=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/schedule/components/ScheduleBar.vue | 3 ++- src/pages/schedule/components/ScheduleTable.vue | 6 ++---- src/pages/schedule/components/ScheduleTableBody.vue | 2 +- src/pages/schedule/components/ScheduleTableSelect.vue | 3 ++- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pages/schedule/components/ScheduleBar.vue b/src/pages/schedule/components/ScheduleBar.vue index 0ecc257..9964289 100644 --- a/src/pages/schedule/components/ScheduleBar.vue +++ b/src/pages/schedule/components/ScheduleBar.vue @@ -43,7 +43,7 @@ color="primary", style="width: 144px", padding="4px 24px", - @click="createSchedules", + @click="createSchedules(); clearCell()", no-caps ) q-btn( @@ -72,6 +72,7 @@ export default { times: Object, createSchedules: Function, deleteSchedule: Function, + clearCell: Function, }, data() { return { diff --git a/src/pages/schedule/components/ScheduleTable.vue b/src/pages/schedule/components/ScheduleTable.vue index 978cc7e..3fd7b0a 100644 --- a/src/pages/schedule/components/ScheduleTable.vue +++ b/src/pages/schedule/components/ScheduleTable.vue @@ -1,8 +1,5 @@ diff --git a/src/pages/schedule/components/ScheduleTableBody.vue b/src/pages/schedule/components/ScheduleTableBody.vue index a7eb21c..baea05f 100644 --- a/src/pages/schedule/components/ScheduleTableBody.vue +++ b/src/pages/schedule/components/ScheduleTableBody.vue @@ -19,7 +19,7 @@ :serialized="serialized", :change-shift="changeShift" ) - .name-employee.flex.justify-center.items-center.cursor-pointer + .name-employee.flex.justify-center.items-center span {{trimOwnerName(schedule.last_name, schedule.first_name, schedule.patronymic)}} .row.flex .cell.flex.flex-col.items-center.justify-center.w-11.h-11.cursor-pointer.transition( diff --git a/src/pages/schedule/components/ScheduleTableSelect.vue b/src/pages/schedule/components/ScheduleTableSelect.vue index fbec6d5..e72b563 100644 --- a/src/pages/schedule/components/ScheduleTableSelect.vue +++ b/src/pages/schedule/components/ScheduleTableSelect.vue @@ -4,7 +4,7 @@ ) .edit.flex.items-center.justify-center.h-11.w-11(v-if="selectEmployee.label") .flex.icon-edit - .flex.justify-center.items-center.cursor-pointer( + .flex.justify-center.items-center( :class="{'select-name': selectEmployee.label}", :style="{color: 'var(--btn-blue-color)'}" ) @@ -68,6 +68,7 @@ export default { .edit border-bottom: 1.5px solid var(--border-light-grey-color-1) border-left: 1.5px solid var(--border-light-grey-color-1) + border-right: 1.5px solid var(--border-light-grey-color-1) .schedule-select border-right: 8px solid var(--bg-ligth-blue-color) From f60eea81fe172b31aec5cf2170a4fd373a6ff3fb Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Mon, 6 Mar 2023 17:21:17 +0300 Subject: [PATCH 2/2] =?UTF-8?q?[WIP]=20=D0=9F=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BA=D0=BE=D0=B4=D0=B0,=20=D0=B4=D0=BE=D0=B1=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8=D0=B3=20?= =?UTF-8?q?=D0=BA=D0=B0=D0=BB=D0=B5=D0=BD=D0=B4=D0=B0=D1=80=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/calendar/TheCalendar.vue | 48 +-------- src/pages/calendar/utils/calendarConfig.js | 44 ++++++++ .../schedule/components/FormChangeShift.vue | 4 +- src/pages/schedule/components/ScheduleBar.vue | 20 ---- .../schedule/components/ScheduleHeader.vue | 102 ++++++------------ .../schedule/components/ScheduleTable.vue | 2 - .../components/ScheduleTableHeader.vue | 8 +- 7 files changed, 83 insertions(+), 145 deletions(-) create mode 100644 src/pages/calendar/utils/calendarConfig.js diff --git a/src/pages/calendar/TheCalendar.vue b/src/pages/calendar/TheCalendar.vue index bdc820a..d49d619 100644 --- a/src/pages/calendar/TheCalendar.vue +++ b/src/pages/calendar/TheCalendar.vue @@ -56,6 +56,8 @@ import CalendarSidebar from "./components/CalendarSidebar.vue"; import CalendarFormAddEvent from "./components/CalendarFormAddEvent.vue"; import BaseModal from "@/components/base/BaseModal.vue"; import CalendarDeleteModal from "./components/CalendarDeleteModal.vue"; +import { calendarConfig } from "@/pages/calendar/utils/calendarConfig"; + export default { name: "TheCalendar", components: { @@ -84,51 +86,7 @@ export default { isOpenForm: false, WORKING_STATUS: "WORKS", changeFormWasClosed: false, - //TODO: Вынести eventStatuses в config - eventStatuses: [ - { - id: 0, - label: "Планируется прием", - value: "PLANNED", - color: "var(--default-white)", - }, - { - id: 1, - label: "Отменил", - value: "CANCELED", - color: "var(--bg-event-grey-color)", - }, - { - id: 2, - label: "Ожидается прием", - value: "EXPECTED", - color: "var(--bg-event-yellow-color)", - }, - { - id: 3, - label: "Опаздывает", - value: "LATE", - color: "var(--bg-event-orange-color)", - }, - { - id: 4, - label: "Идет прием", - value: "RECEPTION", - color: "var(--bg-event-blue-color)", - }, - { - id: 5, - label: "Прием завершен", - value: "COMPLETED", - color: "var(--bg-event-green-color)", - }, - { - id: 6, - label: "Не пришел", - value: "DID_NOT_COME", - color: "var(--bg-event-red-color)", - }, - ], + eventStatuses: calendarConfig, }; }, methods: { diff --git a/src/pages/calendar/utils/calendarConfig.js b/src/pages/calendar/utils/calendarConfig.js new file mode 100644 index 0000000..9bd2ac5 --- /dev/null +++ b/src/pages/calendar/utils/calendarConfig.js @@ -0,0 +1,44 @@ +export const calendarConfig = [ + { + id: 0, + label: "Планируется прием", + value: "PLANNED", + color: "var(--default-white)", + }, + { + id: 1, + label: "Отменил", + value: "CANCELED", + color: "var(--bg-event-grey-color)", + }, + { + id: 2, + label: "Ожидается прием", + value: "EXPECTED", + color: "var(--bg-event-yellow-color)", + }, + { + id: 3, + label: "Опаздывает", + value: "LATE", + color: "var(--bg-event-orange-color)", + }, + { + id: 4, + label: "Идет прием", + value: "RECEPTION", + color: "var(--bg-event-blue-color)", + }, + { + id: 5, + label: "Прием завершен", + value: "COMPLETED", + color: "var(--bg-event-green-color)", + }, + { + id: 6, + label: "Не пришел", + value: "DID_NOT_COME", + color: "var(--bg-event-red-color)", + }, +]; diff --git a/src/pages/schedule/components/FormChangeShift.vue b/src/pages/schedule/components/FormChangeShift.vue index 283bf3d..33259ef 100644 --- a/src/pages/schedule/components/FormChangeShift.vue +++ b/src/pages/schedule/components/FormChangeShift.vue @@ -1,5 +1,5 @@