Fixed malfunction of filters (#5362)

Co-authored-by: Mohammed Nihal <[email protected]>
ohcnetwork · Apr 21, 2023 · ca1e58d · ca1e58d
1 parent da56ceb
commit ca1e58d
Show file tree

Hide file tree

Showing 13 changed files with 65 additions and 12 deletions.
diff --git a/src/Components/Assets/AssetsList.tsx b/src/Components/Assets/AssetsList.tsx
@@ -48,6 +48,7 @@ const AssetsList = () => {
   const [totalCount, setTotalCount] = useState(0);
   const [facility, setFacility] = useState<FacilityModel>();
   const [asset_type, setAssetType] = useState<string>();
+  const [facilityName, setFacilityName] = useState<string>();
   const [asset_class, setAssetClass] = useState<string>();
   const [locationName, setLocationName] = useState<string>();
   const [importAssetModalOpen, setImportAssetModalOpen] = useState(false);
@@ -118,6 +119,14 @@ const AssetsList = () => {
     },
     [dispatch, fetchData]
   );
+  useEffect(() => {
+    async function fetchFacilityName() {
+      if (!qParams.facility) return setFacilityName("");
+      const res = await dispatch(getAnyFacility(qParams.facility, "facility"));
+      setFacilityName(res?.data?.name);
+    }
+    fetchFacilityName();
+  }, [dispatch, qParams.facility]);
 
   const fetchFacility = useCallback(
     async (status: statusType) => {
@@ -367,14 +376,14 @@ const AssetsList = () => {
           </div>
         </div>
       </div>
-      <AssetFilter {...advancedFilter} />
+      <AssetFilter {...advancedFilter} key={window.location.search} />
       {isLoading ? (
         <Loading />
       ) : (
         <>
           <FilterBadges
             badges={({ badge, value }) => [
-              value("Facility", ["facility", "location"], facility?.name || ""),
+              value("Facility", "facility", facilityName || ""),
               badge("Name/Serial No./QR ID", "search"),
               value("Asset Type", "asset_type", asset_type || ""),
               value("Asset Class", "asset_class", asset_class || ""),

diff --git a/src/Components/ExternalResult/ResultList.tsx b/src/Components/ExternalResult/ResultList.tsx
@@ -334,7 +334,11 @@ export default function ResultList() {
         </table>
       </div>
       <Pagination totalCount={totalCount} />
-      <ListFilter {...advancedFilter} dataList={lsgWardData} />
+      <ListFilter
+        {...advancedFilter}
+        dataList={lsgWardData}
+        key={window.location.search}
+      />
     </div>
   );
 }
diff --git a/src/Components/Facility/HospitalList.tsx b/src/Components/Facility/HospitalList.tsx
@@ -258,7 +258,7 @@ export const HospitalList = () => {
         </div>
       </div>
 
-      <FacilityFilter {...advancedFilter} />
+      <FacilityFilter {...advancedFilter} key={window.location.search} />
       <FilterBadges
         badges={({ badge, value, kasp }) => [
           badge("Facility/District Name", "search"),

diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx
@@ -882,7 +882,7 @@ export const PatientManager = () => {
         />
       </div>
       <div>
-        <PatientFilter {...advancedFilter} />
+        <PatientFilter {...advancedFilter} key={window.location.search} />
         <NavTabs
           onChange={(tab) => updateQuery({ is_active: tab ? "False" : "True" })}
           options={[

diff --git a/src/Components/Patient/SampleViewAdmin.tsx b/src/Components/Patient/SampleViewAdmin.tsx
@@ -378,7 +378,7 @@ export default function SampleViewAdmin() {
           </div>
 
           <AdvancedFilterButton onClick={() => advancedFilter.setShow(true)} />
-          <SampleFilter {...advancedFilter} />
+          <SampleFilter {...advancedFilter} key={window.location.search} />
         </div>
         <FilterBadges
           badges={({ badge, value }) => [

diff --git a/src/Components/Resource/BadgesList.tsx b/src/Components/Resource/BadgesList.tsx
@@ -1,6 +1,7 @@
 import { useState, useEffect } from "react";
 import { getAnyFacility } from "../../Redux/actions";
 import { useDispatch } from "react-redux";
+import { SHIFTING_FILTER_ORDER } from "../../Common/constants";
 
 export default function BadgesList(props: any) {
   const { appliedFilters, FilterBadges } = props;
@@ -43,10 +44,24 @@ export default function BadgesList(props: any) {
     fetchData();
   }, [dispatch, appliedFilters.assigned_facility]);
 
+  const getDescShiftingFilterOrder = (ordering: any) => {
+    let desc = "";
+    SHIFTING_FILTER_ORDER.map((item: any) => {
+      if (item.text === ordering) {
+        desc = item.desc;
+      }
+    });
+    return desc;
+  };
+
   return (
     <FilterBadges
       badges={({ badge, value, boolean, dateRange }: any) => [
-        badge("Ordering", "ordering"),
+        value(
+          "Ordering",
+          "ordering",
+          getDescShiftingFilterOrder(appliedFilters.ordering)
+        ),
         badge("Status", "status"),
         boolean("Emergency", "emergency", {
           trueValue: "yes",

diff --git a/src/Components/Resource/ListView.tsx b/src/Components/Resource/ListView.tsx
@@ -248,7 +248,11 @@ export default function ListView() {
           </div>
         )}
       </div>
-      <ListFilter {...advancedFilter} showResourceStatus={true} />
+      <ListFilter
+        {...advancedFilter}
+        showResourceStatus={true}
+        key={window.location.search}
+      />
     </div>
   );
 }
diff --git a/src/Components/Resource/ResourceBoardView.tsx b/src/Components/Resource/ResourceBoardView.tsx
@@ -112,7 +112,7 @@ export default function BoardView() {
           )}
         </div>
       </ScrollingComponent>
-      <ListFilter {...advancedFilter} />
+      <ListFilter {...advancedFilter} key={window.location.search} />
     </div>
   );
 }
diff --git a/src/Components/Shifting/BadgesList.tsx b/src/Components/Shifting/BadgesList.tsx
@@ -2,6 +2,7 @@ import { useState, useEffect } from "react";
 import { getUserList, getAnyFacility } from "../../Redux/actions";
 import { useDispatch } from "react-redux";
 import { useTranslation } from "react-i18next";
+import { SHIFTING_FILTER_ORDER } from "../../Common/constants";
 
 export default function BadgesList(props: any) {
   const { qParams, FilterBadges } = props;
@@ -63,6 +64,15 @@ export default function BadgesList(props: any) {
     }
     fetchData();
   }, [dispatch, qParams.assigned_facility]);
+  const getDescShiftingFilterOrder = (ordering: any) => {
+    let desc = "";
+    SHIFTING_FILTER_ORDER.map((item: any) => {
+      if (item.text === ordering) {
+        desc = item.desc;
+      }
+    });
+    return desc;
+  };
 
   return (
     <FilterBadges
@@ -82,6 +92,7 @@ export default function BadgesList(props: any) {
         phoneNumber(t("phone_no"), "patient_phone_number"),
         badge(t("patient_name"), "patient_name"),
         ...dateRange(t("created"), "created_date"),
+        ...dateRange(t("modified"), "modified_date"),
         badge(t("disease_status"), "disease_status"),
         badge(t("breathlessness_level"), "breathlessness_level"),
         value(t("assigned_to"), "assigned_to", assignedUsername),
@@ -96,6 +107,11 @@ export default function BadgesList(props: any) {
           "shifting_approving_facility",
           approvingFacilityName
         ),
+        value(
+          t("ordering"),
+          "ordering",
+          getDescShiftingFilterOrder(qParams.ordering)
+        ),
       ]}
     />
   );

diff --git a/src/Components/Shifting/BoardView.tsx b/src/Components/Shifting/BoardView.tsx
@@ -125,7 +125,7 @@ export default function BoardView() {
           )}
         </div>
       </ScrollingComponent>
-      <ListFilter {...advancedFilter} />
+      <ListFilter {...advancedFilter} key={window.location.search} />
     </div>
   );
 }
diff --git a/src/Components/Shifting/ListView.tsx b/src/Components/Shifting/ListView.tsx
@@ -339,7 +339,11 @@ export default function ListView() {
           </div>
         )}
       </div>
-      <ListFilter showShiftingStatus={true} {...advancedFilter} />
+      <ListFilter
+        showShiftingStatus={true}
+        {...advancedFilter}
+        key={window.location.search}
+      />
     </Page>
   );
 }
diff --git a/src/Components/Users/ManageUsers.tsx b/src/Components/Users/ManageUsers.tsx
@@ -470,7 +470,7 @@ export default function ManageUsers() {
             {userTypes.length && addUser}
           </div>
 
-          <UserFilter {...advancedFilter} />
+          <UserFilter {...advancedFilter} key={window.location.search} />
         </div>
       </div>
 

diff --git a/src/Locale/en/Common.json b/src/Locale/en/Common.json
@@ -24,6 +24,7 @@
   "no": "No",
   "status": "Status",
   "created": "Created",
+  "modified": "Modified",
   "updated": "Updated",
   "assigned_to": "Assigned to",
   "cancel": "Cancel",
-Original file line number
+Diff line change
@@ Expand Up / @@ -470,7 +470,7 @@ export default function ManageUsers() { @@
                 {userTypes.length && addUser}
               </div>
-              <UserFilter {...advancedFilter} />
+              <UserFilter {...advancedFilter} key={window.location.search} />
             </div>
           </div>
@@ Expand Down @@