- {t("local_ipaddress")}:
+ {t("local_ip_address")}:
{asset?.meta?.local_ip_address}
diff --git a/src/Components/Common/Sidebar/Sidebar.tsx b/src/Components/Common/Sidebar/Sidebar.tsx
index 0e9ee34b715..549cadabb09 100644
--- a/src/Components/Common/Sidebar/Sidebar.tsx
+++ b/src/Components/Common/Sidebar/Sidebar.tsx
@@ -8,11 +8,25 @@ import SlideOver from "../../../CAREUI/interactive/SlideOver";
import { classNames } from "../../../Utils/utils";
import { Link } from "raviger";
import careConfig from "@careConfig";
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipProvider,
+ TooltipTrigger,
+} from "@/Components/ui/tooltip";
+import { useTranslation } from "react-i18next";
+import { useCareAppNavItems } from "@/Common/hooks/useCareApps";
export const SIDEBAR_SHRINK_PREFERENCE_KEY = "sidebarShrinkPreference";
const LOGO_COLLAPSE = "/images/care_logo_mark.svg";
+export interface INavItem {
+ text: string;
+ to?: string;
+ icon: IconName;
+}
+
type StatelessSidebarProps =
| {
shrinkable: true;
@@ -32,21 +46,22 @@ const StatelessSidebar = ({
setShrinked,
onItemClick,
}: StatelessSidebarProps) => {
- const NavItems: {
- text: string;
- to: string;
- icon: IconName;
- }[] = [
- { text: "Facilities", to: "/facility", icon: "l-hospital" },
- { text: "Patients", to: "/patients", icon: "l-user-injured" },
- { text: "Assets", to: "/assets", icon: "l-shopping-cart-alt" },
- { text: "Sample Test", to: "/sample", icon: "l-medkit" },
- { text: "Shifting", to: "/shifting", icon: "l-ambulance" },
- { text: "Resource", to: "/resource", icon: "l-heart-medical" },
- { text: "Users", to: "/users", icon: "l-users-alt" },
- { text: "Notice Board", to: "/notice_board", icon: "l-meeting-board" },
+ const { t } = useTranslation();
+ const BaseNavItems: INavItem[] = [
+ { text: t("facilities"), to: "/facility", icon: "l-hospital" },
+ { text: t("patients"), to: "/patients", icon: "l-user-injured" },
+ { text: t("assets"), to: "/assets", icon: "l-shopping-cart-alt" },
+ { text: t("sample_test"), to: "/sample", icon: "l-medkit" },
+ { text: t("shifting"), to: "/shifting", icon: "l-ambulance" },
+ { text: t("resource"), to: "/resource", icon: "l-heart-medical" },
+ { text: t("users"), to: "/users", icon: "l-users-alt" },
+ { text: t("notice_board"), to: "/notice_board", icon: "l-meeting-board" },
];
+ const PluginNavItems = useCareAppNavItems();
+
+ const NavItems = [...BaseNavItems, ...PluginNavItems];
+
const activeLink = useActiveLink();
const Item = shrinked ? ShrinkedSidebarItem : SidebarItem;
@@ -58,23 +73,21 @@ const StatelessSidebar = ({
const updateIndicator = () => {
if (!indicatorRef.current) return;
const index = NavItems.findIndex((item) => item.to === activeLink);
- const navItemCount = NavItems.length + (careConfig.urls.dashboard ? 2 : 1); // +2 for notification and dashboard
+ const navItemCount = NavItems.length + (careConfig.urls.dashboard ? 2 : 1);
if (index !== -1) {
- // Haha math go brrrrrrrrr
-
const e = indicatorRef.current;
const itemHeight = activeLinkRef.current?.clientHeight || 0;
- if (lastIndicatorPosition > index) {
- e.style.top = `${itemHeight * (index + 0.37)}px`;
- setTimeout(() => {
- e.style.bottom = `${itemHeight * (navItemCount - 0.63 - index)}px`;
- }, 50);
- } else {
- e.style.bottom = `${itemHeight * (navItemCount - 0.63 - index)}px`;
- setTimeout(() => {
- e.style.top = `${itemHeight * (index + 0.37)}px`;
- }, 50);
- }
+ const itemOffset = index * itemHeight;
+
+ const indicatorHeight = indicatorRef.current.clientHeight;
+ const indicatorOffset = (itemHeight - indicatorHeight) / 2;
+
+ const top = `${itemOffset + indicatorOffset}px`;
+ const bottom = `${navItemCount * itemHeight - itemOffset - indicatorOffset}px`;
+
+ e.style.top = top;
+ e.style.bottom = bottom;
+
setLastIndicatorPosition(index);
} else {
indicatorRef.current.style.display = "none";
@@ -96,7 +109,7 @@ const StatelessSidebar = ({
return (
- {shrinked && (
+ {setShrinked && shrinked && (
setShrinked && setShrinked(!shrinked)}
+ toggle={() => setShrinked(!shrinked)}
/>
)}
-
+
- {!shrinked && (
+ {setShrinked && !shrinked && (
setShrinked && setShrinked(!shrinked)}
+ toggle={() => setShrinked(!shrinked)}
/>
)}
{/* flexible spacing */}
-
+
{NavItems.map((i) => {
@@ -151,7 +165,7 @@ const StatelessSidebar = ({
{...i}
icon={
}
selected={i.to === activeLink}
- do={() => onItemClick && onItemClick(false)}
+ onItemClick={() => onItemClick && onItemClick(false)}
handleOverflow={handleOverflow}
/>
);
@@ -218,18 +232,28 @@ interface ToggleShrinkProps {
toggle: () => void;
}
-const ToggleShrink = ({ shrinked, toggle }: ToggleShrinkProps) => (
-
-
-);
+const ToggleShrink = ({ shrinked, toggle }: ToggleShrinkProps) => {
+ const { t } = useTranslation();
+ return (
+
+
+
+
+
+
+
+ {shrinked ? t("expand_sidebar") : t("collapse_sidebar")}
+
+
+
+ );
+};
diff --git a/src/Components/Common/Sidebar/SidebarItem.tsx b/src/Components/Common/Sidebar/SidebarItem.tsx
index 265119f936e..6db51bbac3a 100644
--- a/src/Components/Common/Sidebar/SidebarItem.tsx
+++ b/src/Components/Common/Sidebar/SidebarItem.tsx
@@ -10,37 +10,39 @@ type SidebarItemProps = {
ref?: React.Ref
;
text: string;
icon: SidebarIcon;
+ onItemClick?: () => void;
external?: true | undefined;
badgeCount?: number | undefined;
selected?: boolean | undefined;
handleOverflow?: any;
-} & ({ to: string; do?: undefined } | { to?: string; do: () => void });
+} & ({ to?: string; do?: undefined } | { to?: string; do: () => void });
type SidebarItemBaseProps = SidebarItemProps & {
shrinked?: boolean;
- ref: Ref;
};
-const SidebarItemBase = forwardRef(
- (
- { shrinked, external, ...props }: SidebarItemBaseProps,
- ref: Ref,
- ) => {
+const SidebarItemBase = forwardRef(
+ ({ shrinked, external, ...props }, ref) => {
const { t } = useTranslation();
const { resetHistory } = useAppHistory();
return (
{t(props.text)}
diff --git a/src/Components/Common/Sidebar/SidebarUserCard.tsx b/src/Components/Common/Sidebar/SidebarUserCard.tsx
index 9e9b113c4aa..70a64917224 100644
--- a/src/Components/Common/Sidebar/SidebarUserCard.tsx
+++ b/src/Components/Common/Sidebar/SidebarUserCard.tsx
@@ -5,6 +5,13 @@ import CareIcon from "../../../CAREUI/icons/CareIcon";
import { formatName, formatDisplayName } from "../../../Utils/utils";
import useAuthUser, { useAuthContext } from "../../../Common/hooks/useAuthUser";
import { Avatar } from "@/Components/Common/Avatar";
+import { Button } from "@/Components/ui/button";
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+} from "@/Components/ui/dropdown-menu";
interface SidebarUserCardProps {
shrinked: boolean;
@@ -16,47 +23,59 @@ const SidebarUserCard: React.FC = ({ shrinked }) => {
const { signOut } = useAuthContext();
return (
-
-
-
-
- {!shrinked && (
-
- {formatName(user)}
-
- )}
-
-
-
-
);
};
diff --git a/src/Components/Common/SortDropdown.tsx b/src/Components/Common/SortDropdown.tsx
index b54edffa595..0c4fddec58c 100644
--- a/src/Components/Common/SortDropdown.tsx
+++ b/src/Components/Common/SortDropdown.tsx
@@ -29,6 +29,7 @@ export default function SortDropdownMenu(props: Props) {
>
{props.options.map(({ isAscending, value }) => (
& {
- placeholder?: string;
-};
+type TemperatureFormFieldProps = FormFieldBaseProps;
-export default function TemperatureFormField(props: Props) {
+export default function TemperatureFormField({
+ onChange,
+ id,
+ label,
+ error,
+ value,
+ name,
+}: TemperatureFormFieldProps) {
const [unit, setUnit] = useState("fahrenheit");
+ const [inputValue, setInputValue] = useState(value || "");
+
+ useEffect(() => {
+ if (value) {
+ const initialTemperature =
+ unit === "celsius"
+ ? fahrenheitToCelsius(parseFloat(value)).toFixed(1)
+ : value;
+ setInputValue(initialTemperature);
+ }
+ }, [value, unit]);
+
+ const handleUnitChange = () => {
+ setUnit(unit === "celsius" ? "fahrenheit" : "celsius");
+ if (inputValue) {
+ const convertedValue =
+ unit === "celsius"
+ ? celsiusToFahrenheit(parseFloat(inputValue)).toFixed(1)
+ : fahrenheitToCelsius(parseFloat(inputValue)).toFixed(1);
+ setInputValue(convertedValue);
+ }
+ };
+
+ const handleInputChange = (e: FieldChangeEvent) => {
+ const newValue = e.value;
+
+ const regex = /^-?\d*\.?\d{0,1}$/;
+ if (regex.test(newValue)) {
+ setInputValue(newValue);
+ }
+ };
+
+ const handleBlur = () => {
+ if (!inputValue) return;
+ const parsedValue = parseFloat(inputValue);
+ if (isNaN(parsedValue)) return;
+
+ const finalValue =
+ unit === "celsius"
+ ? celsiusToFahrenheit(parsedValue).toString()
+ : parsedValue.toString();
+
+ setInputValue(finalValue);
+ onChange({ name, value: finalValue });
+ };
return (
- setUnit(unit === "celsius" ? "fahrenheit" : "celsius")}
- >
-
- }
- />
+
+
+
+
);
}
diff --git a/src/Components/Common/components/ButtonV2.tsx b/src/Components/Common/components/ButtonV2.tsx
index bc67e150fdc..b7eab5f29d7 100644
--- a/src/Components/Common/components/ButtonV2.tsx
+++ b/src/Components/Common/components/ButtonV2.tsx
@@ -4,6 +4,8 @@ import CareIcon from "../../../CAREUI/icons/CareIcon";
import { Link } from "raviger";
import { classNames } from "../../../Utils/utils";
import { useTranslation } from "react-i18next";
+import { useEffect, useState } from "react";
+import Spinner from "../Spinner";
export type ButtonSize = "small" | "default" | "large";
export type ButtonShape = "square" | "circle";
@@ -22,36 +24,40 @@ export type RawButtonProps = Omit<
"style"
>;
+export type ButtonStyleProps = {
+ /**
+ * - `"small"` has small text and minimal padding.
+ * - `"default"` has small text with normal padding.
+ * - `"large"` has base text size with large padding.
+ */
+ size?: ButtonSize;
+ /**
+ * - `"square"` gives a button with minimally rounded corners.
+ * - `"circle"` gives a button with fully rounded corners. Ideal when only
+ * icons are present.
+ */
+ circle?: boolean | undefined;
+ /**
+ * - `"primary"` is ideal for form submissions, etc.
+ * - `"secondary"` is ideal for things that have secondary importance.
+ * - `"danger"` is ideal for destructive or dangerous actions, such as delete.
+ * - `"warning"` is ideal for actions that require caution such as archive.
+ * - `"alert"` is ideal for actions that require alert.
+ */
+ variant?: ButtonVariant;
+ /** If set, gives an elevated button with hover effects. */
+ shadow?: boolean | undefined;
+ /** If set, removes the background to give a simple text button. */
+ ghost?: boolean | undefined;
+ /**
+ * If set, applies border to the button.
+ */
+ border?: boolean | undefined;
+};
+
export type ButtonProps = RawButtonProps &
- AuthorizedElementProps & {
- /**
- * - `"small"` has small text and minimal padding.
- * - `"default"` has small text with normal padding.
- * - `"large"` has base text size with large padding.
- */
- size?: ButtonSize;
- /**
- * - `"square"` gives a button with minimally rounded corners.
- * - `"circle"` gives a button with fully rounded corners. Ideal when only
- * icons are present.
- */
- circle?: boolean | undefined;
- /**
- * - `"primary"` is ideal for form submissions, etc.
- * - `"secondary"` is ideal for things that have secondary importance.
- * - `"danger"` is ideal for destructive or dangerous actions, such as delete.
- * - `"warning"` is ideal for actions that require caution such as archive.
- * - `"alert"` is ideal for actions that require alert.
- */
- variant?: ButtonVariant;
- /** If set, gives an elevated button with hover effects. */
- shadow?: boolean | undefined;
- /** If set, removes the background to give a simple text button. */
- ghost?: boolean | undefined;
- /**
- * If set, applies border to the button.
- */
- border?: boolean | undefined;
+ AuthorizedElementProps &
+ ButtonStyleProps & {
/**
* Whether the button is disabled or not.
* This is overriden to `true` if `loading` is `true`.
@@ -83,10 +89,28 @@ export type ButtonProps = RawButtonProps &
tooltipClassName?: string;
};
-const ButtonV2 = ({
- authorizeFor,
+export const buttonStyles = ({
size = "default",
+ circle = false,
variant = "primary",
+ ghost = false,
+ border = false,
+ shadow = !ghost,
+}: ButtonStyleProps) => {
+ return classNames(
+ "inline-flex h-min cursor-pointer items-center justify-center gap-2 whitespace-pre font-medium outline-offset-1 transition-all duration-200 ease-in-out disabled:cursor-not-allowed disabled:bg-secondary-200 disabled:text-secondary-500",
+ `button-size-${size}`,
+ `button-shape-${circle ? "circle" : "square"}`,
+ ghost ? `button-${variant}-ghost` : `button-${variant}-default`,
+ border && `button-${variant}-border`,
+ shadow && "shadow enabled:hover:shadow-md",
+ );
+};
+
+const ButtonV2 = ({
+ authorizeFor,
+ size,
+ variant,
circle,
shadow,
ghost,
@@ -103,14 +127,9 @@ const ButtonV2 = ({
shadow ??= !ghost;
const className = classNames(
- props.className,
- "inline-flex h-min cursor-pointer items-center justify-center gap-2 whitespace-pre font-medium outline-offset-1 transition-all duration-200 ease-in-out disabled:cursor-not-allowed disabled:bg-secondary-200 disabled:text-secondary-500",
- `button-size-${size}`,
- `button-shape-${circle ? "circle" : "square"}`,
- ghost ? `button-${variant}-ghost` : `button-${variant}-default`,
- border && `button-${variant}-border`,
- shadow && "shadow enabled:hover:shadow-md",
+ buttonStyles({ size, circle, variant, ghost, border, shadow }),
tooltip && "tooltip",
+ props.className,
);
if (tooltip) {
@@ -202,3 +221,53 @@ export const Cancel = ({ label = "Cancel", ...props }: CommonButtonProps) => {
/>
);
};
+
+export type ButtonWithTimerProps = CommonButtonProps & {
+ initialInverval?: number;
+ interval?: number;
+};
+
+export const ButtonWithTimer = ({
+ initialInverval,
+ interval = 60,
+ ...buttonProps
+}: ButtonWithTimerProps) => {
+ const [seconds, setSeconds] = useState(initialInverval ?? interval);
+ const [isButtonDisabled, setIsButtonDisabled] = useState(true);
+
+ useEffect(() => {
+ let interval = undefined;
+ if (seconds > 0) {
+ interval = setInterval(() => {
+ setSeconds((prevSeconds) => prevSeconds - 1);
+ }, 1000);
+ } else {
+ setIsButtonDisabled(false);
+ clearInterval(interval);
+ }
+ return () => clearInterval(interval);
+ }, [seconds]);
+
+ return (
+
+
{
+ await buttonProps.onClick?.(e);
+ setSeconds(interval);
+ setIsButtonDisabled(true);
+ }}
+ >
+ {!!(seconds && isButtonDisabled) && (
+
+
+ )}
+
+ {buttonProps.children ?? buttonProps.label}
+
+
diff --git a/src/Components/ErrorPages/SessionExpired.tsx b/src/Components/ErrorPages/SessionExpired.tsx
index 419c9c44dce..32036a0319d 100644
--- a/src/Components/ErrorPages/SessionExpired.tsx
+++ b/src/Components/ErrorPages/SessionExpired.tsx
@@ -1,23 +1,16 @@
import * as Notification from "../../Utils/Notifications";
-import { useNavigate } from "raviger";
import { useEffect } from "react";
import { useTranslation } from "react-i18next";
import { useAuthContext } from "../../Common/hooks/useAuthUser";
export default function SessionExpired() {
- const { signOut, user } = useAuthContext();
- const isAuthenticated = !!user;
- const navigate = useNavigate();
+ const { signOut } = useAuthContext();
const { t } = useTranslation();
useEffect(() => {
Notification.closeAllNotifications();
}, []);
- if (isAuthenticated) {
- navigate("/");
- }
-
return (
diff --git a/src/Components/Facility/ConsultationDetails/ConsultationFeedTab.tsx b/src/Components/Facility/ConsultationDetails/ConsultationFeedTab.tsx
index 2e999d1956e..91922c99205 100644
--- a/src/Components/Facility/ConsultationDetails/ConsultationFeedTab.tsx
+++ b/src/Components/Facility/ConsultationDetails/ConsultationFeedTab.tsx
@@ -1,14 +1,11 @@
import { useEffect, useRef, useState } from "react";
import { ConsultationTabProps } from "./index";
-import { AssetBedModel, AssetData } from "../../Assets/AssetTypes";
-import routes from "../../../Redux/api";
import useQuery from "../../../Utils/request/useQuery";
import CameraFeed from "../../CameraFeed/CameraFeed";
import Loading from "../../Common/Loading";
-import AssetBedSelect from "../../CameraFeed/AssetBedSelect";
+import CameraPresetSelect from "../../CameraFeed/CameraPresetSelect";
import { triggerGoal } from "../../../Integrations/Plausible";
import useAuthUser from "../../../Common/hooks/useAuthUser";
-import useSlug from "../../../Common/hooks/useSlug";
import CareIcon from "../../../CAREUI/icons/CareIcon";
import ButtonV2 from "../../Common/components/ButtonV2";
import useOperateCamera, {
@@ -20,18 +17,19 @@ import ConfirmDialog from "../../Common/ConfirmDialog";
import useBreakpoints from "../../../Common/hooks/useBreakpoints";
import { Warn } from "../../../Utils/Notifications";
import { useTranslation } from "react-i18next";
-import { GetStatusResponse } from "../../CameraFeed/routes";
+import {
+ CameraPreset,
+ FeedRoutes,
+ GetStatusResponse,
+} from "../../CameraFeed/routes";
import StillWatching from "../../CameraFeed/StillWatching";
export const ConsultationFeedTab = (props: ConsultationTabProps) => {
const { t } = useTranslation();
const authUser = useAuthUser();
- const facility = useSlug("facility");
const bed = props.consultationData.current_bed?.bed_object;
const feedStateSessionKey = `encounterFeedState[${props.consultationId}]`;
-
- const [asset, setAsset] = useState
();
- const [preset, setPreset] = useState();
+ const [preset, setPreset] = useState();
const [showPresetSaveConfirmation, setShowPresetSaveConfirmation] =
useState(false);
const [isUpdatingPreset, setIsUpdatingPreset] = useState(false);
@@ -52,23 +50,22 @@ export const ConsultationFeedTab = (props: ConsultationTabProps) => {
}
}, []);
- const { key, operate } = useOperateCamera(asset?.id ?? "", true);
+ const asset = preset?.asset_bed.asset_object;
+
+ const { key, operate } = useOperateCamera(asset?.id ?? "");
- const { data, loading, refetch } = useQuery(routes.listAssetBeds, {
- query: { limit: 100, facility, bed: bed?.id, asset: asset?.id },
+ const presetsQuery = useQuery(FeedRoutes.listBedPresets, {
+ pathParams: { bed_id: bed?.id ?? "" },
+ query: { limit: 100 },
prefetch: !!bed,
onResponse: ({ data }) => {
if (!data) {
return;
}
- const presets = data.results.filter(
- (obj) =>
- obj.asset_object.meta?.asset_type === "CAMERA" &&
- obj.meta.type !== "boundary",
- );
-
+ const presets = data.results;
const lastStateJSON = sessionStorage.getItem(feedStateSessionKey);
+
const preset =
(() => {
if (lastStateJSON) {
@@ -77,23 +74,33 @@ export const ConsultationFeedTab = (props: ConsultationTabProps) => {
return presets.find((obj) => obj.id === lastState.value);
}
if (lastState.type === "position") {
+ const assetBedObj = presets.find(
+ (p) => p.asset_bed.id === lastState.assetBed,
+ )?.asset_bed;
+
+ if (!assetBedObj) {
+ return;
+ }
+
return {
...presets[0],
id: "",
- meta: { ...presets[0].meta, position: lastState.value },
- };
+ asset_bed: assetBedObj,
+ position: lastState.value,
+ } satisfies CameraPreset;
}
}
})() ?? presets[0];
+ console.log({ preset, presets });
+
if (preset) {
setPreset(preset);
- setAsset(preset.asset_object);
}
},
});
- const presets = data?.results;
+ const presets = presetsQuery.data?.results;
const handleUpdatePreset = async () => {
if (!preset) return;
@@ -102,17 +109,17 @@ export const ConsultationFeedTab = (props: ConsultationTabProps) => {
const { data } = await operate({ type: "get_status" });
const { position } = (data as { result: { position: PTZPayload } }).result;
-
- const { data: updated } = await request(routes.partialUpdateAssetBed, {
- pathParams: { external_id: preset.id },
+ const { data: updated } = await request(FeedRoutes.updatePreset, {
+ pathParams: {
+ assetbed_id: preset.asset_bed.id,
+ id: preset.id,
+ },
body: {
- asset: preset.asset_object.id,
- bed: preset.bed_object.id,
- meta: { ...preset.meta, position },
+ position,
},
});
- await refetch();
+ await presetsQuery.refetch();
setPreset(updated);
setHasMoved(false);
@@ -124,7 +131,7 @@ export const ConsultationFeedTab = (props: ConsultationTabProps) => {
if (divRef.current) {
divRef.current.scrollIntoView({ behavior: "smooth" });
}
- }, [!!bed, loading, !!asset, divRef.current]);
+ }, [!!bed, presetsQuery.loading, !!asset, divRef.current]);
useEffect(() => {
if (preset?.id) {
@@ -138,7 +145,7 @@ export const ConsultationFeedTab = (props: ConsultationTabProps) => {
}
}, [feedStateSessionKey, preset]);
- if (loading) {
+ if (presetsQuery.loading) {
return {
+ if (!preset) {
+ return;
+ }
setHasMoved(true);
setTimeout(async () => {
const { data } = await operate({ type: "get_status" });
@@ -179,6 +189,7 @@ export const ConsultationFeedTab = (props: ConsultationTabProps) => {
feedStateSessionKey,
JSON.stringify({
type: "position",
+ assetBed: preset.asset_bed.id,
value: (data as GetStatusResponse).result.position,
} satisfies LastAccessedPosition),
);
@@ -204,26 +215,19 @@ export const ConsultationFeedTab = (props: ConsultationTabProps) => {
{presets ? (
<>
-
obj.meta.preset_name}
+ label={(obj) => obj.name}
value={preset}
onChange={(value) => {
triggerGoal("Camera Preset Clicked", {
- presetName: preset?.meta?.preset_name,
+ presetName: preset?.name,
consultationId: props.consultationId,
userId: authUser.id,
result: "success",
});
setHasMoved(false);
- // Voluntarily copying to trigger change of reference of the position attribute, so that the useEffect of CameraFeed that handles the moves gets triggered.
- setPreset({
- ...value,
- meta: {
- ...value.meta,
- position: { ...value.meta.position },
- },
- });
+ setPreset(value);
}}
/>
{isUpdatingPreset ? (
@@ -269,6 +273,7 @@ type LastAccessedPreset = {
type LastAccessedPosition = {
type: "position";
+ assetBed: string;
value: PTZPayload;
};
diff --git a/src/Components/Facility/ConsultationDetails/index.tsx b/src/Components/Facility/ConsultationDetails/index.tsx
index 53e137d12eb..639c6dd9e40 100644
--- a/src/Components/Facility/ConsultationDetails/index.tsx
+++ b/src/Components/Facility/ConsultationDetails/index.tsx
@@ -1,10 +1,6 @@
import { GENDER_TYPES } from "../../../Common/constants";
import { ConsultationModel } from "../models";
-import {
- getConsultation,
- getPatient,
- listAssetBeds,
-} from "../../../Redux/actions";
+import { getConsultation, getPatient } from "../../../Redux/actions";
import { statusType, useAbortableEffect } from "../../../Common/utils";
import { useCallback, useState } from "react";
import DoctorVideoSlideover from "../DoctorVideoSlideover";
@@ -35,7 +31,6 @@ import { ConsultationNeurologicalMonitoringTab } from "./ConsultationNeurologica
import ABDMRecordsTab from "../../ABDM/ABDMRecordsTab";
import { ConsultationNutritionTab } from "./ConsultationNutritionTab";
import PatientNotesSlideover from "../PatientNotesSlideover";
-import { AssetBedModel } from "../../Assets/AssetTypes";
import PatientInfoCard from "../../Patient/PatientInfoCard";
import RelativeDateUserMention from "../../Common/RelativeDateUserMention";
import DiagnosesListAccordion from "../../Diagnosis/DiagnosesListAccordion";
@@ -129,20 +124,24 @@ export const ConsultationDetails = (props: any) => {
);
}
setConsultationData(data);
- const assetRes = data?.current_bed?.bed_object?.id
- ? await dispatch(
- listAssetBeds({
- bed: data?.current_bed?.bed_object?.id,
- }),
- )
- : null;
- const isCameraAttachedRes =
- assetRes != null
- ? assetRes.data.results.some((asset: AssetBedModel) => {
- return asset?.asset_object?.asset_class === "ONVIF";
- })
- : false;
- setIsCameraAttached(isCameraAttachedRes);
+
+ setIsCameraAttached(
+ await (async () => {
+ const bedId = data?.current_bed?.bed_object?.id;
+ if (!bedId) {
+ return false;
+ }
+ const { data: assetBeds } = await request(routes.listAssetBeds, {
+ query: { bed: bedId },
+ });
+ if (!assetBeds) {
+ return false;
+ }
+ return assetBeds.results.some(
+ (a) => a.asset_object.asset_class === "ONVIF",
+ );
+ })(),
+ );
// Get patient data
const id = res.data.patient;
@@ -169,7 +168,7 @@ export const ConsultationDetails = (props: any) => {
// Get abha number data
const { data: abhaNumberData } = await request(
- routes.abha.getAbhaNumber,
+ routes.abdm.abhaNumber.get,
{
pathParams: { abhaNumberId: id ?? "" },
silent: true,
@@ -256,6 +255,7 @@ export const ConsultationDetails = (props: any) => {
{!consultationData.discharge_date && (
<>
{
triggerGoal("Doctor Connect Clicked", {
consultationId,
diff --git a/src/Components/Facility/DischargedPatientsList.tsx b/src/Components/Facility/DischargedPatientsList.tsx
index 6603f3964af..47e5cd5a68d 100644
--- a/src/Components/Facility/DischargedPatientsList.tsx
+++ b/src/Components/Facility/DischargedPatientsList.tsx
@@ -47,15 +47,16 @@ const DischargedPatientsList = ({
pathParams: { id: facility_external_id },
});
- const { qParams, updateQuery, advancedFilter, FilterBadges } = useFilters({
- limit: 12,
- cacheBlacklist: [
- "name",
- "patient_no",
- "phone_number",
- "emergency_phone_number",
- ],
- });
+ const { qParams, updateQuery, advancedFilter, FilterBadges, updatePage } =
+ useFilters({
+ limit: 12,
+ cacheBlacklist: [
+ "name",
+ "patient_no",
+ "phone_number",
+ "emergency_phone_number",
+ ],
+ });
useEffect(() => {
if (!qParams.phone_number && phone_number.length >= 13) {
@@ -434,10 +435,9 @@ const DischargedPatientsList = ({
route={routes.listFacilityDischargedPatients}
pathParams={{ facility_external_id }}
query={{ ordering: "-modified_date", ...qParams }}
- queryCB={(query) => {
- setCount(query.data?.count || 0);
- console.log(query.data?.count);
- }}
+ queryCB={(query) => setCount(query.data?.count || 0)}
+ initialPage={qParams.page}
+ onPageChange={updatePage}
>
{() => (
diff --git a/src/Components/Facility/DoctorVideoSlideover.tsx b/src/Components/Facility/DoctorVideoSlideover.tsx
index 0f4120e6bae..519a04014fa 100644
--- a/src/Components/Facility/DoctorVideoSlideover.tsx
+++ b/src/Components/Facility/DoctorVideoSlideover.tsx
@@ -16,6 +16,7 @@ import Switch from "../../CAREUI/interactive/Switch";
import useQuery from "../../Utils/request/useQuery";
import routes from "../../Redux/api";
import Loading from "../Common/Loading";
+import { PLUGIN_DoctorConnectButtons } from "@/PluginEngine";
const UserGroups = {
ALL: "All",
@@ -295,7 +296,7 @@ function UserListItem({ user }: { user: UserAnnotatedWithGroup }) {
);
}}
>
-
+
Copy Phone number
@@ -347,7 +348,7 @@ function DoctorConnectButtons(props: {
Connect on WhatsApp
-
Connect on Phone
-
+ {props.children}
+ );
return (
-
- {facility.read_cover_image_url ? (
-
- ) : (
- <>
-
-
- )}
+
+
{facility.name}
@@ -29,6 +36,6 @@ export default function FacilityBlock(props: { facility: FacilityModel }) {
{facility.address} {facility.local_body_object?.name}
-
+
);
}
diff --git a/src/Components/Facility/FacilityCard.tsx b/src/Components/Facility/FacilityCard.tsx
index 0febe36e4b7..e874a0f85c0 100644
--- a/src/Components/Facility/FacilityCard.tsx
+++ b/src/Components/Facility/FacilityCard.tsx
@@ -9,17 +9,20 @@ import CareIcon from "../../CAREUI/icons/CareIcon";
import { formatPhoneNumber, parsePhoneNumber } from "../../Utils/utils";
import DialogModal from "../Common/Dialog";
import TextAreaFormField from "../Form/FormFields/TextAreaFormField";
-import { classNames } from "../../Utils/utils";
import request from "../../Utils/request/request";
import routes from "../../Redux/api";
import careConfig from "@careConfig";
+import { FacilityModel } from "./models";
import { Avatar } from "../Common/Avatar";
-export const FacilityCard = (props: { facility: any; userType: any }) => {
+export const FacilityCard = (props: {
+ facility: FacilityModel;
+ userType: string;
+}) => {
const { facility, userType } = props;
const { t } = useTranslation();
- const [notifyModalFor, setNotifyModalFor] = useState(undefined);
+ const [notifyModalFor, setNotifyModalFor] = useState
();
const [notifyMessage, setNotifyMessage] = useState("");
const [notifyError, setNotifyError] = useState("");
@@ -48,25 +51,18 @@ export const FacilityCard = (props: { facility: any; userType: any }) => {
return (
-
+
- {(facility.read_cover_image_url && (
-
- )) || (
-
- )}
+
@@ -74,21 +70,12 @@ export const FacilityCard = (props: { facility: any; userType: any }) => {
- {(facility.read_cover_image_url && (
-
- )) || (
-
- )}
+
{facility.kasp_empanelled && (
@@ -100,12 +87,27 @@ export const FacilityCard = (props: { facility: any; userType: any }) => {
className="flex flex-wrap items-center justify-between"
id="facility-name-card"
>
-
- {facility.name}
-
+
+
+ {facility.name}
+
+
0.85 ? "justify-center rounded-md border border-red-600 bg-red-500 p-1 font-bold text-white" : "text-secondary-700"}`}
+ >
+
+ {t("live_patients_total_beds")}
+ {" "}
+
+ {t("occupancy")}: {facility.patient_count} /{" "}
+ {facility.bed_count}{" "}
+
+
+
{
icon="l-monitor-heart-rate"
className="text-lg"
/>
- View CNS
+ {t("view_cns")}
+
{
-
+
{/*
*/}
-
0.85
- ? "button-danger-border bg-red-500"
- : "button-primary-border bg-primary-100"
- }`}
- >
-
- Live Patients / Total beds
- {" "}
- 0.85
- ? "text-white"
- : "text-primary-600",
- )}
- />{" "}
- 0.85
- ? "text-white"
- : "text-secondary-700"
- }`}
- >
- Occupancy: {facility.patient_count} /{" "}
- {facility.bed_count}{" "}
- {" "}
-
{
leaveFrom="opacity-100 translate-y-0"
leaveTo="opacity-0 translate-y-1"
>
-
+
{
const feature = FACILITY_FEATURE_TYPES.find((f) => f.id === featureId);
if (!feature?.icon) return null;
@@ -74,6 +75,20 @@ export const FacilityHome = ({ facilityId }: Props) => {
},
});
+ const spokesQuery = useQuery(routes.getFacilitySpokes, {
+ pathParams: {
+ id: facilityId,
+ },
+ silent: true,
+ });
+
+ const hubsQuery = useQuery(routes.getFacilityHubs, {
+ pathParams: {
+ id: facilityId,
+ },
+ silent: true,
+ });
+
const handleDeleteClose = () => {
setOpenDeleteDialog(false);
};
@@ -92,13 +107,6 @@ export const FacilityHome = ({ facilityId }: Props) => {
});
};
- const spokesQuery = useQuery(routes.getFacilitySpokes, {
- pathParams: {
- id: facilityId,
- },
- silent: true,
- });
-
if (isLoading) {
return {`${hasCoverImage ? "Edit" : "Upload"}`}
+ {t(hasCoverImage ? "edit" : "upload")}
);
- const CoverImage = () => (
-
- );
-
return (
{
onDelete={() => facilityFetch()}
facility={facilityData ?? ({} as FacilityModel)}
/>
- {hasCoverImage ? (
-
-
- ) : (
-
- hasPermissionToEditCoverImage && setEditCoverImage(true)
- }
- >
-
- )}
+
+ hasPermissionToEditCoverImage && setEditCoverImage(true)}
+ >
+
+ {editCoverImageTooltip}
+
{
hasPermissionToEditCoverImage && setEditCoverImage(true)
}
>
- {hasCoverImage ? (
-
- ) : (
-
- )}
+
+
{editCoverImageTooltip}
@@ -283,7 +264,7 @@ export const FacilityHome = ({ facilityId }: Props) => {
/>
- {!!spokesQuery.data?.results.length && (
+ {!!spokesQuery.data?.results?.length && (
@@ -291,7 +272,28 @@ export const FacilityHome = ({ facilityId }: Props) => {
{spokesQuery.data?.results.map((spoke) => (
-
+
+
+ )}
+
+ {!!hubsQuery.data?.results?.length && (
+
+
+
+ {t("hubs")}
+
+
+ {hubsQuery.data.results.map((hub) => (
+
diff --git a/src/Components/Facility/HospitalList.tsx b/src/Components/Facility/FacilityList.tsx
similarity index 99%
rename from src/Components/Facility/HospitalList.tsx
rename to src/Components/Facility/FacilityList.tsx
index e7949440307..9143ec29355 100644
--- a/src/Components/Facility/HospitalList.tsx
+++ b/src/Components/Facility/FacilityList.tsx
@@ -18,7 +18,7 @@ import routes from "../../Redux/api";
import CareIcon from "../../CAREUI/icons/CareIcon";
import Loading from "@/Components/Common/Loading";
-export const HospitalList = () => {
+export const FacilityList = () => {
const {
qParams,
updateQuery,
@@ -145,7 +145,7 @@ export const HospitalList = () => {
return (
)}
-
+
diff --git a/src/Components/Facility/Investigations/InvestigationTable.tsx b/src/Components/Facility/Investigations/InvestigationTable.tsx
index 18c64108b6f..84198eea50c 100644
--- a/src/Components/Facility/Investigations/InvestigationTable.tsx
+++ b/src/Components/Facility/Investigations/InvestigationTable.tsx
@@ -5,8 +5,10 @@ import TextFormField from "../../Form/FormFields/TextFormField";
import { classNames } from "../../../Utils/utils";
import { useState } from "react";
import { useTranslation } from "react-i18next";
+import { navigate } from "raviger";
const TestRow = ({ data, i, onChange, showForm, value, isChanged }: any) => {
+ const { t } = useTranslation();
return (
{
)}
x-description="Even row"
>
-
- {data?.investigation_object?.name || "---"}
+
+
+ {data?.investigation_object.name || "---"}
+
+
+
+ {t("investigations__range")}:{" "}
+ {data?.investigation_object.min_value || ""}
+ {data?.investigation_object.min_value ? " - " : ""}
+ {data?.investigation_object.max_value || ""}
+
+
+
+ {t("investigations__unit")}:{" "}
+ {data?.investigation_object.unit || "---"}
+
-
+
{showForm ? (
data?.investigation_object?.investigation_type === "Choice" ? (
{
value || "---"
)}
-
- {data.investigation_object.unit || "---"}
-
-
- {data.investigation_object.min_value || "---"}
-
-
- {data.investigation_object.max_value || "---"}
-
-
+
{data.investigation_object.ideal_value || "---"}
);
};
+const HeadingRow = () => {
+ const { t } = useTranslation();
+ const commonClass =
+ "px-6 py-3 text-xs font-semibold uppercase tracking-wider text-secondary-800";
+ return (
+
+
+ {t("investigations__name")}
+
+
+ {t("investigations__result")}
+
+
+ {t("investigations__ideal_value")}
+
+
+ );
+};
+
export const InvestigationTable = ({
title,
data,
@@ -70,6 +108,10 @@ export const InvestigationTable = ({
changedFields,
handleUpdateCancel,
handleSave,
+ facilityId,
+ patientId,
+ consultationId,
+ sessionId,
}: any) => {
const { t } = useTranslation();
const [searchFilter, setSearchFilter] = useState("");
@@ -85,11 +127,9 @@ export const InvestigationTable = ({
return (
-
- {title && (
-
{title}
- )}
-
+
+ {title &&
{title}
}
+
handleSave()}
+ onClick={() => {
+ handleSave();
+ setShowForm((prev) => !prev);
+ }}
className="my-2 mr-2"
>
- Save
+ {t("save")}
)}
+
+ navigate(
+ `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/investigation/${sessionId}/print`,
+ )
+ }
+ >
+
setSearchFilter(e.value)}
/>
-
-
-
-
- {["Name", "Value", "Unit", "Min", "Max", "Ideal"].map(
- (heading) => (
-
- {heading}
-
- ),
- )}
+
+
+
+
+
+ {filterTests.length > 0 ? (
+ filterTests.map((t: any, i) => {
+ const value =
+ changedFields[t.id]?.notes ??
+ changedFields[t.id]?.value ??
+ null;
+ const isChanged = changedFields[t.id]?.initialValue !== value;
+ return (
+ {
+ const { target, value } =
+ t?.investigation_object?.investigation_type === "Float"
+ ? {
+ target: `${t.id}.value`,
+ value: Number(e.value) || null,
+ }
+ : {
+ target: `${t.id}.notes`,
+ value: e.value,
+ };
+ handleValueChange(value, target);
+ }}
+ />
+ );
+ })
+ ) : (
+
+ {t("no_tests_taken")}
-
-
- {filterTests.length > 0 ? (
- filterTests.map((t: any, i) => {
- const value =
- changedFields[t.id]?.notes ??
- changedFields[t.id]?.value ??
- null;
- const isChanged = changedFields[t.id]?.initialValue !== value;
- return (
- {
- const { target, value } =
- t?.investigation_object?.investigation_type ===
- "Float"
- ? {
- target: `${t.id}.value`,
- value: Number(e.value) || null,
- }
- : {
- target: `${t.id}.notes`,
- value: e.value,
- };
- handleValueChange(value, target);
- }}
- className="print:text-black"
- />
- );
- })
- ) : (
-
- {t("no_tests_taken")}
-
- )}
-
-
-
+
+
+ {investigation.investigation_object.name || "---"}
+
+
+
+ {t("investigations__range")}:{" "}
+ {investigation.investigation_object.min_value || ""}
+ {investigation.investigation_object.min_value ? " - " : ""}
+ {investigation.investigation_object.max_value || ""}
+
+
+
+ {t("investigations__unit")}:{" "}
+ {investigation.investigation_object.unit || "---"}
+
+
+
+ {investigation.value || "---"}
+
+
+ {investigation.investigation_object.ideal_value || "---"}
+
+
+ );
+};
+
+const InvestigationsPreviewTable = ({
+ investigations,
+}: {
+ investigations?: Investigation[];
+}) => {
+ const { t } = useTranslation();
+ if (!investigations) {
+ return (
+
+ {t("no_tests_taken")}
+
+ );
+ }
+
+ return (
+
+
+ {t("investigations")}
+
+
+
+
+ {t("investigations__name")}
+
+ {t("investigations__result")}
+ {t("investigations__ideal_value")}
+
+
+
+ {investigations.map((item) => (
+
+
+ );
+};
+
+interface InvestigationPrintPreviewProps {
+ consultationId: string;
+ patientId: string;
+ sessionId: string;
+ facilityId: string;
+}
+export default function InvestigationPrintPreview(
+ props: InvestigationPrintPreviewProps,
+) {
+ const { consultationId, patientId, sessionId } = props;
+ const { t } = useTranslation();
+ const { loading: investigationLoading, data: investigations } = useQuery(
+ routes.getInvestigation,
+ {
+ pathParams: {
+ consultation_external_id: consultationId,
+ },
+ query: {
+ session: sessionId,
+ },
+ },
+ );
+
+ const { data: patient, loading: patientLoading } = useQuery(
+ routes.getPatient,
+ {
+ pathParams: { id: patientId },
+ },
+ );
+
+ const { data: consultation } = useQuery(routes.getConsultation, {
+ pathParams: { id: consultationId },
+ prefetch: !!consultationId,
+ });
+
+ if (patientLoading || investigationLoading) {
+ return
+
+
{consultation?.facility_name}
+
+
+ );
+}
diff --git a/src/Components/Facility/Investigations/ShowInvestigation.tsx b/src/Components/Facility/Investigations/ShowInvestigation.tsx
index bc0621af7d9..85f2fb1fd7d 100644
--- a/src/Components/Facility/Investigations/ShowInvestigation.tsx
+++ b/src/Components/Facility/Investigations/ShowInvestigation.tsx
@@ -1,13 +1,12 @@
import * as _ from "lodash-es";
-import { navigate } from "raviger";
import { useCallback, useReducer } from "react";
import routes from "../../../Redux/api";
import * as Notification from "../../../Utils/Notifications.js";
import request from "../../../Utils/request/request";
import useQuery from "../../../Utils/request/useQuery";
import InvestigationTable from "./InvestigationTable";
-import PrintPreview from "../../../CAREUI/misc/PrintPreview";
import { useTranslation } from "react-i18next";
+import Page from "../../Common/components/Page";
import Loading from "@/Components/Common/Loading";
const initialState = {
changedFields: {},
@@ -40,7 +39,7 @@ interface ShowInvestigationProps {
facilityId: string;
}
export default function ShowInvestigation(props: ShowInvestigationProps) {
- const { consultationId, patientId, sessionId } = props;
+ const { consultationId, patientId, sessionId, facilityId } = props;
const { t } = useTranslation();
const [state, dispatch] = useReducer(updateFormReducer, initialState);
const { loading: investigationLoading } = useQuery(routes.getInvestigation, {
@@ -116,9 +115,28 @@ export default function ShowInvestigation(props: ShowInvestigationProps) {
Notification.Success({
msg: "Investigation Updated successfully!",
});
- navigate(
- `/facility/${props.facilityId}/patient/${props.patientId}/consultation/${props.consultationId}`,
+ const changedDict: any = {};
+ Object.values(state.changedFields).forEach(
+ (field: any) =>
+ (changedDict[field.id] = {
+ id: field.id,
+ value: field?.value || null,
+ notes: field?.notes || null,
+ }),
);
+ const changedInitialValues: any = {};
+ Object.values(state.initialValues).forEach(
+ (field: any) =>
+ (changedInitialValues[field.id] = {
+ ...field,
+ value: changedDict[field.id].value,
+ notes: changedDict[field.id].notes,
+ }),
+ );
+ dispatch({
+ type: "set_initial_values",
+ initialValues: changedInitialValues,
+ });
}
return;
} else {
@@ -145,22 +163,28 @@ export default function ShowInvestigation(props: ShowInvestigationProps) {
return
-
+
+
+
);
}
diff --git a/src/Components/Facility/Investigations/ViewInvestigations.tsx b/src/Components/Facility/Investigations/ViewInvestigations.tsx
index 22c811f41fa..e889fac4c01 100644
--- a/src/Components/Facility/Investigations/ViewInvestigations.tsx
+++ b/src/Components/Facility/Investigations/ViewInvestigations.tsx
@@ -5,6 +5,8 @@ import { useTranslation } from "react-i18next";
import { formatDateTime } from "../../../Utils/utils";
import { InvestigationResponse } from "./Reports/types";
import { InvestigationSessionType } from "./investigationsTab";
+import ButtonV2 from "../../Common/components/ButtonV2";
+import CareIcon from "../../../CAREUI/icons/CareIcon";
import Loading from "@/Components/Common/Loading";
export default function ViewInvestigations(props: {
@@ -56,16 +58,31 @@ export default function ViewInvestigations(props: {
{formatDateTime(investigationSession.session_created_date)}
-
- navigate(
- `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/investigation/${investigationSession.session_external_id}`,
- )
- }
- className="btn btn-default"
- >
- View
-
+
+
+ navigate(
+ `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/investigation/${investigationSession.session_external_id}`,
+ )
+ }
+ ghost
+ border
+ >
+ {t("view")}
+
+
+ navigate(
+ `/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/investigation/${investigationSession.session_external_id}/print`,
+ )
+ }
+ ghost
+ border
+ >
+
+
);
})}
diff --git a/src/Components/Facility/LocationManagement.tsx b/src/Components/Facility/LocationManagement.tsx
index 1aaf57b7233..2223aa2e8fd 100644
--- a/src/Components/Facility/LocationManagement.tsx
+++ b/src/Components/Facility/LocationManagement.tsx
@@ -16,6 +16,7 @@ import useAuthUser from "../../Common/hooks/useAuthUser";
import useQuery from "../../Utils/request/useQuery";
import Loading from "@/Components/Common/Loading";
+import { cn } from "@/lib/utils";
interface Props {
facilityId: string;
}
@@ -87,14 +88,14 @@ export default function LocationManagement({ facilityId }: Props) {
id="add-new-location"
href={`/facility/${facilityId}/location/add`}
authorizeFor={NonReadOnlyUsers}
- className="mr-4 hidden lg:block"
+ className="hidden lg:block"
>
Add New Location
}
>
-
+
className="my-8 grid gap-3 @4xl:grid-cols-2 @6xl:grid-cols-3 @[100rem]:grid-cols-4 lg:mx-8">
+ className="my-8 grid gap-3 @4xl:grid-cols-2 @6xl:grid-cols-3 @[100rem]:grid-cols-4">
{(item) => (
{
- const { loading, data } = useQuery(routes.listFacilityBeds, {
+ const bedsQuery = useQuery(routes.listFacilityBeds, {
query: {
facility: facilityId,
location: id,
},
});
- const totalBeds = data?.count ?? 0;
-
- if (loading) {
- return
@@ -290,13 +287,16 @@ const Location = ({
id="manage-bed-button"
variant="secondary"
border
- className="mt-3 flex w-full items-center justify-between"
+ className={cn(
+ "mt-3 flex w-full items-center justify-between",
+ totalBeds != null && "opacity-50",
+ )}
href={`location/${id}/beds`}
>
Manage Beds
diff --git a/src/Components/Facility/models.tsx b/src/Components/Facility/models.tsx
index 56c70f2ac94..1be0472c1c3 100644
--- a/src/Components/Facility/models.tsx
+++ b/src/Components/Facility/models.tsx
@@ -5,6 +5,7 @@ import {
ConsultationSuggestionValue,
DISCHARGE_REASONS,
PATIENT_NOTES_THREADS,
+ SHIFTING_CHOICES_PEACETIME,
UserRole,
} from "../../Common/constants";
import { FeatureFlag } from "../../Utils/featureFlags";
@@ -15,12 +16,13 @@ import {
DailyRoundsModel,
FacilityNameModel,
FileUploadModel,
+ PatientModel,
} from "../Patient/models";
import { EncounterSymptom } from "../Symptoms/types";
+import { UserBareMinimum, UserModel } from "../Users/models";
import { InvestigationType } from "../Common/prescription-builder/InvestigationBuilder";
import { ProcedureType } from "../Common/prescription-builder/ProcedureBuilder";
import { RouteToFacility } from "../Common/RouteToFacilitySelect";
-import { UserBareMinimum } from "../Users/models";
export interface LocalBodyModel {
id: number;
@@ -85,8 +87,8 @@ export interface FacilityModel {
latitude?: string;
longitude?: string;
kasp_empanelled?: boolean;
- patient_count?: string;
- bed_count?: string;
+ patient_count?: number;
+ bed_count?: number;
}
export enum SpokeRelationship {
@@ -676,3 +678,50 @@ export type PatientTransferResponse = {
date_of_birth: string;
facility_object: BaseFacilityModel;
};
+
+export interface ShiftingModel {
+ assigned_facility: string;
+ assigned_facility_external: string | null;
+ assigned_facility_object: FacilityModel;
+ created_date: string;
+ emergency: boolean;
+ external_id: string;
+ id: string;
+ modified_date: string;
+ origin_facility_object: FacilityModel;
+ patient: string;
+ patient_object: PatientModel;
+ shifting_approving_facility_object: FacilityModel | null;
+ status: (typeof SHIFTING_CHOICES_PEACETIME)[number]["text"];
+ assigned_to_object?: UserModel;
+}
+
+export interface ResourceModel {
+ approving_facility: string | null;
+ approving_facility_object: FacilityModel | null;
+ assigned_facility: string | null;
+ assigned_facility_object: FacilityModel | null;
+ assigned_quantity: number;
+ assigned_to: string | null;
+ assigned_to_object: UserModel | null;
+ category: string;
+ created_by: number;
+ created_by_object: UserModel;
+ created_date: string;
+ emergency: boolean;
+ id: string;
+ is_assigned_to_user: boolean;
+ last_edited_by: number;
+ last_edited_by_object: UserModel;
+ modified_date: string;
+ origin_facility: string;
+ origin_facility_object: FacilityModel;
+ priority: number | null;
+ reason: string;
+ refering_facility_contact_name: string;
+ refering_facility_contact_number: string;
+ requested_quantity: number;
+ status: string;
+ sub_category: string;
+ title: string;
+}
diff --git a/src/Components/Form/FormFields/TextFormField.tsx b/src/Components/Form/FormFields/TextFormField.tsx
index 0593dc9a2d3..a3663358a56 100644
--- a/src/Components/Form/FormFields/TextFormField.tsx
+++ b/src/Components/Form/FormFields/TextFormField.tsx
@@ -1,31 +1,30 @@
import { FormFieldBaseProps, useFormFieldPropsResolver } from "./Utils";
-import { HTMLInputTypeAttribute, forwardRef, useState } from "react";
+import {
+ DetailedHTMLProps,
+ InputHTMLAttributes,
+ forwardRef,
+ useState,
+} from "react";
import CareIcon from "../../../CAREUI/icons/CareIcon";
import FormField from "./FormField";
import { classNames } from "../../../Utils/utils";
-export type TextFormFieldProps = FormFieldBaseProps
& {
- placeholder?: string;
- value?: string | number;
- autoComplete?: string;
- type?: HTMLInputTypeAttribute;
- className?: string | undefined;
- inputClassName?: string | undefined;
- removeDefaultClasses?: true | undefined;
- leading?: React.ReactNode | undefined;
- trailing?: React.ReactNode | undefined;
- leadingFocused?: React.ReactNode | undefined;
- trailingFocused?: React.ReactNode | undefined;
- trailingPadding?: string | undefined;
- leadingPadding?: string | undefined;
- min?: string | number;
- max?: string | number;
- step?: string | number;
- onKeyDown?: (event: React.KeyboardEvent) => void;
- onFocus?: (event: React.FocusEvent) => void;
- onBlur?: (event: React.FocusEvent) => void;
-};
+export type TextFormFieldProps = FormFieldBaseProps &
+ Omit<
+ DetailedHTMLProps, HTMLInputElement>,
+ "onChange"
+ > & {
+ inputClassName?: string | undefined;
+ removeDefaultClasses?: true | undefined;
+ leading?: React.ReactNode | undefined;
+ trailing?: React.ReactNode | undefined;
+ leadingFocused?: React.ReactNode | undefined;
+ trailingFocused?: React.ReactNode | undefined;
+ trailingPadding?: string | undefined;
+ leadingPadding?: string | undefined;
+ suggestions?: string[];
+ };
const TextFormField = forwardRef((props: TextFormFieldProps, ref) => {
const field = useFormFieldPropsResolver(props);
@@ -43,7 +42,8 @@ const TextFormField = forwardRef((props: TextFormFieldProps, ref) => {
let child = (
+ {child}
+
+ {props.suggestions.map((suggestion) => (
+ field.handleChange(suggestion)}
+ >
+ {suggestion}
+
+ ))}
+
+
{child} ;
});
diff --git a/src/Components/Kanban/Board.tsx b/src/Components/Kanban/Board.tsx
new file mode 100644
index 00000000000..d2ab5da998f
--- /dev/null
+++ b/src/Components/Kanban/Board.tsx
@@ -0,0 +1,190 @@
+import {
+ DragDropContext,
+ Draggable,
+ Droppable,
+ OnDragEndResponder,
+} from "@hello-pangea/dnd";
+import { ReactNode, RefObject, useEffect, useRef, useState } from "react";
+import { QueryRoute } from "../../Utils/request/types";
+import { QueryOptions } from "../../Utils/request/useQuery";
+import CareIcon from "../../CAREUI/icons/CareIcon";
+import request from "../../Utils/request/request";
+import { useTranslation } from "react-i18next";
+
+interface KanbanBoardProps {
+ title?: ReactNode;
+ onDragEnd: OnDragEndResponder;
+ sections: {
+ id: string;
+ title: ReactNode;
+ fetchOptions: (
+ id: string,
+ ...args: unknown[]
+ ) => {
+ route: QueryRoute;
+ options?: QueryOptions;
+ };
+ }[];
+ itemRender: (item: T) => ReactNode;
+}
+
+export default function KanbanBoard(
+ props: KanbanBoardProps,
+) {
+ const board = useRef(null);
+
+ return (
+
+
+
{props.title}
+
+ {[0, 1].map((button, i) => (
+ {
+ board.current?.scrollBy({
+ left: button ? 250 : -250,
+ behavior: "smooth",
+ });
+ }}
+ className="inline-flex aspect-square h-8 items-center justify-center rounded-full border border-secondary-400 bg-secondary-200 text-2xl hover:bg-secondary-300"
+ >
+
+ ))}
+
+
+
+
+
+ {props.sections.map((section, i) => (
+
+ key={i}
+ section={section}
+ itemRender={props.itemRender}
+ boardRef={board}
+ />
+ ))}
+
+
+
(
+ props: Omit, "sections" | "onDragEnd"> & {
+ section: KanbanBoardProps["sections"][number];
+ boardRef: RefObject;
+ },
+) {
+ const { section } = props;
+ const [offset, setOffset] = useState(0);
+ const [pages, setPages] = useState([]);
+ const [fetchingNextPage, setFetchingNextPage] = useState(false);
+ const [hasMore, setHasMore] = useState(true);
+ const [totalCount, setTotalCount] = useState();
+
+ const options = section.fetchOptions(section.id);
+ const sectionRef = useRef(null);
+ const defaultLimit = 14;
+ const { t } = useTranslation();
+
+ // should be replaced with useInfiniteQuery when we move over to react query
+
+ const fetchNextPage = async (refresh: boolean = false) => {
+ if (!refresh && (fetchingNextPage || !hasMore)) return;
+ if (refresh) setPages([]);
+ const offsetToUse = refresh ? 0 : offset;
+ setFetchingNextPage(true);
+ const res = await request(options.route, {
+ ...options.options,
+ query: { ...options.options?.query, offsetToUse, limit: defaultLimit },
+ });
+ const newPages = refresh ? [] : [...pages];
+ const page = Math.floor(offsetToUse / defaultLimit);
+ if (res.error) return;
+ newPages[page] = (res.data as any).results;
+ setPages(newPages);
+ setHasMore(!!(res.data as any)?.next);
+ setTotalCount((res.data as any)?.count);
+ setOffset(offsetToUse + defaultLimit);
+ setFetchingNextPage(false);
+ };
+
+ const items = pages.flat();
+
+ useEffect(() => {
+ const onBoardReachEnd = async () => {
+ const sectionElementHeight =
+ sectionRef.current?.getBoundingClientRect().height;
+ const scrolled = props.boardRef.current?.scrollTop;
+ // if user has scrolled 3/4th of the current items
+ if (
+ scrolled &&
+ sectionElementHeight &&
+ scrolled > sectionElementHeight * (3 / 4)
+ ) {
+ fetchNextPage();
+ }
+ };
+
+ props.boardRef.current?.addEventListener("scroll", onBoardReachEnd);
+ return () =>
+ props.boardRef.current?.removeEventListener("scroll", onBoardReachEnd);
+ }, [props.boardRef, fetchingNextPage, hasMore]);
+
+ useEffect(() => {
+ fetchNextPage(true);
+ }, [props.section]);
+
+ return (
+
+ {(provided) => (
+
+
+
+
{section.title}
+
+
+ {typeof totalCount === "undefined" ? "..." : totalCount}
+
+
+
+
+
+ {!fetchingNextPage && totalCount === 0 && (
+
+ {t("no_results_found")}
+
+ )}
+ {items
+ .filter((item) => item)
+ .map((item, i) => (
+
+ {(provided) => (
+
+ {props.itemRender(item)}
+
+ )}
+
+ ))}
+ {fetchingNextPage && (
+
+ )}
+
+
+ );
+}
diff --git a/src/Components/LogUpdate/Sections/PressureSore/PressureSore.tsx b/src/Components/LogUpdate/Sections/PressureSore/PressureSore.tsx
index a56457ef257..63970d4c25c 100644
--- a/src/Components/LogUpdate/Sections/PressureSore/PressureSore.tsx
+++ b/src/Components/LogUpdate/Sections/PressureSore/PressureSore.tsx
@@ -14,6 +14,7 @@ import { IPressureSore } from "../../../Patient/models";
import { Error } from "../../../../Utils/Notifications";
import { classNames, getValueDescription } from "../../../../Utils/utils";
import { calculatePushScore } from "./utils";
+import { useTranslation } from "react-i18next";
const PressureSore = ({ log, onChange, readonly }: LogUpdateSectionProps) => {
const value = log.pressure_sore ?? [];
@@ -104,6 +105,8 @@ const RegionEditor = (props: RegionEditorProps) => {
const isReadOnly = !props.onSave;
+ const { t } = useTranslation();
+
return (
{
{
onChange={(e) => update({ width: parseFloat(e.value) })}
/>
= {
dosage_type: "REGULAR",
+ route: "ORAL",
+};
+const DefaultPRNPrescription: Partial = {
+ dosage_type: "PRN",
+ route: "ORAL",
};
-const DefaultPRNPrescription: Partial = { dosage_type: "PRN" };
diff --git a/src/Components/Notifications/NoticeBoard.tsx b/src/Components/Notifications/NoticeBoard.tsx
index eb3455ce44c..689478fd93b 100644
--- a/src/Components/Notifications/NoticeBoard.tsx
+++ b/src/Components/Notifications/NoticeBoard.tsx
@@ -53,7 +53,7 @@ export const NoticeBoard = () => {
if (loading) return
+
{notices}
);
diff --git a/src/Components/Notifications/NotificationsList.tsx b/src/Components/Notifications/NotificationsList.tsx
index de9618809b4..30c380fe9a6 100644
--- a/src/Components/Notifications/NotificationsList.tsx
+++ b/src/Components/Notifications/NotificationsList.tsx
@@ -1,5 +1,5 @@
import { navigate } from "raviger";
-import { useEffect, useState } from "react";
+import { useEffect, useRef, useState } from "react";
import Spinner from "../Common/Spinner";
import { NOTIFICATION_EVENTS } from "../../Common/constants";
import { Error, Success, Warn } from "../../Utils/Notifications.js";
@@ -183,6 +183,7 @@ export default function NotificationsList({
const [isSubscribed, setIsSubscribed] = useState("");
const [isSubscribing, setIsSubscribing] = useState(false);
const [showUnread, setShowUnread] = useState(false);
+ const observerRef = useRef(null);
const { t } = useTranslation();
useEffect(() => {
@@ -194,6 +195,26 @@ export default function NotificationsList({
if (open) document.addEventListener("keydown", handleKeyDown);
return () => document.removeEventListener("keydown", handleKeyDown);
}, [open]);
+ useEffect(() => {
+ const observer = new IntersectionObserver(
+ (entries) => {
+ if (entries[0].isIntersecting && data.length < totalCount) {
+ setOffset((prevOffset) => prevOffset + RESULT_LIMIT);
+ }
+ },
+ { threshold: 1.0 },
+ );
+
+ if (observerRef.current) {
+ observer.observe(observerRef.current);
+ }
+
+ return () => {
+ if (observerRef.current) {
+ observer.unobserve(observerRef.current);
+ }
+ };
+ }, [data, totalCount]);
useEffect(() => {
let intervalId: ReturnType;
if (isSubscribing) {
@@ -374,7 +395,15 @@ export default function NotificationsList({
})
.then((res) => {
if (res && res.data) {
- setData(res.data.results);
+ setData((prev) => {
+ const newNotifications = res?.data?.results || [];
+ const allNotifications =
+ offset === 0 ? newNotifications : [...prev, ...newNotifications];
+ const uniqueNotifications = Array.from(
+ new Set(allNotifications.map((n) => n.id)),
+ ).map((id) => allNotifications.find((n) => n.id === id));
+ return uniqueNotifications;
+ });
setUnreadCount(
res.data.results?.reduce(
(acc: number, result: any) => acc + (result.read_at ? 0 : 1),
@@ -391,7 +420,9 @@ export default function NotificationsList({
});
intialSubscriptionState();
}, [reload, open, offset, eventFilter, isSubscribed]);
-
+ useEffect(() => {
+ setOffset(0);
+ }, [eventFilter, showUnread]);
if (!offset && isLoading) {
manageResults = (
@@ -414,27 +445,12 @@ export default function NotificationsList({
setShowNotifications={setOpen}
/>
))}
+
{isLoading && (
)}
- {!showUnread &&
- totalCount > RESULT_LIMIT &&
- offset < totalCount - RESULT_LIMIT && (
-
- setOffset((prev) => prev + RESULT_LIMIT)}
- >
- {isLoading ? t("loading") : t("load_more")}
-
-
- )}
);
} else if (data && data.length === 0) {
diff --git a/src/Components/Notifications/ShowPushNotification.tsx b/src/Components/Notifications/ShowPushNotification.tsx
index 2d2faa5ff5f..ca465f98df7 100644
--- a/src/Components/Notifications/ShowPushNotification.tsx
+++ b/src/Components/Notifications/ShowPushNotification.tsx
@@ -1,9 +1,8 @@
-import { DetailRoute } from "../../Routers/types";
import useQuery from "../../Utils/request/useQuery";
import routes from "../../Redux/api";
import { NotificationData } from "./models";
-export default function ShowPushNotification({ id }: DetailRoute) {
+export default function ShowPushNotification({ id }: { id: string }) {
useQuery(routes.getNotificationData, {
pathParams: { id },
onResponse(res) {
diff --git a/src/Components/Patient/DailyRounds.tsx b/src/Components/Patient/DailyRounds.tsx
index bf25d48f6bf..3e10383e78a 100644
--- a/src/Components/Patient/DailyRounds.tsx
+++ b/src/Components/Patient/DailyRounds.tsx
@@ -1,5 +1,4 @@
import { navigate } from "raviger";
-
import dayjs from "dayjs";
import { useCallback, useEffect, useState } from "react";
import {
@@ -126,7 +125,6 @@ export const DailyRounds = (props: any) => {
return state;
}
};
-
const [state, dispatch] = useAutoSaveReducer
(
DailyRoundsFormReducer,
initialState,
@@ -249,7 +247,9 @@ export const DailyRounds = (props: any) => {
}
return;
case "bp": {
- const error = state.form.bp && BloodPressureValidator(state.form.bp);
+ const error =
+ state.form.bp && BloodPressureValidator(state.form.bp, t);
+
if (error) {
errors.bp = error;
invalidForm = true;
@@ -258,6 +258,23 @@ export const DailyRounds = (props: any) => {
return;
}
+ case "temperature": {
+ const temperatureInputValue = state.form["temperature"];
+
+ if (
+ temperatureInputValue &&
+ (temperatureInputValue < 95 || temperatureInputValue > 106)
+ ) {
+ errors[field] = t("out_of_range_error", {
+ start: "95°F (35°C)",
+ end: "106°F (41.1°C)",
+ });
+ invalidForm = true;
+ scrollTo("temperature");
+ }
+ return;
+ }
+
case "investigations": {
for (const investigation of state.form.investigations) {
if (!investigation.type?.length) {
@@ -773,7 +790,6 @@ export const DailyRounds = (props: any) => {
/>
)}
-
{["NORMAL", "TELEMEDICINE", "DOCTORS_LOG"].includes(
state.form.rounds_type,
) && (
diff --git a/src/Components/Patient/DiagnosesFilter.tsx b/src/Components/Patient/DiagnosesFilter.tsx
index 1217e821389..ba58a549dac 100644
--- a/src/Components/Patient/DiagnosesFilter.tsx
+++ b/src/Components/Patient/DiagnosesFilter.tsx
@@ -68,6 +68,7 @@ export default function DiagnosesFilter(props: Props) {
return (
{
let patientList: ReactNode[] = [];
if (data?.count) {
- patientList = data.results.map((patient: any) => {
+ patientList = data.results.map((patient) => {
let patientUrl = "";
- if (
+ if (!isPatientMandatoryDataFilled(patient)) {
+ patientUrl = `/facility/${patient.facility}/patient/${patient.id}`;
+ } else if (
patient.last_consultation &&
patient.last_consultation?.facility === patient.facility &&
!(patient.last_consultation?.discharge_date && patient.is_active)
@@ -494,7 +497,7 @@ export const PatientManager = () => {
const children = (
{
-
+
{patient?.last_consultation?.current_bed &&
patient?.last_consultation?.discharge_date === null ? (
@@ -541,11 +544,11 @@ export const PatientManager = () => {
) : (
-
+
)}
@@ -592,10 +595,26 @@ export const PatientManager = () => {
)}
- {!patient.last_consultation ||
- patient.last_consultation?.facility !== patient.facility ||
- (patient.last_consultation?.discharge_date &&
- patient.is_active) ? (
+ {!isPatientMandatoryDataFilled(patient) && (
+
+
+
+
+ )}
+
+ {isPatientMandatoryDataFilled(patient) &&
+ (!patient.last_consultation ||
+ patient.last_consultation?.facility !== patient.facility ||
+ (patient.last_consultation?.discharge_date &&
+ patient.is_active)) ? (
{
return (
{
-
+
{
- console.log(e.value);
- setPatientCodeStatus(e.value);
- }}
+ onChange={(e) => setPatientCodeStatus(e.value)}
value={
CONSENT_PATIENT_CODE_STATUS_CHOICES.find(
(c) => c.id === patientCodeStatus,
diff --git a/src/Components/Patient/PatientFilter.tsx b/src/Components/Patient/PatientFilter.tsx
index f496a59df6d..ffe75ca8c7e 100644
--- a/src/Components/Patient/PatientFilter.tsx
+++ b/src/Components/Patient/PatientFilter.tsx
@@ -292,6 +292,7 @@ export default function PatientFilter(props: any) {
Gender
o.text}
@@ -304,6 +305,7 @@ export default function PatientFilter(props: any) {
Category
o.text}
@@ -407,6 +409,7 @@ export default function PatientFilter(props: any) {
Telemedicine
o.text}
@@ -423,6 +426,7 @@ export default function PatientFilter(props: any) {
Respiratory Support
o.text}
@@ -455,6 +459,7 @@ export default function PatientFilter(props: any) {
<>
Review Missed
(o === "true" ? "Yes" : "No")}
@@ -469,6 +474,7 @@ export default function PatientFilter(props: any) {
Is Medico-Legal Case
@@ -484,6 +490,7 @@ export default function PatientFilter(props: any) {
/>
{!props.dischargePage && (
-
+
Facility
Facility type
o.text}
@@ -640,6 +648,7 @@ export default function PatientFilter(props: any) {
LSG Body
-
+
District
{
return OCCUPATION_TYPES.find((i) => i.value === occupation)?.text;
};
@@ -253,7 +254,7 @@ export const PatientHome = (props: any) => {
return (
{
)}
+
+ {isPatientMandatoryDataFilled(patientData) &&
+ (patientData?.facility != patientData?.last_consultation?.facility ||
+ (patientData.is_active &&
+ patientData?.last_consultation?.discharge_date)) && (
+
+
+
+
+
+ {t("consultation_missing_warning")}{" "}
+
+ {patientData.facility_object?.name || "-"}{" "}
+
+
+
+
+
+
+
+
diff --git a/src/Components/Patient/PatientInfoCard.tsx b/src/Components/Patient/PatientInfoCard.tsx
index 1f581b9b0e7..deb3708451c 100644
--- a/src/Components/Patient/PatientInfoCard.tsx
+++ b/src/Components/Patient/PatientInfoCard.tsx
@@ -1,5 +1,10 @@
import * as Notification from "../../Utils/Notifications.js";
-
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipProvider,
+ TooltipTrigger,
+} from "@/Components/ui/tooltip";
import {
CONSULTATION_SUGGESTION,
DISCHARGE_REASONS,
@@ -22,8 +27,6 @@ import {
humanizeStrings,
} from "../../Utils/utils.js";
import ABHAProfileModal from "../ABDM/ABHAProfileModal.js";
-import LinkABHANumberModal from "../ABDM/LinkABHANumberModal.js";
-import LinkCareContextModal from "../ABDM/LinkCareContextModal.js";
import DialogModal from "../Common/Dialog.js";
import ButtonV2 from "../Common/components/ButtonV2.js";
import Beds from "../Facility/Consultations/Beds.js";
@@ -43,7 +46,9 @@ import FetchRecordsModal from "../ABDM/FetchRecordsModal.js";
import { AbhaNumberModel } from "../ABDM/types/abha.js";
import { SkillModel } from "../Users/models.js";
import { AuthorizedForConsultationRelatedActions } from "../../CAREUI/misc/AuthorizedChild.js";
+import LinkAbhaNumber from "../ABDM/LinkAbhaNumber";
import careConfig from "@careConfig";
+import { cn } from "@/lib/utils.js";
const formatSkills = (arr: SkillModel[]) => {
const skills = arr.map((skill) => skill.skill_object.name);
@@ -75,7 +80,6 @@ export default function PatientInfoCard(props: {
const [openDischargeSummaryDialog, setOpenDischargeSummaryDialog] =
useState(false);
const [openDischargeDialog, setOpenDischargeDialog] = useState(false);
- const [showLinkCareContext, setShowLinkCareContext] = useState(false);
const patient = props.patient;
const consultation = props.consultation;
@@ -135,6 +139,11 @@ export default function PatientInfoCard(props: {
prefetch: !!consultation?.treating_physician_object?.username,
});
+ const { data: healthFacility } = useQuery(routes.abdm.healthFacility.get, {
+ pathParams: { facility_id: patient.facility ?? "" },
+ silent: true,
+ });
+
return (
<>
Show ABHA Profile
-
-
{
- triggerGoal("Patient Card Button Clicked", {
- buttonName: "Link Care Context",
- consultationId: consultation?.id,
- userId: authUser?.id,
- });
- close();
- setShowLinkCareContext(true);
- }}
- >
- Link Care Context
+ {t("show_abha_profile")}
Fetch Records over ABDM
+ {t("hi__fetch_records")}
)}
) : (
-
- {({ close }) => (
- {
- close();
- setShowLinkABHANumber(true);
- }}
- >
-
- Link ABHA Number
-
-
+
+
+
+
+ {({ close, disabled }) => (
+ {
+ close();
+ setShowLinkABHANumber(true);
+ }}
+ >
+
+ {t("generate_link_abha")}
+
+
+
+
+ {!healthFacility && (
+
+ {t("abha_disabled_due_to_no_health_facility")}
+
+ )}
+
+
))}
@@ -957,12 +963,33 @@ export default function PatientInfoCard(props: {
-
setShowLinkABHANumber(false)}
- patientId={patient.id as any}
- onSuccess={(_) => {
- window.location.href += "?show-abha-profile=true";
+ onSuccess={async (abhaProfile) => {
+ const { res, data } = await request(
+ routes.abdm.healthId.linkAbhaNumberAndPatient,
+ {
+ body: {
+ patient: patient.id,
+ abha_number: abhaProfile.external_id,
+ },
+ },
+ );
+
+ if (res?.status === 200 && data) {
+ Notification.Success({
+ msg: t("abha_number_linked_successfully"),
+ });
+
+ props.fetchPatientData?.({ aborted: false });
+ setShowLinkABHANumber(false);
+ setShowABHAProfile(true);
+ } else {
+ Notification.Error({
+ msg: t("failed_to_link_abha_number"),
+ });
+ }
}}
/>
setShowABHAProfile(false)}
/>
- setShowLinkCareContext(false)}
- />
{
pathParams: { id: id ? id : 0 },
});
const { data: abhaNumberData } = await request(
- routes.abha.getAbhaNumber,
+ routes.abdm.abhaNumber.get,
{
pathParams: { abhaNumberId: id ?? "" },
silent: true,
@@ -370,6 +377,11 @@ export const PatientRegister = (props: PatientRegisterProps) => {
[id],
);
+ const { data: healthFacility } = useQuery(routes.abdm.healthFacility.get, {
+ pathParams: { facility_id: facilityId },
+ silent: true,
+ });
+
useQuery(routes.hcx.policies.list, {
query: {
patient: id,
@@ -589,7 +601,6 @@ export const PatientRegister = (props: PatientRegisterProps) => {
}
});
const data = {
- abha_number: state.form.abha_number,
phone_number: parsePhoneNumber(formData.phone_number),
emergency_phone_number: parsePhoneNumber(formData.emergency_phone_number),
date_of_birth:
@@ -681,12 +692,15 @@ export const PatientRegister = (props: PatientRegisterProps) => {
});
if (res?.ok && requestData) {
if (state.form.abha_number) {
- const { res, data } = await request(routes.abha.linkPatient, {
- body: {
- patient: requestData.id,
- abha_number: state.form.abha_number,
+ const { res, data } = await request(
+ routes.abdm.healthId.linkAbhaNumberAndPatient,
+ {
+ body: {
+ patient: requestData.id,
+ abha_number: state.form.abha_number,
+ },
},
- });
+ );
if (res?.status === 200 && data) {
Notification.Success({
@@ -738,64 +752,64 @@ export const PatientRegister = (props: PatientRegisterProps) => {
setIsLoading(false);
};
- const handleAbhaLinking = (
- {
- id,
- abha_profile: {
- healthIdNumber,
- healthId,
- name,
- mobile,
- gender,
- monthOfBirth,
- dayOfBirth,
- yearOfBirth,
- pincode,
- },
- }: any,
- field: any,
+ const populateAbhaValues = (
+ abhaProfile: AbhaNumberModel,
+ field: FormContextValue,
) => {
- const values: any = {};
- if (id) values["abha_number"] = id;
- if (healthIdNumber) values["health_id_number"] = healthIdNumber;
- if (healthId) values["health_id"] = healthId;
+ const values = {
+ abha_number: abhaProfile.external_id,
+ health_id_number: abhaProfile.abha_number,
+ health_id: abhaProfile.health_id,
+ };
- if (name)
+ if (abhaProfile.name)
field("name").onChange({
name: "name",
- value: name,
+ value: abhaProfile.name,
});
- if (mobile) {
+ if (abhaProfile.mobile) {
field("phone_number").onChange({
name: "phone_number",
- value: parsePhoneNumber(mobile, "IN"),
+ value: parsePhoneNumber(abhaProfile.mobile, "IN"),
});
field("emergency_phone_number").onChange({
name: "emergency_phone_number",
- value: parsePhoneNumber(mobile, "IN"),
+ value: parsePhoneNumber(abhaProfile.mobile, "IN"),
});
}
- if (gender)
+ if (abhaProfile.gender)
field("gender").onChange({
name: "gender",
- value: gender === "M" ? "1" : gender === "F" ? "2" : "3",
+ value: { M: "1", F: "2", O: "3" }[abhaProfile.gender],
});
- if (monthOfBirth && dayOfBirth && yearOfBirth)
+ if (abhaProfile.date_of_birth)
field("date_of_birth").onChange({
name: "date_of_birth",
- value: new Date(`${monthOfBirth}-${dayOfBirth}-${yearOfBirth}`),
+ value: new Date(abhaProfile.date_of_birth),
});
- if (pincode)
+ if (abhaProfile.pincode)
field("pincode").onChange({
name: "pincode",
- value: pincode,
+ value: abhaProfile.pincode,
+ });
+
+ if (abhaProfile.address) {
+ field("address").onChange({
+ name: "address",
+ value: abhaProfile.address,
});
+ field("permanent_address").onChange({
+ name: "permanent_address",
+ value: abhaProfile.address,
+ });
+ }
+
dispatch({ type: "set_form", form: { ...state.form, ...values } });
setShowLinkAbhaNumberModal(false);
};
@@ -922,7 +936,7 @@ export const PatientRegister = (props: PatientRegisterProps) => {
validate={validateForm}
onSubmit={handleSubmit}
submitLabel={buttonText}
- onCancel={() => navigate("/facility")}
+ onCancel={() => goBack()}
className="bg-transparent px-1 py-2 md:px-2"
onDraftRestore={(newState) => {
dispatch({ type: "set_state", state: newState });
@@ -1009,16 +1023,28 @@ export const PatientRegister = (props: PatientRegisterProps) => {
- {
- e.preventDefault();
- setShowLinkAbhaNumberModal(true);
- }}
- >
- Generate/Link ABHA Number
-
+
+
+
+ {
+ e.preventDefault();
+ setShowLinkAbhaNumberModal(true);
+ }}
+ >
+ {t("generate_link_abha")}
+
+
+ {!healthFacility && (
+
+ {t("abha_disabled_due_to_no_health_facility")}
+
+ )}
+
+
)}
{showAlertMessage.show && (
@@ -1035,16 +1061,17 @@ export const PatientRegister = (props: PatientRegisterProps) => {
{careConfig.abdm.enabled && (
{showLinkAbhaNumberModal && (
- setShowLinkAbhaNumberModal(false)}
- onSuccess={(data: any) => {
+ onSuccess={(data) => {
if (id) {
- navigate(`/facility/${facilityId}/patient/${id}`);
- return;
+ Notification.Warn({
+ msg: "To link Abha Number, please save the patient details",
+ });
}
- handleAbhaLinking(data, field);
+ populateAbhaValues(data, field);
}}
/>
)}
@@ -1546,7 +1573,7 @@ export const PatientRegister = (props: PatientRegisterProps) => {
{field("nationality").value === "India" && (
-
-
+
Insurance Details
diff --git a/src/Components/Patient/Utils.ts b/src/Components/Patient/Utils.ts
new file mode 100644
index 00000000000..96e05e63232
--- /dev/null
+++ b/src/Components/Patient/Utils.ts
@@ -0,0 +1,19 @@
+import { PatientModel } from "./models";
+
+export function isPatientMandatoryDataFilled(patient: PatientModel) {
+ return (
+ patient.phone_number &&
+ patient.emergency_phone_number &&
+ patient.name &&
+ patient.gender &&
+ (patient.date_of_birth || patient.year_of_birth) &&
+ patient.address &&
+ patient.permanent_address &&
+ patient.pincode &&
+ patient.state &&
+ patient.district &&
+ patient.local_body &&
+ ("medical_history" in patient ? patient.medical_history : true) &&
+ patient.blood_group
+ );
+}
diff --git a/src/Components/Patient/models.tsx b/src/Components/Patient/models.tsx
index cf35680de11..9843b867a5b 100644
--- a/src/Components/Patient/models.tsx
+++ b/src/Components/Patient/models.tsx
@@ -134,7 +134,9 @@ export interface PatientModel {
created_by?: PerformedByModel;
assigned_to?: { first_name?: string; username?: string; last_name?: string };
assigned_to_object?: AssignedToObjectModel;
+ occupation?: Occupation;
meta_info?: PatientMeta;
+ age?: string;
}
export interface SampleTestModel {
diff --git a/src/Components/Resource/ResourceBoard.tsx b/src/Components/Resource/ResourceBoard.tsx
deleted file mode 100644
index aa0b031ba0e..00000000000
--- a/src/Components/Resource/ResourceBoard.tsx
+++ /dev/null
@@ -1,301 +0,0 @@
-import { useState, useEffect } from "react";
-import { navigate } from "raviger";
-import { classNames, formatName } from "../../Utils/utils";
-import { useDrag, useDrop } from "react-dnd";
-import { formatDateTime } from "../../Utils/utils";
-import { ExportButton } from "../Common/Export";
-import dayjs from "../../Utils/dayjs";
-import useQuery from "../../Utils/request/useQuery";
-import routes from "../../Redux/api";
-import { PaginatedResponse } from "../../Utils/request/types";
-import { IResource } from "./models";
-import request from "../../Utils/request/request";
-import CareIcon from "../../CAREUI/icons/CareIcon";
-
-interface boardProps {
- board: string;
- filterProp: any;
- formatFilter: any;
-}
-
-const renderBoardTitle = (board: string) => board;
-
-const reduceLoading = (action: string, current: any) => {
- switch (action) {
- case "MORE":
- return { ...current, more: true };
- case "BOARD":
- return { ...current, board: true };
- case "COMPLETE":
- return { board: false, more: false };
- }
-};
-
-const ResourceCard = ({ resource }: any) => {
- const [{ isDragging }, drag] = useDrag(() => ({
- type: "resource-card",
- item: resource,
- collect: (monitor) => ({ isDragging: !!monitor.isDragging() }),
- }));
-
- return (
-
-
-
-
-
-
- {resource.title}
-
-
- {resource.emergency && (
-
- Emergency
-
- )}
-
-
-
-
-
-
- {(resource.origin_facility_object || {}).name}
-
-
-
-
-
-
- {(resource.approving_facility_object || {}).name}
-
-
-
- {resource.assigned_facility_object && (
-
-
-
- {(resource.assigned_facility_object || {}).name ||
- "Yet to be decided"}
-
-
-
- )}
-
-
-
- {formatDateTime(resource.modified_date) || "--"}
-
-
-
- {resource.assigned_to_object && (
-
-
-
- {formatName(resource.assigned_to_object)} -{" "}
- {resource.assigned_to_object.user_type}
-
-
-
- )}
-
-
-
- navigate(`/resource/${resource.id}`)}
- className="btn btn-default mr-2 w-full bg-white"
- >
-
-
-
-
-
>();
-
- useEffect(() => {
- setIsLoading((loading) => reduceLoading("BOARD", loading));
- }, [
- board,
- filterProp.title,
- filterProp.facility,
- filterProp.origin_facility,
- filterProp.approving_facility,
- filterProp.assigned_facility,
- filterProp.emergency,
- filterProp.created_date_before,
- filterProp.created_date_after,
- filterProp.modified_date_before,
- filterProp.modified_date_after,
- filterProp.ordering,
- ]);
-
- useQuery(routes.listResourceRequests, {
- query: formatFilter({
- ...filterProp,
- status: board,
- }),
- onResponse: ({ res, data: listResourceData }) => {
- if (res?.ok && listResourceData) {
- setData(listResourceData);
- }
- setIsLoading((loading) => reduceLoading("COMPLETE", loading));
- },
- });
-
- const handlePagination = async () => {
- setIsLoading((loading) => reduceLoading("MORE", loading));
- setOffSet(offset + 14);
- const { res, data: newPageData } = await request(
- routes.listResourceRequests,
- {
- query: formatFilter({
- ...filterProp,
- status: board,
- offset: offset,
- }),
- },
- );
- if (res?.ok && newPageData) {
- setData((prev) =>
- prev
- ? { ...prev, results: [...prev.results, ...newPageData.results] }
- : newPageData,
- );
- }
- setIsLoading((loading) => reduceLoading("COMPLETE", loading));
- };
-
- const boardFilter = (filter: string) => {
- return data?.results
- .filter(({ status }) => status === filter)
- .map((resource: any) => (
-
-
-
-
- {renderBoardTitle(board)}{" "}
- {
- const { data } = await request(
- routes.downloadResourceRequests,
- {
- query: {
- ...formatFilter({ ...filterProp, status: board }),
- csv: true,
- },
- },
- );
- return data ?? null;
- }}
- filenamePrefix={`resource_requests_${board}`}
- />
-
-
- {data?.count || "0"}
-
-
-
-
- {isLoading.board ? (
-
- ) : data && data?.results.length > 0 ? (
- boardFilter(board)
- ) : (
-
No requests to show.
- )}
- {!isLoading.board &&
- data &&
- data?.results.length < (data?.count || 0) &&
- (isLoading.more ? (
-
- Loading
-
- ) : (
-
handlePagination()}
- className="mx-auto my-4 rounded-md bg-secondary-100 p-2 px-4 hover:bg-white"
- >
- More...
-
- ))}
-
-
+
-
-
-
- {isLoading ? (
-
+ title={
+ {board}{" "}
+ {
+ const { data } = await request(
+ routes.downloadResourceRequests,
+ {
+ query: {
+ ...formatFilter({ ...qParams, status: board }),
+ csv: true,
+ },
+ },
+ );
+ return data ?? null;
+ }}
+ filenamePrefix={`resource_requests_${board}`}
/>
- ))
- )}
-
-
+
+ ),
+ fetchOptions: (id) => ({
+ route: routes.listResourceRequests,
+ options: {
+ query: formatFilter({
+ ...qParams,
+ status: id,
+ }),
+ },
+ }),
+ }))}
+ onDragEnd={(result) => {
+ if (result.source.droppableId !== result.destination?.droppableId)
+ navigate(
+ `/resource/${result.draggableId}/update?status=${result.destination?.droppableId}`,
+ );
+ }}
+ itemRender={(resource) => (
+
+
+
+
+
+ {resource.emergency && (
+
+ {t("emergency")}
+
+ )}
+
+
+
+ {(
+ [
+ {
+ title: "origin_facility",
+ icon: "l-plane-departure",
+ data: resource.origin_facility_object.name,
+ },
+ {
+ title: "resource_approving_facility",
+ icon: "l-user-check",
+ data: resource.approving_facility_object?.name,
+ },
+ {
+ title: "assigned_facility",
+ icon: "l-plane-arrival",
+ data:
+ resource.assigned_facility_object?.name ||
+ t("yet_to_be_decided"),
+ },
+ {
+ title: "last_modified",
+ icon: "l-stopwatch",
+ data: formatDateTime(resource.modified_date),
+ className: dayjs()
+ .subtract(2, "hours")
+ .isBefore(resource.modified_date)
+ ? "text-secondary-900"
+ : "rounded bg-red-500 border border-red-600 text-white w-full font-bold",
+ },
+ {
+ title: "assigned_to",
+ icon: "l-user",
+ data: resource.assigned_to_object
+ ? formatName(resource.assigned_to_object) +
+ " - " +
+ resource.assigned_to_object.user_type
+ : undefined,
+ },
+ ] as const
+ )
+ .filter((d) => d.data)
+ .map((datapoint, i) => (
+
+
+
+
+ {datapoint.data}
+
+
+ ))}
+
+
+
+
+
+ )}
+ />
);
diff --git a/src/Components/Resource/ResourceDetails.tsx b/src/Components/Resource/ResourceDetails.tsx
index de024f46f41..50e572f5680 100644
--- a/src/Components/Resource/ResourceDetails.tsx
+++ b/src/Components/Resource/ResourceDetails.tsx
@@ -253,7 +253,7 @@ export default function ResourceDetails(props: { id: string }) {
{data.title || "--"}
Update Status/Details
diff --git a/src/Components/Shifting/BoardView.tsx b/src/Components/Shifting/BoardView.tsx
index dbd911483dc..c071cc4d934 100644
--- a/src/Components/Shifting/BoardView.tsx
+++ b/src/Components/Shifting/BoardView.tsx
@@ -7,25 +7,26 @@ import BadgesList from "./BadgesList";
import { ExportButton } from "../Common/Export";
import ListFilter from "./ListFilter";
import SearchInput from "../Form/SearchInput";
-import ShiftingBoard from "./ShiftingBoard";
import { formatFilter } from "./Commons";
-import { navigate } from "raviger";
+import { Link, navigate } from "raviger";
import useFilters from "../../Common/hooks/useFilters";
-import { useLayoutEffect, useRef, useState } from "react";
+import { useState } from "react";
import { useTranslation } from "react-i18next";
-import withScrolling from "react-dnd-scrolling";
import ButtonV2 from "../Common/components/ButtonV2";
import { AdvancedFilterButton } from "../../CAREUI/interactive/FiltersSlideover";
import CareIcon from "../../CAREUI/icons/CareIcon";
import Tabs from "../Common/components/Tabs";
import careConfig from "@careConfig";
+import KanbanBoard from "../Kanban/Board";
+import { classNames, formatDateTime, formatName } from "../../Utils/utils";
+import dayjs from "dayjs";
+import ConfirmDialog from "../Common/ConfirmDialog";
+import { ShiftingModel } from "../Facility/models";
+import useAuthUser from "../../Common/hooks/useAuthUser";
import request from "../../Utils/request/request";
import routes from "../../Redux/api";
-
-import Loading from "@/Components/Common/Loading";
import PageTitle from "@/Components/Common/PageTitle";
-const ScrollingComponent = withScrolling("div");
export default function BoardView() {
const { qParams, updateQuery, FilterBadges, advancedFilter } = useFilters({
@@ -33,6 +34,26 @@ export default function BoardView() {
cacheBlacklist: ["patient_name"],
});
+ const [modalFor, setModalFor] = useState<{
+ externalId?: string;
+ loading: boolean;
+ }>({
+ externalId: undefined,
+ loading: false,
+ });
+
+ const authUser = useAuthUser();
+
+ const handleTransferComplete = async (shift: any) => {
+ setModalFor({ ...modalFor, loading: true });
+ await request(routes.completeTransfer, {
+ pathParams: { externalId: shift.external_id },
+ });
+ navigate(
+ `/facility/${shift.assigned_facility}/patient/${shift.patient}/consultation`,
+ );
+ };
+
const shiftStatusOptions = careConfig.wartimeShifting
? SHIFTING_CHOICES_WARTIME
: SHIFTING_CHOICES_PEACETIME;
@@ -55,79 +76,10 @@ export default function BoardView() {
);
const [boardFilter, setBoardFilter] = useState(activeBoards);
- const [isLoading] = useState(false);
const { t } = useTranslation();
- const containerRef = useRef(null);
- const [containerHeight, setContainerHeight] = useState(0);
- const [isLeftScrollable, setIsLeftScrollable] = useState(false);
- const [isRightScrollable, setIsRightScrollable] = useState(false);
-
- useLayoutEffect(() => {
- const container = containerRef.current;
-
- if (!container) return;
-
- const handleScroll = () => {
- setIsLeftScrollable(container.scrollLeft > 0);
- setIsRightScrollable(
- container.scrollLeft + container.clientWidth <
- container.scrollWidth - 10,
- );
- };
-
- container.addEventListener("scroll", handleScroll);
-
- handleScroll();
-
- return () => {
- container.removeEventListener("scroll", handleScroll);
- };
- }, []);
-
- const handleOnClick = (direction: "right" | "left") => {
- const container = containerRef.current;
- if (direction === "left" ? !isLeftScrollable : !isRightScrollable) return;
-
- if (container) {
- const scrollAmount = 300;
- const currentScrollLeft = container.scrollLeft;
-
- if (direction === "left") {
- container.scrollTo({
- left: currentScrollLeft - scrollAmount,
- behavior: "smooth",
- });
- } else if (direction === "right") {
- container.scrollTo({
- left: currentScrollLeft + scrollAmount,
- behavior: "smooth",
- });
- }
- }
- };
-
- const renderArrowIcons = (direction: "right" | "left") => {
- const isIconEnable =
- direction === "left" ? isLeftScrollable : isRightScrollable;
- return (
- isIconEnable && (
-
- handleOnClick(direction)}
- />
-
- )
- );
- };
return (
-
+
-
-
-
- {isLoading ? (
-
- ) : (
- <>
- {renderArrowIcons("left")}
-
- {boardFilter.map((board) => (
-
- ))}
+
+ title={
+ {board.label || board.text}{" "}
+ {
+ const { data } = await request(routes.downloadShiftRequests, {
+ query: {
+ ...formatFilter({ ...qParams, status: board.text }),
+ csv: true,
+ },
+ });
+ return data ?? null;
+ }}
+ filenamePrefix={`shift_requests_${board.label || board.text}`}
+ />
+
+ ),
+ fetchOptions: (id) => ({
+ route: routes.listShiftRequests,
+ options: {
+ query: formatFilter({
+ ...qParams,
+ status: id,
+ }),
+ },
+ }),
+ }))}
+ onDragEnd={(result) => {
+ if (result.source.droppableId !== result.destination?.droppableId)
+ navigate(
+ `/shifting/${result.draggableId}/update?status=${result.destination?.droppableId}`,
+ );
+ }}
+ itemRender={(shift) => (
+
+
+
+
+
+ {shift.patient_object.name}
+
+
+ {shift.patient_object.age} old
+
+
+
+ {shift.emergency && (
+
+ {t("emergency")}
+
+ )}
+
- {renderArrowIcons("right")}
-
- )}
-
-
+
+ {(
+ [
+ {
+ title: "phone_number",
+ icon: "l-mobile-android",
+ data: shift.patient_object.phone_number,
+ },
+ {
+ title: "origin_facility",
+ icon: "l-plane-departure",
+ data: shift.origin_facility_object.name,
+ },
+ {
+ title: "shifting_approving_facility",
+ icon: "l-user-check",
+ data: careConfig.wartimeShifting
+ ? shift.shifting_approving_facility_object?.name
+ : undefined,
+ },
+ {
+ title: "assigned_facility",
+ icon: "l-plane-arrival",
+ data:
+ shift.assigned_facility_external ||
+ shift.assigned_facility_object?.name ||
+ t("yet_to_be_decided"),
+ },
+ {
+ title: "last_modified",
+ icon: "l-stopwatch",
+ data: formatDateTime(shift.modified_date),
+ className: dayjs()
+ .subtract(2, "hours")
+ .isBefore(shift.modified_date)
+ ? "text-secondary-900"
+ : "rounded bg-red-500 border border-red-600 text-white w-full font-bold",
+ },
+ {
+ title: "patient_address",
+ icon: "l-home",
+ data: shift.patient_object.address,
+ },
+ {
+ title: "assigned_to",
+ icon: "l-user",
+ data: shift.assigned_to_object
+ ? formatName(shift.assigned_to_object) +
+ " - " +
+ shift.assigned_to_object.user_type
+ : undefined,
+ },
+ {
+ title: "patient_state",
+ icon: "l-map-marker",
+ data: shift.patient_object.state_object?.name,
+ },
+ ] as const
+ )
+ .filter((d) => d.data)
+ .map((datapoint, i) => (
+
+
+
+
+ {datapoint.data}
+
+
+ ))}
+
+
+
+
{t("all_details")}
+
+
+ {shift.status === "COMPLETED" && shift.assigned_facility && (
+ <>
+
+ setModalFor((m) => ({
+ ...m,
+ externalId: shift.external_id,
+ }))
+ }
+ >
+ {t("transfer_to_receiving_facility")}
+
+
+
+ setModalFor({ externalId: undefined, loading: false })
+ }
+ action={t("confirm")}
+ onConfirm={() => handleTransferComplete(shift)}
+ >
+
+ {t("redirected_to_create_consultation")}
+
+
+
+ )}
+
+ )}
+ />
>;
- containerHeight: number;
-}
-
-const ShiftCard = ({ shift, filter }: any) => {
- const [modalFor, setModalFor] = useState({
- externalId: undefined,
- loading: false,
- });
- const [{ isDragging }, drag] = useDrag(() => ({
- type: "shift-card",
- item: shift,
- collect: (monitor) => ({ isDragging: !!monitor.isDragging() }),
- }));
- const authUser = useAuthUser();
- const { t } = useTranslation();
-
- const handleTransferComplete = async (shift: any) => {
- setModalFor({ ...modalFor, loading: true });
- await request(routes.completeTransfer, {
- pathParams: { externalId: shift.external_id },
- });
- navigate(
- `/facility/${shift.assigned_facility}/patient/${shift.patient}/consultation`,
- );
- };
- return (
-
-
-
-
-
-
- {shift.patient_object.name} - {shift.patient_object.age}
-
-
- {shift.emergency && (
-
- {t("emergency")}
-
- )}
-
-
-
-
-
-
- {shift.patient_object.phone_number || ""}
-
-
-
-
-
-
- {(shift.origin_facility_object || {}).name}
-
-
-
- {careConfig.wartimeShifting && (
-
-
-
- {(shift.shifting_approving_facility_object || {}).name}
-
-
-
- )}
-
-
-
- {shift.assigned_facility_external ||
- shift.assigned_facility_object?.name ||
- t("yet_to_be_decided")}
-
-
-
-
-
-
-
- {formatDateTime(shift.modified_date) || "--"}
-
-
-
-
-
-
-
- {shift.patient_object.address || "--"}
-
-
-
-
- {shift.assigned_to_object && (
-
-
-
- {formatName(shift.assigned_to_object)}
- {" - "}
- {shift.assigned_to_object.user_type}
-
-
-
- )}
-
-
-
-
- {shift.patient_object.state_object.name || "--"}
-
-
-
-
-
-
-
- navigate(`/shifting/${shift.external_id}`)}
- className="btn btn-default mr-2 w-full bg-white"
- >
-
-
- {filter === "COMPLETED" && shift.assigned_facility && (
-
-
setModalFor(shift.external_id)}
- >
- {t("transfer_to_receiving_facility")}
-
-
-
- setModalFor({ externalId: undefined, loading: false })
- }
- action={t("confirm")}
- onConfirm={() => handleTransferComplete(shift)}
- >
-
- {t("redirected_to_create_consultation")}
-
-
-
- )}
-
-
-
(null);
- const [offset, setOffSet] = useState(0);
- const [pages, setPages] = useState[]>([]);
- const [isLoading, setIsLoading] = useState(true);
- const [{ isOver }, drop] = useDrop(() => ({
- accept: "shift-card",
- drop: (item: any) => {
- if (item.status !== board) {
- navigate(`/shifting/${item.id}/update?status=${board}`);
- }
- },
- collect: (monitor) => ({ isOver: !!monitor.isOver() }),
- }));
-
- const query = useQuery(routes.listShiftRequests, {
- query: formatFilter({
- ...filterProp,
- status: board,
- }),
- onResponse: ({ res, data: listShiftData }) => {
- setIsLoading(false);
- if (res?.ok && listShiftData) {
- setPages((prev) => [...prev, listShiftData]);
- }
- },
- });
-
- useEffect(() => {
- setPages([]);
- setIsLoading(true);
- query.refetch();
- }, [
- filterProp.facility,
- filterProp.origin_facility,
- filterProp.shifting_approving_facility,
- filterProp.assigned_facility,
- filterProp.emergency,
- filterProp.is_up_shift,
- filterProp.patient_name,
- filterProp.created_date_before,
- filterProp.created_date_after,
- filterProp.modified_date_before,
- filterProp.modified_date_after,
- filterProp.patient_phone_number,
- filterProp.ordering,
- filterProp.is_kasp,
- filterProp.assigned_to,
- filterProp.is_antenatal,
- filterProp.breathlessness_level,
- ]);
-
- const handlePagination = async () => {
- setIsLoading(true);
- setOffSet(offset + 14);
- const { res, data: newPageData } = await request(routes.listShiftRequests, {
- query: formatFilter({
- ...filterProp,
- status: board,
- offset: offset,
- }),
- });
- if (res?.ok && newPageData) {
- setPages((prev) => [...prev, newPageData]);
- }
- setIsLoading(false);
- };
- const { t } = useTranslation();
-
- const patientFilter = (filter: string) => {
- return pages
- .flatMap((p) => p.results)
- .filter(({ status }) => status === filter)
- .map((shift: any) => (
-
-
-
-
- {title || board}{" "}
- {
- const { data } = await request(routes.downloadShiftRequests, {
- query: {
- ...formatFilter({ ...filterProp, status: board }),
- csv: true,
- },
- });
- return data ?? null;
- }}
- filenamePrefix={`shift_requests_${board}`}
- />
-
-
- {pages[0] ? pages[0].count : "..."}
-
-
-
-
- {pages[0]?.count > 0
- ? patientFilter(board)
- : !isLoading && (
-
{t("no_patients_to_show")}
- )}
- {isLoading ? (
-
- ) : (
- pages.at(-1)?.next && (
-
handlePagination()} className="m-2 block">
- Load More
-
- )
- )}
-
-
Linked Facilities
+ {t("linked_facilities")}
Linked Skills
+ {t("linked_skills")}
{["DistrictAdmin", "StateAdmin"].includes(
@@ -781,7 +781,7 @@ export function UserFacilities(props: { user: any }) {
selected={facility}
setSelected={setFacility}
errors=""
- className="z-40"
+ className="z-40 w-full"
/>
{
selected={selectedSkill}
setSelected={setSelectedSkill}
errors=""
+ className="w-full"
userSkills={skills?.results || []}
/>
- Personal Information
+ {t("personal_information")}
- Local Body, District and State are Non Editable Settings.
+ {t("local_body")}, {t("district")}, {t("state")}{" "}
+ {t("are_non_editable_fields")}.
- {showEdit ? "Cancel" : "Edit User Profile"}
+ {showEdit ? t("cancel") : t("edit_user_profile")}
@@ -498,7 +499,7 @@ export default function UserProfile() {
id="username-profile-details"
>
- Username
+ {t("username")}
{userData?.username || "-"}
@@ -509,7 +510,7 @@ export default function UserProfile() {
id="contactno-profile-details"
>
- Contact No
+ {t("phone_number")}
{userData?.phone_number || "-"}
@@ -521,7 +522,7 @@ export default function UserProfile() {
id="whatsapp-profile-details"
>
- Whatsapp No
+ {t("whatsapp_number")}
{userData?.alt_phone_number || "-"}
@@ -532,7 +533,7 @@ export default function UserProfile() {
id="emailid-profile-details"
>
- Email address
+ {t("email")}
{userData?.email || "-"}
@@ -543,7 +544,7 @@ export default function UserProfile() {
id="firstname-profile-details"
>
- First Name
+ {t("first_name")}
{userData?.first_name || "-"}
@@ -554,7 +555,7 @@ export default function UserProfile() {
id="lastname-profile-details"
>
- Last Name
+ {t("last_name")}
{userData?.last_name || "-"}
@@ -565,7 +566,7 @@ export default function UserProfile() {
id="date_of_birth-profile-details"
>
- Date of Birth
+ {t("date_of_birth")}
{userData?.date_of_birth
@@ -575,7 +576,7 @@ export default function UserProfile() {
- Access Level
+ {t("access_level")}
- Gender
+ {t("gender")}
{userData?.gender || "-"}
@@ -595,7 +596,7 @@ export default function UserProfile() {
- Local Body
+ {t("local_body")}
{userData?.local_body_object?.name || "-"}
@@ -603,7 +604,7 @@ export default function UserProfile() {
- District
+ {t("district")}
{userData?.district_object?.name || "-"}
@@ -611,7 +612,7 @@ export default function UserProfile() {
- State
+ {t("state")}
{userData?.state_object?.name || "-"}
@@ -619,7 +620,7 @@ export default function UserProfile() {
- Skills
+ {t("skills")}
- Average weekly working hours
+ {t("average_weekly_working_hours")}
{userData?.weekly_working_hours ?? "-"}
@@ -656,7 +657,7 @@ export default function UserProfile() {
id="videoconnectlink-profile-details"
>
- Video Connect Link
+ {t("video_conference_link")}
{userData?.video_connect_link ? (
@@ -685,18 +686,18 @@ export default function UserProfile() {
o.text}
optionValue={(o) => o.text}
- optionIcon={(o) => (
- {o.icon}
- )}
options={GENDER_TYPES}
/>
-
@@ -796,7 +798,7 @@ export default function UserProfile() {
- Language Selection
+ {t("language_selection")}
- Set your local language
+ {t("set_your_local_language")}
@@ -903,10 +905,10 @@ export default function UserProfile() {
- Software Update
+ {t("software_update")}
- Check for an available update
+ {t("check_for_available_update")}
@@ -915,7 +917,7 @@ export default function UserProfile() {
@@ -936,8 +938,8 @@ export default function UserProfile() {
)}
/>
{updateStatus.isChecking
- ? "Checking for update"
- : "Check for update"}
+ ? t("checking_for_update")
+ : t("check_for_update")}
)}
diff --git a/src/Components/ui/dropdown-menu.tsx b/src/Components/ui/dropdown-menu.tsx
new file mode 100644
index 00000000000..d019b2893d6
--- /dev/null
+++ b/src/Components/ui/dropdown-menu.tsx
@@ -0,0 +1,203 @@
+import * as React from "react";
+import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
+import {
+ CheckIcon,
+ ChevronRightIcon,
+ DotFilledIcon,
+} from "@radix-ui/react-icons";
+
+import { cn } from "@/lib/utils";
+
+const DropdownMenu = DropdownMenuPrimitive.Root;
+
+const DropdownMenuTrigger = DropdownMenuPrimitive.Trigger;
+
+const DropdownMenuGroup = DropdownMenuPrimitive.Group;
+
+const DropdownMenuPortal = DropdownMenuPrimitive.Portal;
+
+const DropdownMenuSub = DropdownMenuPrimitive.Sub;
+
+const DropdownMenuRadioGroup = DropdownMenuPrimitive.RadioGroup;
+
+const DropdownMenuSubTrigger = React.forwardRef<
+ React.ElementRef
,
+ React.ComponentPropsWithoutRef & {
+ inset?: boolean;
+ }
+>(({ className, inset, children, ...props }, ref) => (
+
+ {children}
+
+));
+DropdownMenuSubTrigger.displayName =
+ DropdownMenuPrimitive.SubTrigger.displayName;
+
+const DropdownMenuSubContent = React.forwardRef<
+ React.ElementRef,
+ React.ComponentPropsWithoutRef
+>(({ className, ...props }, ref) => (
+ ,
+ React.ComponentPropsWithoutRef
+>(({ className, sideOffset = 4, ...props }, ref) => (
+
+
+));
+DropdownMenuContent.displayName = DropdownMenuPrimitive.Content.displayName;
+
+const DropdownMenuItem = React.forwardRef<
+ React.ElementRef,
+ React.ComponentPropsWithoutRef & {
+ inset?: boolean;
+ }
+>(({ className, inset, ...props }, ref) => (
+ ,
+ React.ComponentPropsWithoutRef
+>(({ className, children, checked, ...props }, ref) => (
+
+
+
+
+
+ {children}
+
+));
+DropdownMenuCheckboxItem.displayName =
+ DropdownMenuPrimitive.CheckboxItem.displayName;
+
+const DropdownMenuRadioItem = React.forwardRef<
+ React.ElementRef,
+ React.ComponentPropsWithoutRef
+>(({ className, children, ...props }, ref) => (
+
+
+
+
+
+ {children}
+
+));
+DropdownMenuRadioItem.displayName = DropdownMenuPrimitive.RadioItem.displayName;
+
+const DropdownMenuLabel = React.forwardRef<
+ React.ElementRef,
+ React.ComponentPropsWithoutRef & {
+ inset?: boolean;
+ }
+>(({ className, inset, ...props }, ref) => (
+ ,
+ React.ComponentPropsWithoutRef
+>(({ className, ...props }, ref) => (
+ ) => {
+ return (
+ ,
+ React.ComponentPropsWithoutRef
+>(({ className, sideOffset = 4, ...props }, ref) => (
+ Loading plugins... }>
+
+ Error loading plugins
+
+ }
+ >
+
+ {children}
+
+
+
+ );
+}
+
+export function PLUGIN_DoctorConnectButtons({
+ user,
+}: {
+ user: UserAssignedModel;
+}) {
+ const plugins = useCareApps();
+ return (
+
+ {plugins.map((plugin, index) => {
+ const DoctorConnectButtons = plugin.components.DoctorConnectButtons;
+ if (!DoctorConnectButtons) {
+ return null;
+ }
+ return (
+
+
+ );
+ })}
+
+ );
+}
diff --git a/src/Redux/actions.tsx b/src/Redux/actions.tsx
index 47d3530d065..29fe2fed2ef 100644
--- a/src/Redux/actions.tsx
+++ b/src/Redux/actions.tsx
@@ -1,29 +1,5 @@
import { fireRequest } from "./fireRequest";
-// asset bed
-export const listAssetBeds = (params: object, altKey?: string) =>
- fireRequest("listAssetBeds", [], params, {}, altKey);
-
-export const partialUpdateAssetBed = (params: object, asset_id: string) =>
- fireRequest(
- "partialUpdateAssetBed",
- [],
- { ...params },
- {
- external_id: asset_id,
- },
- );
-
-export const deleteAssetBed = (asset_id: string) =>
- fireRequest(
- "deleteAssetBed",
- [],
- {},
- {
- external_id: asset_id,
- },
- );
-
export const getPatient = (pathParam: object) => {
return fireRequest("getPatient", [], {}, pathParam);
};
@@ -41,6 +17,3 @@ export const getConsultation = (id: string) => {
export const dischargePatient = (params: object, pathParams: object) => {
return fireRequest("dischargePatient", [], params, pathParams);
};
-
-export const operateAsset = (id: string, params: object) =>
- fireRequest("operateAsset", [], params, { external_id: id });
diff --git a/src/Redux/api.tsx b/src/Redux/api.tsx
index 4775674084e..d562908a140 100644
--- a/src/Redux/api.tsx
+++ b/src/Redux/api.tsx
@@ -50,25 +50,6 @@ import {
SampleReportModel,
SampleTestModel,
} from "../Components/Patient/models";
-import {
- IAadhaarOtp,
- IAadhaarOtpTBody,
- ICheckAndGenerateMobileOtp,
- IConfirmMobileOtp,
- ICreateHealthIdRequest,
- ICreateHealthIdResponse,
- IGenerateMobileOtpTBody,
- IHealthFacility,
- IHealthId,
- ILinkABHANumber,
- ILinkViaQRBody,
- ISearchByHealthIdTBody,
- IVerifyAadhaarOtpTBody,
- IcreateHealthFacilityTBody,
- IgetAbhaCardTBody,
- IinitiateAbdmAuthenticationTBody,
- IpartialUpdateHealthFacilityTBody,
-} from "../Components/ABDM/models";
import { IComment, IResource } from "../Components/Resource/models";
import {
IDeleteBedCapacity,
@@ -117,8 +98,13 @@ import {
import { InvestigationSessionType } from "../Components/Facility/Investigations/investigationsTab";
import { AbhaNumberModel } from "../Components/ABDM/types/abha";
import { ScribeModel } from "../Components/Scribe/Scribe";
-import { InsurerOptionModel } from "../Components/HCX/InsurerAutocomplete";
-import { PMJAYPackageItem } from "../Components/Common/PMJAYProcedurePackageAutocomplete";
+import {
+ IcreateHealthFacilityTBody,
+ IHealthFacility,
+ IpartialUpdateHealthFacilityTBody,
+} from "../Components/ABDM/types/health-facility";
+import { PMJAYPackageItem } from "@/Components/Common/PMJAYProcedurePackageAutocomplete";
+import { InsurerOptionModel } from "@/Components/HCX/InsurerAutocomplete";
/**
* A fake function that returns an empty object casted to type T
@@ -387,6 +373,12 @@ const routes = {
TBody: Type
>(),
},
+ getFacilityHubs: {
+ path: "/api/v1/facility/{id}/hubs",
+ method: "GET",
+ TRes: Type>(),
+ },
+
getFacilitySpokes: {
path: "/api/v1/facility/{id}/spokes/",
method: "GET",
@@ -1129,7 +1121,7 @@ const routes = {
path: "/api/v1/notification/notify/",
method: "POST",
TRes: Type(),
- Tbody: Type(),
+ TBody: Type(),
},
// FileUpload Create
@@ -1355,196 +1347,243 @@ const routes = {
TBody: Type(),
},
- abha: {
- getAbhaNumber: {
- path: "/api/v1/abdm/abha_numbers/{abhaNumberId}/",
- method: "GET",
- TRes: Type(),
- },
-
- // ABDM HealthID endpoints
- generateAadhaarOtp: {
- path: "/api/v1/abdm/healthid/generate_aadhaar_otp/",
- method: "POST",
- TRes: Type(),
- TBody: Type(),
- },
-
- resendAadhaarOtp: {
- path: "/api/v1/abdm/healthid/resend_aadhaar_otp/",
- method: "POST",
- TRes: Type(),
- TBody: Type(),
- },
-
- verifyAadhaarOtp: {
- path: "/api/v1/abdm/healthid/verify_aadhaar_otp/",
- method: "POST",
- TRes: Type(),
- TBody: Type(),
- },
-
- generateMobileOtp: {
- path: "/api/v1/abdm/healthid/generate_mobile_otp/",
- method: "POST",
- TRes: Type(),
- TBody: Type(),
- },
-
- checkAndGenerateMobileOtp: {
- path: "/api/v1/abdm/healthid/check_and_generate_mobile_otp/",
- method: "POST",
- TRes: Type(),
- TBody: Type(),
- },
+ abdm: {
+ consent: {
+ list: {
+ path: "/api/abdm/consent/",
+ method: "GET",
+ TRes: Type>(),
+ },
- // TODO: resend mobile otp
- verifyMobileOtp: {
- path: "/api/v1/abdm/healthid/verify_mobile_otp/",
- method: "POST",
- TRes: Type(),
- TBody: Type(),
- },
+ create: {
+ path: "/api/abdm/consent/",
+ method: "POST",
+ TRes: Type(),
+ TBody: Type(),
+ },
- createHealthId: {
- path: "/api/v1/abdm/healthid/create_health_id/",
- method: "POST",
- TRes: Type(),
- TBody: Type(),
- },
+ get: {
+ path: "/api/abdm/consent/{id}/",
+ method: "GET",
+ },
- linkPatient: {
- path: "/api/v1/abdm/healthid/link_patient/",
- method: "POST",
- TBody: Type<{ abha_number: string; patient: string }>(),
- TRes: Type(),
+ checkStatus: {
+ path: "/api/abdm/v3/hiu/consent_request_status/",
+ method: "POST",
+ TBody: Type<{
+ consent_request: string;
+ }>(),
+ TRes: Type<{
+ detail: string;
+ }>(),
+ },
},
- searchByHealthId: {
- path: "/api/v1/abdm/healthid/search_by_health_id/",
- method: "POST",
- TRes: Type(),
- TBody: Type(),
+ healthInformation: {
+ get: {
+ path: "/api/abdm/health_information/{artefactId}",
+ method: "GET",
+ TRes: Type(),
+ },
},
- initiateAbdmAuthentication: {
- path: "/api/v1/abdm/healthid/auth_init/",
- method: "POST",
- TRes: Type(),
- TBody: Type(),
- },
+ healthFacility: {
+ list: {
+ path: "/api/abdm/health_facility/",
+ method: "GET",
+ },
- confirmWithAadhaarOtp: {
- path: "/api/v1/abdm/healthid/confirm_with_aadhaar_otp/",
- method: "POST",
- TRes: Type(),
- TBody: Type(),
- },
+ create: {
+ path: "/api/abdm/health_facility/",
+ method: "POST",
+ TRes: Type(),
+ TBody: Type(),
+ },
- confirmWithMobileOtp: {
- path: "/api/v1/abdm/healthid/confirm_with_mobile_otp/",
- method: "POST",
- TRes: Type(),
- TBody: Type(),
- },
+ get: {
+ path: "/api/abdm/health_facility/{facility_id}/",
+ method: "GET",
+ TRes: Type(),
+ },
- linkViaQR: {
- path: "/api/v1/abdm/healthid/link_via_qr/",
- method: "POST",
- TRes: Type(),
- TBody: Type(),
- },
+ update: {
+ path: "/api/abdm/health_facility/{facility_id}/",
+ method: "PUT",
+ TRes: Type(),
+ TBody: Type(),
+ },
- linkCareContext: {
- path: "/api/v1/abdm/healthid/add_care_context/",
- method: "POST",
- TRes: Type(),
- TBody: Type(),
- },
+ partialUpdate: {
+ path: "/api/abdm/health_facility/{facility_id}/",
+ method: "PATCH",
+ TRes: Type(),
+ TBody: Type(),
+ },
- getAbhaCard: {
- path: "/api/v1/abdm/healthid/get_abha_card/",
- method: "POST",
- TRes: Type(),
- TBody: Type(),
+ registerAsService: {
+ path: "/api/abdm/health_facility/{facility_id}/register_service/",
+ method: "POST",
+ TRes: Type(),
+ TBody: Type(),
+ },
},
- // ABDM Health Facility
-
- listHealthFacility: {
- path: "/api/v1/abdm/health_facility/",
- method: "GET",
+ abhaNumber: {
+ get: {
+ path: "/api/abdm/abha_number/{abhaNumberId}/",
+ method: "GET",
+ TRes: Type(),
+ },
+ create: {
+ path: "/api/abdm/abha_number/",
+ method: "POST",
+ TBody: Type>(),
+ TRes: Type(),
+ },
},
- createHealthFacility: {
- path: "/api/v1/abdm/health_facility/",
- method: "POST",
- TRes: Type(),
- TBody: Type(),
- },
+ healthId: {
+ abhaCreateSendAadhaarOtp: {
+ path: "/api/abdm/v3/health_id/create/send_aadhaar_otp/",
+ method: "POST",
+ TBody: Type<{
+ aadhaar: string;
+ transaction_id?: string;
+ }>(),
+ TRes: Type<{
+ transaction_id: string;
+ detail: string;
+ }>(),
+ },
- getHealthFacility: {
- path: "/api/v1/abdm/health_facility/{facility_id}/",
- method: "GET",
- TRes: Type(),
- },
+ abhaCreateVerifyAadhaarOtp: {
+ path: "/api/abdm/v3/health_id/create/verify_aadhaar_otp/",
+ method: "POST",
+ TBody: Type<{
+ transaction_id: string;
+ otp: string;
+ mobile: string;
+ }>(),
+ TRes: Type<{
+ transaction_id: string;
+ detail: string;
+ is_new: boolean;
+ abha_number: AbhaNumberModel;
+ }>(),
+ },
- updateHealthFacility: {
- path: "/api/v1/abdm/health_facility/{facility_id}/",
- method: "PUT",
- TRes: Type(),
- TBody: Type(),
- },
+ abhaCreateLinkMobileNumber: {
+ path: "/api/abdm/v3/health_id/create/link_mobile_number/",
+ method: "POST",
+ TBody: Type<{
+ transaction_id: string;
+ mobile: string;
+ }>(),
+ TRes: Type<{
+ transaction_id: string;
+ detail: string;
+ }>(),
+ },
- partialUpdateHealthFacility: {
- path: "/api/v1/abdm/health_facility/{facility_id}/",
- method: "PATCH",
- TRes: Type(),
- TBody: Type(),
- },
+ abhaCreateVerifyMobileNumber: {
+ path: "/api/abdm/v3/health_id/create/verify_mobile_otp/",
+ method: "POST",
+ TBody: Type<{
+ transaction_id: string;
+ otp: string;
+ }>(),
+ TRes: Type<{
+ transaction_id: string;
+ detail: string;
+ }>(),
+ },
- registerHealthFacilityAsService: {
- path: "/api/v1/abdm/health_facility/{facility_id}/register_service/",
- method: "POST",
- TRes: Type(),
- TBody: Type(),
- },
+ abhaCreateAbhaAddressSuggestion: {
+ path: "/api/abdm/v3/health_id/create/abha_address_suggestion/",
+ method: "POST",
+ TBody: Type<{
+ transaction_id: string;
+ }>(),
+ TRes: Type<{
+ transaction_id: string;
+ abha_addresses: string[];
+ }>(),
+ },
- listConsents: {
- path: "/api/v1/abdm/consent/",
- method: "GET",
- TRes: Type>(),
- },
+ abhaCreateEnrolAbhaAddress: {
+ path: "/api/abdm/v3/health_id/create/enrol_abha_address/",
+ method: "POST",
+ TBody: Type<{
+ transaction_id: string;
+ abha_address: string;
+ }>(),
+ TRes: Type<{
+ detail?: string;
+ transaction_id: string;
+ health_id: string;
+ preferred_abha_address: string;
+ abha_number: AbhaNumberModel;
+ }>(),
+ },
- createConsent: {
- path: "/api/v1/abdm/consent/",
- method: "POST",
- TRes: Type(),
- TBody: Type(),
- },
+ linkAbhaNumberAndPatient: {
+ path: "/api/abdm/v3/health_id/link_patient/",
+ method: "POST",
+ TBody: Type<{
+ abha_number: string;
+ patient: string;
+ }>(),
+ TRes: Type<{
+ detail: string;
+ }>(),
+ },
- getConsent: {
- path: "/api/v1/abdm/consent/{id}/",
- method: "GET",
- },
+ abhaLoginCheckAuthMethods: {
+ path: "/api/abdm/v3/health_id/login/check_auth_methods/",
+ method: "POST",
+ TBody: Type<{
+ abha_address: string;
+ }>(),
+ TRes: Type<{
+ abha_number: string;
+ auth_methods: string[];
+ }>(),
+ },
- checkConsentStatus: {
- path: "/api/v1/abdm/consent/{id}/status/",
- method: "GET",
- TRes: Type(),
- },
+ abhaLoginSendOtp: {
+ path: "/api/abdm/v3/health_id/login/send_otp/",
+ method: "POST",
+ TBody: Type<{
+ type: "abha-number" | "abha-address" | "mobile" | "aadhaar";
+ value: string;
+ otp_system: "abdm" | "aadhaar";
+ }>(),
+ TRes: Type<{
+ transaction_id: string;
+ detail: string;
+ }>(),
+ },
- getHealthInformation: {
- path: "/api/v1/abdm/health_information/{artefactId}",
- method: "GET",
- TRes: Type(),
- },
+ abhaLoginVerifyOtp: {
+ path: "/api/abdm/v3/health_id/login/verify_otp/",
+ method: "POST",
+ TBody: Type<{
+ type: "abha-number" | "abha-address" | "mobile" | "aadhaar";
+ otp: string;
+ transaction_id: string;
+ otp_system: "abdm" | "aadhaar";
+ }>(),
+ TRes: Type<{
+ abha_number: AbhaNumberModel;
+ created: boolean;
+ }>(),
+ },
- findPatient: {
- path: "/api/v1/abdm/patients/find/",
- method: "POST",
- TRes: Type(),
- TBody: Type<{ id: string }>(),
+ getAbhaCard: {
+ path: "/api/abdm/v3/health_id/abha_card",
+ method: "GET",
+ TRes: Type(),
+ },
},
},
diff --git a/src/Routers/AppRouter.tsx b/src/Routers/AppRouter.tsx
index 87bd3b71d8a..df154ee7a5e 100644
--- a/src/Routers/AppRouter.tsx
+++ b/src/Routers/AppRouter.tsx
@@ -24,11 +24,26 @@ import HCXRoutes from "./routes/HCXRoutes";
import ShiftingRoutes from "./routes/ShiftingRoutes";
import AssetRoutes from "./routes/AssetRoutes";
import ResourceRoutes from "./routes/ResourceRoutes";
-import { DetailRoute } from "./types";
+import { usePluginRoutes } from "@/Common/hooks/useCareApps";
import careConfig from "@careConfig";
import IconIndex from "../CAREUI/icons/Index";
-const Routes = {
+export type RouteParams =
+ T extends `${string}:${infer Param}/${infer Rest}`
+ ? { [K in Param | keyof RouteParams]: string }
+ : T extends `${string}:${infer Param}`
+ ? { [K in Param]: string }
+ : Record;
+
+export type RouteFunction = (
+ params: RouteParams,
+) => JSX.Element;
+
+export type AppRoutes = {
+ [K in string]: RouteFunction;
+};
+
+const Routes: AppRoutes = {
"/": () =>
+
{pages}
diff --git a/src/Routers/routes/AssetRoutes.tsx b/src/Routers/routes/AssetRoutes.tsx
index d3bd96ca437..ee0537d6c58 100644
--- a/src/Routers/routes/AssetRoutes.tsx
+++ b/src/Routers/routes/AssetRoutes.tsx
@@ -2,20 +2,23 @@ import AssetConfigure from "../../Components/Assets/AssetConfigure";
import AssetManage from "../../Components/Assets/AssetManage";
import AssetsList from "../../Components/Assets/AssetsList";
import AssetCreate from "../../Components/Facility/AssetCreate";
+import { AppRoutes } from "../AppRouter";
-export default {
+const AssetRoutes: AppRoutes = {
"/assets": () =>
,
-
- "/facility/:facilityId/assets/new": (params: any) => (
-
- ),
- "/facility/:facilityId/assets/:assetId/update": (params: any) => (
-
+ "/facility/:facilityId/assets/new": ({ facilityId }) => (
+
),
- "/facility/:facilityId/assets/:assetId": (params: any) => (
-
+ "/facility/:facilityId/assets/:assetId/update": ({ facilityId, assetId }) => (
+
),
- "/facility/:facilityId/assets/:assetId/configure": (params: any) => (
-
+ "/facility/:facilityId/assets/:assetId": ({ facilityId, assetId }) => (
+
),
+ "/facility/:facilityId/assets/:assetId/configure": ({
+ facilityId,
+ assetId,
+ }) =>
,
};
+
+export default AssetRoutes;
diff --git a/src/Routers/routes/ConsultationRoutes.tsx b/src/Routers/routes/ConsultationRoutes.tsx
index 598fd06adc3..7f1a7fecfb8 100644
--- a/src/Routers/routes/ConsultationRoutes.tsx
+++ b/src/Routers/routes/ConsultationRoutes.tsx
@@ -5,30 +5,30 @@ import ManagePrescriptions from "../../Components/Medicine/ManagePrescriptions";
import { DailyRoundListDetails } from "../../Components/Patient/DailyRoundListDetails";
import { DailyRounds } from "../../Components/Patient/DailyRounds";
import { ConsultationDetails } from "../../Components/Facility/ConsultationDetails";
-import TreatmentSummary, {
- ITreatmentSummaryProps,
-} from "../../Components/Facility/TreatmentSummary";
+import TreatmentSummary from "../../Components/Facility/TreatmentSummary";
import ConsultationDoctorNotes from "../../Components/Facility/ConsultationDoctorNotes";
import PatientConsentRecords from "../../Components/Patient/PatientConsentRecords";
import CriticalCareEditor from "../../Components/LogUpdate/CriticalCareEditor";
import PrescriptionsPrintPreview from "../../Components/Medicine/PrintPreview";
import CriticalCarePreview from "../../Components/LogUpdate/CriticalCarePreview";
import FileUploadPage from "../../Components/Patient/FileUploadPage";
+import InvestigationPrintPreview from "../../Components/Facility/Investigations/InvestigationsPrintPreview";
+import { AppRoutes } from "../AppRouter";
-export default {
+const consultationRoutes: AppRoutes = {
"/facility/:facilityId/patient/:patientId/consultation": ({
facilityId,
patientId,
- }: any) =>
,
+ }) =>
,
"/facility/:facilityId/patient/:patientId/consultation/:id/update": ({
facilityId,
patientId,
id,
- }: any) => (
+ }) => (
),
"/facility/:facilityId/patient/:patientId/consultation/:id/consent-records":
- ({ facilityId, patientId, id }: any) => (
+ ({ facilityId, patientId, id }) => (
(
+ }) => (
-
),
};
+
+export default FacilityLocationRoutes;
diff --git a/src/Routers/routes/FacilityRoutes.tsx b/src/Routers/routes/FacilityRoutes.tsx
index 2c711cf48cb..16b202ae0ce 100644
--- a/src/Routers/routes/FacilityRoutes.tsx
+++ b/src/Routers/routes/FacilityRoutes.tsx
@@ -2,48 +2,47 @@ import { FacilityConfigure } from "../../Components/Facility/FacilityConfigure";
import { FacilityCreate } from "../../Components/Facility/FacilityCreate";
import { FacilityHome } from "../../Components/Facility/FacilityHome";
import FacilityUsers from "../../Components/Facility/FacilityUsers";
-import { HospitalList } from "../../Components/Facility/HospitalList";
+import { FacilityList } from "../../Components/Facility/FacilityList";
import { TriageForm } from "../../Components/Facility/TriageForm";
import ResourceCreate from "../../Components/Resource/ResourceCreate";
import CentralNursingStation from "../../Components/Facility/CentralNursingStation";
import FacilityLocationRoutes from "./FacilityLocationRoutes";
import FacilityInventoryRoutes from "./FacilityInventoryRoutes";
import DischargedPatientsList from "../../Components/Facility/DischargedPatientsList";
+import { AppRoutes } from "../AppRouter";
-export default {
- "/facility": () =>
-
- ),
+ "/resource/board": () =>
-
- ),
+ "/shifting/board": () => (res: Response): Promise {
}
const isJson = res.headers.get("content-type")?.includes("application/json");
+ const isImage = res.headers.get("content-type")?.includes("image");
+
+ if (isImage) {
+ return (await res.blob()) as TData;
+ }
if (!isJson) {
return (await res.text()) as TData;
diff --git a/src/Utils/transformUtils.ts b/src/Utils/transformUtils.ts
index 0050a0bcbb6..4aa63da734c 100644
--- a/src/Utils/transformUtils.ts
+++ b/src/Utils/transformUtils.ts
@@ -1,16 +1,23 @@
import { AssetData } from "../Components/Assets/AssetTypes";
-export const getCameraConfig = (asset: AssetData) => {
- const { meta } = asset;
+export const getCameraConfig = (meta: AssetData["meta"]) => {
return {
middleware_hostname: meta?.middleware_hostname,
- id: asset?.id,
hostname: meta?.local_ip_address,
username: meta?.camera_access_key?.split(":")[0],
password: meta?.camera_access_key?.split(":")[1],
accessKey: meta?.camera_access_key?.split(":")[2],
port: 80,
- location_id: asset?.location_object?.id,
- facility_id: asset?.location_object?.facility?.id,
};
};
+
+export const makeAccessKey = (
+ attrs: Pick<
+ ReturnType,
+ "username" | "password" | "accessKey"
+ >,
+) => {
+ return [attrs.username, attrs.password, attrs.accessKey]
+ .map((a) => a ?? "")
+ .join(":");
+};
diff --git a/src/Utils/useTimer.tsx b/src/Utils/useTimer.tsx
index 6a8d8320c5e..f7a03ffefa0 100644
--- a/src/Utils/useTimer.tsx
+++ b/src/Utils/useTimer.tsx
@@ -27,7 +27,7 @@ export const useTimer = (autoStart = false) => {
const [time, setTime] = useState(0);
useEffect(() => {
- let interval: number;
+ let interval: ReturnType;
if (running) {
interval = setInterval(() => {
setTime((prevTime) => prevTime + 1);
diff --git a/src/pluginTypes.ts b/src/pluginTypes.ts
new file mode 100644
index 00000000000..26a07e4f141
--- /dev/null
+++ b/src/pluginTypes.ts
@@ -0,0 +1,54 @@
+import { LazyExoticComponent } from "react";
+import { UserAssignedModel } from "./Components/Users/models";
+import { AppRoutes } from "./Routers/AppRouter";
+import { INavItem } from "./Components/Common/Sidebar/Sidebar";
+import { pluginMap } from "./pluginMap";
+
+// Define the available plugins
+export type AvailablePlugin = "@apps/care_livekit_fe";
+
+export type AvailablePluginManifest = "@app-manifest/care_livekit_fe";
+
+export type DoctorConnectButtonComponentType = React.FC<{
+ user: UserAssignedModel;
+}>;
+
+// Define supported plugin components
+export type SupportedPluginComponents = {
+ DoctorConnectButtons: DoctorConnectButtonComponentType;
+};
+
+// Create a type for lazy-loaded components
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type LazyComponent> = LazyExoticComponent;
+
+// Define PluginComponentMap with lazy-loaded components
+export type PluginComponentMap = {
+ [K in keyof SupportedPluginComponents]?: LazyComponent<
+ SupportedPluginComponents[K]
+ >;
+};
+
+type SupportedPluginExtensions =
+ | "DoctorConnectButtons"
+ | "PatientExternalRegistration";
+
+export type PluginManifest = {
+ plugin: string;
+ routes: AppRoutes;
+ extends: SupportedPluginExtensions[];
+ components: PluginComponentMap;
+ navItems: INavItem[];
+};
+
+// Create a type that ensures only available plugins can be used
+export type EnabledPluginConfig = {
+ plugin: string;
+ manifestPath: AvailablePluginManifest;
+ path: AvailablePlugin;
+ manifest: Promise;
+ // Components are a dictionary, with the key being the component name, and the value being the component type
+ components: PluginComponentMap;
+};
+
+export { pluginMap };
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
index 7657f7da19e..f339922bfae 100644
--- a/src/vite-env.d.ts
+++ b/src/vite-env.d.ts
@@ -31,6 +31,7 @@ interface ImportMetaEnv {
readonly REACT_JWT_TOKEN_REFRESH_INTERVAL?: string;
readonly REACT_MIN_ENCOUNTER_DATE?: string;
readonly REACT_ALLOWED_LOCALES?: string;
+ readonly REACT_ENABLED_APPS?: string;
// Plugins related envs...
readonly REACT_PLAUSIBLE_SERVER_URL?: string;
diff --git a/tsconfig.json b/tsconfig.json
index 531d6f800e1..51ffeb4a0ae 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -19,9 +19,12 @@
"baseUrl": ".",
"paths": {
"@/*": ["./src/*"],
+ "@core/*": ["src/*"],
+ "@apps/*": ["apps/*/src"],
+ "@app-manifest/*": ["apps/*/src/manifest.ts"],
"@careConfig": ["./care.config.ts"]
}
},
- "include": ["src", "care.config.ts"],
+ "include": ["src/**/*", "apps/**/*", "care.config.ts"],
"exclude": ["src/**/*.gen.tsx"]
}
diff --git a/vite.config.mts b/vite.config.mts
index acb0cdf727b..905374eb923 100644
--- a/vite.config.mts
+++ b/vite.config.mts
@@ -1,10 +1,12 @@
-import path from "node:path";
+import path from "path";
import { createRequire } from "node:module";
import { VitePWA } from "vite-plugin-pwa";
import react from "@vitejs/plugin-react-swc";
import checker from "vite-plugin-checker";
import { viteStaticCopy } from "vite-plugin-static-copy";
import { treeShakeCareIcons } from "./plugins/treeShakeCareIcons";
+import fs from "fs";
+import { defineConfig } from "vite";
const pdfWorkerPath = path.join(
path.dirname(
@@ -22,8 +24,56 @@ const cdnUrls =
"http://localhost:4566",
].join(" ");
+function getPluginAliases() {
+ const pluginsDir = path.resolve(__dirname, "apps");
+ // Make sure the `apps` folder exists
+ if (!fs.existsSync(pluginsDir)) {
+ return {};
+ }
+ const pluginFolders = fs.readdirSync(pluginsDir);
+
+ const aliases = {};
+
+ pluginFolders.forEach((pluginFolder) => {
+ const pluginSrcPath = path.join(pluginsDir, pluginFolder, "src");
+ if (fs.existsSync(pluginSrcPath)) {
+ aliases[`@apps/${pluginFolder}`] = pluginSrcPath;
+ aliases[`@app-manifest/${pluginFolder}`] = path.join(
+ pluginSrcPath,
+ "manifest.ts",
+ );
+ }
+ });
+
+ return aliases;
+}
+
+function getPluginDependencies() {
+ const pluginsDir = path.resolve(__dirname, "apps");
+ // Make sure the `apps` folder exists
+ if (!fs.existsSync(pluginsDir)) {
+ return [];
+ }
+ const pluginFolders = fs.readdirSync(pluginsDir);
+
+ const dependencies = new Set();
+
+ pluginFolders.forEach((pluginFolder) => {
+ const packageJsonPath = path.join(pluginsDir, pluginFolder, "package.json");
+ if (fs.existsSync(packageJsonPath)) {
+ const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+ const pluginDependencies = packageJson.dependencies
+ ? Object.keys(packageJson.dependencies)
+ : [];
+ pluginDependencies.forEach((dep) => dependencies.add(dep));
+ }
+ });
+
+ return Array.from(dependencies);
+}
+
/** @type {import('vite').UserConfig} */
-export default {
+export default defineConfig({
envPrefix: "REACT_",
plugins: [
viteStaticCopy({
@@ -86,10 +136,15 @@ export default {
],
resolve: {
alias: {
+ ...getPluginAliases(),
"@": path.resolve(__dirname, "./src"),
"@careConfig": path.resolve(__dirname, "./care.config.ts"),
+ "@core": path.resolve(__dirname, "src/"),
},
},
+ optimizeDeps: {
+ include: getPluginDependencies(),
+ },
build: {
outDir: "build",
assetsDir: "bundle",
@@ -118,4 +173,4 @@ export default {
},
port: 4000,
},
-};
+});
+ 