Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added sorting for events #8270

Merged
merged 4 commits into from
Aug 9, 2024
Merged

Added sorting for events #8270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a479857
added sorting for events
khavinshankar Aug 8, 2024
9ea5376
Merge branch 'develop' into sort-events
nihal467 Aug 8, 2024
9db5a37
added translations for taken at sort options
khavinshankar Aug 9, 2024
e1237ac
fixed translation
khavinshankar Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/Common/constants.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,13 @@ export const PATIENT_SORT_OPTIONS: SortOption[] = [
{ isAscending: false, value: "-name" },
];

export const EVENTS_SORT_OPTIONS: SortOption[] = [
{ isAscending: false, value: "-created_date" },
{ isAscending: true, value: "created_date" },
{ isAscending: false, value: "-taken_at" },
{ isAscending: true, value: "taken_at" },
];

export const DISCHARGED_PATIENT_SORT_OPTIONS: SortOption[] = [
{ isAscending: false, value: "-created_date" },
{ isAscending: true, value: "created_date" },
Expand Down
19 changes: 18 additions & 1 deletion src/Components/Facility/ConsultationDetails/Events/EventsList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,32 @@ import LoadingLogUpdateCard from "../../Consultations/DailyRounds/LoadingCard";
import GenericEvent from "./GenericEvent";
import { getEventIcon } from "./iconMap";
import { EventGeneric } from "./types";
import SortDropdownMenu from "../../../Common/SortDropdown";
import { EVENTS_SORT_OPTIONS } from "../../../../Common/constants";
import { QueryParams } from "../../../../Utils/request/types";
import { useState } from "react";

export default function EventsList() {
const [consultationId] = useSlugs("consultation");
const { t } = useTranslation();
const [query, setQuery] = useState<QueryParams>();

return (
<PaginatedList route={routes.getEvents} pathParams={{ consultationId }}>
<PaginatedList
route={routes.getEvents}
pathParams={{ consultationId }}
query={query}
>
{() => (
<>
<div className="m-1 flex flex-1 justify-end">
<SortDropdownMenu
options={EVENTS_SORT_OPTIONS}
selected={query?.ordering?.toString()}
onSelect={setQuery}
/>
</div>

<div className="mt-4 flex w-full flex-col gap-4">
<div className="flex max-h-[85vh] flex-col gap-4 overflow-y-auto overflow-x-hidden px-3">
<PaginatedList.WhenEmpty className="flex w-full justify-center border-b border-secondary-200 bg-white p-5 text-center text-2xl font-bold text-secondary-500">
Expand Down
2 changes: 2 additions & 0 deletions src/Locale/en/SortOptions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
"facility__name,-last_consultation__current_bed__bed__name": "Bed No. N-1",
"-review_time": "Latest review date first",
"review_time": "Oldest review date first",
"taken_at": "Oldest taken date first",
"-taken_at": "Latest taken date first",
"name": "Patient name A-Z",
"-name": "Patient name Z-A",
"bed__name": "Bed No. 1-N",
Expand Down
Loading