-
+
diff --git a/src/Components/Facility/DoctorNote.tsx b/src/Components/Facility/DoctorNote.tsx
index 91c361cc82e..c2bf8155cf2 100644
--- a/src/Components/Facility/DoctorNote.tsx
+++ b/src/Components/Facility/DoctorNote.tsx
@@ -1,17 +1,19 @@
import InfiniteScroll from "react-infinite-scroll-component";
import CircularProgress from "../Common/components/CircularProgress";
import PatientNoteCard from "./PatientNoteCard";
-import { PatientNoteStateType } from "./models";
+import { PatientNoteStateType, PatientNotesModel } from "./models";
+import DoctorNoteReplyPreviewCard from "./DoctorNoteReplyPreviewCard";
interface DoctorNoteProps {
state: PatientNoteStateType;
setReload: any;
handleNext: () => void;
disableEdit?: boolean;
+ setReplyTo?: (reply_to: PatientNotesModel | undefined) => void;
}
const DoctorNote = (props: DoctorNoteProps) => {
- const { state, handleNext, setReload, disableEdit } = props;
+ const { state, handleNext, setReload, disableEdit, setReplyTo } = props;
return (
{
scrollableTarget="patient-notes-list"
>
{state.notes.map((note) => (
- {
});
};
+ const spokesQuery = useQuery(routes.getFacilitySpokes, {
+ pathParams: {
+ id: facilityId,
+ },
+ silent: true,
+ });
+
if (isLoading) {
return
+ {!!spokesQuery.data?.results.length && (
+
+ {parentNote ? (
+
+ );
+};
+
+export default DoctorNoteReplyPreviewCard;
diff --git a/src/Components/Facility/FacilityBlock.tsx b/src/Components/Facility/FacilityBlock.tsx
new file mode 100644
index 00000000000..64c0a24d78d
--- /dev/null
+++ b/src/Components/Facility/FacilityBlock.tsx
@@ -0,0 +1,34 @@
+import { Link } from "raviger";
+import CareIcon from "../../CAREUI/icons/CareIcon";
+import { FacilityModel } from "./models";
+
+export default function FacilityBlock(props: { facility: FacilityModel }) {
+ const { facility } = props;
+
+ return (
+
+
+
+ ) : (
+
+
+
+
+
+
+ {cancelReply && (
+
+
+ {parentNote.created_by_object?.first_name || "Unknown"}{" "}
+ {parentNote.created_by_object?.last_name}
+
+ {parentNote.user_type && (
+
+ {`(${USER_TYPES_MAP[parentNote.user_type]})`}
+
+ )}
+
+
+
+
+
+ {formatDateTime(parentNote.created_date)}
+
+ Created {relativeDate(parentNote.created_date, true)}
+
+
+ Cancel
+
+ )}
+ {parentNote.note}
+ {children}
+ {children}
+ )}
+
+ {facility.read_cover_image_url ? (
+ 
+ ) : (
+ <>
+
+
+ {facility.name}
+
+
+ );
+}
diff --git a/src/Components/Facility/FacilityCreate.tsx b/src/Components/Facility/FacilityCreate.tsx
index 1fe9d2e207e..e9e95fbcdfc 100644
--- a/src/Components/Facility/FacilityCreate.tsx
+++ b/src/Components/Facility/FacilityCreate.tsx
@@ -62,6 +62,7 @@ import routes from "../../Redux/api.js";
import useQuery from "../../Utils/request/useQuery.js";
import { RequestResult } from "../../Utils/request/types.js";
import useAuthUser from "../../Common/hooks/useAuthUser";
+import SpokeFacilityEditor from "./SpokeFacilityEditor.js";
import careConfig from "@careConfig";
const Loading = lazy(() => import("../Common/Loading"));
@@ -247,7 +248,7 @@ export const FacilityCreate = (props: FacilityProps) => {
},
);
- useQuery(routes.getPermittedFacility, {
+ const facilityQuery = useQuery(routes.getPermittedFacility, {
pathParams: {
id: facilityId!,
},
@@ -850,6 +851,14 @@ export const FacilityCreate = (props: FacilityProps) => {
required
types={["mobile", "landline"]}
/>
+ + {facility.address} {facility.local_body_object?.name} +
+
+
{t("spokes")}
+ {facilityId && ( +
+
+ )}
+
+ + {t("spokes")} +
+
+ {spokesQuery.data?.results.map((spoke) => (
+
+