Merge pull request #314 from dinesh-aot/COMP-476

regulated-party change in report

Author: nitheesh-aot

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

@@ -134,7 +134,15 @@ def _build_officer_attendance(self):
                     attendance_list.append(option.data)
             else:
                 # If no data, use the attendance option name
-                attendance_list.append(option.attendance_option.name)
+                if (
+                    option.attendance_option_id
+                    == InspectionAttendanceOptionEnum.CERTIFICATE_HOLDER_OR_REGULATED_PARTY_REPRESENTATIVE.value
+                ):
+                    if not self.data.get("project_details"):
+                        self.build_project_details()
+                    attendance_list.append(self.data["project_details"]["proponent"])
+                else:
+                    attendance_list.append(option.attendance_option.name)
 
         # Join all attendance items with commas
         attendance_string = ", ".join(attendance_list) if attendance_list else ""
@@ -285,7 +293,9 @@ def build_preliminary_review_details(self):
         if self.ir_status == IRStatusEnum.PRELIMINARY.value:
             preliminary_review_details = None
         elif self.ir_status == IRStatusEnum.FINAL.value:
-            inspection_record = InspectionRecordModel.get_by_inspection_id(self.inspection.id)
+            inspection_record = InspectionRecordModel.get_by_inspection_id(
+                self.inspection.id
+            )
             approvals = InspectionRecordApprovalModel.get_approvals_by_ir(
                 inspection_record.id
             )
@@ -306,7 +316,9 @@ def build_preliminary_review_details(self):
                 # Bulid the project details if not yet build to get the proponent label
                 if not self.data.get("project_details"):
                     self.build_project_details()
-                data["proponent_label"] = self.data["project_details"]["proponent_label"]
+                data["proponent_label"] = self.data["project_details"][
+                    "proponent_label"
+                ]
                 data["primary_last_name"] = self.inspection.primary_officer.last_name
                 preliminary_review_details = render_template_with_data(
                     "PRELIMINARY_REVIEW_DETAILS", PRELIMINARY_REVIEW_DETAILS, data

compliance-api/src/compliance_api/templates/ir_template.html

@@ -352,7 +352,7 @@
             </tr>
             <tr>
                 <th>Record Prepared By</th>
-                <td colspan="3">{{ officer_details.primary_officer.name }},&nbsp;{{
+                <td colspan="3">{{ officer_details.primary_officer.name }}</br>{{
                     officer_details.primary_officer.position }}</td>
             </tr>
             <tr>