-
- {t("Patient Information")}
-
-
-
- {t("name")}:{" "}
-
- {patientData?.name}
-
-
-
- {t("age")}:{" "}
-
- {formatPatientAge(patientData, true)}
-
-
-
- {t("gender")}:{" "}
+ return (
+
+
+ {data?.assigned_to_object && (
+
+
+
+
+
+ {t("assigned_to")}: {formatName(data.assigned_to_object)} -{" "}
+ {data.assigned_to_object.user_type}
- {patientGender || "-"}
-
-
-
- {t("phone")}:{" "}
- {" "}
- {patientData?.phone_number || "-"}
-
-
-
{t("address")}
-
- {patientData?.address || "-"}
-
- {patientData?.nationality === "India" && (
- <>
-
- {patientData?.ward_object?.name},{" "}
- {patientData?.local_body_object?.name}
-
-
{patientData?.district_object?.name || "-"}
-
{patientData?.state_object?.name}
-
- )}
-
+
-
-
-
- {t("date_of_admission")}:{" "}
-
- {formatDateTime(
- consultation.encounter_date || consultation.created_date,
- ) || "-"}
-
-
-
- {t("unique_id")}:{" "}
- {" "}
- {data.id}
-
-
-
- {t("patient_no")}:{" "}
- {" "}
- {consultation.patient_no || "-"}
-
-
-
-
-
- {t("date_of_positive_covid_19_swab")}:{" "}
-
- {(patientData?.date_of_test &&
- formatDateTime(patientData.date_of_test)) ||
- "-"}
-
-
-
- {t("covid_19_cat_gov")}:{" "}
- {" "}
- {consultation.category || "-"}
-
-
-
- {t("referred_to")}:{" "}
-
- {data.assigned_facility_external ||
- data.assigned_facility_object?.name ||
- "--"}
-
-
-
- {t("reason_for_referral")}:{" "}
- {" "}
- {data.reason || "--"}
-
-
-
- {t("treatment_summary")}:{" "}
- {" "}
- {consultation.treatment_plan || "-"}
-
+
+
+
+
+
+ {t("created")} on
+
+
+
+
-
-
-
-
-
- {t("approved_by_district_covid_control_room")}
-
-
{t("auto_generated_for_care")}
+
+
+ {t("last_edited")}
+
+
+
+
+
-
-
-
- );
- };
- if (loading) {
- return
;
- }
-
- return (
-
- {isPrintMode ? (
-
{printData(data)}
- ) : (
-
-
- navigate(`/shifting/${data?.external_id}/update`)
- }
- >
- {t("update_status_details")}
-
+
+
+
+ {["COMPLETED", "CANCELLED"].includes(data?.status || "") && (
+
+ A shifting request, once {data?.status.toLowerCase()} cannot
+ be updated
+
+ )}
+
-
setIsPrintMode(true)}
- >
- {" "}
- {t("referral_letter")}
-
-
-
-
-
-
- {t("assigned_to")}: {formatName(data.assigned_to_object)}{" "}
- - {data.assigned_to_object.user_type}
-
-
-
+
+
- )}
-
-
-
-
- {t("patient_name")}:{" "}
+
+
+
+
+
+
+ {t("patient_name")} :
-
+
{data?.patient_object?.name}
+
+
+
+
+ {"View Patient details"}
+
+
- Status:
-
+ Status :
+
+
{shiftStatusOptions.find(
(option) => data?.status === option.text,
)?.label || data?.status}
-
+
- {t("origin_facility")}:{" "}
+ {t("is_up_shift")} :
- {data?.origin_facility_object?.name || "--"}
-
- {careConfig.wartimeShifting && (
-
-
- {t("shifting_approving_facility")}:{" "}
-
- {data?.shifting_approving_facility_object?.name || "--"}
-
- )}
-
-
- {t("assigned_facility")}:{" "}
-
- {data?.assigned_facility_external ||
- data?.assigned_facility_object?.name ||
- "--"}
-
-
-
- {t("contact_person_at_the_facility")}:{" "}
-
- {data?.refering_facility_contact_name || "--"}
-
-
+
- {" "}
- {t("is_emergency")}:{" "}
+ {t("is_emergency")} :
-
- {" "}
+
{data?.emergency ? t("yes") : t("no")}
-
+
-
-
- {t("is_up_shift")}:{" "}
-
-
- {" "}
- {data?.is_up_shift ? t("yes") : t("no")}
-
-
-
+
+
- {t("patient_category")}:{" "}
+ {t("patient_category")} :
-
- {" "}
+
+
{data?.patient_object.last_consultation?.last_daily_round
?.patient_category ??
data?.patient_object.last_consultation?.category}
-
+
+
+
+
+
+ {t("contact_person_at_the_facility")} :
+
+
+ {data?.refering_facility_contact_name || "--"}
+
+
+
+
{careConfig.kasp.enabled && (
- {careConfig.kasp.fullString}:{" "}
+ {careConfig.kasp.fullString} :
-
- {" "}
+
{data?.is_kasp ? t("yes") : t("no")}
@@ -597,162 +284,131 @@ export default function ShiftDetails(props: { id: string }) {
<>
- {careConfig.kasp.fullString}:{" "}
+ {t("vehicle_preference")} :
-
- {" "}
- {data?.is_kasp ? t("yes") : t("no")}
+
+ {data?.vehicle_preference ||
+ data?.preferred_vehicle_choice}
- {t("vehicle_preference")}:{" "}
+ {t("facility_preference")} :
- {data?.vehicle_preference || data?.preferred_vehicle_choice}
-
-
-
- {t("facility_preference")}:{" "}
+
+ {data?.assigned_facility_type || "--"}
- {data?.assigned_facility_type || "--"}
- {t("severity_of_breathlessness")}:{" "}
+ {t("severity_of_breathlessness")} :
- {data?.breathlessness_level || "--"}
-
{" "}
+
+ {data?.breathlessness_level || "--"}
+
+
)}
-
-
- {t("reason")}:{" "}
-
- {data?.reason || "--"}
-
-
-
- {t("ambulance_driver_name")}:{" "}
-
-
- {data?.ambulance_driver_name || "--"}
-
-
-
-
+ {careConfig.wartimeShifting && (
+
+
+ {t("shifting_approving_facility")}:
+
+
+ {data?.shifting_approving_facility_object?.name || "--"}
+
+
+ )}
+
+
- {t("ambulance_number")}:{" "}
+ {t("reason")} :
- {data?.ambulance_number || "--"}
-
-
-
- {t("comments")}:{" "}
+
+ {data?.reason || "--"}
- {data?.comments || "--"}
-
-
- {t("created")}:
-
- }
- time={data?.created_date}
- />
-
- {t("updated")}:
-
- }
- time={data?.modified_date}
- />
+
-
-
-
-
- {t("details_of_patient")} {showCopyToclipBoard(data)}
-
- {data?.patient_object && showPatientCard(data?.patient_object)}
-
-
-
{t("comments")}
-
+
+
+
+
+ {t("details_of_origin_facility")}
+
+
+ {showFacilityCard(data?.origin_facility_object)}
+
+
+
{t("ambulance_details")}
+
+
+
+
+
+ |
+ {t("ambulance_driver_name")} :
+ |
+
+ {data?.ambulance_driver_name || "--"}
+ |
+
+
+ |
+ {t("ambulance_phone_number")} :
+ |
+
+ {data?.ambulance_phone_number ? (
+
+ {data?.ambulance_phone_number}
+
+ ) : (
+ "--"
+ )}
+ |
+
+
+ |
+ {t("ambulance_number")} :
+ |
+
+ {data?.ambulance_number || "--"}
+ |
+
+
+
-
-
{t("audit_log")}
-
-
-
-
- {t("created")}
-
-
-
-
-
-
-
- {t("last_edited")}
-
-
-
-
-
+ {!data?.assigned_facility_external && (
+
+
{t("details_of_assigned_facility")}
+ {showFacilityCard(data?.assigned_facility_object)}
-
-
{t("details_of_origin_facility")}
-
- {showFacilityCard(data?.origin_facility_object)}
+ )}
+ {careConfig.wartimeShifting && (
+
+
+ {t("details_of_shifting_approving_facility")}
+
+ {showFacilityCard(data?.shifting_approving_facility_object)}
- {!data?.assigned_facility_external && (
-
-
{t("details_of_assigned_facility")}
- {showFacilityCard(data?.assigned_facility_object)}
-
- )}
- {careConfig.wartimeShifting && (
-
-
- {t("details_of_shifting_approving_facility")}
-
- {showFacilityCard(data?.shifting_approving_facility_object)}
-
- )}
+ )}
+
+
-
- )}
+
+
);
}
diff --git a/src/components/Shifting/ShiftDetailsUpdate.tsx b/src/components/Shifting/ShiftDetailsUpdate.tsx
index aa2be130ae4..c97ac63fea6 100644
--- a/src/components/Shifting/ShiftDetailsUpdate.tsx
+++ b/src/components/Shifting/ShiftDetailsUpdate.tsx
@@ -1,15 +1,13 @@
import careConfig from "@careConfig";
+import { useQuery } from "@tanstack/react-query";
import { navigate, useQueryParams } from "raviger";
-import { useReducer, useState } from "react";
+import { useEffect, useReducer, useState } from "react";
import { useTranslation } from "react-i18next";
-import Card from "@/CAREUI/display/Card";
+import SlideOver from "@/CAREUI/interactive/SlideOver";
-import { Cancel, Submit } from "@/components/Common/ButtonV2";
import CircularProgress from "@/components/Common/CircularProgress";
import { FacilitySelect } from "@/components/Common/FacilitySelect";
-import Loading from "@/components/Common/Loading";
-import Page from "@/components/Common/Page";
import { LinkedFacilityUsers } from "@/components/Common/UserAutocompleteFormField";
import DischargeModal from "@/components/Facility/DischargeModal";
import { ConsultationModel, ShiftingModel } from "@/components/Facility/models";
@@ -40,12 +38,16 @@ import {
import * as Notification from "@/Utils/Notifications";
import routes from "@/Utils/request/api";
+import query from "@/Utils/request/query";
import request from "@/Utils/request/request";
-import useTanStackQueryInstead from "@/Utils/request/useQuery";
import { parsePhoneNumber } from "@/Utils/utils";
+import { Button } from "../ui/button";
+
interface patientShiftProps {
id: string;
+ open: boolean;
+ setOpen: (state: boolean) => void;
}
export const ShiftDetailsUpdate = (props: patientShiftProps) => {
@@ -152,16 +154,19 @@ export const ShiftDetailsUpdate = (props: patientShiftProps) => {
};
}
- const { loading: assignedUserLoading } = useTanStackQueryInstead(
- routes.userList,
- {
- query: { id: state.form.assigned_to },
- prefetch: state.form.assigned_to ? true : false,
- onResponse: ({ res, data }) => {
- if (res?.ok && data?.count) SetAssignedUser(data.results[0]);
- },
- },
- );
+ const { data, isLoading: assignedUserLoading } = useQuery({
+ queryKey: ["userList", state.form.assigned_to],
+ queryFn: query(routes.userList, {
+ queryParams: { id: state.form.assigned_to },
+ }),
+ enabled: !!state.form.assigned_to && props.open,
+ });
+
+ useEffect(() => {
+ if (data?.count) {
+ SetAssignedUser(data.results[0]);
+ }
+ }, [data]);
const validateForm = () => {
const errors = { ...initError };
@@ -284,41 +289,51 @@ export const ShiftDetailsUpdate = (props: patientShiftProps) => {
}
};
- useTanStackQueryInstead(routes.getShiftDetails, {
- pathParams: { id: props.id },
- onResponse: ({ res, data }) => {
- if (res?.ok && data) {
- const d = data;
- setConsultationData(
- (d.patient as PatientModel).last_consultation as ConsultationModel,
- );
- if (d.assigned_facility_external)
- d["assigned_facility_object"] = {
- name: String(data.assigned_facility_external),
- };
- d["initial_status"] = data.status;
- d["status"] = qParams.status || data.status;
- const patient_category =
- (d.patient as PatientModel).last_consultation?.last_daily_round
- ?.patient_category ??
- (d.patient as PatientModel).last_consultation?.category;
- d["patient_category"] =
- PATIENT_CATEGORIES.find((c) => c.text === patient_category)?.id ?? "";
- dispatch({ type: "set_form", form: d });
- setIsLoading(false);
- }
- },
+ const { data: shiftDetailsData } = useQuery({
+ queryKey: ["getShiftDetails", props.id],
+ queryFn: query(routes.getShiftDetails, {
+ pathParams: { id: props.id },
+ }),
+ enabled: props.open,
});
+ useEffect(() => {
+ if (shiftDetailsData) {
+ const d = shiftDetailsData;
+ setConsultationData(
+ (d.patient as PatientModel).last_consultation as ConsultationModel,
+ );
+ if (d.assigned_facility_external)
+ d["assigned_facility_object"] = {
+ name: String(d.assigned_facility_external),
+ };
+ d["initial_status"] = d.status;
+ d["status"] = qParams.status || d.status;
+ const patient_category =
+ (d.patient as PatientModel).last_consultation?.last_daily_round
+ ?.patient_category ??
+ (d.patient as PatientModel).last_consultation?.category;
+ d["patient_category"] =
+ PATIENT_CATEGORIES.find((c) => c.text === patient_category)?.id ?? "";
+ dispatch({ type: "set_form", form: d });
+ setIsLoading(false);
+ }
+ }, [shiftDetailsData]);
const vehicleOptions = SHIFTING_VEHICLE_CHOICES.map((obj) => obj.text);
const facilityOptions = FACILITY_TYPES.map((obj) => obj.text);
if (isLoading) {
- return
;
+ return "";
}
return (
-
+
setShowDischargeModal(false)}
@@ -329,31 +344,43 @@ export const ShiftDetailsUpdate = (props: patientShiftProps) => {
handleSubmit(true);
}}
/>
-
+
+
-
option.text}
- optionValue={(option) => option.text}
- optionDisabled={(option) =>
- // disable all options except `Destination Approved` for non-admin destination facility users
- home_facility === state.form.assigned_facility_object?.id &&
- USER_TYPES.findIndex((type) => user_type === type) <
- USER_TYPES.findIndex((type) => type === "DistrictAdmin") &&
- !["DESTINATION APPROVED"].includes(option.text)
- }
- optionSelectedLabel={(option) => option.text}
- onChange={handleFormFieldChange}
- className="w-full bg-white md:col-span-1 md:leading-5"
- />
+
+
option.text}
+ optionValue={(option) => option.text}
+ optionDisabled={(option) =>
+ home_facility === state.form.assigned_facility_object?.id &&
+ USER_TYPES.findIndex((type) => user_type === type) <
+ USER_TYPES.findIndex((type) => type === "DistrictAdmin") &&
+ !["DESTINATION APPROVED"].includes(option.text)
+ }
+ optionSelectedLabel={(option) => option.text}
+ onChange={handleFormFieldChange}
+ className="w-full bg-white"
+ />
+
+
+
)}
-
+
{
onChange={handleFormFieldChange}
/>
-
-
{careConfig.wartimeShifting && (
<>
{
)}
-
-
{
/>
+
+ {
error={state.errors.comments}
/>
-
-
goBack()} />
- handleSubmit()} />
+
+
+
+
);
};
diff --git a/src/components/Shifting/ShiftingBoard.tsx b/src/components/Shifting/ShiftingBoard.tsx
index 068820d3311..37edc0fa70b 100644
--- a/src/components/Shifting/ShiftingBoard.tsx
+++ b/src/components/Shifting/ShiftingBoard.tsx
@@ -87,7 +87,7 @@ export default function BoardView() {
{
const [commentBox, setCommentBox] = useState("");
const { t } = useTranslation();
- const onSubmitComment = async () => {
- const payload = {
- comment: commentBox,
- };
- if (!/\S+/.test(commentBox)) {
- Notification.Error({
- msg: t("comment_min_length"),
- });
- return;
- }
- const { res } = await request(routes.addShiftComments, {
+ const { mutate: addComment } = useMutation({
+ mutationFn: mutate(routes.addShiftComments, {
pathParams: { id: props.id },
- body: payload,
- });
- if (res?.ok) {
+ body: { comment: commentBox },
+ }),
+ onSuccess: () => {
Notification.Success({ msg: t("comment_added_successfully") });
-
setCommentBox("");
+ },
+ onError: () => {
+ Notification.Error({ msg: t("comment_add_error") });
+ },
+ });
+
+ const onSubmitComment = async () => {
+ const payload = { comment: commentBox };
+ if (!/\S+/.test(commentBox)) {
+ Notification.Error({ msg: t("comment_min_length") });
+ return;
}
+ addComment(payload);
};
return (
@@ -46,30 +53,17 @@ const CommentSection = (props: CommentSectionProps) => {
pathParams={{ id: props.id }}
>
{(_, query) => (
-
-