Sorted daily rounds by Measured At instead of Created at

ohcnetwork · Nov 26, 2023 · c753f32 · c753f32
1 parent c37b554
commit c753f32
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/CAREUI/misc/PaginatedList.tsx b/src/CAREUI/misc/PaginatedList.tsx
@@ -33,6 +33,7 @@ function useContextualized<TItem>() {
 interface Props<TItem> extends QueryOptions<PaginatedResponse<TItem>> {
   route: QueryRoute<PaginatedResponse<TItem>>;
   perPage?: number;
+  sortFunc?: (item1: any, item2: any) => number;
   children: (
     ctx: PaginatedListContext<TItem>,
     query: ReturnType<typeof useQuery<PaginatedResponse<TItem>>>
@@ -42,6 +43,7 @@ interface Props<TItem> extends QueryOptions<PaginatedResponse<TItem>> {
 export default function PaginatedList<TItem extends object>({
   children,
   route,
+  sortFunc,
   perPage = DEFAULT_PER_PAGE_LIMIT,
   ...queryOptions
 }: Props<TItem>) {
@@ -55,7 +57,11 @@ export default function PaginatedList<TItem extends object>({
     },
   });
 
-  const items = query.data?.results ?? [];
+  const items = query.data?.results
+    ? sortFunc
+      ? query.data?.results.sort(sortFunc)
+      : query.data?.results
+    : [];
 
   return (
     <context.Provider

diff --git a/src/Components/Facility/Consultations/DailyRoundsList.tsx b/src/Components/Facility/Consultations/DailyRoundsList.tsx
@@ -26,6 +26,11 @@ export const DailyRoundsList = (props: any) => {
       query={{
         rounds_type: showAutomatedRounds ? "" : "NORMAL,VENTILATOR,ICU",
       }}
+      sortFunc={(item1, item2) => {
+        const takenAt1 = item1.taken_at;
+        const takenAt2 = item2.taken_at;
+        return Number(new Date(takenAt2)) - Number(new Date(takenAt1));
+      }}
     >
       {(_) => (
         <div className="-mt-2 flex w-full flex-col gap-4">
@@ -52,6 +57,7 @@ export const DailyRoundsList = (props: any) => {
                     />
                   );
                 }
+                console.log(items);
                 return (
                   <DefaultLogUpdateCard
                     round={item}