From 5204f716aeec24575579b91dd26c8f0a4a4fc951 Mon Sep 17 00:00:00 2001
From: Jacobjohnjeevan <mail@jacobjeevan.me>
Date: Mon, 21 Oct 2024 11:49:31 +0530
Subject: [PATCH] Reset location filter on checkbox change

- translations
---
 .../Facility/CentralNursingStation.tsx        | 25 ++++++++++---------
 src/Locale/en.json                            |  4 ++-
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/Components/Facility/CentralNursingStation.tsx b/src/Components/Facility/CentralNursingStation.tsx
index 2dc5e18aff0..07b7b4a0169 100644
--- a/src/Components/Facility/CentralNursingStation.tsx
+++ b/src/Components/Facility/CentralNursingStation.tsx
@@ -81,6 +81,13 @@ export default function CentralNursingStation({ facilityId }: Props) {
       collapseSidebar
       options={
         <div className="flex flex-row-reverse items-center gap-4 md:flex-row">
+          <Pagination
+            className=""
+            cPage={qParams.page}
+            defaultPerPage={PER_PAGE_LIMIT}
+            data={{ totalCount }}
+            onChange={(page) => updatePage(page)}
+          />
           <Popover className="relative">
             <PopoverButton>
               <ButtonV2
@@ -109,8 +116,8 @@ export default function CentralNursingStation({ facilityId }: Props) {
                   <div className="rounded-t-lg bg-secondary-100 px-6 py-4">
                     <div className="flow-root rounded-md">
                       <span className="block text-sm text-secondary-800">
-                        <span className="font-bold">{totalCount}</span> Vitals
-                        Monitor present
+                        <span className="font-bold">{totalCount}</span>{" "}
+                        {t("vitals_present")}
                       </span>
                     </div>
                   </div>
@@ -168,7 +175,9 @@ export default function CentralNursingStation({ facilityId }: Props) {
                       value={JSON.parse(
                         qParams.monitors_without_patient ?? "false",
                       )}
-                      onChange={(e) => updateQuery({ [e.name]: `${e.value}` })}
+                      onChange={(e) =>
+                        updateQuery({ [e.name]: `${e.value}`, location: "" })
+                      }
                       labelClassName="text-sm"
                       errorClassName="hidden"
                     />
@@ -193,14 +202,6 @@ export default function CentralNursingStation({ facilityId }: Props) {
               </PopoverPanel>
             </Transition>
           </Popover>
-
-          <Pagination
-            className=""
-            cPage={qParams.page}
-            defaultPerPage={PER_PAGE_LIMIT}
-            data={{ totalCount }}
-            onChange={(page) => updatePage(page)}
-          />
         </div>
       }
     >
@@ -208,7 +209,7 @@ export default function CentralNursingStation({ facilityId }: Props) {
         <Loading />
       ) : data.length === 0 ? (
         <div className="flex h-[80vh] w-full items-center justify-center text-center text-black">
-          No Vitals Monitor present in this location or facility.
+          {t("no_vitals_present")}
         </div>
       ) : (
         <div className="3xl:grid-cols-3 mt-1 grid grid-cols-1 gap-1 lg:grid-cols-2">
diff --git a/src/Locale/en.json b/src/Locale/en.json
index 5f2652fa91b..eefb1e7ca47 100644
--- a/src/Locale/en.json
+++ b/src/Locale/en.json
@@ -1054,5 +1054,7 @@
   "length": "Length ({{unit}})",
   "expand_sidebar": "Expand Sidebar",
   "collapse_sidebar": "Collapse Sidebar",
-  "linked_skills": "Linked Skills"
+  "linked_skills": "Linked Skills",
+  "no_vitals_present": "No Vitals Monitor present in this location or facility",
+  "vitals_present": "Vitals Monitor present"
 }
\ No newline at end of file