From ee9a8fae543173d8050f784ecb676811a2bc0806 Mon Sep 17 00:00:00 2001
From: megavrilinvv <vastre@rambler.ru>
Date: Tue, 1 Aug 2023 12:57:31 +0300
Subject: [PATCH] [WIP] Fixed bugs

---
 .../components/BasicDataForms/TodaysPatientsForm.vue  | 11 +++++++----
 .../newCalendar/components/CalendarOpenSidebar.vue    |  5 ++++-
 src/pages/newCalendar/utils/calendarConfig.js         |  4 ++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/pages/medcards/components/BasicDataForms/TodaysPatientsForm.vue b/src/pages/medcards/components/BasicDataForms/TodaysPatientsForm.vue
index 587e38a..f5b3337 100644
--- a/src/pages/medcards/components/BasicDataForms/TodaysPatientsForm.vue
+++ b/src/pages/medcards/components/BasicDataForms/TodaysPatientsForm.vue
@@ -3,7 +3,7 @@
     title="Пациенты на сегодня",
     :quantity="patientsData.length",
     :link="redirectCalendar",
-    title-link="Календарь"
+    title-link="В календарь"
   )
     .form-wrapper.flex.flex-col.overflow-y-auto(
       @scroll="scrollTo",
@@ -19,7 +19,7 @@
           img.h-11.w-11.object-cover.rounded-full(:src="patient.avatar")
           .flex.flex-col.justify-center.gap-y-1
             .name.flex.relative {{trimName(patient.last_name, patient.first_name, patient.patronymic)}}
-            .grey-color.text-smm {{patient.birthday}}
+            .grey-color.text-smm {{trimBirthday(patient.birthday)}}
         .flex.flex-col.justify-center.w-full(:style="{width: '140px'}")
           .text-m.font-bold {{patient.time.from + " - " + patient.time.to}}
           .grey-color.font-medium.text-smm(
@@ -62,6 +62,9 @@ export default {
     };
   },
   methods: {
+    trimBirthday(birthday) {
+      return moment(birthday, "DD MM YYYY").format("DD MMMM YYYY") + " г.";
+    },
     trimName(last, first, patronymic) {
       let fullName = last + " " + first + " " + patronymic;
       if (fullName.length > 30) return fullName.slice(0, 30);
@@ -140,7 +143,7 @@ export default {
   margin-right: 0px
   border-right: none
   &:last-child
-    border-bottom: 1px solid var(--gray-scondary)
+    border-bottom: 1px solid var(--gray-secondary)
 
 .default-form
   margin-right: 0px
@@ -155,7 +158,7 @@ export default {
   left: 0
 
 .btn
-  border: 1px solid var(--gray-scondary)
+  border: 1px solid var(--gray-secondary)
   color: var(--font-grey-color)
   background: var(--bg-light-grey)
 
diff --git a/src/pages/newCalendar/components/CalendarOpenSidebar.vue b/src/pages/newCalendar/components/CalendarOpenSidebar.vue
index 9600a2d..c68c406 100644
--- a/src/pages/newCalendar/components/CalendarOpenSidebar.vue
+++ b/src/pages/newCalendar/components/CalendarOpenSidebar.vue
@@ -52,7 +52,7 @@
               )
                 template(v-slot:iconLeft)
                   q-icon.input-icon(name="app:search", size="16px")
-              q-btn.ml-2(
+              q-btn.ml-2.sort-icon(
                 @click="sortPerson(elem.data)",
                 :class="sortingClass",
                 :style="{width: '32px', height: '32px'}",
@@ -411,4 +411,7 @@ export default {
 
 .icon-patients :deep(path)
   fill: var(--btn-blue-color)
+
+.sort-icon :deep(path)
+  fill: var(--font-grey-color)
 </style>
diff --git a/src/pages/newCalendar/utils/calendarConfig.js b/src/pages/newCalendar/utils/calendarConfig.js
index d17e607..0016afe 100644
--- a/src/pages/newCalendar/utils/calendarConfig.js
+++ b/src/pages/newCalendar/utils/calendarConfig.js
@@ -240,8 +240,8 @@ export const patientList = [
         check: false,
         view: false,
         viewDate: "",
-        reception: "26.07.2023",
-        time: { from: "20:00", to: "21:00" },
+        reception: "01.08.2023",
+        time: { from: "15:00", to: "21:00" },
         priority: 1,
         phone: "+7 (910) 623–32–23",
         email: "gaevaia@yandex.ru",