From 5a77383b87bd117d7b2a85966bdcd348ffa02d7d Mon Sep 17 00:00:00 2001
From: Shivank Kacker <kacker.shivank@gmail.com>
Date: Wed, 19 Jun 2024 23:16:06 +0530
Subject: [PATCH] Fixed Log Update Details Page Crashing (#8056)

* Fixed Log Update Details Page Crashing

* fixed buttons

* redirect fix

* minor fix

* fix submit

* inverted if

* fixed filter

* fix notification

* filter fix
---
 .../Others/DailyRound__General.res            | 29 ++++++++++++-------
 .../types/CriticalCare__Others.res            | 14 ++++-----
 .../Consultations/DailyRoundsFilter.tsx       |  4 ++-
 .../Consultations/DailyRoundsList.tsx         |  8 +++--
 src/Components/Patient/DailyRounds.tsx        | 10 +++++--
 5 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/src/Components/CriticalCareRecording/Others/DailyRound__General.res b/src/Components/CriticalCareRecording/Others/DailyRound__General.res
index 18caeb0e597..22c5051083e 100644
--- a/src/Components/CriticalCareRecording/Others/DailyRound__General.res
+++ b/src/Components/CriticalCareRecording/Others/DailyRound__General.res
@@ -30,19 +30,28 @@ let symptoms = [
   "CONSTIPATION",
   "HEAD ACHE",
   "BLEEDING",
-  "DIZZINESS"
-];
+  "DIZZINESS",
+]
 
 @react.component
 let make = (~others, ~renderOptionalDescription, ~title) => {
-  <div> {title("Symptoms")} <div className=" flex flex-wrap max-w-full"> {Js.Array.map(id => {
-        <div className="rounded-full px-4 py-2 bg-gray-400 m-1 text-sm">
-          {str(symptoms[id - 1])}
-        </div>
-      }, Others.additional_symptoms(
-        others,
-      ))->React.array} </div> {renderOptionalDescription(
+  let additionalSymptoms = Others.additional_symptoms(others)
+  <div>
+    {title("Symptoms")}
+    <div className="flex flex-wrap max-w-full">
+      {switch additionalSymptoms {
+      | Some(symptomsArray) => Js.Array.map(id => {
+          <div className="rounded-full px-4 py-2 bg-gray-400 m-1 text-sm">
+            {str(symptoms[id - 1])}
+          </div>
+        }, symptomsArray)->React.array
+      | None => React.null
+      }}
+    </div>
+    {renderOptionalDescription(
       "Physical Examination Info",
       Others.physical_examination_info(others),
-    )} {renderOptionalDescription("Other Details", Others.other_details(others))} </div>
+    )}
+    {renderOptionalDescription("Other Details", Others.other_details(others))}
+  </div>
 }
diff --git a/src/Components/CriticalCareRecording/types/CriticalCare__Others.res b/src/Components/CriticalCareRecording/types/CriticalCare__Others.res
index 93cf8508872..21b9513eb8d 100644
--- a/src/Components/CriticalCareRecording/types/CriticalCare__Others.res
+++ b/src/Components/CriticalCareRecording/types/CriticalCare__Others.res
@@ -2,7 +2,7 @@ type t = {
   bilateral_air_entry: option<bool>,
   etco2: option<int>,
   physical_examination_info: option<string>,
-  additional_symptoms: array<int>,
+  additional_symptoms: option<array<int>>,
   other_details: option<string>,
   other_symptoms: option<string>,
 }
@@ -21,12 +21,12 @@ let make = (
   ~other_symptoms,
   ~other_details,
 ) => {
-  bilateral_air_entry: bilateral_air_entry,
-  etco2: etco2,
-  physical_examination_info: physical_examination_info,
-  other_details: other_details,
-  additional_symptoms: additional_symptoms,
-  other_symptoms: other_symptoms,
+  bilateral_air_entry,
+  etco2,
+  physical_examination_info,
+  other_details,
+  additional_symptoms,
+  other_symptoms,
 }
 
 let makeFromJs = dailyRound => {
diff --git a/src/Components/Facility/Consultations/DailyRoundsFilter.tsx b/src/Components/Facility/Consultations/DailyRoundsFilter.tsx
index 829c085a840..430154d6689 100644
--- a/src/Components/Facility/Consultations/DailyRoundsFilter.tsx
+++ b/src/Components/Facility/Consultations/DailyRoundsFilter.tsx
@@ -73,7 +73,9 @@ export default function DailyRoundsFilter(props: Props) {
                   label={t("Round Type")}
                   options={DailyRoundTypes}
                   placeholder={t("show_all")}
-                  optionLabel={(o) => t(o)}
+                  optionLabel={(o) =>
+                    o === "DOCTORS_LOG" ? "Progress Note" : t(o)
+                  }
                   optionValue={(o) => o}
                 />
                 <TextFormField
diff --git a/src/Components/Facility/Consultations/DailyRoundsList.tsx b/src/Components/Facility/Consultations/DailyRoundsList.tsx
index 65182c01620..fcea928620d 100644
--- a/src/Components/Facility/Consultations/DailyRoundsList.tsx
+++ b/src/Components/Facility/Consultations/DailyRoundsList.tsx
@@ -83,9 +83,11 @@ export default function DailyRoundsList({ consultation }: Props) {
                       );
                     }
 
-                    const itemUrl = ["NORMAL", "TELEMEDICINE"].includes(
-                      item.rounds_type as string,
-                    )
+                    const itemUrl = [
+                      "NORMAL",
+                      "TELEMEDICINE",
+                      "DOCTORS_LOG",
+                    ].includes(item.rounds_type as string)
                       ? `${consultationUrl}/daily-rounds/${item.id}`
                       : `${consultationUrl}/daily_rounds/${item.id}`;
 
diff --git a/src/Components/Patient/DailyRounds.tsx b/src/Components/Patient/DailyRounds.tsx
index 92c32fecdc7..23692f6e37b 100644
--- a/src/Components/Patient/DailyRounds.tsx
+++ b/src/Components/Patient/DailyRounds.tsx
@@ -317,7 +317,7 @@ export const DailyRounds = (props: any) => {
         review_interval: Number(prevReviewInterval),
       };
 
-      if (["NORMAL", "TELEMEDICINE"].includes(state.form.rounds_type)) {
+      if (!["VENTILATOR"].includes(state.form.rounds_type)) {
         data = {
           ...data,
           bp: state.form.bp ?? {},
@@ -342,9 +342,13 @@ export const DailyRounds = (props: any) => {
         if (obj) {
           dispatch({ type: "set_form", form: initForm });
           Notification.Success({
-            msg: `${obj.rounds_type === "VENTILATOR" ? "Critical Care" : capitalize(obj.rounds_type)} log update details updated successfully`,
+            msg: `${obj.rounds_type === "DOCTORS_LOG" ? "Progress Notes" : (obj.rounds_type === "VENTILATOR" ? "Critical Care" : capitalize(obj.rounds_type)) + " log update"} details updated successfully`,
           });
-          if (["NORMAL", "TELEMEDICINE"].includes(state.form.rounds_type)) {
+          if (
+            ["NORMAL", "TELEMEDICINE", "DOCTORS_LOG"].includes(
+              state.form.rounds_type,
+            )
+          ) {
             navigate(
               `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}`,
             );