[Track-747] Add JCA work to reports, required overage responsiblity

epictrack-api/src/api/insights/median_phase_overage_by_worktype_insight.py

@@ -57,7 +57,7 @@ def fetch_data(self, filters: List = None, staff_id: int = None, is_underage_tog
             or_(
                 WorkPhase.legislated.is_(True),
                 and_(
-                    WorkType.id == WorkTypeEnum.AMENDMENT.value,
+                    or_(WorkType.id == WorkTypeEnum.AMENDMENT.value, WorkType.id == WorkTypeEnum.JOINT_COMPLEX_AMENDMENT.value),
                     WorkPhase.visibility == PhaseVisibilityEnum.REGULAR,
                 ),
             ),

epictrack-api/src/api/insights/overage_by_responsibility.py

@@ -60,7 +60,7 @@ def fetch_data(self, filters: List = None, staff_id: int = None, is_underage_tog
             or_(
                 WorkPhase.legislated.is_(True),
                 and_(
-                    WorkType.id == WorkTypeEnum.AMENDMENT.value,
+                    or_(WorkType.id == WorkTypeEnum.AMENDMENT.value, WorkType.id == WorkTypeEnum.JOINT_COMPLEX_AMENDMENT.value),
                     WorkPhase.visibility == PhaseVisibilityEnum.REGULAR,
                 ),
             ),

epictrack-api/src/api/insights/percent_phase_overage_insight.py

@@ -73,7 +73,7 @@ def fetch_data(self, filters: List = None, staff_id: int = None, is_underage_tog
             or_(
                 WorkPhase.legislated.is_(True),
                 and_(
-                    WorkType.id == WorkTypeEnum.AMENDMENT.value,
+                    or_(WorkType.id == WorkTypeEnum.AMENDMENT.value, WorkType.id == WorkTypeEnum.JOINT_COMPLEX_AMENDMENT.value),
                     WorkPhase.visibility == PhaseVisibilityEnum.REGULAR,
                 ),
             ),

epictrack-api/src/api/insights/phase_overage_insight.py

@@ -62,7 +62,7 @@ def fetch_data(
             or_(
                 WorkPhase.legislated.is_(True),
                 and_(
-                    WorkType.id == WorkTypeEnum.AMENDMENT.value,
+                    or_(WorkType.id == WorkTypeEnum.AMENDMENT.value, WorkType.id == WorkTypeEnum.JOINT_COMPLEX_AMENDMENT.value),
                     WorkPhase.visibility == PhaseVisibilityEnum.REGULAR,
                 ),
             ),

epictrack-api/src/api/insights/utils.py

@@ -75,6 +75,7 @@ def get_total_days_subquery(ext_subq):
             or_(
                 WorkPhase.legislated.is_(True),
                 WorkType.id == WorkTypeEnum.AMENDMENT.value,
+                WorkType.id == WorkTypeEnum.JOINT_COMPLEX_AMENDMENT.value
             ),
         )
         .join(Work, WorkPhase.work_id == Work.id)
@@ -157,7 +158,8 @@ def get_days_taken_subquery(sus_subq):
             WorkPhase.is_deleted.is_(False),
             or_(
                 WorkPhase.legislated.is_(True),
-                WorkType.id == WorkTypeEnum.AMENDMENT.value
+                WorkType.id == WorkTypeEnum.AMENDMENT.value,
+                WorkType.id == WorkTypeEnum.JOINT_COMPLEX_AMENDMENT.value
             ),
         )
         .outerjoin(start_event_date_subq, start_event_date_subq.c.work_phase_id == WorkPhase.id)
@@ -193,7 +195,8 @@ def get_days_left_subquery(sus_subq, total_days_subq, work_subq, days_taken_subq
             WorkPhase.is_deleted.is_(False),
             or_(
                 WorkPhase.legislated.is_(True),
-                WorkType.id == WorkTypeEnum.AMENDMENT.value
+                WorkType.id == WorkTypeEnum.AMENDMENT.value,
+                WorkType.id == WorkTypeEnum.JOINT_COMPLEX_AMENDMENT.value
             ),
         )
         .join(Work, WorkPhase.work_id == Work.id)
@@ -222,7 +225,8 @@ def get_work_subquery():
             WorkPhase.is_deleted.is_(False),
             or_(
                 WorkPhase.legislated.is_(True),
-                WorkType.id == WorkTypeEnum.AMENDMENT.value
+                WorkType.id == WorkTypeEnum.AMENDMENT.value,
+                WorkType.id == WorkTypeEnum.JOINT_COMPLEX_AMENDMENT.value
             ),
         )
         .join(Work, WorkPhase.work_id == Work.id)

epictrack-api/src/api/reports/anticipated_schedule_report.py

@@ -327,7 +327,8 @@ def _build_filters(self, report_date: datetime, include_first_phase: bool, next_
                     EventConfiguration.event_type_id == EventTypeEnum.CEAO_DECISION.value
                 ),
                 and_(
-                    Work.work_type_id == WorkTypeEnum.AMENDMENT.value,
+                    or_(Work.work_type_id == WorkTypeEnum.AMENDMENT.value,
+                        Work.work_type_id == WorkTypeEnum.JOINT_COMPLEX_AMENDMENT.value),
                     EventConfiguration.event_category_id == EventCategoryEnum.DECISION.value,
                     EventConfiguration.name != "Delegation of Amendment Decision",
                     EventConfiguration.event_type_id.in_([
@@ -592,7 +593,7 @@ def _resolve_duplicates(self, data):
     def _get_ea_type_column(self, formatted_phase_name):
         return case(
                 (
-                    WorkType.id == WorkTypeEnum.AMENDMENT.value,
+                    or_(WorkType.id == WorkTypeEnum.AMENDMENT.value, WorkType.id == WorkTypeEnum.JOINT_COMPLEX_AMENDMENT.value),
                     case(
                         (
                             FederalInvolvement.id != FederalInvolvementEnum.NONE.value,
@@ -634,7 +635,7 @@ def _get_grouped_column(self, formatted_work_type):
                 ),
             ),
             (
-                WorkType.id == WorkTypeEnum.AMENDMENT.value,
+                or_(WorkType.id == WorkTypeEnum.AMENDMENT.value, WorkType.id == WorkTypeEnum.JOINT_COMPLEX_AMENDMENT.value),
                 "Amendment Decisions"
             ),
             else_=func.concat(formatted_work_type, "s")
@@ -683,7 +684,7 @@ def _get_formatted_phase_name(self):
         """Returns an expression for the reformatted PhaseCode.name"""
         return case(
                 (
-                    WorkType.id == WorkTypeEnum.AMENDMENT.value,
+                    or_(WorkType.id == WorkTypeEnum.AMENDMENT.value, WorkType.id == WorkTypeEnum.JOINT_COMPLEX_AMENDMENT.value),
                     case(
                         # Case for 32.5
                         (
@@ -700,7 +701,7 @@ def _get_formatted_work_type_name(self):
         """Returns an expression for the reformatted workType.name"""
         return case(
                 (
-                    WorkType.id == WorkTypeEnum.AMENDMENT.value,
+                    or_(WorkType.id == WorkTypeEnum.AMENDMENT.value, WorkType.id == WorkTypeEnum.JOINT_COMPLEX_AMENDMENT.value),
                     case(
                         # Case for 32.5
                         (

epictrack-api/src/api/reports/resource_forecast_report.py

@@ -586,6 +586,9 @@ def _sort_data(self, data, second_phases) -> List:
         amendments = self._sort_data_by_work_type(
             data, WorkTypeEnum.AMENDMENT.value, second_phases
         )
+        joint_complex_amendments = self._sort_data_by_work_type(
+            data, WorkTypeEnum.JOINT_COMPLEX_AMENDMENT.value, second_phases
+        )
         order_transfers = self._sort_data_by_work_type(
             data, WorkTypeEnum.EAC_ORDER_TRANSFER.value
         )
@@ -619,6 +622,7 @@ def _sort_data(self, data, second_phases) -> List:
             assessments
             + exemption_orders
             + amendments
+            + joint_complex_amendments
             + order_transfers
             + minister_designations
         )

epictrack-api/src/api/reports/thirty_sixty_ninety_report.py

@@ -467,7 +467,7 @@ def _get_work_type_specific_events(self) -> BooleanClauseList:
                 EventConfiguration.name.in_(["EAC Referral Package sent to Ministers", "Termination Package Referred to Minister"])
             ),
             and_(
-                Work.work_type_id == WorkTypeEnum.AMENDMENT.value,
+                or_(Work.work_type_id == WorkTypeEnum.AMENDMENT.value, Work.work_type_id == WorkTypeEnum.JOINT_COMPLEX_AMENDMENT.value),
                 EventConfiguration.event_category_id == EventCategoryEnum.MILESTONE.value,
                 EventConfiguration.event_type_id == EventTypeEnum.REFERRAL.value,
                 EventConfiguration.name == "Amendment Decision Package Referred to Decision Maker"

epictrack-api/src/api/services/event.py

@@ -195,7 +195,7 @@ def update_event(
             if phase_start_event and phase_start_event.actual_date:
                 days_taken = (data.get("actual_date").date() - phase_start_event.actual_date.date()).days
                 work: Work = Work.find_by_id(work_id)
-                if (current_work_phase.legislated or work.work_type_id == WorkTypeEnum.AMENDMENT.value) \
+                if (current_work_phase.legislated or work.work_type_id == WorkTypeEnum.AMENDMENT.value or work.work_type_id == WorkTypeEnum.JOINT_COMPLEX_AMENDMENT.value) \
                         and (current_work_phase.number_of_days - days_taken < 0):
                     responsibilities = PhaseOverageResponsibilityService.find_by_work_phase_id(
                         current_work_phase.id, is_deleted=False

epictrack-api/src/api/services/work_phase.py

@@ -400,7 +400,7 @@ def find_all_work_phases_with_additional_info(cls, staff_id: int = None, view_un
             or_(
                 WorkPhase.legislated.is_(True),
                 and_(
-                    WorkType.id == WorkTypeEnum.AMENDMENT.value,
+                    or_(WorkType.id == WorkTypeEnum.AMENDMENT.value, WorkType.id == WorkTypeEnum.JOINT_COMPLEX_AMENDMENT.value),
                     WorkPhase.visibility == PhaseVisibilityEnum.REGULAR,
                 ),
             ),

epictrack-web/src/components/workPlan/phase/PhaseAccordion.tsx

@@ -119,7 +119,9 @@ const PhaseAccordion = ({
   const isCompleted = phase.work_phase.is_completed;
   const isLegislated = phase.work_phase.legislated;
   const isOverageResponsibilityRequired =
-    isLegislated || work?.work_type_id === WorkTypeEnum.AMENDMENT;
+    isLegislated ||
+    work?.work_type_id === WorkTypeEnum.AMENDMENT ||
+    work?.work_type_id === WorkTypeEnum.JOINT_COMPLEX_AMENDMENT;
   const responsibilitiesText = overageResponsibilities
     ?.map((r) => r.responsibility)
     .join(", ");

epictrack-web/src/models/workType.ts

@@ -19,4 +19,6 @@ export enum WorkTypeEnum {
   EAC_ORDER_SUSPENSION = 12,
   EAC_ORDER_CANCELLATION = 13,
   OTHER = 14,
+  MATERIAL_ALTERATION = 15,
+  JOINT_COMPLEX_AMENDMENT = 16,
 }