Merge branch 'develop' into useQuery-migrations/file-upload

ohcnetwork · Feb 14, 2024 · e26bcbc · e26bcbc
2 parents 4e77a1e + d36c0f2
commit e26bcbc
Show file tree

Hide file tree

Showing 23 changed files with 826 additions and 921 deletions.
diff --git a/src/CAREUI/display/Timeline.tsx b/src/CAREUI/display/Timeline.tsx
@@ -14,7 +14,7 @@ export interface TimelineEvent<TType = string> {
 }
 
 interface TimelineProps {
-  className: string;
+  className?: string;
   children: React.ReactNode | React.ReactNode[];
   name: string;
 }

diff --git a/src/CAREUI/misc/PaginatedList.tsx b/src/CAREUI/misc/PaginatedList.tsx
@@ -7,7 +7,6 @@ import ButtonV2, {
 import CareIcon from "../icons/CareIcon";
 import { classNames } from "../../Utils/utils";
 import Pagination from "../../Components/Common/Pagination";
-import Timeline from "../display/Timeline";
 
 const DEFAULT_PER_PAGE_LIMIT = 14;
 
@@ -135,21 +134,19 @@ const Items = <TItem extends object>(props: ItemsProps<TItem>) => {
   }
 
   return (
-    <Timeline className="rounded-lg bg-white p-2 shadow" name="log update">
-      <ul className={props.className}>
-        {loading && props.shimmer
-          ? Array.from({ length: props.shimmerCount ?? 8 }).map((_, i) => (
-              <li key={i} className="w-full">
-                {props.shimmer}
-              </li>
-            ))
-          : items.map((item, index, items) => (
-              <li key={index} className="w-full">
-                {props.children(item, items)}
-              </li>
-            ))}
-      </ul>
-    </Timeline>
+    <ul className={props.className}>
+      {loading && props.shimmer
+        ? Array.from({ length: props.shimmerCount ?? 8 }).map((_, i) => (
+            <li key={i} className="w-full">
+              {props.shimmer}
+            </li>
+          ))
+        : items.map((item, index, items) => (
+            <li key={index} className="w-full">
+              {props.children(item, items)}
+            </li>
+          ))}
+    </ul>
   );
 };
 

diff --git a/src/Components/Facility/ConsultationDoctorNotes/index.tsx b/src/Components/Facility/ConsultationDoctorNotes/index.tsx
@@ -34,6 +34,8 @@ const ConsultationDoctorNotes = (props: ConsultationDoctorNotesProps) => {
     notes: [],
     cPage: 1,
     totalPages: 1,
+    facilityId: facilityId,
+    patientId: patientId,
   };
   const [state, setState] = useState(initialData);
 
@@ -113,8 +115,6 @@ const ConsultationDoctorNotes = (props: ConsultationDoctorNotesProps) => {
         <PatientConsultationNotesList
           state={state}
           setState={setState}
-          patientId={patientId}
-          facilityId={facilityId}
           reload={reload}
           setReload={setReload}
         />

diff --git a/src/Components/Facility/Consultations/DailyRoundsList.tsx b/src/Components/Facility/Consultations/DailyRoundsList.tsx
@@ -10,7 +10,8 @@ import PageTitle from "../../Common/PageTitle";
 import DailyRoundsFilter from "./DailyRoundsFilter";
 import { ConsultationModel } from "../models";
 import { useSlugs } from "../../../Common/hooks/useSlug";
-import { TimelineNode } from "../../../CAREUI/display/Timeline";
+
+import Timeline, { TimelineNode } from "../../../CAREUI/display/Timeline";
 import { useState } from "react";
 import { QueryParams } from "../../../Utils/request/types";
 
@@ -52,69 +53,71 @@ export default function DailyRoundsList({ consultation }: Props) {
               <PaginatedList.WhenLoading>
                 <LoadingLogUpdateCard />
               </PaginatedList.WhenLoading>
-              <PaginatedList.Items<DailyRoundsModel> className="flex grow flex-col gap-3">
-                {(item, items) => {
-                  if (item.rounds_type === "AUTOMATED") {
+              <Timeline name="log update">
+                <PaginatedList.Items<DailyRoundsModel> className="flex grow flex-col gap-3 rounded-lg bg-white p-2 shadow">
+                  {(item, items) => {
+                    if (item.rounds_type === "AUTOMATED") {
+                      return (
+                        <TimelineNode
+                          event={{
+                            type: "created",
+                            timestamp: item.taken_at?.toString() ?? "",
+                            by: {
+                              user_type: "",
+                              first_name: "Virtual",
+                              last_name: "Assistant",
+                              username: "",
+                              id: "",
+                              email: "",
+                              last_login: "",
+                            },
+                            icon: "l-robot",
+                          }}
+                          isLast={items.indexOf(item) == items.length - 1}
+                        >
+                          <VirtualNursingAssistantLogUpdateCard
+                            round={item}
+                            previousRound={items[items.indexOf(item) + 1]}
+                          />
+                        </TimelineNode>
+                      );
+                    }
+
+                    const itemUrl = ["NORMAL", "TELEMEDICINE"].includes(
+                      item.rounds_type as string
+                    )
+                      ? `${consultationUrl}/daily-rounds/${item.id}`
+                      : `${consultationUrl}/daily_rounds/${item.id}`;
+
                     return (
                       <TimelineNode
                         event={{
                           type: "created",
                           timestamp: item.taken_at?.toString() ?? "",
                           by: {
-                            user_type: "",
-                            first_name: "Virtual",
-                            last_name: "Assistant",
+                            user_type: item.created_by?.user_type ?? "",
+                            first_name: item.created_by?.first_name ?? "",
+                            last_name: item.created_by?.last_name ?? "",
                             username: "",
                             id: "",
                             email: "",
                             last_login: "",
                           },
-                          icon: "l-robot",
+                          icon: "l-user-nurse",
                         }}
                         isLast={items.indexOf(item) == items.length - 1}
                       >
-                        <VirtualNursingAssistantLogUpdateCard
+                        <DefaultLogUpdateCard
                           round={item}
-                          previousRound={items[items.indexOf(item) + 1]}
+                          consultationData={consultation}
+                          onViewDetails={() => navigate(itemUrl)}
+                          onUpdateLog={() => navigate(`${itemUrl}/update`)}
                         />
                       </TimelineNode>
                     );
-                  }
-
-                  const itemUrl = ["NORMAL", "TELEMEDICINE"].includes(
-                    item.rounds_type
-                  )
-                    ? `${consultationUrl}/daily-rounds/${item.id}`
-                    : `${consultationUrl}/daily_rounds/${item.id}`;
-
-                  return (
-                    <TimelineNode
-                      event={{
-                        type: "created",
-                        timestamp: item.taken_at?.toString() ?? "",
-                        by: {
-                          user_type: item.created_by?.user_type ?? "",
-                          first_name: item.created_by?.first_name ?? "",
-                          last_name: item.created_by?.last_name ?? "",
-                          username: "",
-                          id: "",
-                          email: "",
-                          last_login: "",
-                        },
-                        icon: "l-user-nurse",
-                      }}
-                      isLast={items.indexOf(item) == items.length - 1}
-                    >
-                      <DefaultLogUpdateCard
-                        round={item}
-                        consultationData={consultation}
-                        onViewDetails={() => navigate(itemUrl)}
-                        onUpdateLog={() => navigate(`${itemUrl}/update`)}
-                      />
-                    </TimelineNode>
-                  );
-                }}
-              </PaginatedList.Items>
+                  }}
+                </PaginatedList.Items>
+              </Timeline>
               <div className="flex w-full items-center justify-center">
                 <PaginatedList.Paginator hideIfSinglePage />
               </div>

diff --git a/src/Components/Facility/DoctorNote.tsx b/src/Components/Facility/DoctorNote.tsx
@@ -5,11 +5,13 @@ import { PatientNoteStateType } from "./models";
 
 interface DoctorNoteProps {
   state: PatientNoteStateType;
+  setReload: any;
   handleNext: () => void;
+  disableEdit?: boolean;
 }
 
 const DoctorNote = (props: DoctorNoteProps) => {
-  const { state, handleNext } = props;
+  const { state, handleNext, setReload, disableEdit } = props;
   return (
     <div
       className="m-2 flex h-[390px] grow flex-col-reverse overflow-auto bg-white"
@@ -30,7 +32,13 @@ const DoctorNote = (props: DoctorNoteProps) => {
           scrollableTarget="patient-notes-list"
         >
           {state.notes.map((note: any) => (
-            <PatientNoteCard note={note} key={note.id} />
+            <PatientNoteCard
+              state={state}
+              note={note}
+              key={note.id}
+              setReload={setReload}
+              disableEdit={disableEdit}
+            />
           ))}
         </InfiniteScroll>
       ) : (

diff --git a/src/Components/Facility/PatientConsultationNotesList.tsx b/src/Components/Facility/PatientConsultationNotesList.tsx
@@ -10,16 +10,15 @@ import request from "../../Utils/request/request";
 interface PatientNotesProps {
   state: PatientNoteStateType;
   setState: any;
-  patientId: string;
-  facilityId: string;
   reload?: boolean;
   setReload?: any;
+  disableEdit?: boolean;
 }
 
 const pageSize = RESULTS_PER_PAGE_LIMIT;
 
 const PatientConsultationNotesList = (props: PatientNotesProps) => {
-  const { state, setState, reload, setReload } = props;
+  const { state, setState, reload, setReload, disableEdit } = props;
   const consultationId = useSlug("consultation") ?? "";
 
   const [isLoading, setIsLoading] = useState(true);
@@ -28,7 +27,7 @@ const PatientConsultationNotesList = (props: PatientNotesProps) => {
     setIsLoading(true);
     const { data }: any = await request(routes.getPatientNotes, {
       pathParams: {
-        patientId: props.patientId,
+        patientId: props.state.patientId,
       },
       query: {
         consultation: consultationId,
@@ -81,7 +80,14 @@ const PatientConsultationNotesList = (props: PatientNotesProps) => {
     );
   }
 
-  return <DoctorNote state={state} handleNext={handleNext} />;
+  return (
+    <DoctorNote
+      state={state}
+      handleNext={handleNext}
+      setReload={setReload}
+      disableEdit={disableEdit}
+    />
+  );
 };
 
 export default PatientConsultationNotesList;