fix добавления емкостей

mikhailprivalov · Dec 16, 2024 · e711bb6 · e711bb6
1 parent 8cf2713
commit e711bb6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/api/construct/views.py b/api/construct/views.py
@@ -118,7 +118,7 @@ def get_lab_ref_books(request):
     materials = LaboratoryMaterial.get_materials()
     subgroups = SubGroupPadrazdeleniye.get_subgroup_podrazdeleniye(request_data["departmentId"])
     variants = ResultVariants.get_all()
-    tubes = Tubes.get_all()
+    tubes = Tubes.get_all(True)
     relations_tubes = ReleationsFT.get_all_relation()
     result = {"units": units, "materials": materials, "subGroups": subgroups, "variants": variants, "tubes": tubes, "relations": relations_tubes}
     return JsonResponse({"result": result})

diff --git a/researches/models.py b/researches/models.py
@@ -62,11 +62,11 @@ def get_short_title(self):
         return pr
 
     @staticmethod
-    def get_all():
+    def get_all(pk_in_title=False):
         result = [
             {
                 "id": tube.pk,
-                "label": f"{tube.title} - tube.pk",
+                "label": tube.title if not pk_in_title else f"{tube.title} ({tube.pk})",
                 "color": tube.color,
             }
             for tube in Tubes.objects.all()