From 518200d711904b017216457d0db39098f2e631d3 Mon Sep 17 00:00:00 2001
From: rithviknishad <mail@rithviknishad.dev>
Date: Sun, 21 Apr 2024 20:21:46 +0530
Subject: [PATCH 1/4] Fixes discharge information showing incorrect label for
 base dosage

---
 src/Locale/en/Medicine.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Locale/en/Medicine.json b/src/Locale/en/Medicine.json
index 95ddda7c1fd..36adc259514 100644
--- a/src/Locale/en/Medicine.json
+++ b/src/Locale/en/Medicine.json
@@ -2,6 +2,7 @@
   "medicine": "Medicine",
   "route": "Route",
   "dosage": "Dosage",
+  "base_dosage": "Dosage",
   "start_dosage": "Start Dosage",
   "target_dosage": "Target Dosage",
   "instruction_on_titration": "Instruction on titration",
@@ -58,4 +59,4 @@
   "PRESCRIPTION_FREQUENCY_Q4H": "4th hourly",
   "PRESCRIPTION_FREQUENCY_QOD": "Alternate day",
   "PRESCRIPTION_FREQUENCY_QWK": "Once a week"
-}
+}
\ No newline at end of file

From a7be2efb7c64a6da71fcea2a1d75e79d9fa5ac4e Mon Sep 17 00:00:00 2001
From: rithviknishad <mail@rithviknishad.dev>
Date: Sun, 21 Apr 2024 20:22:33 +0530
Subject: [PATCH 2/4] disabled discontinue/administer/edit prescription
 operations for discharged consultations

---
 .../AdministrationTable.tsx                   |   3 +
 .../AdministrationTableRow.tsx                | 246 +++++++++---------
 .../MedicineAdministrationSheet/index.tsx     |   1 +
 3 files changed, 132 insertions(+), 118 deletions(-)

diff --git a/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTable.tsx b/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTable.tsx
index b983965237a..18d27bf1651 100644
--- a/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTable.tsx
+++ b/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTable.tsx
@@ -10,9 +10,11 @@ interface Props {
   prescriptions: Prescription[];
   pagination: ReturnType<typeof useRangePagination>;
   onRefetch: () => void;
+  readonly: boolean;
 }
 
 export default function MedicineAdministrationTable({
+  readonly,
   pagination,
   prescriptions,
   onRefetch,
@@ -101,6 +103,7 @@ export default function MedicineAdministrationTable({
               prescription={obj}
               intervals={pagination.slots!}
               refetch={onRefetch}
+              readonly={readonly}
             />
           ))}
         </tbody>
diff --git a/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTableRow.tsx b/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTableRow.tsx
index 50b96c9cc0f..f913286c574 100644
--- a/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTableRow.tsx
+++ b/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTableRow.tsx
@@ -19,6 +19,7 @@ interface Props {
   prescription: Prescription;
   intervals: { start: Date; end: Date }[];
   refetch: () => void;
+  readonly: boolean;
 }
 
 export default function MedicineAdministrationTableRow({
@@ -54,12 +55,7 @@ export default function MedicineAdministrationTableRow({
   );
 
   return (
-    <tr
-      className={classNames(
-        "group transition-all duration-200 ease-in-out",
-        loading ? "bg-gray-300" : "bg-white hover:bg-primary-100",
-      )}
-    >
+    <>
       {showDiscontinue && (
         <DiscontinuePrescription
           prescription={prescription}
@@ -96,42 +92,46 @@ export default function MedicineAdministrationTableRow({
                 onClick={() => setShowDetails(false)}
                 label={t("close")}
               />
-              <Submit
-                disabled={
-                  prescription.discontinued ||
-                  prescription.prescription_type === "DISCHARGE"
-                }
-                variant="danger"
-                onClick={() => setShowDiscontinue(true)}
-              >
-                <CareIcon icon="l-ban" className="text-lg" />
-                {t("discontinue")}
-              </Submit>
-              <Submit
-                disabled={
-                  prescription.discontinued ||
-                  prescription.prescription_type === "DISCHARGE"
-                }
-                variant="secondary"
-                border
-                onClick={() => {
-                  setShowDetails(false);
-                  setShowEdit(true);
-                }}
-              >
-                <CareIcon icon="l-pen" className="text-lg" />
-                {t("edit")}
-              </Submit>
-              <Submit
-                disabled={
-                  prescription.discontinued ||
-                  prescription.prescription_type === "DISCHARGE"
-                }
-                onClick={() => setShowAdminister(true)}
-              >
-                <CareIcon icon="l-syringe" className="text-lg" />
-                {t("administer")}
-              </Submit>
+              {!props.readonly && (
+                <>
+                  <Submit
+                    disabled={
+                      prescription.discontinued ||
+                      prescription.prescription_type === "DISCHARGE"
+                    }
+                    variant="danger"
+                    onClick={() => setShowDiscontinue(true)}
+                  >
+                    <CareIcon icon="l-ban" className="text-lg" />
+                    {t("discontinue")}
+                  </Submit>
+                  <Submit
+                    disabled={
+                      prescription.discontinued ||
+                      prescription.prescription_type === "DISCHARGE"
+                    }
+                    variant="secondary"
+                    border
+                    onClick={() => {
+                      setShowDetails(false);
+                      setShowEdit(true);
+                    }}
+                  >
+                    <CareIcon icon="l-pen" className="text-lg" />
+                    {t("edit")}
+                  </Submit>
+                  <Submit
+                    disabled={
+                      prescription.discontinued ||
+                      prescription.prescription_type === "DISCHARGE"
+                    }
+                    onClick={() => setShowAdminister(true)}
+                  >
+                    <CareIcon icon="l-syringe" className="text-lg" />
+                    {t("administer")}
+                  </Submit>
+                </>
+              )}
             </div>
           </div>
         </DialogModal>
@@ -166,93 +166,103 @@ export default function MedicineAdministrationTableRow({
           />
         </DialogModal>
       )}
-      <td
-        className="bg-gray-white sticky left-0 z-10 cursor-pointer bg-white py-3 pl-4 text-left transition-all duration-200 ease-in-out group-hover:bg-primary-100"
-        onClick={() => setShowDetails(true)}
+      <tr
+        className={classNames(
+          "group transition-all duration-200 ease-in-out",
+          loading ? "bg-gray-300" : "bg-white hover:bg-primary-100",
+        )}
       >
-        <div className="flex flex-col gap-1 lg:flex-row lg:justify-between lg:gap-2">
-          <div className="flex items-center gap-2">
-            <span
-              className={classNames(
-                "text-sm font-semibold",
-                prescription.discontinued ? "text-gray-700" : "text-gray-900",
+        <td
+          className="bg-gray-white sticky left-0 z-10 cursor-pointer bg-white py-3 pl-4 text-left transition-all duration-200 ease-in-out group-hover:bg-primary-100"
+          onClick={() => setShowDetails(true)}
+        >
+          <div className="flex flex-col gap-1 lg:flex-row lg:justify-between lg:gap-2">
+            <div className="flex items-center gap-2">
+              <span
+                className={classNames(
+                  "text-sm font-semibold",
+                  prescription.discontinued ? "text-gray-700" : "text-gray-900",
+                )}
+              >
+                {prescription.medicine_object?.name ??
+                  prescription.medicine_old}
+              </span>
+
+              {prescription.discontinued && (
+                <span className="hidden rounded-full border border-gray-500 bg-gray-200 px-1.5 text-xs font-medium text-gray-700 lg:block">
+                  {t("discontinued")}
+                </span>
               )}
-            >
-              {prescription.medicine_object?.name ?? prescription.medicine_old}
-            </span>
 
-            {prescription.discontinued && (
-              <span className="hidden rounded-full border border-gray-500 bg-gray-200 px-1.5 text-xs font-medium text-gray-700 lg:block">
-                {t("discontinued")}
-              </span>
-            )}
+              {prescription.route && (
+                <span className="hidden rounded-full border border-blue-500 bg-blue-100 px-1.5 text-xs font-medium text-blue-700 lg:block">
+                  {t(prescription.route)}
+                </span>
+              )}
+            </div>
 
-            {prescription.route && (
-              <span className="hidden rounded-full border border-blue-500 bg-blue-100 px-1.5 text-xs font-medium text-blue-700 lg:block">
-                {t(prescription.route)}
-              </span>
-            )}
-          </div>
+            <div className="flex gap-1 text-xs font-semibold text-gray-900 lg:flex-col lg:px-2 lg:text-center">
+              {prescription.dosage_type !== "TITRATED" ? (
+                <p>{prescription.base_dosage}</p>
+              ) : (
+                <p>
+                  {prescription.base_dosage} - {prescription.target_dosage}
+                </p>
+              )}
 
-          <div className="flex gap-1 text-xs font-semibold text-gray-900 lg:flex-col lg:px-2 lg:text-center">
-            {prescription.dosage_type !== "TITRATED" ? (
-              <p>{prescription.base_dosage}</p>
-            ) : (
               <p>
-                {prescription.base_dosage} - {prescription.target_dosage}
+                {prescription.dosage_type !== "PRN"
+                  ? t("PRESCRIPTION_FREQUENCY_" + prescription.frequency)
+                  : prescription.indicator}
               </p>
-            )}
-
-            <p>
-              {prescription.dosage_type !== "PRN"
-                ? t("PRESCRIPTION_FREQUENCY_" + prescription.frequency)
-                : prescription.indicator}
-            </p>
+            </div>
           </div>
-        </div>
-      </td>
+        </td>
 
-      <td />
+        <td />
 
-      {/* Administration Cells */}
-      {props.intervals.map(({ start, end }, index) => (
-        <>
-          <td key={`event-seperator-${index}`}>
-            <AdministrationEventSeperator date={start} />
-          </td>
+        {/* Administration Cells */}
+        {props.intervals.map(({ start, end }, index) => (
+          <>
+            <td key={`event-seperator-${index}`}>
+              <AdministrationEventSeperator date={start} />
+            </td>
 
-          <td key={`event-socket-${index}`} className="text-center">
-            {!data?.results ? (
-              <CareIcon
-                icon="l-spinner"
-                className="animate-spin text-lg text-gray-500"
-              />
-            ) : (
-              <AdministrationEventCell
-                administrations={data.results}
-                interval={{ start, end }}
-                prescription={prescription}
-                refetch={refetch}
-              />
-            )}
-          </td>
-        </>
-      ))}
-      <td />
+            <td key={`event-socket-${index}`} className="text-center">
+              {!data?.results ? (
+                <CareIcon
+                  icon="l-spinner"
+                  className="animate-spin text-lg text-gray-500"
+                />
+              ) : (
+                <AdministrationEventCell
+                  administrations={data.results}
+                  interval={{ start, end }}
+                  prescription={prescription}
+                  refetch={refetch}
+                />
+              )}
+            </td>
+          </>
+        ))}
+        <td />
 
-      {/* Action Buttons */}
-      <td className="space-x-1 pr-2 text-right">
-        <ButtonV2
-          type="button"
-          size="small"
-          disabled={prescription.discontinued}
-          ghost
-          border
-          onClick={() => setShowAdminister(true)}
-        >
-          {t("administer")}
-        </ButtonV2>
-      </td>
-    </tr>
+        {/* Action Buttons */}
+        <td className="space-x-1 pr-2 text-right">
+          {!props.readonly && (
+            <ButtonV2
+              type="button"
+              size="small"
+              disabled={prescription.discontinued}
+              ghost
+              border
+              onClick={() => setShowAdminister(true)}
+            >
+              {t("administer")}
+            </ButtonV2>
+          )}
+        </td>
+      </tr>
+    </>
   );
 }
diff --git a/src/Components/Medicine/MedicineAdministrationSheet/index.tsx b/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
index 41a681f26b0..4c054edcaf3 100644
--- a/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
+++ b/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
@@ -140,6 +140,7 @@ const MedicineAdministrationSheet = ({ readonly, is_prn }: Props) => {
                     refetch();
                     discontinuedPrescriptions.refetch();
                   }}
+                  readonly={readonly || false}
                 />
               )}
             </>

From 6fceb4241c1c632e61759e783ebcb490018a56b0 Mon Sep 17 00:00:00 2001
From: rithviknishad <mail@rithviknishad.dev>
Date: Sun, 21 Apr 2024 20:25:33 +0530
Subject: [PATCH 3/4] disallow titrated prescription for discharge

---
 .../Medicine/CreatePrescriptionForm.tsx       | 41 ++++++++++---------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/Components/Medicine/CreatePrescriptionForm.tsx b/src/Components/Medicine/CreatePrescriptionForm.tsx
index 07e8ec208d6..fcc9443eaa3 100644
--- a/src/Components/Medicine/CreatePrescriptionForm.tsx
+++ b/src/Components/Medicine/CreatePrescriptionForm.tsx
@@ -61,26 +61,27 @@ export default function CreatePrescriptionForm(props: {
             {...field("medicine_object", RequiredFieldValidator())}
             required
           />
-          {props.prescription.dosage_type !== "PRN" && (
-            <CheckBoxFormField
-              label={t("titrate_dosage")}
-              name="Titrate Dosage"
-              value={field("dosage_type").value === "TITRATED"}
-              onChange={(e) => {
-                if (e.value) {
-                  field("dosage_type").onChange({
-                    name: "dosage_type",
-                    value: "TITRATED",
-                  });
-                } else {
-                  field("dosage_type").onChange({
-                    name: "dosage_type",
-                    value: "REGULAR",
-                  });
-                }
-              }}
-            />
-          )}
+          {props.prescription.dosage_type !== "PRN" &&
+            props.prescription.prescription_type !== "DISCHARGE" && (
+              <CheckBoxFormField
+                label={t("titrate_dosage")}
+                name="Titrate Dosage"
+                value={field("dosage_type").value === "TITRATED"}
+                onChange={(e) => {
+                  if (e.value) {
+                    field("dosage_type").onChange({
+                      name: "dosage_type",
+                      value: "TITRATED",
+                    });
+                  } else {
+                    field("dosage_type").onChange({
+                      name: "dosage_type",
+                      value: "REGULAR",
+                    });
+                  }
+                }}
+              />
+            )}
           <div className="flex flex-wrap items-center gap-x-4">
             <SelectFormField
               className="flex-1"

From dfede2cca5a016af91216091b4abc1d90f54b2c8 Mon Sep 17 00:00:00 2001
From: rithviknishad <mail@rithviknishad.dev>
Date: Sun, 21 Apr 2024 21:08:40 +0530
Subject: [PATCH 4/4] fix archive not disabled

---
 .../MedicineAdministrationSheet/AdministrationEventCell.tsx   | 3 +++
 .../MedicineAdministrationSheet/AdministrationTableRow.tsx    | 1 +
 src/Components/Medicine/PrescrpitionTimeline.tsx              | 4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Components/Medicine/MedicineAdministrationSheet/AdministrationEventCell.tsx b/src/Components/Medicine/MedicineAdministrationSheet/AdministrationEventCell.tsx
index aaed004127b..b13e05b5b58 100644
--- a/src/Components/Medicine/MedicineAdministrationSheet/AdministrationEventCell.tsx
+++ b/src/Components/Medicine/MedicineAdministrationSheet/AdministrationEventCell.tsx
@@ -12,6 +12,7 @@ interface Props {
   interval: { start: Date; end: Date };
   prescription: Prescription;
   refetch: () => void;
+  readonly?: boolean;
 }
 
 export default function AdministrationEventCell({
@@ -19,6 +20,7 @@ export default function AdministrationEventCell({
   interval: { start, end },
   prescription,
   refetch,
+  readonly,
 }: Props) {
   const [showTimeline, setShowTimeline] = useState(false);
   // Check if cell belongs to an administered prescription (including start and excluding end)
@@ -56,6 +58,7 @@ export default function AdministrationEventCell({
             prescription={prescription}
             showPrescriptionDetails
             onRefetch={refetch}
+            readonly={readonly}
           />
         </DialogModal>
         <button
diff --git a/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTableRow.tsx b/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTableRow.tsx
index f913286c574..7b2aa7e9ca9 100644
--- a/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTableRow.tsx
+++ b/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTableRow.tsx
@@ -240,6 +240,7 @@ export default function MedicineAdministrationTableRow({
                   interval={{ start, end }}
                   prescription={prescription}
                   refetch={refetch}
+                  readonly={props.readonly}
                 />
               )}
             </td>
diff --git a/src/Components/Medicine/PrescrpitionTimeline.tsx b/src/Components/Medicine/PrescrpitionTimeline.tsx
index 12cf3fd4998..9422d349b3a 100644
--- a/src/Components/Medicine/PrescrpitionTimeline.tsx
+++ b/src/Components/Medicine/PrescrpitionTimeline.tsx
@@ -29,12 +29,14 @@ interface Props {
   prescription: Prescription;
   showPrescriptionDetails?: boolean;
   onRefetch?: () => void;
+  readonly?: boolean;
 }
 
 export default function PrescrpitionTimeline({
   prescription,
   interval,
   onRefetch,
+  readonly,
 }: Props) {
   const consultation = useSlug("consultation");
   const { data, refetch, loading } = useQuery(
@@ -89,7 +91,7 @@ export default function PrescrpitionTimeline({
                   refetch();
                 }}
                 isLastNode={index === events.length - 1}
-                hideArchive={prescription.discontinued}
+                hideArchive={prescription.discontinued || readonly}
               />
             );
         }