From 4568e5ffcf60b28d64e7f938bfd0e60ebba1337f Mon Sep 17 00:00:00 2001
From: Rithvik Nishad <mail@rithviknishad.dev>
Date: Wed, 1 May 2024 00:01:36 +0530
Subject: [PATCH] Fixes issue preventing from administering down titration
 prescriptions (#7743)

* Fixes issues with administering down titration prescriptions

* fix for create prescription form
---
 src/Components/Medicine/CreatePrescriptionForm.tsx |  2 +-
 src/Components/Medicine/EditPrescriptionForm.tsx   |  2 +-
 .../AdministrationTableRow.tsx                     |  2 +-
 src/Components/Medicine/PrescriptionBuilder.tsx    |  2 +-
 src/Components/Medicine/validators.ts              | 14 ++++++++------
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/Components/Medicine/CreatePrescriptionForm.tsx b/src/Components/Medicine/CreatePrescriptionForm.tsx
index fcc9443eaa3..b918d5781fe 100644
--- a/src/Components/Medicine/CreatePrescriptionForm.tsx
+++ b/src/Components/Medicine/CreatePrescriptionForm.tsx
@@ -92,7 +92,7 @@ export default function CreatePrescriptionForm(props: {
               optionValue={(key) => key}
             />
             {field("dosage_type").value === "TITRATED" ? (
-              <div className="flex w-full gap-4">
+              <div className="flex w-full flex-[2] gap-4">
                 <DosageFormField
                   className="flex-1"
                   label={t("start_dosage")}
diff --git a/src/Components/Medicine/EditPrescriptionForm.tsx b/src/Components/Medicine/EditPrescriptionForm.tsx
index 0fef57c0641..1af7a1a0356 100644
--- a/src/Components/Medicine/EditPrescriptionForm.tsx
+++ b/src/Components/Medicine/EditPrescriptionForm.tsx
@@ -120,7 +120,7 @@ export default function EditPrescriptionForm(props: Props) {
               optionValue={(key) => key}
             />
             {field("dosage_type").value === "TITRATED" ? (
-              <div className="flex w-full gap-4">
+              <div className="flex w-full flex-[2] gap-4">
                 <DosageFormField
                   className="flex-1"
                   label={t("start_dosage")}
diff --git a/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTableRow.tsx b/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTableRow.tsx
index 7b2aa7e9ca9..b173c35ebbb 100644
--- a/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTableRow.tsx
+++ b/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTableRow.tsx
@@ -153,7 +153,7 @@ export default function MedicineAdministrationTableRow({
               <span>{t("edit_caution_note")}</span>
             </div>
           }
-          className="w-full max-w-3xl lg:min-w-[600px]"
+          className="w-full max-w-4xl lg:min-w-[768px]"
         >
           <EditPrescriptionForm
             initial={prescription}
diff --git a/src/Components/Medicine/PrescriptionBuilder.tsx b/src/Components/Medicine/PrescriptionBuilder.tsx
index 6782d911b6a..bd7701e3e62 100644
--- a/src/Components/Medicine/PrescriptionBuilder.tsx
+++ b/src/Components/Medicine/PrescriptionBuilder.tsx
@@ -102,7 +102,7 @@ export default function PrescriptionBuilder({
               <span>{t("modification_caution_note")}</span>
             </div>
           }
-          className="w-full max-w-3xl lg:min-w-[600px]"
+          className="w-full max-w-4xl lg:min-w-[768px]"
         >
           <CreatePrescriptionForm
             prescription={
diff --git a/src/Components/Medicine/validators.ts b/src/Components/Medicine/validators.ts
index ead48b16b64..13460230737 100644
--- a/src/Components/Medicine/validators.ts
+++ b/src/Components/Medicine/validators.ts
@@ -42,6 +42,7 @@ const PRESCRIPTION_COMPARE_FIELDS: (keyof Prescription)[] = [
   "medicine",
   "days",
   "discontinued",
+  "target_dosage",
   "base_dosage",
   "frequency",
   "indicator",
@@ -77,11 +78,12 @@ export const AdministrationDosageValidator = (
     if (value?.split(" ")[1] !== base_dosage?.split(" ")[1])
       return "Unit must be the same as start and target dosage's unit";
 
-    if (
-      baseDosage &&
-      targetDosage &&
-      (valueDosage < baseDosage || valueDosage > targetDosage)
-    )
-      return "Dosage should be between start and target dosage";
+    if (baseDosage && targetDosage) {
+      const [min, max] = [baseDosage, targetDosage].sort((a, b) => a - b);
+
+      if (!(min <= valueDosage && valueDosage <= max)) {
+        return "Dosage should be between start and target dosage";
+      }
+    }
   };
 };