From 7213b8be2e1fd2b1e1bea6ca36f8066dc3222b82 Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Thu, 25 May 2023 17:59:43 +0300 Subject: [PATCH] =?UTF-8?q?[WIP]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=81=D0=B0=D0=B9=D0=B4=D0=B1=D0=B0=D1=80=20=D0=BD?= =?UTF-8?q?=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D0=B5=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/assets/icons/double_left_arrow.svg | 4 ++ src/assets/icons/medcard.svg | 6 ++ src/assets/icons/person_group.svg | 8 +++ src/assets/icons/status_round.svg | 6 ++ src/pages/newCalendar/TheCalendar.vue | 19 +++++- .../components/CalendarOpenSidebar.vue | 65 +++++++++++++++++++ .../components/CalendarSidebar.vue | 47 ++++++++++++++ .../components/calendarSidebar.vue | 11 ---- .../Forms/MedicalFormTag.vue | 1 - 9 files changed, 152 insertions(+), 15 deletions(-) create mode 100644 src/assets/icons/double_left_arrow.svg create mode 100644 src/assets/icons/medcard.svg create mode 100644 src/assets/icons/person_group.svg create mode 100644 src/assets/icons/status_round.svg create mode 100644 src/pages/newCalendar/components/CalendarOpenSidebar.vue create mode 100644 src/pages/newCalendar/components/CalendarSidebar.vue delete mode 100644 src/pages/newCalendar/components/calendarSidebar.vue diff --git a/src/assets/icons/double_left_arrow.svg b/src/assets/icons/double_left_arrow.svg new file mode 100644 index 0000000..caedef1 --- /dev/null +++ b/src/assets/icons/double_left_arrow.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/icons/medcard.svg b/src/assets/icons/medcard.svg new file mode 100644 index 0000000..f654dc6 --- /dev/null +++ b/src/assets/icons/medcard.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/assets/icons/person_group.svg b/src/assets/icons/person_group.svg new file mode 100644 index 0000000..700f57c --- /dev/null +++ b/src/assets/icons/person_group.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/assets/icons/status_round.svg b/src/assets/icons/status_round.svg new file mode 100644 index 0000000..9d876b8 --- /dev/null +++ b/src/assets/icons/status_round.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/pages/newCalendar/TheCalendar.vue b/src/pages/newCalendar/TheCalendar.vue index 371ff47..cf00915 100644 --- a/src/pages/newCalendar/TheCalendar.vue +++ b/src/pages/newCalendar/TheCalendar.vue @@ -1,13 +1,26 @@ diff --git a/src/pages/newCalendar/components/CalendarOpenSidebar.vue b/src/pages/newCalendar/components/CalendarOpenSidebar.vue new file mode 100644 index 0000000..e1fbbcc --- /dev/null +++ b/src/pages/newCalendar/components/CalendarOpenSidebar.vue @@ -0,0 +1,65 @@ + + + + + diff --git a/src/pages/newCalendar/components/CalendarSidebar.vue b/src/pages/newCalendar/components/CalendarSidebar.vue new file mode 100644 index 0000000..1d9443d --- /dev/null +++ b/src/pages/newCalendar/components/CalendarSidebar.vue @@ -0,0 +1,47 @@ + + + + + diff --git a/src/pages/newCalendar/components/calendarSidebar.vue b/src/pages/newCalendar/components/calendarSidebar.vue deleted file mode 100644 index 111cb2a..0000000 --- a/src/pages/newCalendar/components/calendarSidebar.vue +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue index 6dc1467..8df2a43 100644 --- a/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue +++ b/src/pages/newMedicalCard/components/InitialInspectionProtocol/Forms/MedicalFormTag.vue @@ -50,7 +50,6 @@ .flex.h-10.w-10.absolute.right-4.bottom-4 q-btn(color="primary", dense, padding="4px 12px") q-icon(name="app:icon-plus", size="17px") - .flex(v-if="data.title === 'Осмотр полости рта' && (fillInspection || change)", :style="{color: 'var(--btn-blue-color)'}") q-btn(no-caps, flat padding="2px 4px") q-icon(left, name="app:plus", size="11px")