From 5875faa1e4e20460300350a6dcac232a4c552319 Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Tue, 12 Mar 2024 14:47:16 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=D0=9A=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=20"?=
 =?UTF-8?q?=D0=BE=D1=82=D0=BC=D0=B5=D0=BD=D0=B8=D1=82=D1=8C=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=BF=D0=B8=D1=81=D1=8C"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 l2-frontend/src/fields/AggregateAssignments.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/l2-frontend/src/fields/AggregateAssignments.vue b/l2-frontend/src/fields/AggregateAssignments.vue
index 0e488a4243..1d5d442216 100644
--- a/l2-frontend/src/fields/AggregateAssignments.vue
+++ b/l2-frontend/src/fields/AggregateAssignments.vue
@@ -100,10 +100,13 @@ const columns = ref([
     key: 'schedule_date',
     title: 'Расписание',
     align: 'center',
-    width: 100,
+    width: 150,
     renderBodyCell: ({ row }, h) => {
       if (row.schedule_date) {
-        return row.schedule_date;
+        return h('div', {}, [
+          h('p', {}, row.schedule_date),
+          h('button', { class: 'transparent-button transparent-button-small' }, 'Отменить запись'),
+        ]);
       }
       return h('div', { class: 'button' }, [
         h('button', {
@@ -217,6 +220,9 @@ onMounted(getAssignments);
     color: #FFF;
   }
 }
+.transparent-button-small {
+    padding: 0;
+}
 .table-body-cell-green {
   background: #a9cfbb !important;
 }

From 8885e82d4d23e68f1d0e2e62d2181bdfb02d1418 Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 13 Mar 2024 08:50:48 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81?=
 =?UTF-8?q?=20=D1=84=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/fields/AggregateAssignments.vue       | 107 +++++++++++-------
 1 file changed, 68 insertions(+), 39 deletions(-)

diff --git a/l2-frontend/src/fields/AggregateAssignments.vue b/l2-frontend/src/fields/AggregateAssignments.vue
index 1d5d442216..901043e684 100644
--- a/l2-frontend/src/fields/AggregateAssignments.vue
+++ b/l2-frontend/src/fields/AggregateAssignments.vue
@@ -48,7 +48,7 @@
 
 <script setup lang="ts">
 import {
-  computed, onMounted, ref,
+  computed, getCurrentInstance, onMounted, ref,
 } from 'vue';
 import {
   VeLocale,
@@ -76,15 +76,74 @@ const props = defineProps({
   },
 });
 
+const root = getCurrentInstance().proxy.$root;
+const store = useStore();
+
 const showSchedule = ref(false);
 const currentResearchPk = ref(null);
 const currentDirectionPk = ref(null);
+
 const openSchedule = (researchId, directionId) => {
   currentResearchPk.value = researchId;
   currentDirectionPk.value = directionId;
   showSchedule.value = true;
 };
 
+const pageSize = ref(30);
+const page = ref(1);
+const pageSizeOption = ref([30, 50, 100, 300]);
+const pageNumberChange = (number: number) => {
+  page.value = number;
+};
+const pageSizeChange = (size: number) => {
+  pageSize.value = size;
+};
+
+const cellStyleOption = {
+  bodyCellClass: ({ row }) => {
+    if (row.schedule_date) {
+      return 'table-body-cell-green';
+    }
+    return '';
+  },
+};
+
+const assignments = ref([]);
+
+const getAssignments = async () => {
+  await store.dispatch(actions.INC_LOADING);
+  const results = await api('stationar/get-assignments', { direction_id: props.direction });
+  await store.dispatch(actions.DEC_LOADING);
+  assignments.value = results.data;
+};
+
+const assignmentPagination = computed(() => assignments.value.slice(
+  (page.value - 1) * pageSize.value,
+  page.value * pageSize.value,
+));
+
+const slotFilled = () => {
+  getAssignments();
+};
+
+const cancelSlot = async (researchId) => {
+  await store.dispatch(actions.INC_LOADING);
+  const { ok, message } = await api('/schedule/cancel', {
+    cardId: props.cardPk,
+    id: '33',
+    serviceId: researchId,
+  });
+  await store.dispatch(actions.DEC_LOADING);
+  if (ok) {
+    root.$emit('msg', 'ok', 'Отменено');
+    await getAssignments();
+  } else {
+    root.$emit('msg', 'error', message);
+  }
+
+  await store.dispatch(actions.DEC_LOADING);
+};
+
 const columns = ref([
   {
     field: 'direction_id', key: 'direction_id', title: '№ напр.', width: 100,
@@ -105,7 +164,14 @@ const columns = ref([
       if (row.schedule_date) {
         return h('div', {}, [
           h('p', {}, row.schedule_date),
-          h('button', { class: 'transparent-button transparent-button-small' }, 'Отменить запись'),
+          h('button', {
+            class: 'transparent-button transparent-button-small',
+            on: {
+              click: () => {
+                cancelSlot(row.research_id[0]);
+              },
+            },
+          }, 'Отменить запись'),
         ]);
       }
       return h('div', { class: 'button' }, [
@@ -130,43 +196,6 @@ const columns = ref([
     field: 'who_confirm', key: 'who_confirm', title: 'ФИО подтвердившего', align: 'center', width: 200,
   },
 ]);
-const store = useStore();
-const pageSize = ref(30);
-const page = ref(1);
-const pageSizeOption = ref([30, 50, 100, 300]);
-const pageNumberChange = (number: number) => {
-  page.value = number;
-};
-const pageSizeChange = (size: number) => {
-  pageSize.value = size;
-};
-
-const cellStyleOption = {
-  bodyCellClass: ({ row }) => {
-    if (row.schedule_date) {
-      return 'table-body-cell-green';
-    }
-    return '';
-  },
-};
-
-const assignments = ref([]);
-
-const getAssignments = async () => {
-  await store.dispatch(actions.INC_LOADING);
-  const results = await api('stationar/get-assignments', { direction_id: props.direction });
-  await store.dispatch(actions.DEC_LOADING);
-  assignments.value = results.data;
-};
-
-const assignmentPagination = computed(() => assignments.value.slice(
-  (page.value - 1) * pageSize.value,
-  page.value * pageSize.value,
-));
-
-const slotFilled = () => {
-  getAssignments();
-};
 
 const printForm = () => {
   window.open(`/forms/pdf?type=107.03&&hosp_pk=${props.direction}`);

From e393c69f30979edae365495ded6e8a03a6f9a73a Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 13 Mar 2024 09:04:07 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=D0=9A=D0=BB=D1=8E=D1=87=D0=B8=20=D1=82?=
 =?UTF-8?q?=D0=B0=D0=B1=D0=BB=D0=B8=D1=86=D1=8B=20=D0=B2=20camelCase?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/stationar/stationar_func.py               | 24 ++++++++---------
 .../src/fields/AggregateAssignments.vue       | 26 +++++++++----------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/api/stationar/stationar_func.py b/api/stationar/stationar_func.py
index b25ff7de56..8b4992f62e 100644
--- a/api/stationar/stationar_func.py
+++ b/api/stationar/stationar_func.py
@@ -590,24 +590,24 @@ def get_assignments(direction_id: int):
         create_date = i.data_sozdaniya.strftime("%d.%m.%Y")
         research_title = f"{i.research_title}; "
         if assignment_tmp.get(i.napravlenie_id):
-            assignment_tmp[i.napravlenie_id]["research_id"].append(i.research_id)
-            assignment_tmp[i.napravlenie_id]["research_title"].append(research_title)
+            assignment_tmp[i.napravlenie_id]["researchId"].append(i.research_id)
+            assignment_tmp[i.napravlenie_id]["researchTitle"].append(research_title)
         else:
             assignment_tmp[i.napravlenie_id] = {
-                "direction_id": i.napravlenie_id,
-                "research_id": [i.research_id],
-                "research_title": [research_title],
-                "create_date": create_date,
-                "schedule_date": schedule_date,
-                "who_assigned": fio_assigned,
-                "time_confirmation": "",
-                "who_confirm": "",
+                "directionId": i.napravlenie_id,
+                "researchId": [i.research_id],
+                "researchTitle": [research_title],
+                "createDate": create_date,
+                "scheduleDate": schedule_date,
+                "whoAssigned": fio_assigned,
+                "timeConfirmation": "",
+                "whoConfirm": "",
             }
             if i.total_confirmed:
                 fio_confirm = shorten_fio(i.who_confirm)
                 time_confirmation = i.time_confirmation.astimezone(pytz.timezone(TIME_ZONE))
-                assignment_tmp[i.napravlenie_id]["time_confirmation"] = time_confirmation.strftime("%d.%m.%Y %H:%M")
-                assignment_tmp[i.napravlenie_id]["who_confirm"] = fio_confirm
+                assignment_tmp[i.napravlenie_id]["timeConfirmation"] = time_confirmation.strftime("%d.%m.%Y %H:%M")
+                assignment_tmp[i.napravlenie_id]["whoConfirm"] = fio_confirm
 
     result = [value for value in assignment_tmp.values()]
 
diff --git a/l2-frontend/src/fields/AggregateAssignments.vue b/l2-frontend/src/fields/AggregateAssignments.vue
index 901043e684..3d06a39e2c 100644
--- a/l2-frontend/src/fields/AggregateAssignments.vue
+++ b/l2-frontend/src/fields/AggregateAssignments.vue
@@ -101,7 +101,7 @@ const pageSizeChange = (size: number) => {
 
 const cellStyleOption = {
   bodyCellClass: ({ row }) => {
-    if (row.schedule_date) {
+    if (row.scheduleDate) {
       return 'table-body-cell-green';
     }
     return '';
@@ -146,29 +146,29 @@ const cancelSlot = async (researchId) => {
 
 const columns = ref([
   {
-    field: 'direction_id', key: 'direction_id', title: '№ напр.', width: 100,
+    field: 'directionId', key: 'directionId', title: '№ напр.', width: 100,
   },
   {
-    field: 'research_title', key: 'research_title', title: 'Медицинское вмешательство', align: 'left',
+    field: 'researchTitle', key: 'researchTitle', title: 'Медицинское вмешательство', align: 'left',
   },
   {
-    field: 'create_date', key: 'create_date', title: 'Дата назначения', align: 'center', width: 150,
+    field: 'createDate', key: 'createDate', title: 'Дата назначения', align: 'center', width: 150,
   },
   {
-    field: 'schedule_date',
-    key: 'schedule_date',
+    field: 'scheduleDate',
+    key: 'scheduleDate',
     title: 'Расписание',
     align: 'center',
     width: 150,
     renderBodyCell: ({ row }, h) => {
-      if (row.schedule_date) {
+      if (row.scheduleDate) {
         return h('div', {}, [
-          h('p', {}, row.schedule_date),
+          h('p', {}, row.scheduleDate),
           h('button', {
             class: 'transparent-button transparent-button-small',
             on: {
               click: () => {
-                cancelSlot(row.research_id[0]);
+                cancelSlot(row.researchId[0]);
               },
             },
           }, 'Отменить запись'),
@@ -179,7 +179,7 @@ const columns = ref([
           class: 'transparent-button',
           on: {
             click: () => {
-              openSchedule(row.research_id[0], row.direction_id);
+              openSchedule(row.researchId[0], row.directionId);
             },
           },
         }, 'Записать'),
@@ -187,13 +187,13 @@ const columns = ref([
     },
   },
   {
-    field: 'who_assigned', key: 'who_assigned', title: 'ФИО назначившего', align: 'center', width: 200,
+    field: 'whoAssigned', key: 'whoAssigned', title: 'ФИО назначившего', align: 'center', width: 200,
   },
   {
-    field: 'time_confirmation', key: 'time_confirmation', title: 'Дата и время подтверждения', align: 'center', width: 150,
+    field: 'timeConfirmation', key: 'timeConfirmation', title: 'Дата и время подтверждения', align: 'center', width: 150,
   },
   {
-    field: 'who_confirm', key: 'who_confirm', title: 'ФИО подтвердившего', align: 'center', width: 200,
+    field: 'whoConfirm', key: 'whoConfirm', title: 'ФИО подтвердившего', align: 'center', width: 200,
   },
 ]);
 

From 2f43dd66e7633148199256ecd8b3762be9201732 Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 13 Mar 2024 09:17:44 +0800
Subject: [PATCH 4/4] =?UTF-8?q?slotPlanId=20=D0=B4=D0=BB=D1=8F=20=D0=BE?=
 =?UTF-8?q?=D1=82=D0=BC=D0=B5=D0=BD=D1=8B=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81?=
 =?UTF-8?q?=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/stationar/stationar_func.py                 | 1 +
 l2-frontend/src/fields/AggregateAssignments.vue | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/api/stationar/stationar_func.py b/api/stationar/stationar_func.py
index 8b4992f62e..a2df430a9c 100644
--- a/api/stationar/stationar_func.py
+++ b/api/stationar/stationar_func.py
@@ -599,6 +599,7 @@ def get_assignments(direction_id: int):
                 "researchTitle": [research_title],
                 "createDate": create_date,
                 "scheduleDate": schedule_date,
+                "slotPlanId": i.slot_plan_id,
                 "whoAssigned": fio_assigned,
                 "timeConfirmation": "",
                 "whoConfirm": "",
diff --git a/l2-frontend/src/fields/AggregateAssignments.vue b/l2-frontend/src/fields/AggregateAssignments.vue
index 3d06a39e2c..7905e09e98 100644
--- a/l2-frontend/src/fields/AggregateAssignments.vue
+++ b/l2-frontend/src/fields/AggregateAssignments.vue
@@ -126,11 +126,11 @@ const slotFilled = () => {
   getAssignments();
 };
 
-const cancelSlot = async (researchId) => {
+const cancelSlot = async (researchId, slotPlanId) => {
   await store.dispatch(actions.INC_LOADING);
   const { ok, message } = await api('/schedule/cancel', {
     cardId: props.cardPk,
-    id: '33',
+    id: slotPlanId,
     serviceId: researchId,
   });
   await store.dispatch(actions.DEC_LOADING);
@@ -168,7 +168,7 @@ const columns = ref([
             class: 'transparent-button transparent-button-small',
             on: {
               click: () => {
-                cancelSlot(row.researchId[0]);
+                cancelSlot(row.researchId[0], row.slotPlanId);
               },
             },
           }, 'Отменить запись'),