}>
{pages}
diff --git a/src/Routers/routes/ConsultationRoutes.tsx b/src/Routers/routes/ConsultationRoutes.tsx
index 699964122f3..080b90a0a54 100644
--- a/src/Routers/routes/ConsultationRoutes.tsx
+++ b/src/Routers/routes/ConsultationRoutes.tsx
@@ -16,33 +16,57 @@ const consultationRoutes: AppRoutes = {
/>
),
"/facility/:facilityId/patient/:patientId/encounter/:encounterId/treatment_summary":
- ({ facilityId, encounterId }) => (
-
),
- "/facility/:facilityId/encounter/:encounterId/:tab": ({
- facilityId,
- encounterId,
- tab,
- }) => (
-
- ),
- "/facility/:facilityId/encounter/:encounterId/:tab/:subPage": ({
+ "/facility/:facilityId/patient/:patientId/encounter/:encounterId/questionnaire":
+ ({ facilityId, encounterId, patientId }) => (
+
+ ),
+ "/facility/:facilityId/patient/:patientId/encounter/:encounterId/questionnaire/:slug":
+ ({ facilityId, encounterId, slug, patientId }) => (
+
+ ),
+ "/facility/:facilityId/patient/:patientId/encounter/:encounterId/questionnaire_response/:id":
+ ({ patientId, id }) => (
+
+ ),
+ "/facility/:facilityId/patient/:patientId/encounter/:encounterId/:tab": ({
facilityId,
+ patientId,
encounterId,
tab,
- subPage,
}) => (
),
+ "/facility/:facilityId/patient/:patientId/encounter/:encounterId/:tab/:subPage":
+ ({ facilityId, encounterId, patientId, tab, subPage }) => (
+
+ ),
"/facility/:facilityId/patient/:patientId/consultation": ({
facilityId,
patientId,
@@ -63,27 +87,6 @@ const consultationRoutes: AppRoutes = {
subjectType="patient"
/>
),
- "/facility/:facilityId/patient/:patientId/encounter/:encounterId/questionnaire":
- ({ facilityId, encounterId, patientId }) => (
-
- ),
- "/facility/:facilityId/patient/:patientId/encounter/:encounterId/questionnaire/:slug":
- ({ facilityId, encounterId, slug, patientId }) => (
-
- ),
- "/facility/:facilityId/patient/:patientId/encounter/:encounterId/questionnaire_response/:id":
- ({ patientId, id }) => (
-
- ),
};
export default consultationRoutes;
diff --git a/src/Routers/routes/adminRoutes.tsx b/src/Routers/routes/adminRoutes.tsx
index abbc7bef952..bbf0aa1e185 100644
--- a/src/Routers/routes/adminRoutes.tsx
+++ b/src/Routers/routes/adminRoutes.tsx
@@ -1,6 +1,5 @@
import QuestionnaireEditor from "@/components/Questionnaire/QuestionnaireEditor";
import { QuestionnaireList } from "@/components/Questionnaire/QuestionnaireList";
-import { QuestionnaireShow } from "@/components/Questionnaire/show";
import { ValueSetEditor } from "@/components/ValueSet/ValueSetEditor";
import { ValueSetList } from "@/components/ValueSet/ValueSetList";
@@ -9,7 +8,6 @@ import { AppRoutes } from "@/Routers/AppRouter";
const AdminRoutes: AppRoutes = {
"/admin/questionnaire": () =>
,
diff --git a/src/Utils/utils.ts b/src/Utils/utils.ts
index 3198b10bcd3..c17e08e006f 100644
--- a/src/Utils/utils.ts
+++ b/src/Utils/utils.ts
@@ -1,3 +1,4 @@
+import careConfig from "@careConfig";
import { differenceInMinutes, format } from "date-fns";
import { toPng } from "html-to-image";
@@ -94,6 +95,16 @@ export const isUserOnline = (user: { last_login: DateLike }) => {
: false;
};
+export const isAndroidDevice = /android/i.test(navigator.userAgent);
+
+export const getMapUrl = (latitude: string, longitude: string) => {
+ return isAndroidDevice
+ ? `geo:${latitude},${longitude}`
+ : careConfig.mapFallbackUrlTemplate
+ .replace("{lat}", latitude)
+ .replace("{long}", longitude);
+};
+
const getRelativeDateSuffix = (abbreviated: boolean) => {
return {
day: abbreviated ? "d" : "days",
diff --git a/src/common/constants.tsx b/src/common/constants.tsx
index 1ce2a011725..c572e130f5b 100644
--- a/src/common/constants.tsx
+++ b/src/common/constants.tsx
@@ -1,5 +1,16 @@
+import {
+ Ambulance,
+ BedDouble,
+ Building2,
+ Home,
+ MonitorSmartphone,
+ Stethoscope,
+} from "lucide-react";
+
import { IconName } from "@/CAREUI/icons/CareIcon";
+import { EncounterClass } from "@/types/emr/encounter";
+
export const RESULTS_PER_PAGE_LIMIT = 14;
/**
@@ -112,37 +123,37 @@ export const FACILITY_FEATURE_TYPES: {
id: 1,
name: "CT Scan",
icon: "l-compact-disc",
- variant: "green",
+ variant: "blue",
},
{
id: 2,
name: "Maternity Care",
icon: "l-baby-carriage",
- variant: "blue",
+ variant: "pink",
},
{
id: 3,
name: "X-Ray",
icon: "l-clipboard-alt",
- variant: "amber",
+ variant: "blue",
},
{
id: 4,
name: "Neonatal Care",
icon: "l-baby-carriage",
- variant: "teal",
+ variant: "pink",
},
{
id: 5,
name: "Operation Theater",
icon: "l-syringe",
- variant: "red",
+ variant: "orange",
},
{
id: 6,
name: "Blood Bank",
icon: "l-medical-drip",
- variant: "orange",
+ variant: "purple",
},
{
id: 7,
@@ -154,17 +165,17 @@ export const FACILITY_FEATURE_TYPES: {
id: 8,
name: "Inpatient Services",
icon: "l-hospital",
- variant: "red",
+ variant: "orange",
},
{
id: 9,
name: "Outpatient Services",
icon: "l-hospital",
- variant: "red",
+ variant: "indigo",
},
{
id: 10,
- name: "Intensive Care Units",
+ name: "Intensive Care Units (ICU)",
icon: "l-hospital",
variant: "red",
},
@@ -172,25 +183,25 @@ export const FACILITY_FEATURE_TYPES: {
id: 11,
name: "Pharmacy",
icon: "l-hospital",
- variant: "red",
+ variant: "indigo",
},
{
id: 12,
name: "Rehabilitation Services",
icon: "l-hospital",
- variant: "red",
+ variant: "teal",
},
{
id: 13,
name: "Home Care Services",
icon: "l-hospital",
- variant: "red",
+ variant: "teal",
},
{
id: 14,
name: "Psychosocial Support",
icon: "l-hospital",
- variant: "red",
+ variant: "purple",
},
{
id: 15,
@@ -202,7 +213,7 @@ export const FACILITY_FEATURE_TYPES: {
id: 16,
name: "Daycare Programs",
icon: "l-hospital",
- variant: "red",
+ variant: "yellow",
},
];
@@ -354,6 +365,14 @@ export const FILE_EXTENSIONS = {
PRESENTATION: ["pptx"],
DOCUMENT: ["pdf", "docx"],
} as const;
+export const encounterIcons = {
+ imp:
;
export const PREVIEWABLE_FILE_EXTENSIONS = [
"html",
diff --git a/src/components/Auth/Login.tsx b/src/components/Auth/Login.tsx
index dfe4aaac4de..87eb7c10004 100644
--- a/src/components/Auth/Login.tsx
+++ b/src/components/Auth/Login.tsx
@@ -633,6 +633,7 @@ const Login = (props: LoginProps) => {
}}
maxLength={5}
placeholder="Enter 5-digit OTP"
+ autoFocus
/>
{otpValidationError && (
diff --git a/src/components/Common/AvatarEditModal.tsx b/src/components/Common/AvatarEditModal.tsx
index 3c278ea80b0..dd4d6284e57 100644
--- a/src/components/Common/AvatarEditModal.tsx
+++ b/src/components/Common/AvatarEditModal.tsx
@@ -1,3 +1,4 @@
+import DOMPurify from "dompurify";
import React, {
ChangeEventHandler,
useCallback,
@@ -15,6 +16,7 @@ import { Button } from "@/components/ui/button";
import {
Dialog,
DialogContent,
+ DialogDescription,
DialogHeader,
DialogTitle,
} from "@/components/ui/dialog";
@@ -26,8 +28,12 @@ interface Props {
open: boolean;
onOpenChange: (open: boolean) => void;
imageUrl?: string;
- handleUpload: (file: File, onError: () => void) => Promise;
- handleDelete: (onError: () => void) => Promise;
+ handleUpload: (
+ file: File,
+ onSuccess: () => void,
+ onError: () => void,
+ ) => Promise;
+ handleDelete: (onSuccess: () => void, onError: () => void) => Promise;
hint?: React.ReactNode;
}
@@ -62,8 +68,8 @@ const AvatarEditModal = ({
const [selectedFile, setSelectedFile] = useState();
const [preview, setPreview] = useState();
const [isCameraOpen, setIsCameraOpen] = useState(false);
- const webRef = useRef(null);
- const [previewImage, setPreviewImage] = useState(null);
+ const webRef = useRef(null);
+ const [previewImage, setPreviewImage] = useState(null);
const [isCaptureImgBeingUploaded, setIsCaptureImgBeingUploaded] =
useState(false);
const [constraint, setConstraint] = useState(
@@ -81,16 +87,35 @@ const AvatarEditModal = ({
}, []);
const captureImage = () => {
- setPreviewImage(webRef.current.getScreenshot());
- const canvas = webRef.current.getCanvas();
- canvas?.toBlob((blob: Blob) => {
- const myFile = new File([blob], "image.png", {
- type: blob.type,
- });
- setSelectedFile(myFile);
+ if (webRef.current) {
+ setPreviewImage(webRef.current.getScreenshot());
+ }
+ const canvas = webRef.current?.getCanvas();
+ canvas?.toBlob((blob) => {
+ if (blob) {
+ const myFile = new File([blob], "image.png", {
+ type: blob.type,
+ });
+ setSelectedFile(myFile);
+ } else {
+ toast.error(t("failed_to_capture_image"));
+ }
});
};
-
+ const stopCamera = useCallback(() => {
+ try {
+ if (webRef.current) {
+ const openCamera = webRef.current?.video?.srcObject as MediaStream;
+ if (openCamera) {
+ openCamera.getTracks().forEach((track) => track.stop());
+ }
+ }
+ } catch {
+ toast.error("Failed to stop camera");
+ } finally {
+ setIsCameraOpen(false);
+ }
+ }, []);
const closeModal = () => {
setPreview(undefined);
setIsProcessing(false);
@@ -112,11 +137,12 @@ const AvatarEditModal = ({
setSelectedFile(undefined);
return;
}
- if (!isImageFile(e.target.files[0])) {
+ const file = e.target.files[0];
+ if (!isImageFile(file)) {
toast.warning(t("please_upload_an_image_file"));
return;
}
- setSelectedFile(e.target.files[0]);
+ setSelectedFile(file);
};
const uploadAvatar = async () => {
@@ -128,24 +154,36 @@ const AvatarEditModal = ({
setIsProcessing(true);
setIsCaptureImgBeingUploaded(true);
- await handleUpload(selectedFile, () => {
- setSelectedFile(undefined);
- setPreview(undefined);
- setPreviewImage(null);
- setIsCaptureImgBeingUploaded(false);
- setIsProcessing(false);
- });
+ await handleUpload(
+ selectedFile,
+ () => {
+ setPreview(undefined);
+ },
+ () => {
+ setPreview(undefined);
+ setPreviewImage(null);
+ setIsCaptureImgBeingUploaded(false);
+ setIsProcessing(false);
+ },
+ );
} finally {
+ setPreview(undefined);
setIsCaptureImgBeingUploaded(false);
setIsProcessing(false);
+ setSelectedFile(undefined);
}
};
const deleteAvatar = async () => {
setIsProcessing(true);
- await handleDelete(() => {
- setIsProcessing(false);
- });
+ await handleDelete(
+ () => {
+ setIsProcessing(false);
+ setPreview(undefined);
+ setPreviewImage(null);
+ },
+ () => setIsProcessing(false),
+ );
};
const dragProps = useDragAndDrop();
@@ -187,6 +225,9 @@ const AvatarEditModal = ({
{title}
+
+ {t("edit_avatar")}
+
@@ -194,11 +235,15 @@ const AvatarEditModal = ({
<>
{preview || imageUrl ? (
<>
-
+
@@ -308,6 +353,7 @@ const AvatarEditModal = ({
variant="destructive"
onClick={deleteAvatar}
disabled={isProcessing}
+ data-cy="delete-avatar"
>
{t("delete")}
@@ -317,6 +363,7 @@ const AvatarEditModal = ({
variant="outline"
onClick={uploadAvatar}
disabled={isProcessing || !selectedFile}
+ data-cy="save-cover-image"
>
{isProcessing ? (
{
setPreviewImage(null);
setIsCameraOpen(false);
- webRef.current.stopCamera();
+ stopCamera();
}}
disabled={isProcessing}
>
diff --git a/src/components/Common/ContactLink.tsx b/src/components/Common/ContactLink.tsx
index c8115b42a1f..fc3cf7729e1 100644
--- a/src/components/Common/ContactLink.tsx
+++ b/src/components/Common/ContactLink.tsx
@@ -7,14 +7,8 @@ type ContactLinkProps =
export default function ContactLink(props: ContactLinkProps) {
return (
diff --git a/src/components/Common/DebugPreview.tsx b/src/components/Common/DebugPreview.tsx
index ef0e794ab4d..25adb85daaf 100644
--- a/src/components/Common/DebugPreview.tsx
+++ b/src/components/Common/DebugPreview.tsx
@@ -19,7 +19,7 @@ export function DebugPreview({ data, title, className }: DebugPreviewProps) {
-
+
{JSON.stringify(data, null, 2)}
diff --git a/src/components/Common/FilePreviewDialog.tsx b/src/components/Common/FilePreviewDialog.tsx
index f5c44865549..7aaabf84dd5 100644
--- a/src/components/Common/FilePreviewDialog.tsx
+++ b/src/components/Common/FilePreviewDialog.tsx
@@ -13,6 +13,8 @@ import {
import { useTranslation } from "react-i18next";
import useKeyboardShortcut from "use-keyboard-shortcut";
+import { cn } from "@/lib/utils";
+
import CareIcon, { IconName } from "@/CAREUI/icons/CareIcon";
import { Button } from "@/components/ui/button";
@@ -27,7 +29,6 @@ import CircularProgress from "@/components/Common/CircularProgress";
import { FileUploadModel } from "@/components/Patient/models";
const PDFViewer = lazy(() => import("@/components/Common/PDFViewer"));
-
export const zoom_values = [
"scale-25",
"scale-50",
@@ -38,7 +39,6 @@ export const zoom_values = [
"scale-175",
"scale-200",
];
-
export interface StateInterface {
open: boolean;
isImage: boolean;
@@ -51,7 +51,6 @@ export interface StateInterface {
id?: string;
associating_id?: string;
}
-
type FilePreviewProps = {
title?: ReactNode;
description?: ReactNode;
@@ -68,7 +67,6 @@ type FilePreviewProps = {
loadFile?: (file: FileUploadModel, associating_id: string) => void;
currentIndex: number;
};
-
const previewExtensions = [
".html",
".htm",
@@ -81,7 +79,6 @@ const previewExtensions = [
".gif",
".webp",
];
-
const FilePreviewDialog = (props: FilePreviewProps) => {
const {
show,
@@ -95,18 +92,15 @@ const FilePreviewDialog = (props: FilePreviewProps) => {
currentIndex,
} = props;
const { t } = useTranslation();
-
const [page, setPage] = useState(1);
const [numPages, setNumPages] = useState(1);
const [index, setIndex] = useState(currentIndex);
const [scale, setScale] = useState(1.0);
-
useEffect(() => {
if (uploadedFiles && show) {
setIndex(currentIndex);
}
}, [uploadedFiles, show, currentIndex]);
-
const handleZoomIn = () => {
const checkFull = file_state.zoom === zoom_values.length;
setFileState({
@@ -115,7 +109,6 @@ const FilePreviewDialog = (props: FilePreviewProps) => {
});
setScale((prevScale) => Math.min(prevScale + 0.25, 2));
};
-
const handleZoomOut = () => {
const checkFull = file_state.zoom === 1;
setFileState({
@@ -124,6 +117,29 @@ const FilePreviewDialog = (props: FilePreviewProps) => {
});
setScale((prevScale) => Math.max(prevScale - 0.25, 0.5));
};
+ const handleRotate = (angle: number) => {
+ setFileState((prev: any) => {
+ const newRotation = (prev.rotation + angle + 360) % 360;
+ return {
+ ...prev,
+ rotation: newRotation,
+ };
+ });
+ };
+
+ function getRotationClass(rotation: number) {
+ const normalizedRotation = rotation % 360;
+ switch (normalizedRotation) {
+ case 90:
+ return "rotate-90";
+ case 180:
+ return "rotate-180";
+ case 270:
+ return "-rotate-90";
+ default:
+ return "";
+ }
+ }
const fileName = file_state?.name
? file_state.name + "." + file_state.extension
@@ -138,12 +154,11 @@ const FilePreviewDialog = (props: FilePreviewProps) => {
!loadFile ||
newIndex < 0 ||
newIndex >= uploadedFiles.length
- )
+ ) {
return;
-
+ }
const nextFile = uploadedFiles[newIndex];
if (!nextFile?.id) return;
-
const associating_id = nextFile.associating_id || "";
loadFile(nextFile, associating_id);
setIndex(newIndex);
@@ -157,24 +172,8 @@ const FilePreviewDialog = (props: FilePreviewProps) => {
onClose?.();
};
- const handleRotate = (rotation: number) => {
- setFileState((prev: any) => ({
- ...prev,
- rotation: prev.rotation + rotation,
- }));
- };
-
- function getRotationClass(rotation: number) {
- let normalizedRotation = ((rotation % 360) + 360) % 360;
- if (normalizedRotation > 180) {
- normalizedRotation -= 360;
- }
- return normalizedRotation === -90
- ? "-rotate-90"
- : `rotate-${normalizedRotation}`;
- }
-
useKeyboardShortcut(["ArrowLeft"], () => index > 0 && handleNext(index - 1));
+
useKeyboardShortcut(
["ArrowRight"],
() => index < (uploadedFiles?.length || 0) - 1 && handleNext(index + 1),
@@ -188,7 +187,6 @@ const FilePreviewDialog = (props: FilePreviewProps) => {
{t("file_preview")}
-
{fileUrl ? (
<>
@@ -251,7 +249,7 @@ const FilePreviewDialog = (props: FilePreviewProps) => {
)}
-
+
{file_state.isImage ? (
{
sandbox=""
title={t("source_file")}
src={fileUrl}
- className="h-[75vh] w-full"
+ className="h-[50vh] md:h-[75vh] w-full"
/>
) : (
@@ -289,7 +287,6 @@ const FilePreviewDialog = (props: FilePreviewProps) => {
)}
-
{uploadedFiles && uploadedFiles.length > 1 && (
)}
-
-
+
+
{file_state.isImage && (
<>
{[
@@ -344,7 +341,10 @@ const FilePreviewDialog = (props: FilePreviewProps) => {
variant="ghost"
key={index}
onClick={button[2] as () => void}
- className="z-50 rounded bg-white/60 px-4 py-2 text-black backdrop-blur transition hover:bg-white/70"
+ className={cn(
+ "z-50 rounded bg-white/60 px-4 py-2 text-black backdrop-blur transition hover:bg-white/70",
+ index > 2 ? "max-md:col-span-3" : "max-md:col-span-2",
+ )}
disabled={button[3] as boolean}
>
{button[1] && (
@@ -387,7 +387,10 @@ const FilePreviewDialog = (props: FilePreviewProps) => {
variant="ghost"
key={index}
onClick={button[2] as () => void}
- className="z-50 rounded bg-white/60 px-4 py-2 text-black backdrop-blur transition hover:bg-white/70"
+ className={cn(
+ "z-50 rounded bg-white/60 px-4 py-2 text-black backdrop-blur transition hover:bg-white/70",
+ index > 2 ? "max-md:col-span-3" : "max-md:col-span-2",
+ )}
disabled={button[3] as boolean}
>
{button[1] && (
@@ -405,7 +408,7 @@ const FilePreviewDialog = (props: FilePreviewProps) => {
) : (
-
+
)}
@@ -413,5 +416,4 @@ const FilePreviewDialog = (props: FilePreviewProps) => {
);
};
-
export default FilePreviewDialog;
diff --git a/src/components/Common/Page.tsx b/src/components/Common/Page.tsx
index b9079c5089e..a4a2ba48a3e 100644
--- a/src/components/Common/Page.tsx
+++ b/src/components/Common/Page.tsx
@@ -9,7 +9,6 @@ interface PageProps extends PageTitleProps {
options?: React.ReactNode | React.ReactNode[];
changePageMetadata?: boolean;
className?: string;
- noImplicitPadding?: boolean;
ref?: RefObject
;
/**
* If true, the sidebar will be collapsed when mounted, and restored to original state when unmounted.
@@ -31,14 +30,8 @@ export default function Page(props: PageProps) {
// };
// }, [props.collapseSidebar]);
- let padding = "";
- if (!props.noImplicitPadding) {
- if (props.componentRight) padding = "py-0 md:px-6";
- else padding = "px-6 py-0";
- }
-
return (
-
+
;
+interface GenericTableProps {
+ headers: HeaderRow[];
+ rows: TableRowType[] | undefined;
+}
+
+export default function PrintTable({ headers, rows }: GenericTableProps) {
+ return (
+
+
+
+
+ {headers.map(({ key, width }, index) => (
+
+ {t(key)}
+
+ ))}
+
+
+
+ {!!rows &&
+ rows.map((row, index) => (
+
+ {headers.map(({ key }) => (
+
+ {row[key] || "-"}
+
+ ))}
+
+ ))}
+
+
+
+
{formatName(selected)}
diff --git a/src/components/Encounter/CreateEncounterForm.tsx b/src/components/Encounter/CreateEncounterForm.tsx
index 488cbc585fd..32d7d600fd6 100644
--- a/src/components/Encounter/CreateEncounterForm.tsx
+++ b/src/components/Encounter/CreateEncounterForm.tsx
@@ -1,6 +1,7 @@
import careConfig from "@careConfig";
import { zodResolver } from "@hookform/resolvers/zod";
import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { t } from "i18next";
import {
Ambulance,
BedDouble,
@@ -12,9 +13,12 @@ import {
import { navigate } from "raviger";
import { useState } from "react";
import { useForm } from "react-hook-form";
+import { useTranslation } from "react-i18next";
import { toast } from "sonner";
import * as z from "zod";
+import { cn } from "@/lib/utils";
+
import { Button } from "@/components/ui/button";
import {
Form,
@@ -74,7 +78,9 @@ const encounterFormSchema = z.object({
"use_as_directed",
"urgent",
] as const),
- organizations: z.array(z.string()),
+ organizations: z.array(z.string()).min(1, {
+ message: t("at_least_one_department_is_required"),
+ }),
});
const encounterClasses = [
@@ -135,6 +141,7 @@ export default function CreateEncounterForm({
}: Props) {
const [isOpen, setIsOpen] = useState(false);
const queryClient = useQueryClient();
+ const { t } = useTranslation();
const form = useForm>({
resolver: zodResolver(encounterFormSchema),
@@ -154,13 +161,9 @@ export default function CreateEncounterForm({
form.reset();
queryClient.invalidateQueries({ queryKey: ["encounters", patientId] });
onSuccess?.();
- navigate(`/facility/${facilityId}/encounter/${data.id}/updates`);
- },
- onError: (error) => {
- const errorData = error.cause as { errors: { msg: string[] } };
- errorData.errors.msg.forEach((er) => {
- toast.error(er);
- });
+ navigate(
+ `/facility/${facilityId}/patient/${patientId}/encounter/${data.id}/updates`,
+ );
},
});
@@ -178,7 +181,15 @@ export default function CreateEncounterForm({
}
return (
-
+ {
+ setIsOpen(open);
+ if (!open) {
+ form.reset();
+ }
+ }}
+ >
{trigger || (
)}
- Initiate Patient Encounter
+ {t("initiate_encounter")}
- Begin a new clinical encounter for {patientName}. Select the
- appropriate encounter type, status, and priority to ensure proper
- documentation and care delivery.
+ {t("begin_clinical_encounter", { patientName })}