From a4dce57eef04b9d06c13e4f1b515d835c3510392 Mon Sep 17 00:00:00 2001 From: megavrilinvv Date: Thu, 8 Jun 2023 16:38:42 +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=84=D0=BE=D1=80=D0=BC=D1=83=20=D1=81=D0=BE=D0=B7?= =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D0=B8=20=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=86=D0=B5=20=D0=BA=D0=B0=D0=BB=D0=B5=D0=BD=D0=B4=D0=B0=D1=80?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/calendar-grey.svg | 4 + src/assets/icons/folder.svg | 3 + src/assets/icons/noname.svg | 5 + src/assets/icons/time.svg | 3 + src/components/base/BaseModal.vue | 4 +- src/pages/newCalendar/TheCalendar.vue | 17 ++- .../components/CalendarOpenSidebar.vue | 3 +- .../components/CalendarSidebar.vue | 4 +- .../components/RecordCreationForm.vue | 105 ++++++++++++++++++ 9 files changed, 141 insertions(+), 7 deletions(-) create mode 100644 src/assets/icons/calendar-grey.svg create mode 100644 src/assets/icons/folder.svg create mode 100644 src/assets/icons/noname.svg create mode 100644 src/assets/icons/time.svg create mode 100644 src/pages/newCalendar/components/RecordCreationForm.vue diff --git a/src/assets/icons/calendar-grey.svg b/src/assets/icons/calendar-grey.svg new file mode 100644 index 0000000..d813c8b --- /dev/null +++ b/src/assets/icons/calendar-grey.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/assets/icons/folder.svg b/src/assets/icons/folder.svg new file mode 100644 index 0000000..7325acf --- /dev/null +++ b/src/assets/icons/folder.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/noname.svg b/src/assets/icons/noname.svg new file mode 100644 index 0000000..c9f6868 --- /dev/null +++ b/src/assets/icons/noname.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/assets/icons/time.svg b/src/assets/icons/time.svg new file mode 100644 index 0000000..a529182 --- /dev/null +++ b/src/assets/icons/time.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/base/BaseModal.vue b/src/components/base/BaseModal.vue index 7832c5a..e95635a 100644 --- a/src/components/base/BaseModal.vue +++ b/src/components/base/BaseModal.vue @@ -4,7 +4,7 @@ @show="onShow", @hide="onHide", ref="dialog" - ) + ) .base-content( :class="{'draggable': draggable, 'base-content-default': !defaultPadding}", ref="contentRef", @@ -165,4 +165,6 @@ export default { @media (min-width: 600px) .q-dialog__inner--minimized > div max-width: 100vh !important +.q-dialog + font-feature-settings: 'pnum' on, 'lnum' on diff --git a/src/pages/newCalendar/TheCalendar.vue b/src/pages/newCalendar/TheCalendar.vue index 4c98bdf..b3ac0e4 100644 --- a/src/pages/newCalendar/TheCalendar.vue +++ b/src/pages/newCalendar/TheCalendar.vue @@ -1,29 +1,40 @@ diff --git a/src/pages/newCalendar/components/CalendarOpenSidebar.vue b/src/pages/newCalendar/components/CalendarOpenSidebar.vue index 1046ee7..76df06b 100644 --- a/src/pages/newCalendar/components/CalendarOpenSidebar.vue +++ b/src/pages/newCalendar/components/CalendarOpenSidebar.vue @@ -13,6 +13,7 @@ color="primary", size="16px", label="Создать запись", + @click="createForm", no-caps, icon="add", :style="{width: '100%', height: '40px'}", @@ -82,7 +83,7 @@ import { patientList } from "@/pages/newCalendar/utils/calendarConfig.js"; export default { name: "CalendarOpenSidebar", - props: { openSidebar: Function }, + props: { openSidebar: Function, createForm: Function }, components: { BaseInput }, data() { return { diff --git a/src/pages/newCalendar/components/CalendarSidebar.vue b/src/pages/newCalendar/components/CalendarSidebar.vue index 1d9443d..0f81b70 100644 --- a/src/pages/newCalendar/components/CalendarSidebar.vue +++ b/src/pages/newCalendar/components/CalendarSidebar.vue @@ -9,7 +9,7 @@ ) img(:src="arrow") .button.flex - q-btn(color="primary", dense, padding="14px") + q-btn(color="primary", dense, padding="14px", @click="createForm") q-icon(name="app:icon-plus", size="12px") .button.flex q-btn(dense, style="color: var(--font-grey-color)", padding="0px") @@ -30,7 +30,7 @@ import round from "@/assets/icons/status_round.svg"; export default { name: "CalendarSidebar", - props: { openSidebar: Function }, + props: { openSidebar: Function, createForm: Function }, data() { return { arrow, group, medcard, round }; }, diff --git a/src/pages/newCalendar/components/RecordCreationForm.vue b/src/pages/newCalendar/components/RecordCreationForm.vue new file mode 100644 index 0000000..72e21c8 --- /dev/null +++ b/src/pages/newCalendar/components/RecordCreationForm.vue @@ -0,0 +1,105 @@ + + + + +