diff --git a/src/Common/constants.tsx b/src/Common/constants.tsx index 71fac975492..07768a16cee 100644 --- a/src/Common/constants.tsx +++ b/src/Common/constants.tsx @@ -207,6 +207,15 @@ export const PATIENT_SORT_OPTIONS: SortOption[] = [ { isAscending: false, value: "-name" }, ]; +export const DISCHARGED_PATIENT_SORT_OPTIONS: SortOption[] = [ + { isAscending: false, value: "-created_date" }, + { isAscending: true, value: "created_date" }, + { isAscending: false, value: "-modified_date" }, + { isAscending: true, value: "modified_date" }, + { isAscending: true, value: "name" }, + { isAscending: false, value: "-name" }, +]; + export const getBedTypes = ({ kasp_enabled, kasp_string, diff --git a/src/Components/Facility/DischargedPatientsList.tsx b/src/Components/Facility/DischargedPatientsList.tsx index af5f79cf4c6..bdd0a0a649e 100644 --- a/src/Components/Facility/DischargedPatientsList.tsx +++ b/src/Components/Facility/DischargedPatientsList.tsx @@ -1,4 +1,4 @@ -import { Link, navigate, useQueryParams } from "raviger"; +import { Link, navigate } from "raviger"; import routes from "../../Redux/api"; import Page from "../Common/components/Page"; import PaginatedList from "../../CAREUI/misc/PaginatedList"; @@ -7,12 +7,17 @@ import { PatientModel } from "../Patient/models"; import useQuery from "../../Utils/request/useQuery"; import { debounce } from "lodash-es"; import SearchInput from "../Form/SearchInput"; -import { GENDER_TYPES } from "../../Common/constants"; +import { + DISCHARGED_PATIENT_SORT_OPTIONS, + GENDER_TYPES, +} from "../../Common/constants"; import CareIcon from "../../CAREUI/icons/CareIcon"; import RecordMeta from "../../CAREUI/display/RecordMeta"; import { formatPatientAge } from "../../Utils/utils"; import { useTranslation } from "react-i18next"; import SwitchTabs from "../Common/components/SwitchTabs"; +import SortDropdownMenu from "../Common/SortDropdown"; +import useFilters from "../../Common/hooks/useFilters"; const DischargedPatientsList = ({ facility_external_id, @@ -24,7 +29,7 @@ const DischargedPatientsList = ({ pathParams: { id: facility_external_id }, }); - const [search, setSearch] = useQueryParams(); + const { qParams, updateQuery, FilterBadges } = useFilters({}); return ( setSearch({ [e.name]: e.value }), 300)} - /> - navigate("/patients")} - isTab2Active + value={qParams.name} + onChange={debounce((e) => updateQuery({ name: e.value }))} /> +
+ navigate("/patients")} + isTab2Active + /> + updateQuery({ ordering: e.ordering })} + /> +
} > +
+ [ordering()]} /> +
{() => (