From 85cf137c4d0d9b114da46e77164a2d5659b1f1b4 Mon Sep 17 00:00:00 2001
From: Nithin <nithin958595@gmail.com>
Date: Sat, 24 Aug 2024 19:14:40 +0530
Subject: [PATCH 1/6] Fix TypeError: s.map is not a function in
 InvestigationBuilder component

---
 .../InvestigationBuilder.tsx                  | 275 +++++++++---------
 1 file changed, 143 insertions(+), 132 deletions(-)

diff --git a/src/Components/Common/prescription-builder/InvestigationBuilder.tsx b/src/Components/Common/prescription-builder/InvestigationBuilder.tsx
index ce7c579ee22..65f427cb26b 100644
--- a/src/Components/Common/prescription-builder/InvestigationBuilder.tsx
+++ b/src/Components/Common/prescription-builder/InvestigationBuilder.tsx
@@ -96,164 +96,175 @@ export default function InvestigationBuilder(
   };
 
   useEffect(() => {
-    const load = async () => setInvestigationsList(await loadInvestigations());
+    const load = async () => {
+      try {
+        const loadedInvestigations = await loadInvestigations();
+        setInvestigationsList(loadedInvestigations);
+      } catch (error) {
+        console.error("Error loading investigations:", error);
+        setInvestigationsList([]);
+      }
+    };
     load();
   }, []);
 
   return (
     <div className="mt-2">
-      {investigations?.map((investigation, i) => {
-        const setFrequency = (frequency: string) => {
-          setItem(
-            {
-              ...investigation,
-              frequency,
-            },
-            i,
-          );
-        };
+      {(Array.isArray(investigations) ? investigations : []).map(
+        (investigation, i) => {
+          const setFrequency = (frequency: string) => {
+            setItem(
+              {
+                ...investigation,
+                frequency,
+              },
+              i,
+            );
+          };
 
-        const setType = (type: string[]) => {
-          setItem(
-            {
-              ...investigation,
-              type,
-            },
-            i,
-          );
-        };
+          const setType = (type: string[]) => {
+            setItem(
+              {
+                ...investigation,
+                type,
+              },
+              i,
+            );
+          };
 
-        return (
-          <div
-            key={i}
-            className={`border-2 ${
-              activeIdx === i ? "border-primary-500" : "border-secondary-500"
-            } mb-2 border-spacing-2 rounded-md border-dashed p-3 text-sm text-secondary-600`}
-          >
-            <div className="mb-2 flex flex-wrap items-center gap-2 md:flex-row md:gap-4">
-              <h4 className="text-base font-medium text-secondary-700">
-                Investigation No. {i + 1}
-              </h4>
-              <button
-                type="button"
-                className="flex h-full items-center justify-center gap-1.5 rounded-md bg-red-500 px-3 py-1 text-sm text-secondary-100 transition hover:bg-red-600"
-                onClick={() =>
-                  setInvestigations(
-                    investigations.filter((investigation, index) => i != index),
-                  )
-                }
-              >
-                Delete Investigation
-                <CareIcon icon="l-trash-alt" className="h-4 w-4" />
-              </button>
-            </div>
-            <div className="flex flex-col gap-2">
-              <div className="flex w-full flex-col justify-between">
-                <div>
-                  Investigations Recommended
-                  <span className="text-danger-500">{" *"}</span>
-                </div>
-                <div id="search-patient-investigation">
-                  <PrescriptionMultiDropdown
-                    options={investigationsList}
-                    placeholder="Search Investigations"
-                    selectedValues={
-                      investigation.type?.constructor === Array
-                        ? investigation.type
-                        : []
-                    }
-                    setSelectedValues={setType}
-                    onFocus={() => setActiveIdx(i)}
-                    onBlur={() => setActiveIdx(null)}
-                  />
-                </div>
+          return (
+            <div
+              key={i}
+              className={`border-2 ${
+                activeIdx === i ? "border-primary-500" : "border-secondary-500"
+              } mb-2 border-spacing-2 rounded-md border-dashed p-3 text-sm text-secondary-600`}
+            >
+              <div className="mb-2 flex flex-wrap items-center gap-2 md:flex-row md:gap-4">
+                <h4 className="text-base font-medium text-secondary-700">
+                  Investigation No. {i + 1}
+                </h4>
+                <button
+                  type="button"
+                  className="flex h-full items-center justify-center gap-1.5 rounded-md bg-red-500 px-3 py-1 text-sm text-secondary-100 transition hover:bg-red-600"
+                  onClick={() =>
+                    setInvestigations(
+                      investigations.filter((_, index) => i !== index),
+                    )
+                  }
+                >
+                  Delete Investigation
+                  <CareIcon icon="l-trash-alt" className="h-4 w-4" />
+                </button>
               </div>
-              <div className="flex w-full shrink-0 flex-col justify-between">
-                <div className="flex flex-col gap-4 md:flex-row">
-                  <div className="flex shrink-0 cursor-pointer items-center gap-2 md:mt-3">
-                    Is the investigation repetitive?
-                    <br />
-                    <input
-                      id="investigation-checkbox"
-                      type="checkbox"
+              <div className="flex flex-col gap-2">
+                <div className="flex w-full flex-col justify-between">
+                  <div>
+                    Investigations Recommended
+                    <span className="text-danger-500">{" *"}</span>
+                  </div>
+                  <div id="search-patient-investigation">
+                    <PrescriptionMultiDropdown
+                      options={investigationsList}
+                      placeholder="Search Investigations"
+                      selectedValues={
+                        Array.isArray(investigation.type)
+                          ? investigation.type
+                          : []
+                      }
+                      setSelectedValues={setType}
                       onFocus={() => setActiveIdx(i)}
                       onBlur={() => setActiveIdx(null)}
-                      className="inline-block h-[18px] w-[18px] rounded-md"
-                      checked={investigation?.repetitive || false}
-                      onChange={(e) => {
-                        setItem(
-                          {
-                            ...investigation,
-                            repetitive: e.currentTarget.checked,
-                          },
-                          i,
-                        );
-                      }}
                     />
                   </div>
-                  {investigation.repetitive ? (
-                    <div className="w-full">
-                      <div className="mb-1">
-                        Frequency<span className="text-danger-500">{" *"}</span>
-                      </div>
-                      <div id="investigation-frequency">
-                        <PrescriptionDropdown
-                          placeholder="Frequency"
-                          options={FREQUENCY}
-                          value={investigation.frequency || ""}
-                          setValue={setFrequency}
-                          onFocus={() => setActiveIdx(i)}
-                          onBlur={() => setActiveIdx(null)}
-                        />
-                      </div>
-                    </div>
-                  ) : (
-                    <div className="w-full">
-                      Time<span className="text-danger-500">{" *"}</span>
+                </div>
+                <div className="flex w-full shrink-0 flex-col justify-between">
+                  <div className="flex flex-col gap-4 md:flex-row">
+                    <div className="flex shrink-0 cursor-pointer items-center gap-2 md:mt-3">
+                      Is the investigation repetitive?
+                      <br />
                       <input
-                        type="datetime-local"
-                        className="block w-[calc(100%-5px)] rounded border border-secondary-400 bg-secondary-100 px-4 py-2 text-sm hover:bg-secondary-200 focus:border-primary-500 focus:bg-white focus:outline-none focus:ring-primary-500"
-                        value={investigation.time || ""}
+                        id="investigation-checkbox"
+                        type="checkbox"
+                        onFocus={() => setActiveIdx(i)}
+                        onBlur={() => setActiveIdx(null)}
+                        className="inline-block h-[18px] w-[18px] rounded-md"
+                        checked={investigation?.repetitive || false}
                         onChange={(e) => {
                           setItem(
                             {
                               ...investigation,
-                              time: e.currentTarget.value,
+                              repetitive: e.currentTarget.checked,
                             },
                             i,
                           );
                         }}
-                        onFocus={() => setActiveIdx(i)}
-                        onBlur={() => setActiveIdx(null)}
                       />
                     </div>
-                  )}
-                </div>
-                <div className="w-full">
-                  <div className="mb-1">Notes</div>
-                  <input
-                    type="text"
-                    className="cui-input-base py-2"
-                    placeholder="Notes"
-                    value={investigation.notes || ""}
-                    onChange={(e) => {
-                      setItem(
-                        {
-                          ...investigation,
-                          notes: e.currentTarget.value,
-                        },
-                        i,
-                      );
-                    }}
-                    onFocus={() => setActiveIdx(i)}
-                    onBlur={() => setActiveIdx(null)}
-                  />
+                    {investigation.repetitive ? (
+                      <div className="w-full">
+                        <div className="mb-1">
+                          Frequency
+                          <span className="text-danger-500">{" *"}</span>
+                        </div>
+                        <div id="investigation-frequency">
+                          <PrescriptionDropdown
+                            placeholder="Frequency"
+                            options={FREQUENCY}
+                            value={investigation.frequency || ""}
+                            setValue={setFrequency}
+                            onFocus={() => setActiveIdx(i)}
+                            onBlur={() => setActiveIdx(null)}
+                          />
+                        </div>
+                      </div>
+                    ) : (
+                      <div className="w-full">
+                        Time<span className="text-danger-500">{" *"}</span>
+                        <input
+                          type="datetime-local"
+                          className="block w-[calc(100%-5px)] rounded border border-secondary-400 bg-secondary-100 px-4 py-2 text-sm hover:bg-secondary-200 focus:border-primary-500 focus:bg-white focus:outline-none focus:ring-primary-500"
+                          value={investigation.time || ""}
+                          onChange={(e) => {
+                            setItem(
+                              {
+                                ...investigation,
+                                time: e.currentTarget.value,
+                              },
+                              i,
+                            );
+                          }}
+                          onFocus={() => setActiveIdx(i)}
+                          onBlur={() => setActiveIdx(null)}
+                        />
+                      </div>
+                    )}
+                  </div>
+                  <div className="w-full">
+                    <div className="mb-1">Notes</div>
+                    <input
+                      type="text"
+                      className="cui-input-base py-2"
+                      placeholder="Notes"
+                      value={investigation.notes || ""}
+                      onChange={(e) => {
+                        setItem(
+                          {
+                            ...investigation,
+                            notes: e.currentTarget.value,
+                          },
+                          i,
+                        );
+                      }}
+                      onFocus={() => setActiveIdx(i)}
+                      onBlur={() => setActiveIdx(null)}
+                    />
+                  </div>
                 </div>
               </div>
             </div>
-          </div>
-        );
-      })}
+          );
+        },
+      )}
       <button
         type="button"
         onClick={() => {

From 3461e98bd511a296e81a9e01fb29066b8e3c38f2 Mon Sep 17 00:00:00 2001
From: rithviknishad <mail@rithviknishad.dev>
Date: Thu, 29 Aug 2024 22:56:31 +0530
Subject: [PATCH 2/6] revert changes

---
 .../InvestigationBuilder.tsx                  | 275 +++++++++---------
 1 file changed, 132 insertions(+), 143 deletions(-)

diff --git a/src/Components/Common/prescription-builder/InvestigationBuilder.tsx b/src/Components/Common/prescription-builder/InvestigationBuilder.tsx
index 65f427cb26b..ce7c579ee22 100644
--- a/src/Components/Common/prescription-builder/InvestigationBuilder.tsx
+++ b/src/Components/Common/prescription-builder/InvestigationBuilder.tsx
@@ -96,175 +96,164 @@ export default function InvestigationBuilder(
   };
 
   useEffect(() => {
-    const load = async () => {
-      try {
-        const loadedInvestigations = await loadInvestigations();
-        setInvestigationsList(loadedInvestigations);
-      } catch (error) {
-        console.error("Error loading investigations:", error);
-        setInvestigationsList([]);
-      }
-    };
+    const load = async () => setInvestigationsList(await loadInvestigations());
     load();
   }, []);
 
   return (
     <div className="mt-2">
-      {(Array.isArray(investigations) ? investigations : []).map(
-        (investigation, i) => {
-          const setFrequency = (frequency: string) => {
-            setItem(
-              {
-                ...investigation,
-                frequency,
-              },
-              i,
-            );
-          };
+      {investigations?.map((investigation, i) => {
+        const setFrequency = (frequency: string) => {
+          setItem(
+            {
+              ...investigation,
+              frequency,
+            },
+            i,
+          );
+        };
 
-          const setType = (type: string[]) => {
-            setItem(
-              {
-                ...investigation,
-                type,
-              },
-              i,
-            );
-          };
+        const setType = (type: string[]) => {
+          setItem(
+            {
+              ...investigation,
+              type,
+            },
+            i,
+          );
+        };
 
-          return (
-            <div
-              key={i}
-              className={`border-2 ${
-                activeIdx === i ? "border-primary-500" : "border-secondary-500"
-              } mb-2 border-spacing-2 rounded-md border-dashed p-3 text-sm text-secondary-600`}
-            >
-              <div className="mb-2 flex flex-wrap items-center gap-2 md:flex-row md:gap-4">
-                <h4 className="text-base font-medium text-secondary-700">
-                  Investigation No. {i + 1}
-                </h4>
-                <button
-                  type="button"
-                  className="flex h-full items-center justify-center gap-1.5 rounded-md bg-red-500 px-3 py-1 text-sm text-secondary-100 transition hover:bg-red-600"
-                  onClick={() =>
-                    setInvestigations(
-                      investigations.filter((_, index) => i !== index),
-                    )
-                  }
-                >
-                  Delete Investigation
-                  <CareIcon icon="l-trash-alt" className="h-4 w-4" />
-                </button>
+        return (
+          <div
+            key={i}
+            className={`border-2 ${
+              activeIdx === i ? "border-primary-500" : "border-secondary-500"
+            } mb-2 border-spacing-2 rounded-md border-dashed p-3 text-sm text-secondary-600`}
+          >
+            <div className="mb-2 flex flex-wrap items-center gap-2 md:flex-row md:gap-4">
+              <h4 className="text-base font-medium text-secondary-700">
+                Investigation No. {i + 1}
+              </h4>
+              <button
+                type="button"
+                className="flex h-full items-center justify-center gap-1.5 rounded-md bg-red-500 px-3 py-1 text-sm text-secondary-100 transition hover:bg-red-600"
+                onClick={() =>
+                  setInvestigations(
+                    investigations.filter((investigation, index) => i != index),
+                  )
+                }
+              >
+                Delete Investigation
+                <CareIcon icon="l-trash-alt" className="h-4 w-4" />
+              </button>
+            </div>
+            <div className="flex flex-col gap-2">
+              <div className="flex w-full flex-col justify-between">
+                <div>
+                  Investigations Recommended
+                  <span className="text-danger-500">{" *"}</span>
+                </div>
+                <div id="search-patient-investigation">
+                  <PrescriptionMultiDropdown
+                    options={investigationsList}
+                    placeholder="Search Investigations"
+                    selectedValues={
+                      investigation.type?.constructor === Array
+                        ? investigation.type
+                        : []
+                    }
+                    setSelectedValues={setType}
+                    onFocus={() => setActiveIdx(i)}
+                    onBlur={() => setActiveIdx(null)}
+                  />
+                </div>
               </div>
-              <div className="flex flex-col gap-2">
-                <div className="flex w-full flex-col justify-between">
-                  <div>
-                    Investigations Recommended
-                    <span className="text-danger-500">{" *"}</span>
-                  </div>
-                  <div id="search-patient-investigation">
-                    <PrescriptionMultiDropdown
-                      options={investigationsList}
-                      placeholder="Search Investigations"
-                      selectedValues={
-                        Array.isArray(investigation.type)
-                          ? investigation.type
-                          : []
-                      }
-                      setSelectedValues={setType}
+              <div className="flex w-full shrink-0 flex-col justify-between">
+                <div className="flex flex-col gap-4 md:flex-row">
+                  <div className="flex shrink-0 cursor-pointer items-center gap-2 md:mt-3">
+                    Is the investigation repetitive?
+                    <br />
+                    <input
+                      id="investigation-checkbox"
+                      type="checkbox"
                       onFocus={() => setActiveIdx(i)}
                       onBlur={() => setActiveIdx(null)}
+                      className="inline-block h-[18px] w-[18px] rounded-md"
+                      checked={investigation?.repetitive || false}
+                      onChange={(e) => {
+                        setItem(
+                          {
+                            ...investigation,
+                            repetitive: e.currentTarget.checked,
+                          },
+                          i,
+                        );
+                      }}
                     />
                   </div>
-                </div>
-                <div className="flex w-full shrink-0 flex-col justify-between">
-                  <div className="flex flex-col gap-4 md:flex-row">
-                    <div className="flex shrink-0 cursor-pointer items-center gap-2 md:mt-3">
-                      Is the investigation repetitive?
-                      <br />
+                  {investigation.repetitive ? (
+                    <div className="w-full">
+                      <div className="mb-1">
+                        Frequency<span className="text-danger-500">{" *"}</span>
+                      </div>
+                      <div id="investigation-frequency">
+                        <PrescriptionDropdown
+                          placeholder="Frequency"
+                          options={FREQUENCY}
+                          value={investigation.frequency || ""}
+                          setValue={setFrequency}
+                          onFocus={() => setActiveIdx(i)}
+                          onBlur={() => setActiveIdx(null)}
+                        />
+                      </div>
+                    </div>
+                  ) : (
+                    <div className="w-full">
+                      Time<span className="text-danger-500">{" *"}</span>
                       <input
-                        id="investigation-checkbox"
-                        type="checkbox"
-                        onFocus={() => setActiveIdx(i)}
-                        onBlur={() => setActiveIdx(null)}
-                        className="inline-block h-[18px] w-[18px] rounded-md"
-                        checked={investigation?.repetitive || false}
+                        type="datetime-local"
+                        className="block w-[calc(100%-5px)] rounded border border-secondary-400 bg-secondary-100 px-4 py-2 text-sm hover:bg-secondary-200 focus:border-primary-500 focus:bg-white focus:outline-none focus:ring-primary-500"
+                        value={investigation.time || ""}
                         onChange={(e) => {
                           setItem(
                             {
                               ...investigation,
-                              repetitive: e.currentTarget.checked,
+                              time: e.currentTarget.value,
                             },
                             i,
                           );
                         }}
+                        onFocus={() => setActiveIdx(i)}
+                        onBlur={() => setActiveIdx(null)}
                       />
                     </div>
-                    {investigation.repetitive ? (
-                      <div className="w-full">
-                        <div className="mb-1">
-                          Frequency
-                          <span className="text-danger-500">{" *"}</span>
-                        </div>
-                        <div id="investigation-frequency">
-                          <PrescriptionDropdown
-                            placeholder="Frequency"
-                            options={FREQUENCY}
-                            value={investigation.frequency || ""}
-                            setValue={setFrequency}
-                            onFocus={() => setActiveIdx(i)}
-                            onBlur={() => setActiveIdx(null)}
-                          />
-                        </div>
-                      </div>
-                    ) : (
-                      <div className="w-full">
-                        Time<span className="text-danger-500">{" *"}</span>
-                        <input
-                          type="datetime-local"
-                          className="block w-[calc(100%-5px)] rounded border border-secondary-400 bg-secondary-100 px-4 py-2 text-sm hover:bg-secondary-200 focus:border-primary-500 focus:bg-white focus:outline-none focus:ring-primary-500"
-                          value={investigation.time || ""}
-                          onChange={(e) => {
-                            setItem(
-                              {
-                                ...investigation,
-                                time: e.currentTarget.value,
-                              },
-                              i,
-                            );
-                          }}
-                          onFocus={() => setActiveIdx(i)}
-                          onBlur={() => setActiveIdx(null)}
-                        />
-                      </div>
-                    )}
-                  </div>
-                  <div className="w-full">
-                    <div className="mb-1">Notes</div>
-                    <input
-                      type="text"
-                      className="cui-input-base py-2"
-                      placeholder="Notes"
-                      value={investigation.notes || ""}
-                      onChange={(e) => {
-                        setItem(
-                          {
-                            ...investigation,
-                            notes: e.currentTarget.value,
-                          },
-                          i,
-                        );
-                      }}
-                      onFocus={() => setActiveIdx(i)}
-                      onBlur={() => setActiveIdx(null)}
-                    />
-                  </div>
+                  )}
+                </div>
+                <div className="w-full">
+                  <div className="mb-1">Notes</div>
+                  <input
+                    type="text"
+                    className="cui-input-base py-2"
+                    placeholder="Notes"
+                    value={investigation.notes || ""}
+                    onChange={(e) => {
+                      setItem(
+                        {
+                          ...investigation,
+                          notes: e.currentTarget.value,
+                        },
+                        i,
+                      );
+                    }}
+                    onFocus={() => setActiveIdx(i)}
+                    onBlur={() => setActiveIdx(null)}
+                  />
                 </div>
               </div>
             </div>
-          );
-        },
-      )}
+          </div>
+        );
+      })}
       <button
         type="button"
         onClick={() => {

From adc927efb9ef901707d0d6352a6d4959654af50b Mon Sep 17 00:00:00 2001
From: rithviknishad <mail@rithviknishad.dev>
Date: Thu, 29 Aug 2024 22:56:59 +0530
Subject: [PATCH 3/6] remove investigations hack in consultation form

---
 src/Components/Facility/ConsultationForm.tsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Components/Facility/ConsultationForm.tsx b/src/Components/Facility/ConsultationForm.tsx
index 8b946cf3cc6..a94378946f7 100644
--- a/src/Components/Facility/ConsultationForm.tsx
+++ b/src/Components/Facility/ConsultationForm.tsx
@@ -407,9 +407,7 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
             cause_of_death: data?.discharge_notes || "",
             death_datetime: data?.death_datetime || "",
             death_confirmed_doctor: data?.death_confirmed_doctor || "",
-            InvestigationAdvice: Array.isArray(data.investigation)
-              ? data.investigation
-              : [],
+            InvestigationAdvice: data.investigation ?? [],
             diagnoses: data.diagnoses?.sort(
               (a: ConsultationDiagnosis, b: ConsultationDiagnosis) =>
                 ConditionVerificationStatuses.indexOf(a.verification_status) -

From a7da8722c09fbe24f6f405d435605189a3e8da3c Mon Sep 17 00:00:00 2001
From: rithviknishad <mail@rithviknishad.dev>
Date: Thu, 29 Aug 2024 22:57:18 +0530
Subject: [PATCH 4/6] udpate type definitions

---
 src/Components/Facility/models.tsx               | 3 ---
 src/Components/Patient/DailyRoundListDetails.tsx | 1 -
 src/Components/Patient/models.tsx                | 1 -
 3 files changed, 5 deletions(-)

diff --git a/src/Components/Facility/models.tsx b/src/Components/Facility/models.tsx
index c6dde2b508b..b5808e86774 100644
--- a/src/Components/Facility/models.tsx
+++ b/src/Components/Facility/models.tsx
@@ -11,7 +11,6 @@ import { RouteToFacility } from "../Common/RouteToFacilitySelect";
 import { InvestigationType } from "../Common/prescription-builder/InvestigationBuilder";
 import { ProcedureType } from "../Common/prescription-builder/ProcedureBuilder";
 import { ConsultationDiagnosis, CreateDiagnosis } from "../Diagnosis/types";
-import { NormalPrescription, PRNPrescription } from "../Medicine/models";
 import {
   AssignedToObjectModel,
   DailyRoundsModel,
@@ -127,8 +126,6 @@ export interface ConsultationModel {
   created_date?: string;
   discharge_date?: string;
   new_discharge_reason?: (typeof DISCHARGE_REASONS)[number]["id"];
-  discharge_prescription?: NormalPrescription;
-  discharge_prn_prescription?: PRNPrescription;
   discharge_notes?: string;
   examination_details?: string;
   history_of_present_illness?: string;
diff --git a/src/Components/Patient/DailyRoundListDetails.tsx b/src/Components/Patient/DailyRoundListDetails.tsx
index fbf001427dd..42fd6cda22d 100644
--- a/src/Components/Patient/DailyRoundListDetails.tsx
+++ b/src/Components/Patient/DailyRoundListDetails.tsx
@@ -20,7 +20,6 @@ export const DailyRoundListDetails = (props: any) => {
       if (res && data) {
         const tdata: DailyRoundsModel = {
           ...data,
-          medication_given: data.medication_given ?? [],
         };
         setDailyRoundListDetails(tdata);
       }
diff --git a/src/Components/Patient/models.tsx b/src/Components/Patient/models.tsx
index cd1353bd972..237978c843e 100644
--- a/src/Components/Patient/models.tsx
+++ b/src/Components/Patient/models.tsx
@@ -320,7 +320,6 @@ export interface DailyRoundsModel {
   physical_examination_info?: string;
   other_details?: string;
   consultation?: number;
-  medication_given?: Array<any>;
   action?: string;
   review_interval?: number;
   id?: string;

From 1e0e74a0448051b26d7d1dd5ee26d31415219bf1 Mon Sep 17 00:00:00 2001
From: rithviknishad <mail@rithviknishad.dev>
Date: Thu, 29 Aug 2024 23:04:02 +0530
Subject: [PATCH 5/6] fix type error

---
 .../Consultations/DailyRounds/LogUpdateCardAttribute.tsx        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Components/Facility/Consultations/DailyRounds/LogUpdateCardAttribute.tsx b/src/Components/Facility/Consultations/DailyRounds/LogUpdateCardAttribute.tsx
index cc6f467b186..b153cca45ea 100644
--- a/src/Components/Facility/Consultations/DailyRounds/LogUpdateCardAttribute.tsx
+++ b/src/Components/Facility/Consultations/DailyRounds/LogUpdateCardAttribute.tsx
@@ -70,7 +70,7 @@ const LogUpdateCardAttribute = <T extends keyof DailyRoundsModel>({
         <div className="flex flex-col items-center gap-2 md:flex-row">
           <AttributeLabel attributeKey={attributeKey} />
           <span className="text-sm font-semibold text-secondary-700">
-            {t(attributeValue)}
+            {t(attributeValue as string)}
           </span>
         </div>
       );

From 1acde794303e63266c9214ad20b27dc4211bbece Mon Sep 17 00:00:00 2001
From: rithviknishad <mail@rithviknishad.dev>
Date: Thu, 29 Aug 2024 23:14:11 +0530
Subject: [PATCH 6/6] remove unnecessary object destructuring

---
 src/Components/Patient/DailyRoundListDetails.tsx | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Components/Patient/DailyRoundListDetails.tsx b/src/Components/Patient/DailyRoundListDetails.tsx
index 42fd6cda22d..eb7eda62064 100644
--- a/src/Components/Patient/DailyRoundListDetails.tsx
+++ b/src/Components/Patient/DailyRoundListDetails.tsx
@@ -16,12 +16,9 @@ export const DailyRoundListDetails = (props: any) => {
 
   const { loading: isLoading } = useQuery(routes.getDailyReport, {
     pathParams: { consultationId, id },
-    onResponse: ({ res, data }) => {
-      if (res && data) {
-        const tdata: DailyRoundsModel = {
-          ...data,
-        };
-        setDailyRoundListDetails(tdata);
+    onResponse: ({ data }) => {
+      if (data) {
+        setDailyRoundListDetails(data);
       }
     },
   });