@@ -229,11 +235,15 @@ const AvatarEditModal = ({
<>
{preview || imageUrl ? (
<>
-
+
@@ -343,6 +353,7 @@ const AvatarEditModal = ({
variant="destructive"
onClick={deleteAvatar}
disabled={isProcessing}
+ data-cy="delete-avatar"
>
{t("delete")}
@@ -352,6 +363,7 @@ const AvatarEditModal = ({
variant="outline"
onClick={uploadAvatar}
disabled={isProcessing || !selectedFile}
+ data-cy="save-cover-image"
>
{isProcessing ? (
-
+
{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 0bb287d8637..a4a2ba48a3e 100644
--- a/src/components/Common/Page.tsx
+++ b/src/components/Common/Page.tsx
@@ -31,7 +31,7 @@ export default function Page(props: PageProps) {
// }, [props.collapseSidebar]);
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] || "-"}
+
+ ))}
+
+ ))}
+
+
+
diff --git a/src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx b/src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx
index 2514c7bbdfe..c6fc5667222 100644
--- a/src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx
+++ b/src/components/Facility/ConsultationDetails/QuestionnaireResponsesList.tsx
@@ -197,12 +197,23 @@ function StructuredResponseBadge({
);
}
-function ResponseCard({ item }: { item: QuestionnaireResponse }) {
+function ResponseCard({
+ item,
+ isPrintPreview,
+}: {
+ item: QuestionnaireResponse;
+ isPrintPreview?: boolean;
+}) {
const isStructured = !item.questionnaire;
const structuredType = Object.keys(item.structured_responses || {})[0];
return (
-
+
@@ -317,7 +328,12 @@ export default function QuestionnaireResponsesList({
) : (
{questionnarieResponses?.results?.length === 0 ? (
-
+
{t("no_questionnaire_responses")}
@@ -327,7 +343,11 @@ export default function QuestionnaireResponsesList({
{questionnarieResponses?.results?.map(
(item: QuestionnaireResponse) => (
-
+
),
)}
diff --git a/src/components/Facility/FacilityForm.tsx b/src/components/Facility/FacilityForm.tsx
index c6cabe1de6a..4acae303aaf 100644
--- a/src/components/Facility/FacilityForm.tsx
+++ b/src/components/Facility/FacilityForm.tsx
@@ -144,7 +144,7 @@ export default function FacilityForm({
const handleFeatureChange = (value: string[]) => {
const features = value.map((val) => Number(val));
- form.setValue("features", features);
+ form.setValue("features", features, { shouldDirty: true });
};
const handleGetCurrentLocation = () => {
@@ -152,8 +152,12 @@ export default function FacilityForm({
setIsGettingLocation(true);
navigator.geolocation.getCurrentPosition(
(position) => {
- form.setValue("latitude", position.coords.latitude);
- form.setValue("longitude", position.coords.longitude);
+ form.setValue("latitude", position.coords.latitude, {
+ shouldDirty: true,
+ });
+ form.setValue("longitude", position.coords.longitude, {
+ shouldDirty: true,
+ });
setIsGettingLocation(false);
toast.success(t("location_updated_successfully"));
},
@@ -308,7 +312,6 @@ export default function FacilityForm({
@@ -346,7 +349,9 @@ export default function FacilityForm({
value={form.watch("geo_organization")}
selected={selectedLevels}
onChange={(value) =>
- form.setValue("geo_organization", value)
+ form.setValue("geo_organization", value, {
+ shouldDirty: true,
+ })
}
required
/>
@@ -418,6 +423,7 @@ export default function FacilityForm({
form.setValue(
"latitude",
e.target.value ? Number(e.target.value) : undefined,
+ { shouldDirty: true },
);
}}
data-cy="facility-latitude"
@@ -445,6 +451,7 @@ export default function FacilityForm({
form.setValue(
"longitude",
e.target.value ? Number(e.target.value) : undefined,
+ { shouldDirty: true },
);
}}
data-cy="facility-longitude"
@@ -493,7 +500,9 @@ export default function FacilityForm({
type="submit"
className="w-full"
variant="primary"
- disabled={facilityId ? isUpdatePending : isPending}
+ disabled={
+ facilityId ? isUpdatePending || !form.formState.isDirty : isPending
+ }
data-cy={facilityId ? "update-facility" : "submit-facility"}
>
{facilityId ? (
diff --git a/src/components/Facility/FacilityHome.tsx b/src/components/Facility/FacilityHome.tsx
index 7af7f0407fa..2c3e121afd8 100644
--- a/src/components/Facility/FacilityHome.tsx
+++ b/src/components/Facility/FacilityHome.tsx
@@ -8,7 +8,6 @@ import { toast } from "sonner";
import CareIcon from "@/CAREUI/icons/CareIcon";
-import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Markdown } from "@/components/ui/markdown";
@@ -27,6 +26,7 @@ import query from "@/Utils/request/query";
import uploadFile from "@/Utils/request/uploadFile";
import { getAuthorizationHeader } from "@/Utils/request/utils";
import { sleep } from "@/Utils/utils";
+import { FeatureBadge } from "@/pages/Facility/Utils";
import EditFacilitySheet from "@/pages/Organization/components/EditFacilitySheet";
import { FacilityData } from "@/types/facility/facility";
import type {
@@ -35,6 +35,8 @@ import type {
} from "@/types/organization/organization";
import { getOrgLabel } from "@/types/organization/organization";
+import { FacilityMapsLink } from "./FacilityMapLink";
+
type Props = {
facilityId: string;
};
@@ -200,12 +202,12 @@ export const FacilityHome = ({ facilityId }: Props) => {
)}
@@ -221,10 +223,6 @@ export const FacilityHome = ({ facilityId }: Props) => {
-
{/*
TODO: add delete facility
@@ -267,7 +265,7 @@ export const FacilityHome = ({ facilityId }: Props) => {
aria-label={t("edit_cover_photo")}
>
@@ -280,15 +278,16 @@ export const FacilityHome = ({ facilityId }: Props) => {
-
+
+
-
+
}
@@ -322,8 +321,13 @@ export const FacilityHome = ({ facilityId }: Props) => {
{t("location_details")}
-
- {/* Add Location Link Here */}
+
+ {facilityData.latitude && facilityData.longitude && (
+
+ )}
@@ -355,33 +359,18 @@ export const FacilityHome = ({ facilityId }: Props) => {
) && (
-
+
{t("features")}
- {facilityData?.features?.map(
- (feature: number) =>
- FACILITY_FEATURE_TYPES.some(
- (f) => f.id === feature,
- ) && (
-
- {getFacilityFeatureIcon(feature)}
-
- {
- FACILITY_FEATURE_TYPES.find(
- (f) => f.id === feature,
- )?.name
- }
-
-
- ),
- )}
+ {facilityData.features?.map((featureId) => (
+
+ ))}
diff --git a/src/components/Facility/FacilityMapLink.tsx b/src/components/Facility/FacilityMapLink.tsx
new file mode 100644
index 00000000000..47a76082fbf
--- /dev/null
+++ b/src/components/Facility/FacilityMapLink.tsx
@@ -0,0 +1,42 @@
+import { SquareArrowOutUpRight } from "lucide-react";
+import { Link } from "raviger";
+import { useTranslation } from "react-i18next";
+
+import { getMapUrl, isAndroidDevice } from "@/Utils/utils";
+
+const isValidLatitude = (latitude: string) => {
+ const lat = parseFloat(latitude.trim());
+ return Number.isFinite(lat) && lat >= -90 && lat <= 90;
+};
+
+const isValidLongitude = (longitude: string) => {
+ const long = parseFloat(longitude.trim());
+ return Number.isFinite(long) && long >= -180 && long <= 180;
+};
+
+export const FacilityMapsLink = ({
+ latitude,
+ longitude,
+}: {
+ latitude: string;
+ longitude: string;
+}) => {
+ const { t } = useTranslation();
+
+ if (!isValidLatitude(latitude) || !isValidLongitude(longitude)) {
+ return null;
+ }
+ const target = isAndroidDevice ? "_self" : "_blank";
+
+ return (
+
+ {t("show_on_map")}
+
+
+ );
+};
diff --git a/src/components/Files/FilesTab.tsx b/src/components/Files/FilesTab.tsx
index 50fb179cd36..3c1abcbfb45 100644
--- a/src/components/Files/FilesTab.tsx
+++ b/src/components/Files/FilesTab.tsx
@@ -251,54 +251,52 @@ export const FilesTab = (props: FilesTabProps) => {
const filetype = getFileType(file);
return (
<>
- {editPermission() && (
-
- {filetype === "AUDIO" && !file.is_archived && (
-
- )}
- {fileManager.isPreviewable(file) && (
-
);
};
diff --git a/src/components/Location/LocationHistorySheet.tsx b/src/components/Location/LocationHistorySheet.tsx
deleted file mode 100644
index de0ddb25abb..00000000000
--- a/src/components/Location/LocationHistorySheet.tsx
+++ /dev/null
@@ -1,49 +0,0 @@
-import { useTranslation } from "react-i18next";
-
-import { ScrollArea } from "@/components/ui/scroll-area";
-import {
- Sheet,
- SheetContent,
- SheetHeader,
- SheetTitle,
- SheetTrigger,
-} from "@/components/ui/sheet";
-
-import { LocationHistory } from "@/types/emr/encounter";
-
-import { LocationTree } from "./LocationTree";
-
-interface LocationHistorySheetProps {
- trigger: React.ReactNode;
- history: LocationHistory[];
-}
-
-export function LocationHistorySheet({
- trigger,
- history,
-}: LocationHistorySheetProps) {
- const { t } = useTranslation();
-
- return (
-
- {trigger}
-
-
- {t("location_history")}
-
-
- {history.map((item, index) => (
-
-
-
- ))}
-
-
-
- );
-}
diff --git a/src/components/Location/LocationSearch.tsx b/src/components/Location/LocationSearch.tsx
index a27d8e8d1ec..3e741c7c03f 100644
--- a/src/components/Location/LocationSearch.tsx
+++ b/src/components/Location/LocationSearch.tsx
@@ -1,4 +1,5 @@
import { useQuery } from "@tanstack/react-query";
+import { t } from "i18next";
import { useState } from "react";
import {
@@ -15,6 +16,7 @@ import {
} from "@/components/ui/popover";
import query from "@/Utils/request/query";
+import { stringifyNestedObject } from "@/Utils/utils";
import { LocationList } from "@/types/location/location";
import locationApi from "@/types/location/locationApi";
@@ -40,7 +42,7 @@ export function LocationSearch({
queryKey: ["locations", facilityId, mode, search],
queryFn: query(locationApi.list, {
pathParams: { facility_id: facilityId },
- queryParams: { mode, name: search },
+ queryParams: { mode, name: search, form: "bd", available: "true" },
}),
enabled: facilityId !== "preview",
});
@@ -52,7 +54,7 @@ export function LocationSearch({
role="combobox"
aria-expanded={open}
>
- {value?.name || "Select location..."}
+ {stringifyNestedObject(value || { name: "" }) || "Select location..."}
+
+
+
+
+
+
+
+
+ {stringifyNestedObject(location.location, " < ")}
+
+
+
+ {t("manage_patient_location_and_transfers")}
+
+
+
+
+ {/* Active Location */}
+ {activeLocation && renderLocation(activeLocation)}
+
+ {/* Reserved Locations */}
+ {reservedLocations.map((location) => renderLocation(location))}
+
+ {/* Planned Locations */}
+ {plannedLocations.map((location) => renderLocation(location))}
+
+
+
+
+
+
+
+
setSelectedLocation(location)}
+ value={selectedLocation}
+ />
+ {selectedLocation && (
+
+
+
+
+
+ {(newLocation.status === "active" ||
+ newLocation.status === "planned" ||
+ newLocation.status === "reserved") && (
+
+
+
+ setNewLocation((prev) => ({
+ ...prev,
+ start_datetime: e.target.value,
+ }))
+ }
+ className="h-9"
+ />
+
+ )}
+ {newLocation.status !== "active" && (
+
+
+
+ setNewLocation((prev) => ({
+ ...prev,
+ end_datetime: e.target.value,
+ }))
+ }
+ className="h-9"
+ />
+
+ )}
+
+
+
+ {history.map((item, index) => (
+
+
+
+ ))}
+
onEditAdministration(medication, admin)}
>
-
+
+
+
+ {admin.note && (
+
+ )}
+
+
+
+
{new Date(
admin.occurrence_period_start,
).toLocaleTimeString("en-US", {
@@ -273,11 +289,11 @@ const MedicationRow: React.FC = ({
minute: "2-digit",
hour12: true,
})}
-
-
- {admin.occurrence_period_end && (
- <>
- {"- "}
+
+ {admin.occurrence_period_end && (
+ <>
+ {"-"}
+
{new Date(
admin.occurrence_period_end,
).toLocaleTimeString("en-US", {
@@ -285,19 +301,10 @@ const MedicationRow: React.FC = ({
minute: "2-digit",
hour12: true,
})}
-
- )}
-
+
+
+ )}
- {admin.note && (
-
- )}
);
- } else if (!medications?.length) {
+ } else if (
+ !activeMedications?.results?.length &&
+ !stoppedMedications?.results?.length
+ ) {
content = (
);
@@ -629,124 +647,134 @@ export const AdministrationTab: React.FC
= ({
content = ;
} else {
content = (
-
-
-
- {/* Top row without vertical borders */}
-
-
-
- {lastModifiedDate && (
-
- {t("last_modified")}{" "}
- {formatDistanceToNow(lastModifiedDate)} {t("ago")}
-
- )}
+ <>
+ {!filteredMedications.length && (
+
+
+ {t("no_active_medication_recorded")}
+
+
+ )}
+
+
+
+ {/* Top row without vertical borders */}
+
+
+
+ {lastModifiedDate && (
+
+ {t("last_modified")}{" "}
+ {formatDistanceToNow(lastModifiedDate)} {t("ago")}
+
+ )}
+
+
+
+
-
+ {visibleSlots.map((slot) => (
+
+ ))}
+
- {visibleSlots.map((slot) => (
-
- ))}
-
-
-
-
- {/* Main content with borders */}
-
- {/* Headers */}
-
- {t("medicine")}:
-
- {visibleSlots.map((slot, i) => (
-
- {i === endSlotIndex &&
- slot.date.getTime() === currentDate.getTime() && (
-
- )}
- {slot.label}
+ {/* Main content with borders */}
+
+ {/* Headers */}
+
+ {t("medicine")}:
- ))}
-
-
- {/* Medication rows */}
- {filteredMedications?.map((medication) => (
-
- ))}
+ {visibleSlots.map((slot, i) => (
+
+ {i === endSlotIndex &&
+ slot.date.getTime() === currentDate.getTime() && (
+
+ )}
+ {slot.label}
+
+ ))}
+
+
+ {/* Medication rows */}
+ {filteredMedications?.map((medication) => (
+
+ ))}
+
-
- {stoppedMedications?.results?.length > 0 && (
-
setShowStopped(!showStopped)}
- >
-
-
- {showStopped ? t("hide") : t("show")}{" "}
- {`${stoppedMedications?.results?.length} ${t("stopped")}`}{" "}
- {t("prescriptions")}
-
-
- )}
-
-
-
+ {stoppedMedications?.results?.length > 0 && !searchQuery.trim() && (
+
setShowStopped(!showStopped)}
+ >
+
+
+ {showStopped ? t("hide") : t("show")}{" "}
+ {`${stoppedMedications?.results?.length} ${t("stopped")}`}{" "}
+ {t("prescriptions")}
+
+
+ )}
+
+
+
+
);
}
return (
-
+