+
+
+
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/src/Components/Facility/Consultations/DailyRoundsList.tsx b/src/Components/Facility/Consultations/DailyRoundsList.tsx
index ffc70ddf175..2060d8657e7 100644
--- a/src/Components/Facility/Consultations/DailyRoundsList.tsx
+++ b/src/Components/Facility/Consultations/DailyRoundsList.tsx
@@ -6,88 +6,84 @@ import { useTranslation } from "react-i18next";
import LoadingLogUpdateCard from "./DailyRounds/LoadingCard";
import routes from "../../../Redux/api";
import PaginatedList from "../../../CAREUI/misc/PaginatedList";
+import PageTitle from "../../Common/PageTitle";
+import DailyRoundsFilter from "./DailyRoundsFilter";
+import { ConsultationModel } from "../models";
+import { useSlugs } from "../../../Common/hooks/useSlug";
-export const DailyRoundsList = (props: any) => {
+interface Props {
+ consultation: ConsultationModel;
+}
+
+export default function DailyRoundsList({ consultation }: Props) {
+ const [facilityId, patientId, consultationId] = useSlugs(
+ "facility",
+ "patient",
+ "consultation"
+ );
const { t } = useTranslation();
- const {
- facilityId,
- patientId,
- consultationId,
- consultationData,
- showAutomatedRounds,
- } = props;
+
+ const consultationUrl = `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}`;
return (
+
+
+
+
+
+ {t("filter_by")}
+
+
+
+ t(o)}
+ optionValue={(o) => o}
+ />
+
+ {
+ setFilter({});
+ props.onApply({});
+ }}
+ border
+ className="w-full"
+ >
+ {t("clear")}
+
+
+
+ props.onApply(filter)}
+ border
+ className="w-full"
+ >
+ {t("apply")}
+
+
+
+
-
-
-
- {t("no_consultation_updates")}
-
-
-
- <>
- {Array.from({ length: 3 }).map((_, i) => (
-
- className="flex grow flex-col gap-3">
- {(item, items) => {
- if (item.rounds_type === "AUTOMATED") {
+ {({ refetch }) => (
+ <>
+
+ refetch({ query })} />
+
+
+
+
+
)}
);
-};
+}
diff --git a/src/Components/Facility/FacilityBedCapacity.tsx b/src/Components/Facility/FacilityBedCapacity.tsx
index 33583840643..0c05fb022cb 100644
--- a/src/Components/Facility/FacilityBedCapacity.tsx
+++ b/src/Components/Facility/FacilityBedCapacity.tsx
@@ -82,7 +82,7 @@ export const FacilityBedCapacity = (props: any) => {
}
return (
-
+
+
+ {t("no_consultation_updates")}
+
+
+
+ <>
+ {Array.from({ length: 3 }).map((_, i) => (
+
+ className="flex grow flex-col gap-3">
+ {(item, items) => {
+ if (item.rounds_type === "AUTOMATED") {
+ return (
+ navigate(itemUrl)}
+ onUpdateLog={() => navigate(`${itemUrl}/update`)}
/>
);
- }
- return (
- {
- if (item.rounds_type === "NORMAL") {
- navigate(
- `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/daily-rounds/${item.id}`
- );
- } else {
- navigate(
- `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/daily_rounds/${item.id}`
- );
- }
- }}
- onUpdateLog={() => {
- if (item.rounds_type === "NORMAL") {
- navigate(
- `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/daily-rounds/${item.id}/update`
- );
- } else {
- navigate(
- `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/daily_rounds/${item.id}/update`
- );
- }
- }}
- />
- );
- }}
-
-
-
-
+
+
+
);
};
diff --git a/src/Components/Facility/FacilityCreate.tsx b/src/Components/Facility/FacilityCreate.tsx
index e742caefb82..8a7887ebc25 100644
--- a/src/Components/Facility/FacilityCreate.tsx
+++ b/src/Components/Facility/FacilityCreate.tsx
@@ -570,7 +570,10 @@ export const FacilityCreate = (props: FacilityProps) => {
});
capacityList = (
-
Bed Capacity
@@ -114,6 +114,6 @@ export const FacilityBedCapacity = (props: any) => {
/>
)}
-
+
{
-
);
diff --git a/src/Components/Facility/FacilityDoctorList.tsx b/src/Components/Facility/FacilityDoctorList.tsx
index e6bbc7f7f3b..d9a8b0d1a37 100644
--- a/src/Components/Facility/FacilityDoctorList.tsx
+++ b/src/Components/Facility/FacilityDoctorList.tsx
@@ -83,7 +83,7 @@ export const FacilityDoctorList = (props: any) => {
}
return (
-
{t("doctors_list")}
{doctorList}
+
+ {doctorList}
+
+
+
);
};
diff --git a/src/Components/Facility/FacilityHome.tsx b/src/Components/Facility/FacilityHome.tsx
index e971f0f3b9d..3ad295a3df3 100644
--- a/src/Components/Facility/FacilityHome.tsx
+++ b/src/Components/Facility/FacilityHome.tsx
@@ -198,7 +198,7 @@ export const FacilityHome = (props: any) => {
)}
{editCoverImageTooltip}
-
Doctors List
@@ -116,6 +116,6 @@ export const FacilityDoctorList = (props: any) => {
/>
)}
-
+
{
{facilityData?.name}
{facilityData?.modified_date && (
-
+
Address
@@ -222,7 +222,7 @@ export const FacilityHome = (props: any) => {
-
+
Phone Number
@@ -270,7 +270,10 @@ export const FacilityHome = (props: any) => { ) && (Available features
)} -
+
{facilityData?.features?.map(
(feature: number, i: number) =>
FACILITY_FEATURE_TYPES.some((f) => f.id === feature) && (
@@ -426,7 +429,10 @@ export const FacilityHome = (props: any) => {
Oxygen Information
-
+
{
);
temp.push(