From 4c7e62d4505a68c8c0f44e416f74068ce1cb6821 Mon Sep 17 00:00:00 2001
From: megavrilinvv <vastre@rambler.ru>
Date: Mon, 24 Jul 2023 12:56:56 +0300
Subject: [PATCH 1/3] =?UTF-8?q?[WIP]=20=D0=A4=D0=B8=D0=BA=D1=81=20=D1=81?=
 =?UTF-8?q?=D1=82=D0=B8=D0=BB=D0=B5=D0=B9=20=D1=81=D0=B0=D0=B9=D0=B4=D0=B1?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B0=20=D0=BA=D0=B0=D0=BB=D0=B5=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/CalendarOpenSidebar.vue        | 23 +++++++++++--------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/pages/newCalendar/components/CalendarOpenSidebar.vue b/src/pages/newCalendar/components/CalendarOpenSidebar.vue
index 3715ec9..af35c13 100644
--- a/src/pages/newCalendar/components/CalendarOpenSidebar.vue
+++ b/src/pages/newCalendar/components/CalendarOpenSidebar.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  .sidebar-wrapper.flex.flex-col.gap-y-1
+  .sidebar-wrapper.flex.flex-col.gap-y-px
     .form.flex.items-center.justify-end.py-4.pr-4.rounded-t
       q-btn.rotate-180.button-open(
         @click="openSidebar(); hideSidebar()",
@@ -15,7 +15,7 @@
       )
         q-icon(name="app:plus", size="12px", left)
         span Создать запись
-    .flex.flex-col.gap-y-1
+    .flex.flex-col.gap-y-px
       q-expansion-item.expansion.font-bold.text-xm(
         v-for="(elem, index) in patientList",
         expand-separator,
@@ -23,7 +23,7 @@
         @click="choiceForm(elem.choice, index)",
         :class="{'patient': elem.label === 'Пациенты'}"
       )
-        .select.flex.flex-col.font-medium.text-smm.px-4(
+        .select.flex.flex-col.font-medium.text-smm.px-2(
           v-if="elem.label !== 'Пациенты'",
           v-for="item in elem.data"
         )
@@ -238,7 +238,6 @@ export default {
   background: var(--bg-light-grey)
 
 .select
-  padding-bottom: 2px
   &:last-child
     padding-bottom: 16px
 
@@ -253,7 +252,7 @@ export default {
 
 .status
   border-radius: 4px
-  height: 28px
+  height: 40px
   &:hover
     background: var(--gray-thirdly)
     cursor: pointer
@@ -308,7 +307,7 @@ export default {
   &::-webkit-scrollbar
     width: 4px
   &::-webkit-scrollbar-track:vertical
-    margin-top: -26px
+    margin-top: -40px
     margin-bottom: 26px
 
 .person
@@ -317,21 +316,23 @@ export default {
   border-bottom: 1px solid var(--bg-light-grey)
   &:first-child
     border-top: 1px solid var(--bg-light-grey)
+  &:last-child
+    border-bottom: none
 
 .one-form
-  max-height: calc(100vh - 394px)
+  max-height: calc(100vh - 382px)
   transition: all 0.2s ease-in
 
 .two-form
-  max-height: calc(100vh - 528px)
+  max-height: calc(100vh - 558px)
   transition: all 0.2s ease-in
 
 .all-form
-  max-height: calc(100vh - 632px)
+  max-height: calc(100vh - 694px)
   transition: all 0.2s ease-in
 
 .primary-form
-  max-height: calc(100vh - 498px)
+  max-height: calc(100vh - 518px)
   transition: all 0.2s ease-in
 
 .default
@@ -345,6 +346,8 @@ export default {
   padding-left: 6px
 
 .gradient
+  border-bottom-left-radius: 0.25rem
+  border-bottom-right-radius: 0.25rem
   width: 232px
   height: 44px
   right: 0px

From c63fe8c3192fe4c9d00837edff7354e52faa15f5 Mon Sep 17 00:00:00 2001
From: megavrilinvv <vastre@rambler.ru>
Date: Mon, 24 Jul 2023 15:40:59 +0300
Subject: [PATCH 2/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?=
 =?UTF-8?q?=20=D1=80=D0=BE=D1=83=D1=82=D0=B8=D0=BD=D0=B3=20=D0=BD=D0=B0=20?=
 =?UTF-8?q?=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=83=20=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=BA=D0=B0=D1=80=D1=82=D0=BE=D1=87=D0=B5=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SidebarButtonSvg.vue               |  3 +++
 src/components/TheSidebar.vue                     |  6 ++++++
 src/pages/medcards/TheMedcards.vue                | 15 +++++++++++++++
 .../medcards/components/MedicalCardSearch.vue     |  9 +++++++++
 src/pages/medcards/components/TablePatients.vue   |  9 +++++++++
 src/router.js                                     |  2 ++
 6 files changed, 44 insertions(+)
 create mode 100644 src/pages/medcards/TheMedcards.vue
 create mode 100644 src/pages/medcards/components/MedicalCardSearch.vue
 create mode 100644 src/pages/medcards/components/TablePatients.vue

diff --git a/src/components/SidebarButtonSvg.vue b/src/components/SidebarButtonSvg.vue
index 121d23c..26a1a21 100644
--- a/src/components/SidebarButtonSvg.vue
+++ b/src/components/SidebarButtonSvg.vue
@@ -18,6 +18,9 @@
         path(:fill="active ? '#4772f2' : '#9294A7'" d="m5.27928,29.28626l0.08668,0.14927l1.20485,-0.5043c2.25214,-0.94252 4.85974,-0.0736 6.08008,2.02584l2.2854,3.93248c0.15561,0.26751 0.28249,0.54462 0.38128,0.82717l1.15109,0c1.2218,0 2.25198,-0.90204 2.40291,-2.10376l0.09234,-0.73693c0.05778,-0.45966 0.36481,-0.84492 0.76788,-1.07915c0.41372,-0.24031 0.91687,-0.30591 1.35803,-0.11968l0.63003,0.26591c1.1272,0.47582 2.43536,0.04208 3.04682,-1.01004l0.99742,-1.71609c0.58483,-1.00636 0.32462,-2.28663 -0.60775,-2.98996l-0.95626,-0.72141c-0.18596,-0.14016 -0.25198,-0.37951 -0.25198,-0.61102l0,-0.75597c0,-0.23391 0.08814,-0.46526 0.27587,-0.60685l0.89621,-0.67598c0.96917,-0.73101 1.23971,-2.06184 0.6318,-3.10771l-0.96045,-1.65245c-0.61017,-1.04977 -1.91397,-1.48421 -3.04004,-1.01292l-0.67216,0.28132c-0.43487,0.18202 -0.93027,0.11791 -1.33285,-0.12657c-0.4042,-0.24465 -0.72575,-0.62664 -0.78419,-1.09246l-0.09072,-0.7237c-0.15093,-1.20163 -1.18111,-2.10369 -2.40291,-2.10369l-1.90606,0c-1.22179,0 -2.25214,0.90206 -2.40291,2.10369l-0.0925,0.73703c-0.05762,0.45963 -0.36465,0.84488 -0.76788,1.07913c-0.41372,0.24047 -0.91687,0.30678 -1.35884,0.12181l-0.66086,-0.27656c-1.12591,-0.47129 -2.4297,-0.03685 -3.03988,1.01292l-0.96045,1.65245c-0.60791,1.04587 -0.33737,2.3767 0.63164,3.10771l0.89621,0.67598c0.18773,0.14159 0.27603,0.37294 0.27603,0.60685l0,0.75597c0,0.23455 -0.08862,0.46654 -0.27684,0.60862l-0.8954,0.67533c-0.96901,0.73101 -1.23955,2.06184 -0.63164,3.10772zm10.29253,-0.84925c1.08684,0 2.01437,-0.38271 2.78273,-1.14795c0.7682,-0.76525 1.15239,-1.68922 1.15239,-2.77189c0,-1.08268 -0.38419,-2.00664 -1.15239,-2.77189c-0.76836,-0.76525 -1.69589,-1.14796 -2.78273,-1.14796c-1.10558,0 -2.03794,0.38271 -2.79727,1.14796c-0.75852,0.76525 -1.13786,1.68921 -1.13786,2.77189c0,1.08267 0.37934,2.00664 1.13786,2.77189c0.75933,0.76524 1.69169,1.14795 2.79727,1.14795z" clip-rule="evenodd" fill-rule="evenodd")
     g(v-if="nameSvg === 'home'")
       path(d="M20 5L20.5303 4.46967C20.3897 4.32902 20.1989 4.25 20 4.25C19.8011 4.25 19.6103 4.32902 19.4697 4.46967L20 5ZM8.33331 16.6667L7.80298 16.1363C7.66233 16.277 7.58331 16.4678 7.58331 16.6667L8.33331 16.6667ZM31.6666 16.6667H32.4166C32.4166 16.4678 32.3376 16.277 32.197 16.1363L31.6666 16.6667ZM31.6667 33.3333V34.0833C31.8656 34.0833 32.0563 34.0043 32.197 33.8637C32.3376 33.723 32.4167 33.5322 32.4167 33.3333H31.6667ZM8.33332 33.3333H7.58332C7.58332 33.7475 7.91911 34.0833 8.33332 34.0833V33.3333ZM19.4697 4.46967L7.80298 16.1363L8.86364 17.197L20.5303 5.53033L19.4697 4.46967ZM32.197 16.1363L20.5303 4.46967L19.4697 5.53033L31.1363 17.197L32.197 16.1363ZM30.9166 16.6667L30.9167 33.3333H32.4167L32.4166 16.6667L30.9166 16.6667ZM31.6667 32.5833H8.33332V34.0833H31.6667V32.5833ZM9.08332 33.3333L9.08331 16.6667L7.58331 16.6667L7.58332 33.3333H9.08332Z" :fill="active ? '#4772f2' : '#9294A7'")
+    g(v-if="nameSvg === 'medcards'")
+      path(fill-rule="evenodd" clip-rule="evenodd" d="M8.5 20V31C8.5 32.1046 9.39543 33 10.5 33H29.5C30.6046 33 31.5 32.1046 31.5 31V22.9032C31.5 21.7987 30.6046 20.9032 29.5 20.9032H20.0299C19.5184 20.9032 19.0263 20.7073 18.6549 20.3556L16.7451 18.5476C16.3737 18.196 15.8816 18 15.3701 18H10.5C9.39543 18 8.5 18.8954 8.5 20ZM19.5 25V26H18.5C17.9477 26 17.5 26.4477 17.5 27C17.5 27.5523 17.9477 28 18.5 28H19.5V29C19.5 29.5523 19.9477 30 20.5 30C21.0523 30 21.5 29.5523 21.5 29V28H22.5C23.0523 28 23.5 27.5523 23.5 27C23.5 26.4477 23.0523 26 22.5 26H21.5V25C21.5 24.4477 21.0523 24 20.5 24C19.9477 24 19.5 24.4477 19.5 25Z" :fill="active ? '#4772f2' : '#9294A7'")
+      path(opacity="0.6" fill-rule="evenodd" clip-rule="evenodd" d="M10.5 9L10.5 16.5H15.3701C16.2652 16.5 17.1263 16.8429 17.7763 17.4583L19.6861 19.2663C19.779 19.3542 19.902 19.4032 20.0299 19.4032H29.5L29.5 11.7986C29.5 11.2859 29.3031 10.7928 28.95 10.4211L26.2914 7.6225C25.9138 7.22504 25.3896 7 24.8414 7H12.5C11.3954 7 10.5 7.89543 10.5 9ZM12.75 10C12.75 9.58579 13.0858 9.25 13.5 9.25H24.5C24.9142 9.25 25.25 9.58579 25.25 10C25.25 10.4142 24.9142 10.75 24.5 10.75H13.5C13.0858 10.75 12.75 10.4142 12.75 10ZM12.75 13.5C12.75 13.0858 13.0858 12.75 13.5 12.75H26.5C26.9142 12.75 27.25 13.0858 27.25 13.5C27.25 13.9142 26.9142 14.25 26.5 14.25H13.5C13.0858 14.25 12.75 13.9142 12.75 13.5Z" :fill="active ? '#4772f2' : '#9294A7'")
 </template>
 
 <script>
diff --git a/src/components/TheSidebar.vue b/src/components/TheSidebar.vue
index 997e2af..b55ce2a 100644
--- a/src/components/TheSidebar.vue
+++ b/src/components/TheSidebar.vue
@@ -40,6 +40,12 @@ export default {
           active: false,
           icon: "clients",
         },
+        {
+          id: "medcards",
+          path: "#/medcards",
+          active: false,
+          icon: "medcards",
+        },
         {
           id: "settings",
           path: "#/settings",
diff --git a/src/pages/medcards/TheMedcards.vue b/src/pages/medcards/TheMedcards.vue
new file mode 100644
index 0000000..e4efc7b
--- /dev/null
+++ b/src/pages/medcards/TheMedcards.vue
@@ -0,0 +1,15 @@
+<template lang="pug">
+  .medcards-wrapper.flex.flex-col
+    table-patients
+    medical-card-search
+</template>
+
+<script>
+import MedicalCardSearch from "./components/MedicalCardSearch.vue";
+import TablePatients from "./components/TablePatients.vue";
+
+export default {
+  name: "TheMedcards",
+  components: { MedicalCardSearch, TablePatients },
+};
+</script>
diff --git a/src/pages/medcards/components/MedicalCardSearch.vue b/src/pages/medcards/components/MedicalCardSearch.vue
new file mode 100644
index 0000000..4807348
--- /dev/null
+++ b/src/pages/medcards/components/MedicalCardSearch.vue
@@ -0,0 +1,9 @@
+<template lang="pug">
+  .medical-wrapper.flex
+</template>
+
+<script>
+export default { name: "MedicalCardSearch" };
+</script>
+
+<style lang="sass" scoped></style>
diff --git a/src/pages/medcards/components/TablePatients.vue b/src/pages/medcards/components/TablePatients.vue
new file mode 100644
index 0000000..e68196d
--- /dev/null
+++ b/src/pages/medcards/components/TablePatients.vue
@@ -0,0 +1,9 @@
+<template lang="pug">
+  .table-wrapper.flex
+</template>
+
+<script>
+export default {
+  name: "TablePatients",
+};
+</script>
diff --git a/src/router.js b/src/router.js
index 7f52b40..8d043cb 100644
--- a/src/router.js
+++ b/src/router.js
@@ -2,6 +2,7 @@ import { createRouter, createWebHashHistory } from "vue-router";
 import TheCalendar from "@/pages/newCalendar/TheCalendar";
 import TheUser from "@/pages/clients/TheClients";
 import TheSettings from "@/pages/settings/TheSettings";
+import TheMedcards from "@/pages/medcards/TheMedcards";
 import TheLogin from "@/pages/login/TheLogin";
 import LoggedInLayout from "@/components/LoggedInLayout";
 import TheMedicalCard from "@/pages/newMedicalCard/TheMedicalCard";
@@ -37,6 +38,7 @@ export default createRouter({
         { path: "", redirect: "calendar" },
         { path: "calendar", component: TheCalendar },
         { path: "clients", component: TheUser },
+        { path: "medcards", component: TheMedcards },
         { path: "settings", component: TheSettings },
         { path: "medical-card", component: TheMedicalCard },
       ],

From 2e3764c6acd4e89cef323d801bedc8d080cbe767 Mon Sep 17 00:00:00 2001
From: megavrilinvv <vastre@rambler.ru>
Date: Mon, 24 Jul 2023 18:37:58 +0300
Subject: [PATCH 3/3] =?UTF-8?q?[WIP]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20wrapper=20=D0=BD=D0=B0=20=D1=84=D0=BE=D1=80?=
 =?UTF-8?q?=D0=BC=D1=8B=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86=D1=8B?=
 =?UTF-8?q?=20=D0=BC=D0=B5=D0=B4=D0=BA=D0=B0=D1=82=D0=BE=D1=87=D0=B5=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/medcards/TheMedcards.vue            |  2 +-
 .../BasicDataForms/CurrentPatientForm.vue     | 14 +++++++
 .../BasicDataForms/TodaysPatientsForm.vue     | 15 +++++++
 .../ViewedMedicalRecordsForm.vue              | 14 +++++++
 .../components/MedcardFormWrapper.vue         | 41 +++++++++++++++++++
 .../medcards/components/TablePatients.vue     | 16 +++++++-
 6 files changed, 100 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/medcards/components/BasicDataForms/CurrentPatientForm.vue
 create mode 100644 src/pages/medcards/components/BasicDataForms/TodaysPatientsForm.vue
 create mode 100644 src/pages/medcards/components/BasicDataForms/ViewedMedicalRecordsForm.vue
 create mode 100644 src/pages/medcards/components/MedcardFormWrapper.vue

diff --git a/src/pages/medcards/TheMedcards.vue b/src/pages/medcards/TheMedcards.vue
index e4efc7b..39c4891 100644
--- a/src/pages/medcards/TheMedcards.vue
+++ b/src/pages/medcards/TheMedcards.vue
@@ -1,5 +1,5 @@
 <template lang="pug">
-  .medcards-wrapper.flex.flex-col
+  .medcards-wrapper.flex.flex-col.w-full
     table-patients
     medical-card-search
 </template>
diff --git a/src/pages/medcards/components/BasicDataForms/CurrentPatientForm.vue b/src/pages/medcards/components/BasicDataForms/CurrentPatientForm.vue
new file mode 100644
index 0000000..6ad92e0
--- /dev/null
+++ b/src/pages/medcards/components/BasicDataForms/CurrentPatientForm.vue
@@ -0,0 +1,14 @@
+<template lang="pug">
+  medcard-form-wrapper(title="Пациент на приеме", title-link="Медкарта")
+</template>
+
+<script>
+import MedcardFormWrapper from "@/pages/medcards/components/MedcardFormWrapper.vue";
+
+export default {
+  name: "CurrentPatientForm",
+  components: { MedcardFormWrapper },
+};
+</script>
+
+<style lang="sass" scoped></style>
diff --git a/src/pages/medcards/components/BasicDataForms/TodaysPatientsForm.vue b/src/pages/medcards/components/BasicDataForms/TodaysPatientsForm.vue
new file mode 100644
index 0000000..1dccefe
--- /dev/null
+++ b/src/pages/medcards/components/BasicDataForms/TodaysPatientsForm.vue
@@ -0,0 +1,15 @@
+<template lang="pug">
+  medcard-form-wrapper(title="Пациенты на сегодня", :quantity="13", title-link="Календарь")
+    .flex gwiefujm
+</template>
+
+<script>
+import MedcardFormWrapper from "@/pages/medcards/components/MedcardFormWrapper.vue";
+
+export default {
+  name: "TodaysPatientsForm",
+  components: { MedcardFormWrapper },
+};
+</script>
+
+<style lang="sass" scoped></style>
diff --git a/src/pages/medcards/components/BasicDataForms/ViewedMedicalRecordsForm.vue b/src/pages/medcards/components/BasicDataForms/ViewedMedicalRecordsForm.vue
new file mode 100644
index 0000000..00f88f3
--- /dev/null
+++ b/src/pages/medcards/components/BasicDataForms/ViewedMedicalRecordsForm.vue
@@ -0,0 +1,14 @@
+<template lang="pug">
+  medcard-form-wrapper(title="Недавно просмотренные медкарты")
+</template>
+
+<script>
+import MedcardFormWrapper from "@/pages/medcards/components/MedcardFormWrapper.vue";
+
+export default {
+  name: "ViewedMedicalRecordsForm",
+  components: { MedcardFormWrapper },
+};
+</script>
+
+<style lang="sass" scoped></style>
diff --git a/src/pages/medcards/components/MedcardFormWrapper.vue b/src/pages/medcards/components/MedcardFormWrapper.vue
new file mode 100644
index 0000000..bae968a
--- /dev/null
+++ b/src/pages/medcards/components/MedcardFormWrapper.vue
@@ -0,0 +1,41 @@
+<template lang="pug">
+  .form-wrapper.flex.flex-col.w-full.rounded
+    .header.flex.items-center.text-sm.font-bold.justify-between.w-full.px-6.py-5
+      .left-side.flex.gap-x-2.items-center
+        span {{title}}
+        .grey-color(v-if="quantity") {{quantity}}
+      .link.flex.items-center.cursor-pointer(v-if="titleLink", @click="link")
+        span.font-medium {{ titleLink }}
+    slot
+</template>
+
+<script>
+export default {
+  name: "MedcardFormWrapper",
+  props: {
+    title: String,
+    titleLink: String,
+    link: Function,
+    quantity: Number,
+  },
+};
+</script>
+
+<style lang="sass" scoped>
+.form-wrapper
+  height: 360px
+  background: var(--default-white)
+  color: var(--font-dark-blue-color)
+
+.header
+  max-height: 62px
+  border-bottom: 1px solid var(--gray-scondary)
+
+.grey-color
+  color: var(--font-grey-color)
+
+.link
+  color: var(--btn-blue-color)
+  &:hover
+    opacity: 0.7
+</style>
diff --git a/src/pages/medcards/components/TablePatients.vue b/src/pages/medcards/components/TablePatients.vue
index e68196d..3cdf1d3 100644
--- a/src/pages/medcards/components/TablePatients.vue
+++ b/src/pages/medcards/components/TablePatients.vue
@@ -1,9 +1,23 @@
 <template lang="pug">
-  .table-wrapper.flex
+  .table-wrapper.flex.gap-x-2    
+    todays-patients-form
+    current-patient-form
+    viewed-medical-records-form
 </template>
 
 <script>
+import CurrentPatientForm from "./BasicDataForms/CurrentPatientForm.vue";
+import TodaysPatientsForm from "./BasicDataForms/TodaysPatientsForm.vue";
+import ViewedMedicalRecordsForm from "./BasicDataForms/ViewedMedicalRecordsForm.vue";
+
 export default {
   name: "TablePatients",
+  components: {
+    TodaysPatientsForm,
+    CurrentPatientForm,
+    ViewedMedicalRecordsForm,
+  },
 };
 </script>
+
+<style lang="sass" scoped></style>