From d4aa75a6902c2dbee7eb4a16881cf0f7d84edc5d Mon Sep 17 00:00:00 2001
From: megavrilinvv <vastre@rambler.ru>
Date: Wed, 26 Jul 2023 17:02:48 +0300
Subject: [PATCH] =?UTF-8?q?[WIP]=20=D0=A4=D0=B8=D0=BA=D1=81=20=D0=BA=D0=BE?=
 =?UTF-8?q?=D0=BD=D1=84=D0=B8=D0=B3=D0=B0=20=D1=81=D1=82=D0=B0=D1=82=D1=83?=
 =?UTF-8?q?=D1=81=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/CalendarRecordCard.vue         |  7 +-
 .../components/CalendarRecordPreview.vue      | 12 ++-
 src/pages/newCalendar/utils/calendarConfig.js | 77 ++++++++++---------
 3 files changed, 50 insertions(+), 46 deletions(-)

diff --git a/src/pages/newCalendar/components/CalendarRecordCard.vue b/src/pages/newCalendar/components/CalendarRecordCard.vue
index 0a6ebf9..e29b939 100644
--- a/src/pages/newCalendar/components/CalendarRecordCard.vue
+++ b/src/pages/newCalendar/components/CalendarRecordCard.vue
@@ -43,8 +43,7 @@
 <script>
 import * as moment from "moment/moment";
 import {
-  recordingStatuses,
-  medicalСardStatuses,
+  statuses,
   networks,
 } from "@/pages/newCalendar/utils/calendarConfig.js";
 import { trimName } from "@/pages/newCalendar/utils/calendarFunctions.js";
@@ -80,12 +79,12 @@ export default {
       return !this.bodyClass?.["flex-col"] && !this.expandedType;
     },
     recordingStatus() {
-      return recordingStatuses.find(
+      return statuses[0].data.find(
         (elem) => elem.value === this.record?.status
       );
     },
     medicalСardStatus() {
-      return medicalСardStatuses.find(
+      return statuses[1].data.find(
         (elem) => elem.value === this.record?.medicalCard?.status
       );
     },
diff --git a/src/pages/newCalendar/components/CalendarRecordPreview.vue b/src/pages/newCalendar/components/CalendarRecordPreview.vue
index 7dc9674..dda7e12 100644
--- a/src/pages/newCalendar/components/CalendarRecordPreview.vue
+++ b/src/pages/newCalendar/components/CalendarRecordPreview.vue
@@ -52,7 +52,7 @@ import { trimName } from "@/pages/newCalendar/utils/calendarFunctions.js";
 import {
   recordList,
   recordPreviewConfig,
-  recordingStatuses,
+  statuses,
 } from "@/pages/newCalendar/utils/calendarConfig.js";
 export default {
   name: "CalendarRecordPreview",
@@ -93,14 +93,12 @@ export default {
       return this.start?.format("HH:mm") + " – " + this.end?.format("HH:mm");
     },
     statusLabel() {
-      return recordingStatuses.find(
-        (elem) => elem.value === this.record?.status
-      ).label;
+      return statuses[0].data.find((elem) => elem.value === this.record?.status)
+        .label;
     },
     statusIcon() {
-      return recordingStatuses.find(
-        (elem) => elem.value === this.record?.status
-      ).icon;
+      return statuses[0].data.find((elem) => elem.value === this.record?.status)
+        .icon;
     },
     memberData() {
       return this.record?.member;
diff --git a/src/pages/newCalendar/utils/calendarConfig.js b/src/pages/newCalendar/utils/calendarConfig.js
index 056faef..6616886 100644
--- a/src/pages/newCalendar/utils/calendarConfig.js
+++ b/src/pages/newCalendar/utils/calendarConfig.js
@@ -42,44 +42,51 @@ export const networks = [
   },
 ];
 
-export const recordingStatuses = [
+export const statuses = [
   {
-    label: "Не принят",
-    icon: not_accepted,
-    value: "not_accepted",
+    name: "recording",
+    data: [
+      {
+        label: "Не принят",
+        icon: not_accepted,
+        value: "not_accepted",
+      },
+      {
+        label: "Принят",
+        icon: accepted,
+        value: "accepted",
+      },
+      {
+        label: "Отказ",
+        icon: rejected,
+        value: "rejected",
+      },
+      {
+        label: "На приеме",
+        icon: reception,
+        value: "reception",
+      },
+    ],
   },
   {
-    label: "Принят",
-    icon: accepted,
-    value: "accepted",
-  },
-  {
-    label: "Отказ",
-    icon: rejected,
-    value: "rejected",
-  },
-  {
-    label: "На приеме",
-    icon: reception,
-    value: "reception",
-  },
-];
-
-export const medicalСardStatuses = [
-  {
-    label: "Не заполнена",
-    icon: not_filled,
-    value: "not_filled",
-  },
-  {
-    label: "Частично заполнена",
-    icon: partially_filled,
-    value: "partially_filled",
-  },
-  {
-    label: "Заполнена",
-    icon: filled,
-    value: "filled",
+    name: "medicalCard",
+    data: [
+      {
+        label: "Не заполнена",
+        icon: not_filled,
+        value: "not_filled",
+      },
+      {
+        label: "Частично заполнена",
+        icon: partially_filled,
+        value: "partially_filled",
+      },
+      {
+        label: "Заполнена",
+        icon: filled,
+        value: "filled",
+      },
+    ],
   },
 ];