From 2817c98bea07de2b7806be7325f690becee1d89b Mon Sep 17 00:00:00 2001
From: Ashraf Mohammed <98876115+AshrafMd-1@users.noreply.github.com>
Date: Tue, 14 Nov 2023 13:05:55 +0000
Subject: [PATCH 1/4] fix scroll overlay

---
 .../MedicineAdministrationSheet/index.tsx     | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/Components/Medicine/MedicineAdministrationSheet/index.tsx b/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
index 187d5447314..e83caf09044 100644
--- a/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
+++ b/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
@@ -106,7 +106,9 @@ const MedicineAdministrationSheet = ({ readonly, is_prn }: Props) => {
             <CareIcon icon="l-arrow-down" className="animate-bounce text-2xl" />
           </div>
         }
-        disableOverlay={loading || !prescriptions?.length}
+        disableOverlay={
+          loading || !prescriptions?.length || !(prescriptions?.length > 1)
+        }
       >
         {loading && <Loading />}
         {prescriptions?.length === 0 && <NoPrescriptions prn={is_prn} />}
@@ -121,23 +123,22 @@ const MedicineAdministrationSheet = ({ readonly, is_prn }: Props) => {
             }}
           />
         )}
-
-        {!showDiscontinued && !!discontinuedCount && (
-          <ButtonV2
-            variant="secondary"
-            className="group sticky left-0 w-full rounded-b-lg rounded-t-none bg-gray-100"
-            onClick={() => setShowDiscontinued(true)}
-          >
-            <span className="flex w-full items-center justify-start gap-1 text-xs transition-all duration-200 ease-in-out group-hover:gap-3 md:text-sm">
-              <CareIcon icon="l-eye" className="text-lg" />
-              <span>
-                Show <strong>{discontinuedCount}</strong> discontinued
-                prescription(s)
-              </span>
-            </span>
-          </ButtonV2>
-        )}
       </ScrollOverlay>
+      {!showDiscontinued && !!discontinuedCount && (
+        <ButtonV2
+          variant="secondary"
+          className="group sticky left-0 w-full rounded-b-lg rounded-t-none bg-gray-100"
+          onClick={() => setShowDiscontinued(true)}
+        >
+          <span className="flex w-full items-center justify-start gap-1 text-xs transition-all duration-200 ease-in-out group-hover:gap-3 md:text-sm">
+            <CareIcon icon="l-eye" className="text-lg" />
+            <span>
+              Show <strong>{discontinuedCount}</strong> discontinued
+              prescription(s)
+            </span>
+          </span>
+        </ButtonV2>
+      )}
     </div>
   );
 };

From bcb2a1f4cd538b5c9e335ccc2c187556a466ffff Mon Sep 17 00:00:00 2001
From: Ashraf Mohammed <ashrafmd0506@gmail.com>
Date: Wed, 15 Nov 2023 13:26:30 +0530
Subject: [PATCH 2/4] add style

---
 .../MedicineAdministrationSheet/index.tsx     | 83 ++++++++++---------
 1 file changed, 43 insertions(+), 40 deletions(-)

diff --git a/src/Components/Medicine/MedicineAdministrationSheet/index.tsx b/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
index e83caf09044..6a187f1f998 100644
--- a/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
+++ b/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
@@ -97,48 +97,51 @@ const MedicineAdministrationSheet = ({ readonly, is_prn }: Props) => {
           )
         }
       />
-
-      <ScrollOverlay
-        className="rounded-lg border shadow"
-        overlay={
-          <div className="flex items-center gap-2 pb-2">
-            <span className="text-sm">Scroll to view more prescriptions</span>
-            <CareIcon icon="l-arrow-down" className="animate-bounce text-2xl" />
-          </div>
-        }
-        disableOverlay={
-          loading || !prescriptions?.length || !(prescriptions?.length > 1)
-        }
-      >
-        {loading && <Loading />}
-        {prescriptions?.length === 0 && <NoPrescriptions prn={is_prn} />}
-
-        {!!prescriptions?.length && (
-          <MedicineAdministrationTable
-            prescriptions={prescriptions}
-            pagination={pagination}
-            onRefetch={() => {
-              refetch();
-              discontinuedPrescriptions.refetch();
-            }}
-          />
-        )}
-      </ScrollOverlay>
-      {!showDiscontinued && !!discontinuedCount && (
-        <ButtonV2
-          variant="secondary"
-          className="group sticky left-0 w-full rounded-b-lg rounded-t-none bg-gray-100"
-          onClick={() => setShowDiscontinued(true)}
+      <div className="rounded-lg border shadow">
+        <ScrollOverlay
+          overlay={
+            <div className="flex items-center gap-2 pb-2">
+              <span className="text-sm">Scroll to view more prescriptions</span>
+              <CareIcon
+                icon="l-arrow-down"
+                className="animate-bounce text-2xl"
+              />
+            </div>
+          }
+          disableOverlay={
+            loading || !prescriptions?.length || !(prescriptions?.length > 1)
+          }
         >
-          <span className="flex w-full items-center justify-start gap-1 text-xs transition-all duration-200 ease-in-out group-hover:gap-3 md:text-sm">
-            <CareIcon icon="l-eye" className="text-lg" />
-            <span>
-              Show <strong>{discontinuedCount}</strong> discontinued
-              prescription(s)
+          {loading && <Loading />}
+          {prescriptions?.length === 0 && <NoPrescriptions prn={is_prn} />}
+
+          {!!prescriptions?.length && (
+            <MedicineAdministrationTable
+              prescriptions={prescriptions}
+              pagination={pagination}
+              onRefetch={() => {
+                refetch();
+                discontinuedPrescriptions.refetch();
+              }}
+            />
+          )}
+        </ScrollOverlay>
+        {!showDiscontinued && !!discontinuedCount && (
+          <ButtonV2
+            variant="secondary"
+            className="group sticky left-0 w-full rounded-b-lg rounded-t-none bg-gray-100"
+            onClick={() => setShowDiscontinued(true)}
+          >
+            <span className="flex w-full items-center justify-start gap-1 text-xs transition-all duration-200 ease-in-out group-hover:gap-3 md:text-sm">
+              <CareIcon icon="l-eye" className="text-lg" />
+              <span>
+                Show <strong>{discontinuedCount}</strong> discontinued
+                prescription(s)
+              </span>
             </span>
-          </span>
-        </ButtonV2>
-      )}
+          </ButtonV2>
+        )}
+      </div>
     </div>
   );
 };

From c1cdaf438f923c90f13f7e03acd5b8c3b2a80582 Mon Sep 17 00:00:00 2001
From: Ashraf Mohammed <ashrafmd0506@gmail.com>
Date: Wed, 15 Nov 2023 14:04:14 +0530
Subject: [PATCH 3/4] add hide button

---
 .../MedicineAdministrationSheet/index.tsx     | 61 ++++++++++++-------
 1 file changed, 40 insertions(+), 21 deletions(-)

diff --git a/src/Components/Medicine/MedicineAdministrationSheet/index.tsx b/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
index 6a187f1f998..f30cb6e704a 100644
--- a/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
+++ b/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
@@ -39,7 +39,11 @@ const MedicineAdministrationSheet = ({ readonly, is_prn }: Props) => {
 
   const discontinuedPrescriptions = useQuery(MedicineRoutes.listPrescriptions, {
     pathParams: { consultation },
-    query: { ...filters, discontinued: true },
+    query: {
+      ...filters,
+      limit: showDiscontinued ? 100 : 1,
+      discontinued: true,
+    },
     prefetch: !showDiscontinued,
   });
 
@@ -112,33 +116,48 @@ const MedicineAdministrationSheet = ({ readonly, is_prn }: Props) => {
             loading || !prescriptions?.length || !(prescriptions?.length > 1)
           }
         >
-          {loading && <Loading />}
-          {prescriptions?.length === 0 && <NoPrescriptions prn={is_prn} />}
-
-          {!!prescriptions?.length && (
-            <MedicineAdministrationTable
-              prescriptions={prescriptions}
-              pagination={pagination}
-              onRefetch={() => {
-                refetch();
-                discontinuedPrescriptions.refetch();
-              }}
-            />
+          {loading ? (
+            <Loading />
+          ) : (
+            <>
+              {prescriptions?.length === 0 && <NoPrescriptions prn={is_prn} />}
+              {!!prescriptions?.length && (
+                <MedicineAdministrationTable
+                  prescriptions={prescriptions}
+                  pagination={pagination}
+                  onRefetch={() => {
+                    refetch();
+                    discontinuedPrescriptions.refetch();
+                  }}
+                />
+              )}
+            </>
           )}
         </ScrollOverlay>
-        {!showDiscontinued && !!discontinuedCount && (
+        {!!discontinuedCount && (
           <ButtonV2
             variant="secondary"
             className="group sticky left-0 w-full rounded-b-lg rounded-t-none bg-gray-100"
-            onClick={() => setShowDiscontinued(true)}
+            onClick={() => !loading && setShowDiscontinued(!showDiscontinued)}
           >
-            <span className="flex w-full items-center justify-start gap-1 text-xs transition-all duration-200 ease-in-out group-hover:gap-3 md:text-sm">
-              <CareIcon icon="l-eye" className="text-lg" />
-              <span>
-                Show <strong>{discontinuedCount}</strong> discontinued
-                prescription(s)
+            {loading ? (
+              <span className="flex w-full items-center justify-start gap-1 text-xs transition-all duration-200 ease-in-out group-hover:gap-3 md:text-sm">
+                <CareIcon icon="l-spinner-alt" className="text-lg" />
+                <span>Loading...</span>
+              </span>
+            ) : (
+              <span className="flex w-full items-center justify-start gap-1 text-xs transition-all duration-200 ease-in-out group-hover:gap-3 md:text-sm">
+                <CareIcon
+                  icon={showDiscontinued ? "l-eye-slash" : "l-eye"}
+                  className="text-lg"
+                />
+                <span>
+                  {showDiscontinued ? "Hide" : "Show"}{" "}
+                  <strong>{discontinuedCount}</strong> discontinued
+                  prescription(s)
+                </span>
               </span>
-            </span>
+            )}
           </ButtonV2>
         )}
       </div>

From 6bdde35d4d2351a21c321e8ede15fe31efbb1cbb Mon Sep 17 00:00:00 2001
From: Ashraf Mohammed <ashrafmd0506@gmail.com>
Date: Wed, 15 Nov 2023 14:58:53 +0530
Subject: [PATCH 4/4] add loading logic

---
 .../MedicineAdministrationSheet/index.tsx     | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/Components/Medicine/MedicineAdministrationSheet/index.tsx b/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
index f30cb6e704a..9b37c53f599 100644
--- a/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
+++ b/src/Components/Medicine/MedicineAdministrationSheet/index.tsx
@@ -138,26 +138,20 @@ const MedicineAdministrationSheet = ({ readonly, is_prn }: Props) => {
           <ButtonV2
             variant="secondary"
             className="group sticky left-0 w-full rounded-b-lg rounded-t-none bg-gray-100"
-            onClick={() => !loading && setShowDiscontinued(!showDiscontinued)}
+            disabled={loading || discontinuedPrescriptions.loading}
+            onClick={() => setShowDiscontinued(!showDiscontinued)}
           >
-            {loading ? (
-              <span className="flex w-full items-center justify-start gap-1 text-xs transition-all duration-200 ease-in-out group-hover:gap-3 md:text-sm">
-                <CareIcon icon="l-spinner-alt" className="text-lg" />
-                <span>Loading...</span>
-              </span>
-            ) : (
-              <span className="flex w-full items-center justify-start gap-1 text-xs transition-all duration-200 ease-in-out group-hover:gap-3 md:text-sm">
-                <CareIcon
-                  icon={showDiscontinued ? "l-eye-slash" : "l-eye"}
-                  className="text-lg"
-                />
-                <span>
-                  {showDiscontinued ? "Hide" : "Show"}{" "}
-                  <strong>{discontinuedCount}</strong> discontinued
-                  prescription(s)
-                </span>
+            <span className="flex w-full items-center justify-start gap-1 text-xs transition-all duration-200 ease-in-out group-hover:gap-3 md:text-sm">
+              <CareIcon
+                icon={showDiscontinued ? "l-eye-slash" : "l-eye"}
+                className="text-lg"
+              />
+              <span>
+                {showDiscontinued ? "Hide" : "Show"}{" "}
+                <strong>{discontinuedCount}</strong> discontinued
+                prescription(s)
               </span>
-            )}
+            </span>
           </ButtonV2>
         )}
       </div>