From 7b2e07f0d2d2f6973cc9163c7191dd1d8910e180 Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Tue, 19 Sep 2023 17:05:29 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=D0=B0=20=D0=B1=D0=B0=D0=B3=20=D0=B2=20=D0=B4=D0=BE=D0=BA?=
 =?UTF-8?q?=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/base/BaseInput.vue                   |  6 ++++++
 .../components/doctorCalendar/CalendarColumn.vue    | 13 +++++++------
 .../components/managerCalendar/CalendarHeader.vue   | 10 +++++++++-
 src/pages/newCalendar/utils/calendarFunctions.js    |  4 ++++
 .../components/BasicDataForms/DocumentsForm.vue     |  7 ++++++-
 src/store/index.js                                  |  2 +-
 src/store/modules/medicalCard.js                    |  3 +--
 7 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/src/components/base/BaseInput.vue b/src/components/base/BaseInput.vue
index d17b07a..10fa8ad 100644
--- a/src/components/base/BaseInput.vue
+++ b/src/components/base/BaseInput.vue
@@ -233,4 +233,10 @@ export default {
 
 .input :deep(.q-field__marginal)
   height: auto !important
+
+.input :deep(.q-field__shadow)
+  opacity: 0.5
+  top: 3px
+  color: var(--font-grey-color)
+  margin-left: 8px
 </style>
diff --git a/src/pages/newCalendar/components/doctorCalendar/CalendarColumn.vue b/src/pages/newCalendar/components/doctorCalendar/CalendarColumn.vue
index e5bd845..6fbb497 100644
--- a/src/pages/newCalendar/components/doctorCalendar/CalendarColumn.vue
+++ b/src/pages/newCalendar/components/doctorCalendar/CalendarColumn.vue
@@ -2,7 +2,7 @@
   .calendar-column-wrapper.flex.flex-col
     .header.flex.flex-col.items-center.justify-center.top-0.pt-3.pb-10px
       span.font-bold.text-base.color-black {{ date?.format("D MMMM")}}
-      span.text-smm.color-grey {{ transformDayName(date?.format("dddd"))}}
+      span.text-smm.color-grey {{ capitalizeFirstChar(date?.format("dddd"))}}
     .body.h-full.px-1.py-1
       calendar-record-card(
         v-for="record in filteredRecords",
@@ -19,6 +19,7 @@
 <script>
 import * as moment from "moment/moment";
 import { columnMixin } from "@/pages/newCalendar/mixins/columnMixin.js";
+import { capitalizeFirstChar } from "@/pages/newCalendar/utils/calendarFunctions.js";
 export default {
   name: "CalendarColumn",
   mixins: [columnMixin],
@@ -26,6 +27,11 @@ export default {
     date: Object,
     expandedDisplayType: Boolean,
   },
+  data() {
+    return {
+      capitalizeFirstChar: capitalizeFirstChar,
+    };
+  },
   computed: {
     filteredRecords() {
       return this.events.filter(
@@ -35,11 +41,6 @@ export default {
       );
     },
   },
-  methods: {
-    transformDayName(name) {
-      return name[0]?.toUpperCase() + name?.slice(1);
-    },
-  },
 };
 </script>
 
diff --git a/src/pages/newCalendar/components/managerCalendar/CalendarHeader.vue b/src/pages/newCalendar/components/managerCalendar/CalendarHeader.vue
index 85315ea..c284025 100644
--- a/src/pages/newCalendar/components/managerCalendar/CalendarHeader.vue
+++ b/src/pages/newCalendar/components/managerCalendar/CalendarHeader.vue
@@ -18,12 +18,13 @@
         icon="arrow_back_ios_new",
         text-color="primary",
         padding="2px 11px 2px 8px",
-        @click="previousDate"
+        @click="previousDate",
       )
       base-input.search(
         size="M"
         :width="332",
         v-model="currentDate",
+        :shadow-text="inputShadowText"
       )
         .h-5.w-5.flex.items-center.justify-center.ml-3
           q-icon.calendar-icon.text.cursor-pointer(
@@ -64,6 +65,7 @@
 <script>
 import { v_model } from "@/shared/mixins/v-model";
 import { headerMixin } from "@/pages/newCalendar/mixins/headerMixin.js";
+import { capitalizeFirstChar } from "@/pages/newCalendar/utils/calendarFunctions.js";
 export default {
   name: "CalendarHeader",
   mixins: [v_model, headerMixin],
@@ -86,6 +88,12 @@ export default {
     currentDate() {
       return this.date?.format("D MMMM YYYY");
     },
+    inputShadowText() {
+      console.log(this.date, capitalizeFirstChar(this.date?.format("dddd")));
+      return this.date?.isValid()
+        ? capitalizeFirstChar(this.date?.format("dddd"))
+        : "";
+    },
   },
   methods: {
     previousDate() {
diff --git a/src/pages/newCalendar/utils/calendarFunctions.js b/src/pages/newCalendar/utils/calendarFunctions.js
index 33d8d76..80721e8 100644
--- a/src/pages/newCalendar/utils/calendarFunctions.js
+++ b/src/pages/newCalendar/utils/calendarFunctions.js
@@ -13,3 +13,7 @@ export function verifyTime(dayTime) {
   let newTime = timeArray[1] >= 30 ? timeArray[0] + 1 : timeArray[0];
   return newTime;
 }
+
+export function capitalizeFirstChar(str) {
+  return str[0]?.toUpperCase() + str?.slice(1);
+}
diff --git a/src/pages/newMedicalCard/components/BasicDataForms/DocumentsForm.vue b/src/pages/newMedicalCard/components/BasicDataForms/DocumentsForm.vue
index df7b46a..2a8e34f 100644
--- a/src/pages/newMedicalCard/components/BasicDataForms/DocumentsForm.vue
+++ b/src/pages/newMedicalCard/components/BasicDataForms/DocumentsForm.vue
@@ -148,7 +148,12 @@ export default {
       return this.$store.state.medical.documents;
     },
     passportFields() {
-      let excludedFields = ["attachments", "id", "category"];
+      let excludedFields = [
+        "attachments",
+        "id",
+        "category",
+        "issued_by_org_code",
+      ];
       return Object.keys(this.docData.passport).filter(
         (key) => !excludedFields.includes(key)
       );
diff --git a/src/store/index.js b/src/store/index.js
index 86ff1e2..b0ecdf5 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -8,7 +8,7 @@ export default createStore({
     imgUrl: "https://astra-dev.dopcore.com/api/store/",
     routingHistory: window.history,
     userData: {},
-    calendarShape: "doctor",
+    calendarShape: "manager",
   },
   modules: {
     medical,
diff --git a/src/store/modules/medicalCard.js b/src/store/modules/medicalCard.js
index 76d5019..177a547 100644
--- a/src/store/modules/medicalCard.js
+++ b/src/store/modules/medicalCard.js
@@ -194,8 +194,7 @@ const getters = {
         series: document?.series || (isPolicy || isPassport ? "" : "000"),
         number: document?.number || "",
         issued_by: document?.issued_by || (isPassport ? "" : "000"),
-        issued_by_org_code:
-          document?.issued_by_org_code || (isPassport ? "000-000" : ""),
+        issued_by_org_code: document?.issued_by_org_code || "",
         issued_at: document?.issued_at || "",
         attachments: document?.attachments?.length
           ? {