From 430ac662731168d3752c2ddb8d556b0b21cf7ef2 Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Fri, 28 Apr 2023 12:25:18 +0300
Subject: [PATCH 1/2] =?UTF-8?q?WIP=20=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B0=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D1=83=20=D0=B4=D0=BE?=
 =?UTF-8?q?=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/MedicalBaseInfo.vue            |  2 ++
 .../components/MedicalProtocolsList.vue       | 29 +++++++++++++++++++
 .../components/MedicalProtocolsWrapper.vue    | 18 ++++++++++++
 .../newMedicalCard/utils/medicalConfig.js     |  2 +-
 4 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/newMedicalCard/components/MedicalProtocolsList.vue
 create mode 100644 src/pages/newMedicalCard/components/MedicalProtocolsWrapper.vue

diff --git a/src/pages/newMedicalCard/components/MedicalBaseInfo.vue b/src/pages/newMedicalCard/components/MedicalBaseInfo.vue
index 7d92f70..d2a33a6 100644
--- a/src/pages/newMedicalCard/components/MedicalBaseInfo.vue
+++ b/src/pages/newMedicalCard/components/MedicalBaseInfo.vue
@@ -12,6 +12,7 @@ import MedicalSidebar from "@/pages/newMedicalCard/components/MedicalSidebar.vue
 import MedicalBasicDataWrapper from "@/pages/newMedicalCard/components/MedicalBasicDataWrapper.vue";
 import MedicalAllergiesWrapper from "@/pages/newMedicalCard/components/MedicalAllergiesWrapper.vue";
 import MedicalConfidantWrapper from "@/pages/newMedicalCard/components/MedicalConfidantWrapper.vue";
+import MedicalProtocolsWrapper from "@/pages/newMedicalCard/components/MedicalProtocolsWrapper.vue";
 export default {
   name: "MedicalBaseInfo",
   components: {
@@ -19,6 +20,7 @@ export default {
     MedicalBasicDataWrapper,
     MedicalAllergiesWrapper,
     MedicalConfidantWrapper,
+    MedicalProtocolsWrapper,
   },
   data() {
     return {
diff --git a/src/pages/newMedicalCard/components/MedicalProtocolsList.vue b/src/pages/newMedicalCard/components/MedicalProtocolsList.vue
new file mode 100644
index 0000000..004b2cf
--- /dev/null
+++ b/src/pages/newMedicalCard/components/MedicalProtocolsList.vue
@@ -0,0 +1,29 @@
+<template lang="pug">
+  .list-wrapper.h-full.flex.gap-y-1.flex-col
+    .p-4.rounded.background
+      q-btn(
+        color="primary",
+        size="16px",
+        label="Создать осмотр",
+        no-caps,
+        icon="add",
+        :style="{width: '100%'}"
+      )
+    .p-4.rounded.background.h-full
+      base-select
+</template>
+
+<script>
+import BaseSelect from "@/components/base/BaseSelect.vue";
+export default {
+  name: "MedicalProtocolsList",
+  components: { BaseSelect },
+};
+</script>
+
+<style lang="sass" scoped>
+.list-wrapper
+  width: 19.6%
+.background
+  background-color: var(--default-white)
+</style>
diff --git a/src/pages/newMedicalCard/components/MedicalProtocolsWrapper.vue b/src/pages/newMedicalCard/components/MedicalProtocolsWrapper.vue
new file mode 100644
index 0000000..b7d254d
--- /dev/null
+++ b/src/pages/newMedicalCard/components/MedicalProtocolsWrapper.vue
@@ -0,0 +1,18 @@
+<template lang="pug">
+  .wrapper
+    medical-protocols-list
+</template>
+
+<script>
+import MedicalProtocolsList from "@/pages/newMedicalCard/components/MedicalProtocolsList.vue";
+export default {
+  name: "MedicalProtocolsWrapper",
+  components: { MedicalProtocolsList },
+};
+</script>
+
+<style lang="sass" scoped>
+.wrapper
+  width: 83.2%
+  overflow-y: auto
+</style>
diff --git a/src/pages/newMedicalCard/utils/medicalConfig.js b/src/pages/newMedicalCard/utils/medicalConfig.js
index 1d83454..3c2e2a0 100644
--- a/src/pages/newMedicalCard/utils/medicalConfig.js
+++ b/src/pages/newMedicalCard/utils/medicalConfig.js
@@ -322,7 +322,7 @@ export const baseInfoMenu = [
   {
     title: "Протоколы первичного осмотра",
     id: "protocols",
-    component: "Protocols",
+    component: "MedicalProtocolsWrapper",
   },
   {
     title: "Доверенное лицо",

From a5acc67c10a29131c9784c0399dd029d8a248040 Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Fri, 28 Apr 2023 13:56:51 +0300
Subject: [PATCH 2/2] =?UTF-8?q?WIP=20=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B0=20=D1=81=D0=B5=D0=BB=D0=B5=D0=BA=D1=82=20=D0=B8=20=D0=BA?=
 =?UTF-8?q?=D0=BD=D0=BE=D0=BF=D0=BA=D1=83=20=D1=81=D0=BE=D1=80=D1=82=D0=B8?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=BA=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/base/BaseSelect.vue            |  3 +-
 .../components/MedicalProtocolsList.vue       | 39 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/components/base/BaseSelect.vue b/src/components/base/BaseSelect.vue
index abd7492..b498f6a 100644
--- a/src/components/base/BaseSelect.vue
+++ b/src/components/base/BaseSelect.vue
@@ -1,6 +1,6 @@
 <template lang="pug">
   .flex.flex-col.gap-y-2
-    base-input-container(:label="label")
+    base-input-container(:label="label", :style="{width: width}")
       q-select(
         v-model="value",
         :options="items",
@@ -74,6 +74,7 @@ export default {
     disable: Boolean,
     label: String,
     readonly: Boolean,
+    width: String,
   },
   emits: ["update:modelValue"],
   data() {
diff --git a/src/pages/newMedicalCard/components/MedicalProtocolsList.vue b/src/pages/newMedicalCard/components/MedicalProtocolsList.vue
index 004b2cf..5c07cc4 100644
--- a/src/pages/newMedicalCard/components/MedicalProtocolsList.vue
+++ b/src/pages/newMedicalCard/components/MedicalProtocolsList.vue
@@ -9,8 +9,16 @@
         icon="add",
         :style="{width: '100%'}"
       )
-    .p-4.rounded.background.h-full
-      base-select
+    .p-4.rounded.background.h-full.w-full
+      .flex.w-full
+        base-select(:style="{flex: 1}")
+        q-btn.ml-2(
+          icon="sort"
+          :style="{width: '40px', height: '40px'}",
+          padding="0"
+          :class="sortingClass"
+          @click="invertSorting"
+        )
 </template>
 
 <script>
@@ -18,6 +26,27 @@ import BaseSelect from "@/components/base/BaseSelect.vue";
 export default {
   name: "MedicalProtocolsList",
   components: { BaseSelect },
+  data() {
+    return {
+      sorting: false,
+    };
+  },
+  computed: {
+    sortingClass() {
+      return this.sorting
+        ? {
+            "sort-icon-active": true,
+          }
+        : {
+            "sort-icon-default": true,
+          };
+    },
+  },
+  methods: {
+    invertSorting() {
+      this.sorting = !this.sorting;
+    },
+  },
 };
 </script>
 
@@ -26,4 +55,10 @@ export default {
   width: 19.6%
 .background
   background-color: var(--default-white)
+.sort-icon-default
+  background-color: var(--bg-light-grey)
+  color: var(--font-grey-color)
+.sort-icon-active
+  background-color: var(--btn-blue-color)
+  color: var(--default-white)
 </style>