From 82c39aac886ab1c18e2e69f8df4cefe0921b5311 Mon Sep 17 00:00:00 2001
From: well <Well.heor@yandex.ru>
Date: Tue, 26 Nov 2024 14:39:50 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=D0=A1=D0=BA=D1=80=D1=8B=D1=82=D1=8B=D0=B5?=
 =?UTF-8?q?=20=D1=84=D1=80=D0=B0=D0=BA=D1=86=D0=B8=D0=B8=20-=20fix=20?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 l2-frontend/src/construct/FractionsGroup.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/l2-frontend/src/construct/FractionsGroup.vue b/l2-frontend/src/construct/FractionsGroup.vue
index 4a7d6f0fd5..04eec3ba45 100644
--- a/l2-frontend/src/construct/FractionsGroup.vue
+++ b/l2-frontend/src/construct/FractionsGroup.vue
@@ -356,7 +356,7 @@ const changeTube = async () => {
     background-image: linear-gradient(#6c7a89, #56616c);
     color: #fff;
     cursor: not-allowed;
-    line-height: 28px !important;
+    line-height: 26px !important;
   }
 }
 ::v-deep .hide-treeselect .vue-treeselect {

From 58d648c9a17e72d2dd69a5a6aaf074526ce72706 Mon Sep 17 00:00:00 2001
From: well <Well.heor@yandex.ru>
Date: Tue, 26 Nov 2024 14:43:55 +0800
Subject: [PATCH 2/7] fix

---
 l2-frontend/src/construct/FractionsGroup.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/l2-frontend/src/construct/FractionsGroup.vue b/l2-frontend/src/construct/FractionsGroup.vue
index 04eec3ba45..2a785e54a7 100644
--- a/l2-frontend/src/construct/FractionsGroup.vue
+++ b/l2-frontend/src/construct/FractionsGroup.vue
@@ -361,7 +361,7 @@ const changeTube = async () => {
 }
 ::v-deep .hide-treeselect .vue-treeselect {
   &__placeholder {
-    line-height: 28px !important;
+    line-height: 26px !important;
   }
 }
 

From 86e699f31d510829d70cb4a1e9bdca0eab284a94 Mon Sep 17 00:00:00 2001
From: well <Well.heor@yandex.ru>
Date: Tue, 26 Nov 2024 15:06:39 +0800
Subject: [PATCH 3/7] fix

---
 l2-frontend/src/construct/FractionsGroup.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/l2-frontend/src/construct/FractionsGroup.vue b/l2-frontend/src/construct/FractionsGroup.vue
index 2a785e54a7..37d95fdbbd 100644
--- a/l2-frontend/src/construct/FractionsGroup.vue
+++ b/l2-frontend/src/construct/FractionsGroup.vue
@@ -9,7 +9,7 @@
       </div>
       <button
         v-tippy
-        class="height-button-change-tube"
+        class="height-button-change-tube btn"
         title="Изменить пробирку"
         :disabled="selectedTubeTypeId===-1"
         @click="changeTube()"
@@ -310,7 +310,7 @@ const changeTube = async () => {
   border: 1px solid #AAB2BD;
   border-radius: 4px;
   padding: 3px 2px;
-  margin: 0px 1px;
+  margin: 0 1px;
 }
 .transparent-button:hover {
   background-color: #434a54;
@@ -393,5 +393,7 @@ const changeTube = async () => {
 
 .height-button-change-tube {
   height: 26px;
+  padding: 0 2px;
+  border-radius: 4px;
 }
 </style>

From 7b212c88aac8a04a09c87354f9228696f25b13e8 Mon Sep 17 00:00:00 2001
From: well <Well.heor@yandex.ru>
Date: Tue, 26 Nov 2024 15:09:09 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=D0=9F=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA?=
 =?UTF-8?q?=D0=B0=20=D0=BD=D0=B0=20=D0=BF=D1=83=D1=81=D1=82=D0=BE=D0=B5=20?=
 =?UTF-8?q?=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B8=D1=80=D0=BA=D0=B8=20=D0=BD=D0=B0=20=D1=84?=
 =?UTF-8?q?=D1=80=D0=BE=D0=BD=D1=82=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 l2-frontend/src/construct/FractionsGroup.vue | 22 +++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/l2-frontend/src/construct/FractionsGroup.vue b/l2-frontend/src/construct/FractionsGroup.vue
index 37d95fdbbd..7d6860594b 100644
--- a/l2-frontend/src/construct/FractionsGroup.vue
+++ b/l2-frontend/src/construct/FractionsGroup.vue
@@ -11,7 +11,7 @@
         v-tippy
         class="height-button-change-tube btn"
         title="Изменить пробирку"
-        :disabled="selectedTubeTypeId===-1"
+        :disabled="!selectedTubeTypeId"
         @click="changeTube()"
       >
         Изменить
@@ -254,16 +254,18 @@ const addFraction = () => {
   }
 };
 
-const selectedTubeTypeId = ref(-1);
+const selectedTubeTypeId = ref(null);
 
 const changeTube = async () => {
-  const fractionsIds = props.tube.fractions.map(t => t.id);
-  await api('construct/laboratory/change-tube-for-fractions', {
-    oldTube: props.tube.id,
-    newTube: selectedTubeTypeId.value,
-    fractionsIds,
-  });
-  emit('changeTube');
+  if (selectedTubeTypeId.value) {
+    const fractionsIds = props.tube.fractions.map(t => t.id);
+    await api('construct/laboratory/change-tube-for-fractions', {
+      oldTube: props.tube.id,
+      newTube: selectedTubeTypeId.value,
+      fractionsIds,
+    });
+    emit('changeTube');
+  }
 };
 </script>
 
@@ -393,7 +395,7 @@ const changeTube = async () => {
 
 .height-button-change-tube {
   height: 26px;
-  padding: 0 2px;
+  padding: 0 6px;
   border-radius: 4px;
 }
 </style>

From 8ee5ac361efe27c125e771f9768ed95d22a25491 Mon Sep 17 00:00:00 2001
From: well <Well.heor@yandex.ru>
Date: Tue, 26 Nov 2024 15:12:22 +0800
Subject: [PATCH 5/7] fix

---
 l2-frontend/src/construct/FractionsGroup.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/l2-frontend/src/construct/FractionsGroup.vue b/l2-frontend/src/construct/FractionsGroup.vue
index 7d6860594b..d068f91e8a 100644
--- a/l2-frontend/src/construct/FractionsGroup.vue
+++ b/l2-frontend/src/construct/FractionsGroup.vue
@@ -265,6 +265,8 @@ const changeTube = async () => {
       fractionsIds,
     });
     emit('changeTube');
+  } else {
+    root.$emit('msg', 'error', 'Пробирка не выбрана');
   }
 };
 </script>

From cb3cbb96c709a1d04f0b4b97c759a4f9a6fc0611 Mon Sep 17 00:00:00 2001
From: well <Well.heor@yandex.ru>
Date: Tue, 26 Nov 2024 15:15:26 +0800
Subject: [PATCH 6/7] fix backend

---
 api/construct/views.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/api/construct/views.py b/api/construct/views.py
index 0ab55344a4..51bd3db887 100644
--- a/api/construct/views.py
+++ b/api/construct/views.py
@@ -82,6 +82,8 @@ def change_tube_for_fractions(request):
     fractions_id = request_data.get("fractionsIds")
     old_tube = request_data.get("oldTube")
     new_tube = request_data.get("newTube")
+    if not new_tube:
+        return JsonResponse({"ok": False, "message": "Не выбрана пробирка"})
     result = Fractions.change_relation_tube(fractions_id, old_tube, new_tube)
     if result:
         Log.log(

From c15e066b2ec0cdf095e3f7c51fed0ca63450540a Mon Sep 17 00:00:00 2001
From: well <Well.heor@yandex.ru>
Date: Wed, 27 Nov 2024 15:30:24 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=D0=9F=D0=BE=D0=B8=D1=81=D0=BA=20=D0=BF?=
 =?UTF-8?q?=D0=BE=20=D0=B2=D0=BD=D1=83=D1=82=D1=80=D0=B5=D0=BD=D0=BD=D0=B5?=
 =?UTF-8?q?=D0=BC=D1=83=20=D0=BA=D0=BE=D0=B4=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 directory/models.py                               | 1 +
 l2-frontend/src/construct/ConstructLaboratory.vue | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/directory/models.py b/directory/models.py
index f06a3530a1..277b83fb7e 100644
--- a/directory/models.py
+++ b/directory/models.py
@@ -582,6 +582,7 @@ def as_json(research):
             "pk": research.pk,
             "title": research.title,
             "internalCode": research.internal_code,
+            "code": research.code,
             "hide": research.hide,
             "order": research.sort_weight,
         }
diff --git a/l2-frontend/src/construct/ConstructLaboratory.vue b/l2-frontend/src/construct/ConstructLaboratory.vue
index 6649fb0ab5..077af09189 100644
--- a/l2-frontend/src/construct/ConstructLaboratory.vue
+++ b/l2-frontend/src/construct/ConstructLaboratory.vue
@@ -123,7 +123,8 @@ const filteredResearchTubes = computed(() => researchTubes.value.map(tubes => {
   const result = tubes.researches.filter(research => {
     const researchTitle = research.title.toLowerCase();
     const researchInternalCode = research.internalCode.toLowerCase();
-    return researchTitle.includes(searchTerm) || researchInternalCode.includes(searchTerm);
+    const researchCode = research.code.toLowerCase();
+    return researchTitle.includes(searchTerm) || researchInternalCode.includes(searchTerm) || researchCode.includes(searchTerm);
   });
   if (result) {
     return { researches: result, tubes: tubes.tubes };