From 03068f9ad4cc4f58d7fd38c576d4a21970c25f23 Mon Sep 17 00:00:00 2001
From: Shaelyn Tolkamp <46355612+tolkamps1@users.noreply.github.com>
Date: Thu, 5 Dec 2024 08:10:37 -0800
Subject: [PATCH] [Track-276] AS add responsible minister or responsible
 ministry (#2466)

---
 .../reports/anticipated_schedule_report.py    |  31 ++++++++++++++++--
 .../anticipated_schedule.docx                 | Bin 15997 -> 16068 bytes
 .../eaReferral/AnticipatedEAOSchedule.tsx     |  31 +++++++++++++-----
 3 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/epictrack-api/src/api/reports/anticipated_schedule_report.py b/epictrack-api/src/api/reports/anticipated_schedule_report.py
index f0116394d..3e327a819 100644
--- a/epictrack-api/src/api/reports/anticipated_schedule_report.py
+++ b/epictrack-api/src/api/reports/anticipated_schedule_report.py
@@ -60,7 +60,8 @@ def __init__(self, filters, color_intensity):
             "report_description",
             "anticipated_decision_date",
             "additional_info",
-            "ministry_name",
+            "responsible_minister",
+            "ministry",
             "referral_date",
             "eac_decision_by",
             "decision_by",
@@ -86,6 +87,7 @@ def _fetch_data(self, report_date):
         start_date = report_date + timedelta(days=-7)
         report_date = report_date.astimezone(timezone('US/Pacific'))
         staff_decision_by = aliased(Staff)
+        staff_minister = aliased(Staff)
 
         next_pecp_query = self._get_next_pcp_query(start_date)
         referral_event_query = self._get_referral_event_query(start_date)
@@ -95,6 +97,7 @@ def _fetch_data(self, report_date):
             exclude_phase_names = self.filters["exclude"]
         formatted_phase_name = self._get_formatted_phase_name()
         ea_type_column = self._get_ea_type_column(formatted_phase_name)
+        responsible_minister_column = self._get_responsible_minister_column(staff_minister)
 
         current_app.logger.debug(f"Executing query for {self.report_title} report")
         results_qry = (
@@ -128,6 +131,7 @@ def _fetch_data(self, report_date):
             .join(Region, Region.id == Project.region_id_env)
             .join(EAAct, EAAct.id == Work.ea_act_id)
             .join(Ministry)
+            .outerjoin(staff_minister, Ministry.minister_id == staff_minister.id)
             .outerjoin(latest_status_updates, latest_status_updates.c.work_id == Work.id)
             .outerjoin(
                 staff_decision_by,  # Join staff alias
@@ -274,7 +278,14 @@ def _fetch_data(self, report_date):
                     Event.anticipated_date + func.cast(func.concat(Event.number_of_days, " DAYS"), INTERVAL)
                 ).label("anticipated_decision_date"),
                 latest_status_updates.c.description.label("additional_info"),
-                Ministry.name.label("ministry_name"),
+                case(
+                    (
+                        Ministry.name != "Not Applicable",
+                        Ministry.name
+                    ),
+                    else_=""
+                ).label("ministry"),
+                responsible_minister_column,
                 (
                     Event.anticipated_date + func.cast(func.concat(Event.number_of_days, " DAYS"), INTERVAL)
                 ).label("referral_date"),
@@ -431,6 +442,22 @@ def _get_formatted_phase_name(self):
             else_=func.concat(func.substring(PhaseCode.name, r"\((.*?)\)"), " Amendment"),
         ).label("formatted_phase_name")
 
+    def _get_responsible_minister_column(self, staff_minister):
+        """Returns an expression for the responsible minister"""
+        return case(
+                (
+                    Ministry.name != "Not Applicable",
+                    case(
+                        (
+                            func.concat(staff_minister.first_name, staff_minister.last_name) != "",
+                            func.concat(staff_minister.first_name, " ", staff_minister.last_name)
+                        ),
+                        else_=""
+                    )
+                ),
+                else_=None,
+        ).label("responsible_minister")
+
     def _get_next_pcp_query(self, start_date):
         """Create and return the subquery for next PCP event based on start date"""
         pecp_configuration_ids = (
diff --git a/epictrack-api/src/api/reports/report_templates/anticipated_schedule.docx b/epictrack-api/src/api/reports/report_templates/anticipated_schedule.docx
index 25609c891a813fc4995f6e5a9c0d63cddad7da4f..8c74d711333065e4aae1c1d92833f92bbd53097d 100644
GIT binary patch
delta 4453
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

delta 4493
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
Vi)=-npsT<}C{kghno#`h{69=^0mlFU

diff --git a/epictrack-web/src/components/reports/eaReferral/AnticipatedEAOSchedule.tsx b/epictrack-web/src/components/reports/eaReferral/AnticipatedEAOSchedule.tsx
index f20f4577c..f50f912fa 100644
--- a/epictrack-web/src/components/reports/eaReferral/AnticipatedEAOSchedule.tsx
+++ b/epictrack-web/src/components/reports/eaReferral/AnticipatedEAOSchedule.tsx
@@ -293,14 +293,29 @@ export default function AnticipatedEAOSchedule() {
                                       <TableCell>EA Type</TableCell>
                                       <TableCell>{item["ea_type"]}</TableCell>
                                     </TableRow>
-                                    <TableRow>
-                                      <TableCell>
-                                        Responsible Minister
-                                      </TableCell>
-                                      <TableCell>
-                                        {item["ministry_name"]}
-                                      </TableCell>
-                                    </TableRow>
+                                    {item["ministry"] && (
+                                      <TableRow>
+                                        {item["responsible_minister"] ? (
+                                          <>
+                                            <TableCell>
+                                              Responsible Minister
+                                            </TableCell>
+                                            <TableCell>
+                                              {item["responsible_minister"]}
+                                            </TableCell>
+                                          </>
+                                        ) : (
+                                          <>
+                                            <TableCell>
+                                              Responsible Ministry
+                                            </TableCell>
+                                            <TableCell>
+                                              {item["ministry"]}
+                                            </TableCell>
+                                          </>
+                                        )}
+                                      </TableRow>
+                                    )}
                                     <TableRow>
                                       <TableCell>
                                         Decision to be made by