Merge pull request #313 from dinesh-aot/fixes

preliminary_review_details content fix

Author: dinesh-aot

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

@@ -122,6 +122,7 @@ def switch_to_final(cls, inspection_id, inspection_record_id):
                 "preliminary_review_details", None
             ),
             "enforcement_summary": ir_data.get("enforcement_summary", None),
+            "action_required_by_rp": None,  # This field should be NONE when you switch to final
             "ir_status_id": IRStatusEnum.FINAL.value,
             "ir_progress": IRProgressEnum.FINALIZING_RECORD,
         }

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

@@ -284,10 +284,12 @@ def build_preliminary_review_details(self):
         #  No preliminary_review_details for ir when it is PRELIMINARY
         if self.ir_status == IRStatusEnum.PRELIMINARY.value:
             preliminary_review_details = None
-        elif self.ir_status == IRStatusEnum.FINAL.value and self.existing_ir:
+        elif self.ir_status == IRStatusEnum.FINAL.value:
+            inspection_record = InspectionRecordModel.get_by_inspection_id(self.inspection.id)
             approvals = InspectionRecordApprovalModel.get_approvals_by_ir(
-                self.existing_ir.id
+                inspection_record.id
             )
+            # Build comma separated dates from the approval requests
             if approvals:
                 data = {
                     "date_report_sent": ", ".join(
@@ -301,11 +303,15 @@ def build_preliminary_review_details(self):
                         if approval.date_response is not None
                     ),
                 }
+                # 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["primary_last_name"] = self.inspection.primary_officer.last_name
                 preliminary_review_details = render_template_with_data(
                     "PRELIMINARY_REVIEW_DETAILS", PRELIMINARY_REVIEW_DETAILS, data
                 )
-
-        self.data["preliminary_review_details"] = preliminary_review_details
+                self.data["preliminary_review_details"] = preliminary_review_details
         return self
 
     def build_finding_statement(self):

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

@@ -37,7 +37,7 @@
 PRELIMINARY_REVIEW_DETAILS = """<div>
     <p class="editor-paragraph" dir="ltr">
         <span>
-            On {{ date_report_sent}} ., Officer [Lombardi] provided the preliminary
+            On {{ date_report_sent}} ., Officer {{ primary_last_name }} provided the preliminary
             inspection record to the {{ proponent_label }}.
         AND</span><br><span>On {{ date_repsonse }} ., the {{ proponent_label }}
             provided comments pertaining to the preliminary inspection record. These comments were reviewed, and edits

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

@@ -481,7 +481,7 @@
                     </th>
                 </tr>
                 <tr>
-                    <td colspan="2">{{ action_required_by_rp | safe | replace('style="white-space: pre-wrap;"', '') }}
+                    <td colspan="2">{% if action_required_by_rp %}{{ action_required_by_rp | safe | replace('style="white-space: pre-wrap;"', '') }}{% else %}None at this time{% endif %}
                     </td>
                 </tr>
                 <tr>