From 53af5a49329644d0f64c17bab2039c11a687e502 Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 16:08:13 +0800
Subject: [PATCH 01/26] upload result v1

---
 api/laboratory/forms100.py                         |  4 ++++
 l2-frontend/src/components/UploadFile.vue          |  2 +-
 l2-frontend/src/components/types-and-forms-file.ts | 14 ++++++++++++--
 l2-frontend/src/ui-cards/LaboratoryHeader.vue      |  3 +++
 4 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 api/laboratory/forms100.py

diff --git a/api/laboratory/forms100.py b/api/laboratory/forms100.py
new file mode 100644
index 0000000000..9ac40d0dd1
--- /dev/null
+++ b/api/laboratory/forms100.py
@@ -0,0 +1,4 @@
+
+def form_01(request):
+    print('fdfd')
+    return
diff --git a/l2-frontend/src/components/UploadFile.vue b/l2-frontend/src/components/UploadFile.vue
index bc722d52ef..9eea5e58a5 100644
--- a/l2-frontend/src/components/UploadFile.vue
+++ b/l2-frontend/src/components/UploadFile.vue
@@ -141,7 +141,7 @@ const selectedForm = ref(null);
 
 const changeType = () => {
   fileFilter.value = `.${selectedType.value}`;
-  currentFileForms.value = getForms(String(selectedType.value), props.formsFile);
+  currentFileForms.value = getForms(String(selectedType.value), props.formsFile, props.uploadResult);
   if (currentFileForms.value.length > 0) {
     selectedForm.value = currentFileForms.value[0].id;
   }
diff --git a/l2-frontend/src/components/types-and-forms-file.ts b/l2-frontend/src/components/types-and-forms-file.ts
index 1d251fefa6..e738afec21 100644
--- a/l2-frontend/src/components/types-and-forms-file.ts
+++ b/l2-frontend/src/components/types-and-forms-file.ts
@@ -11,6 +11,7 @@ export interface formsFile {
 export default function typesAndForms() {
   const fileTypes = ref({
     XLSX: { id: 'XLSX', label: 'XLSX' },
+    PDF: { id: 'PDF', label: 'PDF' },
   });
   // todo - сделать соотношение - расширение файла - и все виды accept фильтров {xlsx: '.xlx, .xlsx, ws-excel'}
   const getTypes = (types: string[]): typesFile[] => {
@@ -27,19 +28,28 @@ export default function typesAndForms() {
     return result;
   };
 
+  const isResult = ref([
+    'api.laboratory.forms100.form_01',
+  ]);
+
   /* (101.01) - 101 номер файла, 01 - номер функции в файле для обработки загруженного файла (см. parseFile) */
   const fileForms = ref({
     XLSX: {
       'api.contracts.forms100.form_01': { id: 'api.contracts.forms100.form_01', label: 'Загрузка цен по прайсу' },
     },
+    PDF: {
+      'api.laboratory.forms100.form_01': { id: 'api.laboratory.forms100.form_01', label: 'Загрузка PDF результата' },
+    },
   });
   // todo - режим UploadResult - получать по расширению файла - только функции связанные с сохранением результата (анализаторы)
   // todo - UploadResult + forms - получать только выбранные isResult функции
-  const getForms = (type: string, forms: string[] = []): formsFile[] => {
+  const getForms = (type: string, forms: string[] = [], onlyResult = false): formsFile[] => {
     let result: formsFile[] = [];
     if (forms && forms.length > 0) {
       for (const form of forms) {
-        if (fileForms.value[type][form]) {
+        if (!onlyResult && fileForms.value[type][form]) {
+          result.push(fileForms.value[type][form]);
+        } else if (onlyResult && isResult.value.includes(form)) {
           result.push(fileForms.value[type][form]);
         }
       }
diff --git a/l2-frontend/src/ui-cards/LaboratoryHeader.vue b/l2-frontend/src/ui-cards/LaboratoryHeader.vue
index ed65fd5a6b..3c9c474103 100644
--- a/l2-frontend/src/ui-cards/LaboratoryHeader.vue
+++ b/l2-frontend/src/ui-cards/LaboratoryHeader.vue
@@ -36,6 +36,7 @@
     <ul class="nav navbar-nav">
       <LoadFile />
     </ul>
+    <UploadFileModal title="Прикрепить результат" />
   </div>
 </template>
 
@@ -45,10 +46,12 @@ import LaboratorySelector from '@/ui-cards/LaboratorySelector.vue';
 import ExecutionList from '@/ui-cards/ExecutionList.vue';
 import LaboratoryJournal from '@/ui-cards/LaboratoryJournal.vue';
 import LaboratoryPrintResults from '@/ui-cards/LaboratoryPrintResults.vue';
+import UploadFileModal from "@/modals/UploadFileModal.vue";
 
 export default {
   name: 'LaboratoryHeader',
   components: {
+    UploadFileModal,
     LoadFile,
     LaboratorySelector,
     ExecutionList,

From 0ab79f88f1e3f0ab0531c3f81616748d170ca4a5 Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 16:13:47 +0800
Subject: [PATCH 02/26] upload result v2

---
 l2-frontend/src/components/types-and-forms-file.ts | 10 ++++++++--
 l2-frontend/src/ui-cards/LaboratoryHeader.vue      |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/l2-frontend/src/components/types-and-forms-file.ts b/l2-frontend/src/components/types-and-forms-file.ts
index e738afec21..9268d8fb3d 100644
--- a/l2-frontend/src/components/types-and-forms-file.ts
+++ b/l2-frontend/src/components/types-and-forms-file.ts
@@ -28,7 +28,7 @@ export default function typesAndForms() {
     return result;
   };
 
-  const isResult = ref([
+  const isResultFunc = ref([
     'api.laboratory.forms100.form_01',
   ]);
 
@@ -49,10 +49,16 @@ export default function typesAndForms() {
       for (const form of forms) {
         if (!onlyResult && fileForms.value[type][form]) {
           result.push(fileForms.value[type][form]);
-        } else if (onlyResult && isResult.value.includes(form)) {
+        } else if (onlyResult && isResultFunc.value.includes(form)) {
           result.push(fileForms.value[type][form]);
         }
       }
+    } else if (!forms && onlyResult) {
+      for (const func of isResultFunc.value) {
+        if (fileForms.value[type][func]) {
+          result.push(fileForms.value[type][func]);
+        }
+      }
     } else {
       result = Object.values(fileForms.value[type]);
     }
diff --git a/l2-frontend/src/ui-cards/LaboratoryHeader.vue b/l2-frontend/src/ui-cards/LaboratoryHeader.vue
index 3c9c474103..799468e6a5 100644
--- a/l2-frontend/src/ui-cards/LaboratoryHeader.vue
+++ b/l2-frontend/src/ui-cards/LaboratoryHeader.vue
@@ -36,7 +36,7 @@
     <ul class="nav navbar-nav">
       <LoadFile />
     </ul>
-    <UploadFileModal title="Прикрепить результат" />
+    <UploadFileModal title="Прикрепить результат" :types-file="['PDF']" :upload-result="true" />
   </div>
 </template>
 

From ec45efb4440694dae6a1a943e6bd49fcd3000b87 Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 16:44:31 +0800
Subject: [PATCH 03/26] upload result v3

---
 l2-frontend/src/components/UploadFile.vue          |  2 ++
 l2-frontend/src/components/types-and-forms-file.ts |  2 +-
 l2-frontend/src/ui-cards/LaboratoryHeader.vue      | 12 ++++++++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/l2-frontend/src/components/UploadFile.vue b/l2-frontend/src/components/UploadFile.vue
index 9eea5e58a5..dcb3d02541 100644
--- a/l2-frontend/src/components/UploadFile.vue
+++ b/l2-frontend/src/components/UploadFile.vue
@@ -144,6 +144,8 @@ const changeType = () => {
   currentFileForms.value = getForms(String(selectedType.value), props.formsFile, props.uploadResult);
   if (currentFileForms.value.length > 0) {
     selectedForm.value = currentFileForms.value[0].id;
+  } else {
+    selectedForm.value = null;
   }
 };
 
diff --git a/l2-frontend/src/components/types-and-forms-file.ts b/l2-frontend/src/components/types-and-forms-file.ts
index 9268d8fb3d..0fbcc495cd 100644
--- a/l2-frontend/src/components/types-and-forms-file.ts
+++ b/l2-frontend/src/components/types-and-forms-file.ts
@@ -43,7 +43,7 @@ export default function typesAndForms() {
   });
   // todo - режим UploadResult - получать по расширению файла - только функции связанные с сохранением результата (анализаторы)
   // todo - UploadResult + forms - получать только выбранные isResult функции
-  const getForms = (type: string, forms: string[] = [], onlyResult = false): formsFile[] => {
+  const getForms = (type: string, forms: string[] = null, onlyResult = false): formsFile[] => {
     let result: formsFile[] = [];
     if (forms && forms.length > 0) {
       for (const form of forms) {
diff --git a/l2-frontend/src/ui-cards/LaboratoryHeader.vue b/l2-frontend/src/ui-cards/LaboratoryHeader.vue
index 799468e6a5..742023dea8 100644
--- a/l2-frontend/src/ui-cards/LaboratoryHeader.vue
+++ b/l2-frontend/src/ui-cards/LaboratoryHeader.vue
@@ -36,7 +36,15 @@
     <ul class="nav navbar-nav">
       <LoadFile />
     </ul>
-    <UploadFileModal title="Прикрепить результат" :types-file="['PDF']" :upload-result="true" />
+    <ul class="nav navbar-nav">
+      <li>
+        <UploadFileModal
+          title="Прикрепить результат"
+          :types-file="['PDF', 'XLSX']"
+          :upload-result="true"
+        />
+      </li>
+    </ul>
   </div>
 </template>
 
@@ -46,7 +54,7 @@ import LaboratorySelector from '@/ui-cards/LaboratorySelector.vue';
 import ExecutionList from '@/ui-cards/ExecutionList.vue';
 import LaboratoryJournal from '@/ui-cards/LaboratoryJournal.vue';
 import LaboratoryPrintResults from '@/ui-cards/LaboratoryPrintResults.vue';
-import UploadFileModal from "@/modals/UploadFileModal.vue";
+import UploadFileModal from '@/modals/UploadFileModal.vue';
 
 export default {
   name: 'LaboratoryHeader',

From 5ee7d72a11ea330d7cde3aba20f359560291adaa Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 16:49:42 +0800
Subject: [PATCH 04/26] upload result v4

---
 l2-frontend/src/components/types-and-forms-file.ts | 2 +-
 l2-frontend/src/ui-cards/LaboratoryHeader.vue      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/l2-frontend/src/components/types-and-forms-file.ts b/l2-frontend/src/components/types-and-forms-file.ts
index 0fbcc495cd..c1be0dc2e0 100644
--- a/l2-frontend/src/components/types-and-forms-file.ts
+++ b/l2-frontend/src/components/types-and-forms-file.ts
@@ -38,7 +38,7 @@ export default function typesAndForms() {
       'api.contracts.forms100.form_01': { id: 'api.contracts.forms100.form_01', label: 'Загрузка цен по прайсу' },
     },
     PDF: {
-      'api.laboratory.forms100.form_01': { id: 'api.laboratory.forms100.form_01', label: 'Загрузка PDF результата' },
+      'api.laboratory.forms100.form_01': { id: 'api.laboratory.forms100.form_01', label: 'Загрузка PDF результата из QMS' },
     },
   });
   // todo - режим UploadResult - получать по расширению файла - только функции связанные с сохранением результата (анализаторы)
diff --git a/l2-frontend/src/ui-cards/LaboratoryHeader.vue b/l2-frontend/src/ui-cards/LaboratoryHeader.vue
index 742023dea8..16bf9cf26a 100644
--- a/l2-frontend/src/ui-cards/LaboratoryHeader.vue
+++ b/l2-frontend/src/ui-cards/LaboratoryHeader.vue
@@ -40,7 +40,8 @@
       <li>
         <UploadFileModal
           title="Прикрепить результат"
-          :types-file="['PDF', 'XLSX']"
+          :types-file="['PDF']"
+          :forms-file="['api.laboratory.forms100.form_01']"
           :upload-result="true"
         />
       </li>

From ae06c0918444551c61bef1131b49244cde679197 Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 16:51:13 +0800
Subject: [PATCH 05/26] upload qms result v1

---
 api/laboratory/forms100.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/laboratory/forms100.py b/api/laboratory/forms100.py
index 9ac40d0dd1..c4e8979c21 100644
--- a/api/laboratory/forms100.py
+++ b/api/laboratory/forms100.py
@@ -1,4 +1,4 @@
 
 def form_01(request):
     print('fdfd')
-    return
+    return {"ok": True, "result": [], "message": ""}

From 6fae05365c5b36fce33ef74fec6ea47e21dba0ad Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 16:53:43 +0800
Subject: [PATCH 06/26] upload qms result v1.1

---
 api/laboratory/forms100.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/laboratory/forms100.py b/api/laboratory/forms100.py
index c4e8979c21..71ba2b849c 100644
--- a/api/laboratory/forms100.py
+++ b/api/laboratory/forms100.py
@@ -1,4 +1,4 @@
 
-def form_01(request):
+def form_01(request_data):
     print('fdfd')
     return {"ok": True, "result": [], "message": ""}

From 6b53b0b516b2cf1d5a0e1e5a139b9c2153b1ccc1 Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 16:54:35 +0800
Subject: [PATCH 07/26] todo complete

---
 l2-frontend/src/components/UploadFile.vue          | 1 -
 l2-frontend/src/components/types-and-forms-file.ts | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/l2-frontend/src/components/UploadFile.vue b/l2-frontend/src/components/UploadFile.vue
index dcb3d02541..d2ae4e148d 100644
--- a/l2-frontend/src/components/UploadFile.vue
+++ b/l2-frontend/src/components/UploadFile.vue
@@ -77,7 +77,6 @@
 <script setup lang="ts">
 // todo - slot на вывод результата, для удобного вывода каждому)
 // todo - дефолтный вывод результата - таблица, строчка
-// todo - уведомление о успешной загрузке файла
 import {
   getCurrentInstance, onMounted, PropType, ref, watch,
 } from 'vue';
diff --git a/l2-frontend/src/components/types-and-forms-file.ts b/l2-frontend/src/components/types-and-forms-file.ts
index c1be0dc2e0..10e207b349 100644
--- a/l2-frontend/src/components/types-and-forms-file.ts
+++ b/l2-frontend/src/components/types-and-forms-file.ts
@@ -41,8 +41,7 @@ export default function typesAndForms() {
       'api.laboratory.forms100.form_01': { id: 'api.laboratory.forms100.form_01', label: 'Загрузка PDF результата из QMS' },
     },
   });
-  // todo - режим UploadResult - получать по расширению файла - только функции связанные с сохранением результата (анализаторы)
-  // todo - UploadResult + forms - получать только выбранные isResult функции
+  // todo - UploadResult + forms - получать только выбранные isResult функции (протестировать)
   const getForms = (type: string, forms: string[] = null, onlyResult = false): formsFile[] => {
     let result: formsFile[] = [];
     if (forms && forms.length > 0) {

From 8d4142891ff0c2ee3668022e85438973adac5726 Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 17:08:43 +0800
Subject: [PATCH 08/26] style and tag upload file

---
 l2-frontend/src/modals/UploadFileModal.vue    | 11 ++++++++--
 l2-frontend/src/ui-cards/LaboratoryHeader.vue | 20 +++++++++++--------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/l2-frontend/src/modals/UploadFileModal.vue b/l2-frontend/src/modals/UploadFileModal.vue
index 8a208710d2..f86022b23e 100644
--- a/l2-frontend/src/modals/UploadFileModal.vue
+++ b/l2-frontend/src/modals/UploadFileModal.vue
@@ -1,5 +1,7 @@
 <template>
-  <div>
+  <component
+    :is="tag"
+  >
     <slot>
       <a
         class="pointer"
@@ -44,7 +46,7 @@
         </div>
       </div>
     </Modal>
-  </div>
+  </component>
 </template>
 
 <script setup lang="ts">
@@ -60,6 +62,11 @@ const props = defineProps({
     type: String,
     required: false,
   },
+  tag: {
+    type: String,
+    default: 'div',
+    required: false,
+  },
   typesFile: {
     type: Array as PropType<string[]>,
     required: false,
diff --git a/l2-frontend/src/ui-cards/LaboratoryHeader.vue b/l2-frontend/src/ui-cards/LaboratoryHeader.vue
index 16bf9cf26a..ff6d2ff6a5 100644
--- a/l2-frontend/src/ui-cards/LaboratoryHeader.vue
+++ b/l2-frontend/src/ui-cards/LaboratoryHeader.vue
@@ -37,14 +37,13 @@
       <LoadFile />
     </ul>
     <ul class="nav navbar-nav">
-      <li>
-        <UploadFileModal
-          title="Прикрепить результат"
-          :types-file="['PDF']"
-          :forms-file="['api.laboratory.forms100.form_01']"
-          :upload-result="true"
-        />
-      </li>
+      <UploadFileModal
+        tag="li"
+        title="Прикрепить результат"
+        :types-file="['PDF']"
+        :forms-file="['api.laboratory.forms100.form_01']"
+        :upload-result="true"
+      />
     </ul>
   </div>
 </template>
@@ -92,4 +91,9 @@ export default {
       background: #049372 !important;
       border: none !important;
   }
+
+  .nav-upload-file {
+    padding: 8px 15px;
+  }
+
 </style>

From e38d2d2e6375fb6abcb003413934497ef585890a Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 17:22:45 +0800
Subject: [PATCH 09/26] allowed v1

---
 l2-frontend/src/components/UploadFile.vue          | 6 ++++++
 l2-frontend/src/components/types-and-forms-file.ts | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/l2-frontend/src/components/UploadFile.vue b/l2-frontend/src/components/UploadFile.vue
index d2ae4e148d..83ac938336 100644
--- a/l2-frontend/src/components/UploadFile.vue
+++ b/l2-frontend/src/components/UploadFile.vue
@@ -78,6 +78,7 @@
 // todo - slot на вывод результата, для удобного вывода каждому)
 // todo - дефолтный вывод результата - таблица, строчка
 import {
+  computed,
   getCurrentInstance, onMounted, PropType, ref, watch,
 } from 'vue';
 import Treeselect from '@riophae/vue-treeselect';
@@ -93,6 +94,11 @@ import typesAndForms, { formsFile, typesFile } from './types-and-forms-file';
 const { getTypes, getForms } = typesAndForms();
 
 const store = useStore();
+
+const allowedFormsForOrganization = computed(() => {
+  return store.getters.modules.l2_allowed_forms;
+});
+
 const root = getCurrentInstance().proxy.$root;
 const props = defineProps({
   typesFile: {
diff --git a/l2-frontend/src/components/types-and-forms-file.ts b/l2-frontend/src/components/types-and-forms-file.ts
index 10e207b349..eb4cf2365d 100644
--- a/l2-frontend/src/components/types-and-forms-file.ts
+++ b/l2-frontend/src/components/types-and-forms-file.ts
@@ -42,8 +42,11 @@ export default function typesAndForms() {
     },
   });
   // todo - UploadResult + forms - получать только выбранные isResult функции (протестировать)
-  const getForms = (type: string, forms: string[] = null, onlyResult = false): formsFile[] => {
+  const getForms = (type: string, forms: string[] = null, onlyResult = false, allowedForms: string[] = null): formsFile[] => {
     let result: formsFile[] = [];
+    if (!allowedForms) {
+      return result;
+    }
     if (forms && forms.length > 0) {
       for (const form of forms) {
         if (!onlyResult && fileForms.value[type][form]) {

From cc9e4141601ef8b155a3f4afe04427e8e20b20db Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 17:27:21 +0800
Subject: [PATCH 10/26] appconf params

---
 appconf/manager.py                        | 1 +
 l2-frontend/src/components/UploadFile.vue | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/appconf/manager.py b/appconf/manager.py
index a96d2cba40..56b0816d41 100644
--- a/appconf/manager.py
+++ b/appconf/manager.py
@@ -191,6 +191,7 @@ def l2_modules() -> dict:
                     "code_price",
                     "all_service",
                     "show_barcode_button_in_direction_history",
+                    "allowed_forms_file"
                 ]
             },
             "consults_module": SettingManager.get("consults_module", default='false', default_type='b'),
diff --git a/l2-frontend/src/components/UploadFile.vue b/l2-frontend/src/components/UploadFile.vue
index 83ac938336..41150701f8 100644
--- a/l2-frontend/src/components/UploadFile.vue
+++ b/l2-frontend/src/components/UploadFile.vue
@@ -96,7 +96,7 @@ const { getTypes, getForms } = typesAndForms();
 const store = useStore();
 
 const allowedFormsForOrganization = computed(() => {
-  return store.getters.modules.l2_allowed_forms;
+  return store.getters.modules.allowed_forms_file;
 });
 
 const root = getCurrentInstance().proxy.$root;
@@ -146,7 +146,8 @@ const selectedForm = ref(null);
 
 const changeType = () => {
   fileFilter.value = `.${selectedType.value}`;
-  currentFileForms.value = getForms(String(selectedType.value), props.formsFile, props.uploadResult);
+  currentFileForms.value = getForms(String(selectedType.value), props.formsFile, props.uploadResult,
+    allowedFormsForOrganization.value);
   if (currentFileForms.value.length > 0) {
     selectedForm.value = currentFileForms.value[0].id;
   } else {

From 51fa68209d40ede3086dc1de7ac4f50cfd9c14cb Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 17:27:59 +0800
Subject: [PATCH 11/26] fix

---
 l2-frontend/src/components/UploadFile.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/l2-frontend/src/components/UploadFile.vue b/l2-frontend/src/components/UploadFile.vue
index 41150701f8..927d6d54bc 100644
--- a/l2-frontend/src/components/UploadFile.vue
+++ b/l2-frontend/src/components/UploadFile.vue
@@ -95,9 +95,7 @@ const { getTypes, getForms } = typesAndForms();
 
 const store = useStore();
 
-const allowedFormsForOrganization = computed(() => {
-  return store.getters.modules.allowed_forms_file;
-});
+const allowedFormsForOrganization = computed(() => store.getters.modules.l2_allowed_forms_file);
 
 const root = getCurrentInstance().proxy.$root;
 const props = defineProps({
@@ -146,8 +144,12 @@ const selectedForm = ref(null);
 
 const changeType = () => {
   fileFilter.value = `.${selectedType.value}`;
-  currentFileForms.value = getForms(String(selectedType.value), props.formsFile, props.uploadResult,
-    allowedFormsForOrganization.value);
+  currentFileForms.value = getForms(
+    String(selectedType.value),
+    props.formsFile,
+    props.uploadResult,
+    allowedFormsForOrganization.value,
+  );
   if (currentFileForms.value.length > 0) {
     selectedForm.value = currentFileForms.value[0].id;
   } else {

From 4b5f134d0680a5a3e86718d6b1568b121cd623b5 Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 17:36:30 +0800
Subject: [PATCH 12/26] fix

---
 l2-frontend/src/components/UploadFile.vue          | 4 ++--
 l2-frontend/src/components/types-and-forms-file.ts | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/l2-frontend/src/components/UploadFile.vue b/l2-frontend/src/components/UploadFile.vue
index 927d6d54bc..261f1937b5 100644
--- a/l2-frontend/src/components/UploadFile.vue
+++ b/l2-frontend/src/components/UploadFile.vue
@@ -95,7 +95,7 @@ const { getTypes, getForms } = typesAndForms();
 
 const store = useStore();
 
-const allowedFormsForOrganization = computed(() => store.getters.modules.l2_allowed_forms_file);
+const allowedFormsForOrganization = computed(() => store.getters.modules.l2_allowed_forms_file.trim());
 
 const root = getCurrentInstance().proxy.$root;
 const props = defineProps({
@@ -148,7 +148,7 @@ const changeType = () => {
     String(selectedType.value),
     props.formsFile,
     props.uploadResult,
-    allowedFormsForOrganization.value,
+    allowedFormsForOrganization.value.split(', '),
   );
   if (currentFileForms.value.length > 0) {
     selectedForm.value = currentFileForms.value[0].id;
diff --git a/l2-frontend/src/components/types-and-forms-file.ts b/l2-frontend/src/components/types-and-forms-file.ts
index eb4cf2365d..bdce5c82a8 100644
--- a/l2-frontend/src/components/types-and-forms-file.ts
+++ b/l2-frontend/src/components/types-and-forms-file.ts
@@ -44,6 +44,7 @@ export default function typesAndForms() {
   // todo - UploadResult + forms - получать только выбранные isResult функции (протестировать)
   const getForms = (type: string, forms: string[] = null, onlyResult = false, allowedForms: string[] = null): formsFile[] => {
     let result: formsFile[] = [];
+    console.log(allowedForms);
     if (!allowedForms) {
       return result;
     }

From b81460819bcf37cd13c9cb22bbc8698a36f0f57b Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 17:49:22 +0800
Subject: [PATCH 13/26] fix

---
 .../src/components/types-and-forms-file.ts    | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/l2-frontend/src/components/types-and-forms-file.ts b/l2-frontend/src/components/types-and-forms-file.ts
index bdce5c82a8..02df5deb84 100644
--- a/l2-frontend/src/components/types-and-forms-file.ts
+++ b/l2-frontend/src/components/types-and-forms-file.ts
@@ -28,7 +28,7 @@ export default function typesAndForms() {
     return result;
   };
 
-  const isResultFunc = ref([
+  const isResultForm = ref([
     'api.laboratory.forms100.form_01',
   ]);
 
@@ -43,27 +43,33 @@ export default function typesAndForms() {
   });
   // todo - UploadResult + forms - получать только выбранные isResult функции (протестировать)
   const getForms = (type: string, forms: string[] = null, onlyResult = false, allowedForms: string[] = null): formsFile[] => {
-    let result: formsFile[] = [];
+    /* onlyResult - Выдаст только формы находящиеся в isResultForm, allowedForms - выдаст только те функции которые разрешены */
+    const result: formsFile[] = [];
     console.log(allowedForms);
     if (!allowedForms) {
       return result;
     }
     if (forms && forms.length > 0) {
       for (const form of forms) {
-        if (!onlyResult && fileForms.value[type][form]) {
+        if (!onlyResult && fileForms.value[type][form] && allowedForms.includes(form)) {
           result.push(fileForms.value[type][form]);
-        } else if (onlyResult && isResultFunc.value.includes(form)) {
+        } else if (onlyResult && isResultForm.value.includes(form) && allowedForms.includes(form)) {
           result.push(fileForms.value[type][form]);
         }
       }
     } else if (!forms && onlyResult) {
-      for (const func of isResultFunc.value) {
-        if (fileForms.value[type][func]) {
-          result.push(fileForms.value[type][func]);
+      for (const form of isResultForm.value) {
+        if (fileForms.value[type][form] && allowedForms.includes(form)) {
+          result.push(fileForms.value[type][form]);
         }
       }
     } else {
-      result = Object.values(fileForms.value[type]);
+      const tmpResult = Object.values(fileForms.value[type]);
+      for (const form of tmpResult) {
+        if (allowedForms.includes(String(form))) {
+          result.push(fileForms.value[type][form]);
+        }
+      }
     }
     return result;
   };

From 0c8b9619ca302d2c3cbfbf6e59fd4146d5b44350 Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 17:54:02 +0800
Subject: [PATCH 14/26] fix

---
 l2-frontend/src/components/types-and-forms-file.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/l2-frontend/src/components/types-and-forms-file.ts b/l2-frontend/src/components/types-and-forms-file.ts
index 02df5deb84..637bb1f399 100644
--- a/l2-frontend/src/components/types-and-forms-file.ts
+++ b/l2-frontend/src/components/types-and-forms-file.ts
@@ -45,7 +45,6 @@ export default function typesAndForms() {
   const getForms = (type: string, forms: string[] = null, onlyResult = false, allowedForms: string[] = null): formsFile[] => {
     /* onlyResult - Выдаст только формы находящиеся в isResultForm, allowedForms - выдаст только те функции которые разрешены */
     const result: formsFile[] = [];
-    console.log(allowedForms);
     if (!allowedForms) {
       return result;
     }

From bf9f224e4062e728b7647f774a33e662da81281c Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 17:58:29 +0800
Subject: [PATCH 15/26] fix

---
 api/laboratory/forms100.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/api/laboratory/forms100.py b/api/laboratory/forms100.py
index 71ba2b849c..4a56785bc6 100644
--- a/api/laboratory/forms100.py
+++ b/api/laboratory/forms100.py
@@ -1,4 +1,2 @@
-
 def form_01(request_data):
-    print('fdfd')
     return {"ok": True, "result": [], "message": ""}

From 8acab7b156daa243cdc0507b22b349dd1bc1161d Mon Sep 17 00:00:00 2001
From: Well <72241044+Wellheor1@users.noreply.github.com>
Date: Wed, 3 Jul 2024 17:58:47 +0800
Subject: [PATCH 16/26] Update appconf/manager.py

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
---
 appconf/manager.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appconf/manager.py b/appconf/manager.py
index 56b0816d41..6c928d191b 100644
--- a/appconf/manager.py
+++ b/appconf/manager.py
@@ -191,7 +191,7 @@ def l2_modules() -> dict:
                     "code_price",
                     "all_service",
                     "show_barcode_button_in_direction_history",
-                    "allowed_forms_file"
+                    "allowed_forms_file",
                 ]
             },
             "consults_module": SettingManager.get("consults_module", default='false', default_type='b'),

From 52ca146b9cb1ad4880c4ce18eb3874f752e0e7a7 Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 18:21:19 +0800
Subject: [PATCH 17/26] comment

---
 api/laboratory/forms100.py                         | 2 ++
 l2-frontend/src/components/types-and-forms-file.ts | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/api/laboratory/forms100.py b/api/laboratory/forms100.py
index 4a56785bc6..2c8575e612 100644
--- a/api/laboratory/forms100.py
+++ b/api/laboratory/forms100.py
@@ -1,2 +1,4 @@
 def form_01(request_data):
+    file = request_data.get("file")
+    print(file)
     return {"ok": True, "result": [], "message": ""}
diff --git a/l2-frontend/src/components/types-and-forms-file.ts b/l2-frontend/src/components/types-and-forms-file.ts
index 637bb1f399..b36371f888 100644
--- a/l2-frontend/src/components/types-and-forms-file.ts
+++ b/l2-frontend/src/components/types-and-forms-file.ts
@@ -48,7 +48,7 @@ export default function typesAndForms() {
     if (!allowedForms) {
       return result;
     }
-    if (forms && forms.length > 0) {
+    if (forms && forms.length > 0) { // Если переданы формы
       for (const form of forms) {
         if (!onlyResult && fileForms.value[type][form] && allowedForms.includes(form)) {
           result.push(fileForms.value[type][form]);
@@ -56,13 +56,13 @@ export default function typesAndForms() {
           result.push(fileForms.value[type][form]);
         }
       }
-    } else if (!forms && onlyResult) {
+    } else if (!forms && onlyResult) { // если нет форм, но, есть "только результат"
       for (const form of isResultForm.value) {
         if (fileForms.value[type][form] && allowedForms.includes(form)) {
           result.push(fileForms.value[type][form]);
         }
       }
-    } else {
+    } else { // Если нет форм и "только результат" - выдать всё разрешенное
       const tmpResult = Object.values(fileForms.value[type]);
       for (const form of tmpResult) {
         if (allowedForms.includes(String(form))) {

From 85c78ca2fb7f342938a0fd8cf4a7cacce5123b30 Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 19:17:49 +0800
Subject: [PATCH 18/26] fix

---
 .../src/pages/LaboratoryResults/ResultsForm.vue        |  7 +++++++
 l2-frontend/src/ui-cards/LaboratoryHeader.vue          | 10 ----------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/l2-frontend/src/pages/LaboratoryResults/ResultsForm.vue b/l2-frontend/src/pages/LaboratoryResults/ResultsForm.vue
index 6d468c6722..4300c6344e 100644
--- a/l2-frontend/src/pages/LaboratoryResults/ResultsForm.vue
+++ b/l2-frontend/src/pages/LaboratoryResults/ResultsForm.vue
@@ -72,6 +72,11 @@
         <thead>
           <tr>
             <td colspan="5">
+              <UploadFileModal
+                title="Прикрепить результат"
+                :types-file="['PDF']"
+                :forms-file="['api.laboratory.forms100.form_01']"
+              />
               <strong>
                 {{ research.title }}
               </strong>
@@ -320,10 +325,12 @@ import Ref from '@/pages/LaboratoryResults/Ref.vue';
 import TextInputField from '@/pages/LaboratoryResults/TextInputField.vue';
 import BloodTypeField from '@/pages/LaboratoryResults/BloodTypeField.vue';
 import RefSettings from '@/pages/LaboratoryResults/RefSettings.vue';
+import UploadFileModal from '@/modals/UploadFileModal.vue';
 
 export default {
   name: 'ResultsForm',
   components: {
+    UploadFileModal,
     RefSettings,
     TextInputField,
     BloodTypeField,
diff --git a/l2-frontend/src/ui-cards/LaboratoryHeader.vue b/l2-frontend/src/ui-cards/LaboratoryHeader.vue
index ff6d2ff6a5..5487f742b1 100644
--- a/l2-frontend/src/ui-cards/LaboratoryHeader.vue
+++ b/l2-frontend/src/ui-cards/LaboratoryHeader.vue
@@ -36,15 +36,6 @@
     <ul class="nav navbar-nav">
       <LoadFile />
     </ul>
-    <ul class="nav navbar-nav">
-      <UploadFileModal
-        tag="li"
-        title="Прикрепить результат"
-        :types-file="['PDF']"
-        :forms-file="['api.laboratory.forms100.form_01']"
-        :upload-result="true"
-      />
-    </ul>
   </div>
 </template>
 
@@ -59,7 +50,6 @@ import UploadFileModal from '@/modals/UploadFileModal.vue';
 export default {
   name: 'LaboratoryHeader',
   components: {
-    UploadFileModal,
     LoadFile,
     LaboratorySelector,
     ExecutionList,

From 6bcc532313db77e5664964f92042e7eb88aec981 Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 19:22:10 +0800
Subject: [PATCH 19/26] fix

---
 api/laboratory/forms100.py                              | 3 +++
 l2-frontend/src/pages/LaboratoryResults/ResultsForm.vue | 1 +
 2 files changed, 4 insertions(+)

diff --git a/api/laboratory/forms100.py b/api/laboratory/forms100.py
index 2c8575e612..b54e62f92a 100644
--- a/api/laboratory/forms100.py
+++ b/api/laboratory/forms100.py
@@ -1,4 +1,7 @@
 def form_01(request_data):
+    file = request_data.get("file")
+    issledovanie_id = request_data.get("entity_id")
     file = request_data.get("file")
     print(file)
+    print(issledovanie_id)
     return {"ok": True, "result": [], "message": ""}
diff --git a/l2-frontend/src/pages/LaboratoryResults/ResultsForm.vue b/l2-frontend/src/pages/LaboratoryResults/ResultsForm.vue
index 4300c6344e..789477bcad 100644
--- a/l2-frontend/src/pages/LaboratoryResults/ResultsForm.vue
+++ b/l2-frontend/src/pages/LaboratoryResults/ResultsForm.vue
@@ -76,6 +76,7 @@
                 title="Прикрепить результат"
                 :types-file="['PDF']"
                 :forms-file="['api.laboratory.forms100.form_01']"
+                :entity-id="pk"
               />
               <strong>
                 {{ research.title }}

From 9538bc43f863f046a81d8d4ca7844ae0ab93d06c Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 19:25:26 +0800
Subject: [PATCH 20/26] fix

---
 api/laboratory/forms100.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/api/laboratory/forms100.py b/api/laboratory/forms100.py
index b54e62f92a..aec5865de7 100644
--- a/api/laboratory/forms100.py
+++ b/api/laboratory/forms100.py
@@ -1,7 +1,13 @@
+from directions.models import Issledovaniya
+
+
 def form_01(request_data):
     file = request_data.get("file")
     issledovanie_id = request_data.get("entity_id")
     file = request_data.get("file")
+    issledovanie: Issledovaniya = Issledovaniya.objects.filter(pk=issledovanie_id).select_related('research').first()
     print(file)
     print(issledovanie_id)
+    print(issledovanie)
+    print(issledovanie.research.title)
     return {"ok": True, "result": [], "message": ""}

From 30ee2b2b0e90a3956228b510d9491d362c7efe10 Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 19:31:32 +0800
Subject: [PATCH 21/26] fix

---
 api/laboratory/forms100.py | 6 +-----
 api/parse_file/views.py    | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/api/laboratory/forms100.py b/api/laboratory/forms100.py
index aec5865de7..a530cc68e3 100644
--- a/api/laboratory/forms100.py
+++ b/api/laboratory/forms100.py
@@ -1,13 +1,9 @@
 from directions.models import Issledovaniya
 
-
 def form_01(request_data):
     file = request_data.get("file")
     issledovanie_id = request_data.get("entity_id")
     file = request_data.get("file")
     issledovanie: Issledovaniya = Issledovaniya.objects.filter(pk=issledovanie_id).select_related('research').first()
-    print(file)
-    print(issledovanie_id)
-    print(issledovanie)
-    print(issledovanie.research.title)
+    Issledovaniya.add
     return {"ok": True, "result": [], "message": ""}
diff --git a/api/parse_file/views.py b/api/parse_file/views.py
index 6021885b23..9565155e68 100644
--- a/api/parse_file/views.py
+++ b/api/parse_file/views.py
@@ -901,7 +901,7 @@ def get_parts_fio(fio_data):
         patronymic_data = fio_data[2]
     return family_data, name_data, patronymic_data
 
-
+@login_required()
 def upload_file(request):
     # todo - Логирование загрузки файлов
     try:

From 944df0bbdd7323e9cd0a349f51372e59e432c93f Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 19:32:27 +0800
Subject: [PATCH 22/26] fix

---
 api/laboratory/forms100.py | 1 +
 api/parse_file/views.py    | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/api/laboratory/forms100.py b/api/laboratory/forms100.py
index a530cc68e3..4f4c4aedf8 100644
--- a/api/laboratory/forms100.py
+++ b/api/laboratory/forms100.py
@@ -1,5 +1,6 @@
 from directions.models import Issledovaniya
 
+
 def form_01(request_data):
     file = request_data.get("file")
     issledovanie_id = request_data.get("entity_id")
diff --git a/api/parse_file/views.py b/api/parse_file/views.py
index 9565155e68..4572474318 100644
--- a/api/parse_file/views.py
+++ b/api/parse_file/views.py
@@ -643,10 +643,10 @@ def find_and_replace(text, symbol1, symbol2):
     result = []
     for i in range(len(text)):
         if text[i] == symbol1:
-            current_text = text[0:i] + symbol2 + text[i + 1 :]
+            current_text = text[0:i] + symbol2 + text[i + 1:]
             result.append(current_text)
         elif text[i] == symbol2:
-            current_text = text[0:i] + symbol1 + text[i + 1 :]
+            current_text = text[0:i] + symbol1 + text[i + 1:]
             result.append(current_text)
     return result
 
@@ -728,13 +728,13 @@ def load_equipment(request):
             result = re.findall(search_result, data_from_cell)
             if len(result) > 0:
                 num_row = cell.row
-                result_data = ws[f"A{num_row + 1}:M{num_row+10}"]
+                result_data = ws[f"A{num_row + 1}:M{num_row + 10}"]
                 result_list = [[j.value for j in k] for k in result_data]
 
             result = re.findall(search_tubes_number, data_from_cell)
             if len(result) > 0:
                 num_row = cell.row
-                tube_data = ws[f"A{num_row + 1}:M{num_row+10}"]
+                tube_data = ws[f"A{num_row + 1}:M{num_row + 10}"]
                 tube_list = [[j.value for j in k] for k in tube_data]
 
             if cell.value == "Тест:":
@@ -901,6 +901,7 @@ def get_parts_fio(fio_data):
         patronymic_data = fio_data[2]
     return family_data, name_data, patronymic_data
 
+
 @login_required()
 def upload_file(request):
     # todo - Логирование загрузки файлов

From 125af1ef80fabc8343b3a1905753b783833130fd Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 20:05:26 +0800
Subject: [PATCH 23/26] upload pdf

---
 api/directions/views.py    |  1 +
 api/laboratory/forms100.py | 19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/api/directions/views.py b/api/directions/views.py
index 9353952cfc..95f6953550 100644
--- a/api/directions/views.py
+++ b/api/directions/views.py
@@ -4346,6 +4346,7 @@ def send_to_l2vi(request):
 @login_required
 @group_required("Врач параклиники", "Врач консультаций", "Заполнение мониторингов", "Свидетельство о смерти-доступ")
 def add_file(request):
+    print(request.FILES)
     file = request.FILES.get('file')
     form = request.FILES['form'].read()
     request_data = json.loads(form)
diff --git a/api/laboratory/forms100.py b/api/laboratory/forms100.py
index 4f4c4aedf8..05aa9a8cc8 100644
--- a/api/laboratory/forms100.py
+++ b/api/laboratory/forms100.py
@@ -1,10 +1,23 @@
-from directions.models import Issledovaniya
+from django.http import HttpRequest
+
+from directions.models import Issledovaniya, IssledovaniyaFiles
 
 
 def form_01(request_data):
     file = request_data.get("file")
+    user = request_data.get('user')
     issledovanie_id = request_data.get("entity_id")
-    file = request_data.get("file")
     issledovanie: Issledovaniya = Issledovaniya.objects.filter(pk=issledovanie_id).select_related('research').first()
-    Issledovaniya.add
+    if issledovanie:
+        iss_files = IssledovaniyaFiles.objects.filter(issledovaniye_id=issledovanie.pk)
+        if file and iss_files.count() >= 5:
+            return {"ok": False, "result": [], "message": "Вы добавили слишком много файлов в одну заявку"}
+
+        if file and file.size > 5242880:
+            return {"ok": False, "result": [], "message": "Файл слишком большой"}
+
+        iss = IssledovaniyaFiles(issledovaniye_id=issledovanie.pk, uploaded_file=file, who_add_files=user.doctorprofile)
+        iss.save()
+    else:
+        return {"ok": False, "result": [], "message": "Нет такого исследования"}
     return {"ok": True, "result": [], "message": ""}

From e47395fef66d49144786e86a40c6e617456e31bd Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 20:09:14 +0800
Subject: [PATCH 24/26] ifx

---
 api/directions/views.py    | 1 -
 api/laboratory/forms100.py | 2 --
 2 files changed, 3 deletions(-)

diff --git a/api/directions/views.py b/api/directions/views.py
index 95f6953550..9353952cfc 100644
--- a/api/directions/views.py
+++ b/api/directions/views.py
@@ -4346,7 +4346,6 @@ def send_to_l2vi(request):
 @login_required
 @group_required("Врач параклиники", "Врач консультаций", "Заполнение мониторингов", "Свидетельство о смерти-доступ")
 def add_file(request):
-    print(request.FILES)
     file = request.FILES.get('file')
     form = request.FILES['form'].read()
     request_data = json.loads(form)
diff --git a/api/laboratory/forms100.py b/api/laboratory/forms100.py
index 05aa9a8cc8..3ed533eafd 100644
--- a/api/laboratory/forms100.py
+++ b/api/laboratory/forms100.py
@@ -1,5 +1,3 @@
-from django.http import HttpRequest
-
 from directions.models import Issledovaniya, IssledovaniyaFiles
 
 

From 0454d16cdefd8b769798d521c08d2b8b24bbfd44 Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 20:30:35 +0800
Subject: [PATCH 25/26] v-if enabled_add_files

---
 api/laboratory/views.py                                 | 1 +
 l2-frontend/src/pages/LaboratoryResults/ResultsForm.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/api/laboratory/views.py b/api/laboratory/views.py
index bdcb817f96..4d5bcd66fa 100644
--- a/api/laboratory/views.py
+++ b/api/laboratory/views.py
@@ -379,6 +379,7 @@ def form(request):
         "allow_reset_confirm": iss.allow_reset_confirm(request.user),
         "research": {
             "title": research.title,
+            "enabled_add_files": research.enabled_add_files,
             "can_comment": research.can_lab_result_comment,
             "no_units_and_ref": research.no_units_and_ref,
             "co_executor_mode": research.co_executor_mode or 0,
diff --git a/l2-frontend/src/pages/LaboratoryResults/ResultsForm.vue b/l2-frontend/src/pages/LaboratoryResults/ResultsForm.vue
index 789477bcad..41f0559865 100644
--- a/l2-frontend/src/pages/LaboratoryResults/ResultsForm.vue
+++ b/l2-frontend/src/pages/LaboratoryResults/ResultsForm.vue
@@ -73,6 +73,7 @@
           <tr>
             <td colspan="5">
               <UploadFileModal
+                v-if="research.enabled_add_files"
                 title="Прикрепить результат"
                 :types-file="['PDF']"
                 :forms-file="['api.laboratory.forms100.form_01']"

From cb43183fc2b8d3bc29809bc8289672c668ebaa5e Mon Sep 17 00:00:00 2001
From: Well <Well.heor@yandex.ru>
Date: Wed, 3 Jul 2024 20:34:27 +0800
Subject: [PATCH 26/26] fix

---
 api/parse_file/views.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/parse_file/views.py b/api/parse_file/views.py
index 4572474318..d6d73312ed 100644
--- a/api/parse_file/views.py
+++ b/api/parse_file/views.py
@@ -643,10 +643,10 @@ def find_and_replace(text, symbol1, symbol2):
     result = []
     for i in range(len(text)):
         if text[i] == symbol1:
-            current_text = text[0:i] + symbol2 + text[i + 1:]
+            current_text = text[0:i] + symbol2 + text[i + 1 :]
             result.append(current_text)
         elif text[i] == symbol2:
-            current_text = text[0:i] + symbol1 + text[i + 1:]
+            current_text = text[0:i] + symbol1 + text[i + 1 :]
             result.append(current_text)
     return result
 
@@ -728,13 +728,13 @@ def load_equipment(request):
             result = re.findall(search_result, data_from_cell)
             if len(result) > 0:
                 num_row = cell.row
-                result_data = ws[f"A{num_row + 1}:M{num_row + 10}"]
+                result_data = ws[f"A{num_row + 1}:M{num_row+10}"]
                 result_list = [[j.value for j in k] for k in result_data]
 
             result = re.findall(search_tubes_number, data_from_cell)
             if len(result) > 0:
                 num_row = cell.row
-                tube_data = ws[f"A{num_row + 1}:M{num_row + 10}"]
+                tube_data = ws[f"A{num_row + 1}:M{num_row+10}"]
                 tube_list = [[j.value for j in k] for k in tube_data]
 
             if cell.value == "Тест:":