[Track-278-2 ]Update AS to not use work_title (#2463)

bcgov · Dec 2, 2024 · b41c6a8 · b41c6a8
1 parent ff51a5c
commit b41c6a8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/epictrack-api/src/api/reports/anticipated_schedule_report.py b/epictrack-api/src/api/reports/anticipated_schedule_report.py
@@ -69,7 +69,7 @@ def __init__(self, filters, color_intensity):
             "event_name",
             "notes",
             "next_pecp_number_of_days",
-            "work_title",
+            "amendment_title",
             "work_type_id"
         ]
         group_by = "phase_name"
@@ -240,7 +240,16 @@ def _fetch_data(self, report_date):
                 Event.id.label("event_id"),
                 Work.id.label("work_id"),
                 Work.work_type_id.label("work_type_id"),
-                Work.title.label("work_title"),
+                case(
+                        (
+                            and_(
+                                Work.simple_title != "",
+                                Work.simple_title.is_not(None),
+                            ),
+                            func.concat(Project.name, " - ", Work.simple_title, " - Amendment")
+                        ),
+                        else_=func.concat(Project.name, " - Amendment")
+                ).label("amendment_title"),
                 PhaseCode.name.label("phase_name"),
                 latest_status_updates.c.posted_date.label("date_updated"),
                 Project.name.label("project_name"),

diff --git a/epictrack-api/src/api/reports/report_templates/anticipated_schedule.docx b/epictrack-api/src/api/reports/report_templates/anticipated_schedule.docx