diff --git a/api/directions/views.py b/api/directions/views.py index 28b01f279b..97580240d1 100644 --- a/api/directions/views.py +++ b/api/directions/views.py @@ -543,14 +543,22 @@ def directions_history(request): if i[36] and req_status == 7: case_child_direction = Napravleniya.objects.values_list("pk", flat=True).filter(parent_case__id=i[2]) case_childs = Issledovaniya.objects.filter(napravleniye_id__in=case_child_direction) + step = 0 for csh in case_childs: ch_title = csh.research.short_title if csh.research.short_title else csh.research.title - child_researches_titles = f"{child_researches_titles} {ch_title}" + if step != 0: + child_researches_titles = f"{child_researches_titles}; {ch_title}" + else: + child_researches_titles = f"{ch_title}" + step += 1 if researches_titles: researches_titles = f'{researches_titles} | {i[5]}' + elif child_researches_titles: + researches_titles = f'{child_researches_titles} - {i[5]}' else: - researches_titles = f'{child_researches_titles} {i[5]}' + researches_titles = i[5] + child_researches_titles = "" status_val = 0 diff --git a/pyproject.toml b/pyproject.toml index f9fa2df43d..f1de5eeebf 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -72,7 +72,7 @@ beren = "0.7.1" transliterate = "1.10.2" imgkit = "1.2.3" astm = {git = "https://github.com/moodpulse/python-astm.git", rev = "v0.6"} -psycopg2-binary = "^2.9.4" +#psycopg2-binary = "^2.9.4" boto3 = "^1.26.157" prompt-toolkit = "^3.0.36" pdf2docx = "^0.5.6"