requirement source title related fix (#635)

Author: dinesh-aot

compliance-api/src/compliance_api/schemas/inspection_approval.py

@@ -1,5 +1,6 @@
 """Schema for Inspection Record Approval."""
 
+from compliance_api.schemas.common import KeyValueSchema
 from marshmallow import EXCLUDE, ValidationError, fields, post_dump, post_load, validate
 from marshmallow_enum import EnumField
 
@@ -24,6 +25,7 @@ class Meta:  # pylint: disable=too-few-public-methods
         include_fk = True
 
     approved_by = fields.Nested(StaffUserSchema)
+    approved_by_position = fields.Nested(KeyValueSchema)
 
     @post_dump
     def convert_enum_to_key_value(

compliance-api/src/compliance_api/services/inspection_record/inspection_record_builder.py

@@ -186,6 +186,7 @@ def _build_officer_attendance(self):
                             {
                                 "id": officer.get("id"),
                                 "name": f"{officer.get('name')}",
+                                "position": officer.get("position").get("name"),
                             }
                         )
                 #  Iterate over the inspecting officers to fix their position name

compliance-api/src/compliance_api/services/restorative_justice.py

@@ -1,6 +1,6 @@
 """Restorative Justice Service."""
 
-from compliance_api.exceptions import BadRequestError, ResourceNotFoundError, UnprocessableEntityError
+from compliance_api.exceptions import ResourceNotFoundError, UnprocessableEntityError
 from compliance_api.models.case_file import CaseFile as CaseFileModel
 from compliance_api.models.db import session_scope
 from compliance_api.models.restorative_justice import RestorativeJustice as RestorativeJusticeModel

compliance-web/src/components/App/Inspections/Profile/Reports/ReportTabContents/IROverview/ProjectOverview.tsx

@@ -122,7 +122,8 @@ const ProjectOverview = () => {
     ].includes(inspectionReportsData?.ir_progress?.id as IRProgressEnum);
     if (isApproved) {
       const approvedBy = irApprovalsData?.[0]?.approved_by;
-      return `${approvedBy?.name}, ${approvedBy?.position?.name}`;
+      const approvedByPosition = irApprovalsData?.[0]?.approved_by_position;
+      return `${approvedBy?.name}, ${approvedByPosition?.name}`;
     }
     return "";
   };

compliance-web/src/components/App/Inspections/Profile/Reports/ReportTabContents/IRRequirement.tsx

@@ -3,7 +3,7 @@ import { RequirementImage } from "@/models/Image";
 import IRBoxContainer from "./IRBoxContainer";
 import { Box, Typography } from "@mui/material";
 import { useReportStore } from "@/components/App/Inspections/Profile/Reports/reportStore";
-import { DRAWER_WIDTHS } from "@/utils/constants";
+import { DRAWER_WIDTHS, RequirementSourceEnum } from "@/utils/constants";
 import RequirementDrawer from "@/components/App/Inspections/Profile/Requirements/RequirementDrawer";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import { useDrawer } from "@/store/drawerStore";
@@ -155,12 +155,30 @@ const IRRequirement = ({
       {Array.from(groupedRequirementSources.entries()).map(
         ([sourceId, reqSourceDetails], groupIndex) => (
           <Box key={sourceId} sx={{ mb: 3 }}>
-            {reqSourceDetails.map((reqSourceDetail) => (
+            {reqSourceDetails.map((reqSourceDetail) => {
+              let title = `${groupIndex === 0 ? `Requirement ${requirementIndex + 1}:` : ""} `;
+               if ( reqSourceDetail.condition_number) {
+                title += `Condition ${reqSourceDetail.condition_number} of`;
+               }
+               if (reqSourceDetail.section_number) {
+                title += `Section ${reqSourceDetail.section_number} of`;
+               }
+               if (reqSourceDetail.source_title) {
+                title += ` ${reqSourceDetail.source_title}`;
+               }
+               if (reqSourceDetail.requirement_source_id.toString() === RequirementSourceEnum.EACA) {
+                title += ` ${reqSourceDetail.amendment_number}`;
+               }
+               if (reqSourceDetail.requirement_source_id.toString() === RequirementSourceEnum.COMPLAINCE_AGREEMENT) {
+                title += ` ${reqSourceDetail.compliance_number}`;
+               }
+               if (reqSourceDetail.requirement_source_id.toString() === RequirementSourceEnum.REGULATION) {
+                title += ` ${reqSourceDetail.regulation_number}`;
+               }
+              return(
               <Box key={reqSourceDetail.id} sx={{ mb: 2 }}>
                 <DetailSection
-                  title={`${groupIndex === 0 ? `Requirement ${requirementIndex + 1}:` : ""} 
-                  ${reqSourceDetail.condition_number ? `Condition ${reqSourceDetail.condition_number}` : `Section ${reqSourceDetail.section_number}`}
-                  of ${reqSourceDetail.source_title || ""}`}
+                  title={title}
                   subTitle={reqSourceDetail.title || ""}
                   content={reqSourceDetail.description || ""}
                   appendixNo={reqSourceDetail.appendix?.appendix_no}
@@ -176,7 +194,7 @@ const IRRequirement = ({
                   />
                 ))}
               </Box>
-            ))}
+            )})}
           </Box>
         )
       )}

compliance-web/src/models/IRApproval.ts

@@ -1,9 +1,11 @@
 import { ApprovalStatus } from "./ApprovalStatus";
+import { Position } from "./Position";
 import { StaffUser } from "./Staff";
 
 export interface IRApproval {
   approved_by: StaffUser;
   approval_status: ApprovalStatus;
+  approved_by_position: Position;
   id: number;
   inspection_record_id: number;
   date_report_sent: string;