-
+
{" "}
{
diff --git a/src/Components/Auth/Login.tsx b/src/Components/Auth/Login.tsx
index 77278e8e8f1..8ce3d684e51 100644
--- a/src/Components/Auth/Login.tsx
+++ b/src/Components/Auth/Login.tsx
@@ -2,7 +2,7 @@ import { useEffect, useState } from "react";
import { useDispatch } from "react-redux";
import { postLogin } from "../../Redux/actions";
import { navigate } from "raviger";
-import { CardContent, Grid, CircularProgress } from "@material-ui/core";
+import { Grid, CircularProgress } from "@material-ui/core";
import { TextInputField } from "../Common/HelperInputFields";
import { PublicDashboard } from "../Dashboard/PublicDashboard";
import { useTranslation } from "react-i18next";
@@ -11,7 +11,7 @@ import VisibilityIcon from "@material-ui/icons/Visibility";
import VisibilityOffIcon from "@material-ui/icons/VisibilityOff";
import LanguageSelector from "../Common/LanguageSelector";
import { RECAPTCHA_SITE_KEY } from "../../Common/env";
-import get from "lodash.get";
+import { get } from "lodash";
export const Login = () => {
const dispatch: any = useDispatch();
@@ -99,11 +99,10 @@ export const Login = () => {
window.location.pathname === "/" ||
window.location.pathname === "/login"
) {
- navigate("/facility");
+ window.location.href = "/facility";
} else {
- navigate(window.location.pathname.toString());
+ window.location.href = window.location.pathname.toString();
}
- window.location.reload();
} else {
// error from server set back to login button
setLoading(false);
diff --git a/src/Components/Common/FacilitySelect.tsx b/src/Components/Common/FacilitySelect.tsx
index 5ec02e3c570..8cb1c790e87 100644
--- a/src/Components/Common/FacilitySelect.tsx
+++ b/src/Components/Common/FacilitySelect.tsx
@@ -3,7 +3,7 @@ import { useDispatch } from "react-redux";
import { getAllFacilities, getPermittedFacilities } from "../../Redux/actions";
import { AutoCompleteAsyncField } from "../Common/HelperInputFields";
import { FacilityModel } from "../Facility/models";
-const debounce = require("lodash.debounce");
+import { debounce } from "lodash";
interface FacilitySelectProps {
name: string;
margin?: string;
diff --git a/src/Components/Common/GLocationPicker.tsx b/src/Components/Common/GLocationPicker.tsx
index 656d116147f..7d99104cd3b 100644
--- a/src/Components/Common/GLocationPicker.tsx
+++ b/src/Components/Common/GLocationPicker.tsx
@@ -87,7 +87,7 @@ const Map: React.FC = ({
}) => {
const ref = React.useRef(null);
const searchRef = React.useRef(null);
- const [map, setMap] = React.useState();
+ const [map, setMap] = React.useState>();
const [searchBox, setSearchBox] =
React.useState();
@@ -158,7 +158,7 @@ const Map: React.FC = ({
/>
{React.Children.map(children, (child) => {
if (React.isValidElement(child)) {
- return React.cloneElement(child, { map });
+ return React.cloneElement(child as React.ReactElement, { map });
}
})}
diff --git a/src/Components/Common/LocationSelect.tsx b/src/Components/Common/LocationSelect.tsx
index c9060feafcf..a8b117387b4 100644
--- a/src/Components/Common/LocationSelect.tsx
+++ b/src/Components/Common/LocationSelect.tsx
@@ -3,7 +3,7 @@ import { useDispatch } from "react-redux";
import { listFacilityAssetLocation } from "../../Redux/actions";
import { AutoCompleteAsyncField } from "../Common/HelperInputFields";
import { AssetLocationObject } from "../Assets/AssetTypes";
-const debounce = require("lodash.debounce");
+import { debounce } from "lodash";
interface LocationSelectProps {
name: string;
margin?: string;
@@ -28,7 +28,6 @@ export const LocationSelect = (props: LocationSelectProps) => {
margin,
errors,
searchAll,
- showAll = true,
className = "",
facilityId,
} = props;
diff --git a/src/Components/Common/SideBar.tsx b/src/Components/Common/SideBar.tsx
index 4e3d8fb8055..0146d4c6d25 100644
--- a/src/Components/Common/SideBar.tsx
+++ b/src/Components/Common/SideBar.tsx
@@ -1,5 +1,5 @@
import React, { useEffect, useState } from "react";
-import get from "lodash.get";
+import { get } from "lodash";
import { useSelector } from "react-redux";
import { Link, navigate, usePath } from "raviger";
import { IconButton } from "@material-ui/core";
@@ -85,7 +85,7 @@ export const SideBar: React.FC = ({ isOpen, setIsOpen }) => {
}, "");
const { width } = useWindowDimensions();
- const mobileBreakpoint: number = 768;
+ const mobileBreakpoint = 768;
const isMobile = width <= mobileBreakpoint ? true : false;
const [enableCollapse, setEnableCollapse] = useState(
localStorage.getItem(PREFERENCE_SIDEBAR_KEY) === SIDEBAR.COLLAPSED
diff --git a/src/Components/Common/UserSelect2.tsx b/src/Components/Common/UserSelect2.tsx
index 77f4cad654b..7182310d734 100644
--- a/src/Components/Common/UserSelect2.tsx
+++ b/src/Components/Common/UserSelect2.tsx
@@ -3,7 +3,7 @@ import { useDispatch } from "react-redux";
import { getUserList } from "../../Redux/actions";
import { AutoCompleteAsyncField } from "../Common/HelperInputFields";
import { UserModel } from "../Users/models";
-const debounce = require("lodash.debounce");
+import { debounce } from "lodash";
interface UserSelectProps {
name?: string | "";
margin?: string;
@@ -30,7 +30,7 @@ export const UserSelect = (props: UserSelectProps) => {
const [UserList, setUserList] = useState>([]);
const getPersonName = (user: any) => {
- let personName = user.first_name + " " + user.last_name;
+ const personName = user.first_name + " " + user.last_name;
return personName.trim().length > 0 ? personName : user.username;
};
diff --git a/src/Components/Dashboard/PublicDashboard.tsx b/src/Components/Dashboard/PublicDashboard.tsx
index a29f412b372..3ced184babc 100644
--- a/src/Components/Dashboard/PublicDashboard.tsx
+++ b/src/Components/Dashboard/PublicDashboard.tsx
@@ -4,7 +4,7 @@ export const PublicDashboard = () => {
const { t } = useTranslation();
return (
-
+
{t("coronasafe_network")}
diff --git a/src/Components/Facility/BedCapacityForm.tsx b/src/Components/Facility/BedCapacityForm.tsx
index 2754cac864b..534fd92ee47 100644
--- a/src/Components/Facility/BedCapacityForm.tsx
+++ b/src/Components/Facility/BedCapacityForm.tsx
@@ -163,15 +163,15 @@ export const BedCapacityForm = (props: BedCapacityProps) => {
}, [bedTypes]);
const handleChange = (e: any) => {
- let form = { ...state.form };
+ const form = { ...state.form };
form[e.target.name] = e.target.value;
dispatch({ type: "set_form", form });
};
const validateData = () => {
- let errors = { ...initForm };
+ const errors = { ...initForm };
let invalidForm = false;
- Object.keys(state.form).forEach((field, i) => {
+ Object.keys(state.form).forEach((field) => {
if (!state.form[field]) {
errors[field] = "Field is required";
invalidForm = true;
@@ -191,7 +191,7 @@ export const BedCapacityForm = (props: BedCapacityProps) => {
return true;
};
- const handleSubmit = async (e: any, btnType: string = "Save") => {
+ const handleSubmit = async (e: any, btnType = "Save") => {
e.preventDefault();
const valid = validateData();
if (valid) {
@@ -324,9 +324,7 @@ export const BedCapacityForm = (props: BedCapacityProps) => {
variant="contained"
type="button"
fullWidth
- onClick={() =>
- goBack(!id && `/facility/${facilityId}/doctor`)
- }
+ onClick={() => goBack(!id && `/facility/${facilityId}`)}
>
Cancel
diff --git a/src/Components/Facility/ConsultationForm.tsx b/src/Components/Facility/ConsultationForm.tsx
index ed2e8547a3d..a227d173889 100644
--- a/src/Components/Facility/ConsultationForm.tsx
+++ b/src/Components/Facility/ConsultationForm.tsx
@@ -105,7 +105,7 @@ type FormDetails = {
assigned_to: string;
assigned_to_object: UserModel | null;
special_instruction: string;
- review_time: number;
+ review_interval: number;
weight: string;
height: string;
bed: BedModel | null;
@@ -150,7 +150,7 @@ const initForm: FormDetails = {
assigned_to: "",
assigned_to_object: null,
special_instruction: "",
- review_time: 0,
+ review_interval: -1,
weight: "",
height: "",
bed: null,
@@ -265,7 +265,8 @@ export const ConsultationForm = (props: any) => {
admitted: res.data.admitted ? String(res.data.admitted) : "false",
admitted_to: res.data.admitted_to ? res.data.admitted_to : "",
category: res.data.category
- ? PATIENT_CATEGORIES.find((i) => i.text === res.data.category)?.id || "Comfort"
+ ? PATIENT_CATEGORIES.find((i) => i.text === res.data.category)
+ ?.id || "Comfort"
: "Comfort",
ip_no: res.data.ip_no ? res.data.ip_no : "",
verified_by: res.data.verified_by ? res.data.verified_by : "",
@@ -514,7 +515,7 @@ export const ConsultationForm = (props: any) => {
consultation_notes: state.form.consultation_notes,
is_telemedicine: state.form.is_telemedicine,
action: state.form.action,
- review_time: state.form.review_time,
+ review_interval: state.form.review_interval,
assigned_to:
state.form.is_telemedicine === "true" ? state.form.assigned_to : "",
special_instruction: state.form.special_instruction,
@@ -1041,20 +1042,20 @@ export const ConsultationForm = (props: any) => {
{JSON.parse(state.form.is_telemedicine) && (
-
-
+
+
Review After{" "}
)}
diff --git a/src/Components/Facility/Consultations/Feed.tsx b/src/Components/Facility/Consultations/Feed.tsx
index 0f27053b1ce..0b6998a997a 100644
--- a/src/Components/Facility/Consultations/Feed.tsx
+++ b/src/Components/Facility/Consultations/Feed.tsx
@@ -210,7 +210,7 @@ export const Feed: React.FC = ({ consultationId }) => {
onError: (resp) => {
resp instanceof AxiosError &&
Notification.Error({
- msg: "Fetching presets failed",
+ msg: "Camera is offline",
});
},
});
diff --git a/src/Components/Facility/Consultations/LiveFeed.tsx b/src/Components/Facility/Consultations/LiveFeed.tsx
index 40cb73b2511..f091275c68f 100644
--- a/src/Components/Facility/Consultations/LiveFeed.tsx
+++ b/src/Components/Facility/Consultations/LiveFeed.tsx
@@ -57,7 +57,7 @@ const LiveFeed = (props: any) => {
const [toDelete, setToDelete] = useState(null);
const [toUpdate, setToUpdate] = useState(null);
const { width } = useWindowDimensions();
- const extremeSmallScreenBreakpoint: number = 320;
+ const extremeSmallScreenBreakpoint = 320;
const isExtremeSmallScreen =
width <= extremeSmallScreenBreakpoint ? true : false;
const liveFeedPlayerRef = useRef(null);
@@ -163,7 +163,7 @@ const LiveFeed = (props: any) => {
onError: (resp) => {
resp instanceof AxiosError &&
Notification.Error({
- msg: "Fetching presets failed",
+ msg: "Camera is offline",
});
},
});
@@ -635,7 +635,7 @@ const LiveFeed = (props: any) => {
getPresets({
onError: () => {
Notification.Error({
- msg: "Fetching presets failed",
+ msg: "Camera is offline",
});
},
});
diff --git a/src/Components/Facility/FacilityFilter/DistrictSelect.tsx b/src/Components/Facility/FacilityFilter/DistrictSelect.tsx
index 9ff83e3de90..92c7aa1a381 100644
--- a/src/Components/Facility/FacilityFilter/DistrictSelect.tsx
+++ b/src/Components/Facility/FacilityFilter/DistrictSelect.tsx
@@ -1,8 +1,8 @@
import React, { useState, useCallback } from "react";
import { useDispatch } from "react-redux";
-import { getDistrictByName, getStates } from "../../../Redux/actions";
+import { getDistrictByName } from "../../../Redux/actions";
import { AutoCompleteAsyncField } from "../../Common/HelperInputFields";
-const debounce = require("lodash.debounce");
+import { debounce } from "lodash";
interface DistrictSelectProps {
name: string;
@@ -16,16 +16,8 @@ interface DistrictSelectProps {
}
function DistrictSelect(props: DistrictSelectProps) {
- const {
- name,
- errors,
- className,
- multiple,
- selected,
- searchAll,
- setSelected,
- margin,
- } = props;
+ const { name, errors, className, multiple, selected, setSelected, margin } =
+ props;
const [isdistrictLoading, setDistrictLoading] = useState(false);
const [hasSearchText, setHasSearchText] = useState(false);
const [districtList, setDistrictList] = useState([]);
diff --git a/src/Components/Facility/FacilityHome.tsx b/src/Components/Facility/FacilityHome.tsx
index c728888fbf5..198ee21ea7e 100644
--- a/src/Components/Facility/FacilityHome.tsx
+++ b/src/Components/Facility/FacilityHome.tsx
@@ -253,7 +253,7 @@ export const FacilityHome = (props: any) => {
{facilityData.name}
-
+
Last updated{" "}
{facilityData?.modified_date &&
moment(facilityData?.modified_date).fromNow()}
diff --git a/src/Components/Facility/FacilityUsers.tsx b/src/Components/Facility/FacilityUsers.tsx
index 1d9d2b40d35..752c768bc3f 100644
--- a/src/Components/Facility/FacilityUsers.tsx
+++ b/src/Components/Facility/FacilityUsers.tsx
@@ -339,7 +339,7 @@ export default function FacilityUsers(props: any) {
-
+
{`${user.first_name} ${user.last_name}`}
{user.last_login &&
diff --git a/src/Components/Facility/HospitalList.tsx b/src/Components/Facility/HospitalList.tsx
index 2fb4e4ff71b..bea9146376c 100644
--- a/src/Components/Facility/HospitalList.tsx
+++ b/src/Components/Facility/HospitalList.tsx
@@ -353,7 +353,7 @@ export const HospitalList = (props: any) => {
{KASP_STRING}
)}
-
diff --git a/src/Components/Facility/models.tsx b/src/Components/Facility/models.tsx
index 60664876c50..bd2598a41dc 100644
--- a/src/Components/Facility/models.tsx
+++ b/src/Components/Facility/models.tsx
@@ -75,7 +75,8 @@ export type PatientCategory =
| "Comfort Care"
| "Stable"
| "Slightly Abnormal"
- | "Critical";
+ | "Critical"
+ | "unknown";
export interface ConsultationModel {
admission_date?: string;
@@ -125,6 +126,7 @@ export interface ConsultationModel {
lines?: any;
last_daily_round?: any;
current_bed?: CurrentBed;
+ review_interval?: number;
}
export interface PatientStatsModel {
id?: number;
diff --git a/src/Components/Patient/DailyRounds.tsx b/src/Components/Patient/DailyRounds.tsx
index 62478fbf5e5..7eb7b35d6df 100644
--- a/src/Components/Patient/DailyRounds.tsx
+++ b/src/Components/Patient/DailyRounds.tsx
@@ -52,7 +52,7 @@ const initForm: any = {
current_health: 0,
recommend_discharge: false,
actions: null,
- review_time: 0,
+ review_interval: 0,
admitted_to: "",
taken_at: null,
rounds_type: "NORMAL",
@@ -107,7 +107,7 @@ export const DailyRounds = (props: any) => {
const [isLoading, setIsLoading] = useState(false);
const [facilityName, setFacilityName] = useState("");
const [patientName, setPatientName] = useState("");
- const [prevReviewTime, setPreviousReviewTime] = useState("");
+ const [prevReviewInterval, setPreviousReviewInterval] = useState(-1);
const [hasPreviousLog, setHasPreviousLog] = useState(false);
const headerText = !id ? "Add Consultation Update" : "Info";
const buttonText = !id ? "Save" : "Continue";
@@ -156,7 +156,9 @@ export const DailyRounds = (props: any) => {
if (res.data) {
setPatientName(res.data.name);
setFacilityName(res.data.facility_object.name);
- setPreviousReviewTime(res.data.review_time);
+ setPreviousReviewInterval(
+ Number(res.data.last_consultation.review_interval)
+ );
}
} else {
setPatientName("");
@@ -243,6 +245,8 @@ export const DailyRounds = (props: any) => {
return map.toFixed(2);
};
+ console.log(state.form.review_interval);
+
const handleSubmit = async (e: any) => {
e.preventDefault();
const validForm = validateForm();
@@ -275,7 +279,9 @@ export const DailyRounds = (props: any) => {
consultation: consultationId,
recommend_discharge: JSON.parse(state.form.recommend_discharge),
action: state.form.action,
- review_time: state.form.review_time,
+ review_interval: Number(
+ state.form.review_interval || prevReviewInterval
+ ),
// bed: isTeleicu === "true" ? state.form.bed : undefined,
};
if (state.form.rounds_type === "NORMAL") {
@@ -460,12 +466,13 @@ export const DailyRounds = (props: any) => {
};
const getExpectedReviewTime = () => {
- if (Number(state.form.review_time))
- return `Next Review at ${moment()
- .add(state.form.review_time, "minutes")
- .format("DD/MM/YYYY hh:mm A")}`;
- if (prevReviewTime && moment().isBefore(prevReviewTime))
- return `Next Review at ${formatDate(prevReviewTime)}`;
+ const nextReviewTime = Number(
+ state.form.review_interval || prevReviewInterval
+ );
+ if (nextReviewTime > 0)
+ return `Review before ${formatDate(
+ moment().add(nextReviewTime, "minutes").toDate()
+ )}`;
return "No Reviews Planned!";
};
@@ -667,19 +674,19 @@ export const DailyRounds = (props: any) => {
-
+
Review After{" "}
diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx
index 73dc008acd3..1b324a3dd8a 100644
--- a/src/Components/Patient/ManagePatients.tsx
+++ b/src/Components/Patient/ManagePatients.tsx
@@ -26,14 +26,15 @@ import {
TELEMEDICINE_ACTIONS,
PATIENT_FILTER_ADMITTED_TO,
KASP_STRING,
+ PatientCategoryTailwindClass,
} from "../../Common/constants";
import { make as SlideOver } from "../Common/SlideOver.gen";
import PatientFilterV2 from "./PatientFilterV2";
import { parseOptionId } from "../../Common/utils";
import { statusType, useAbortableEffect } from "../../Common/utils";
-import { FacilityModel } from "../Facility/models";
-import clsx from "clsx";
+import { FacilityModel, PatientCategory } from "../Facility/models";
import { Badge } from "../Common/Badge";
+import useWindowDimensions from "../../Common/hooks/useWindowDimensions";
const Loading = loadable(() => import("../Common/Loading"));
const PageTitle = loadable(() => import("../Common/PageTitle"));
@@ -67,6 +68,14 @@ const now = moment().format("DD-MM-YYYY:hh:mm:ss");
const RESULT_LIMIT = 12;
+const PatientCategoryDisplayText: Record
= {
+ "Comfort Care": "COMFORT CARE",
+ Stable: "STABLE",
+ "Slightly Abnormal": "ABNORMAL",
+ Critical: "CRITICAL",
+ unknown: "UNKNOWN",
+};
+
export const PatientManager = (props: any) => {
const { facilityId } = props;
const dispatch: any = useDispatch();
@@ -86,6 +95,14 @@ export const PatientManager = (props: any) => {
const [localbodyName, setLocalbodyName] = useState("");
const [facilityBadgeName, setFacilityBadgeName] = useState("");
const [facilityCrumbName, setFacilityCrumbName] = useState("");
+ const { width } = useWindowDimensions();
+ const extremeSmallScreenBreakpoint = 320;
+ const isExtremeSmallScreen =
+ width <= extremeSmallScreenBreakpoint ? true : false;
+ const isTwoColumnCardBreakpointRange =
+ width <= 900 && width >= 769 ? true : false;
+ const isThreeColumnCardBreakpointRange =
+ width <= 1220 && width >= 1025 ? true : false;
const tabValue = qParams.is_active === "False" ? 1 : 0;
@@ -458,12 +475,24 @@ export const PatientManager = (props: any) => {
} else {
patientUrl = `/patient/${patient.id}`;
}
+
+ const category: PatientCategory =
+ patient?.last_consultation?.category || "unknown";
+ const categoryClass = PatientCategoryTailwindClass[category];
+
return (
+
+
+ {PatientCategoryDisplayText[category]}
+
+
{patient?.last_consultation &&
@@ -501,8 +530,9 @@ export const PatientManager = (props: any) => {
-
- {patient.name} - {patient.age}
+
+
{patient.name}
+
{" - " + patient.age}
{patient.action && patient.action != 10 && (
-{" "}
@@ -536,6 +566,16 @@ export const PatientManager = (props: any) => {
)}
+ {patient.review_time &&
+ !patient.last_consultation?.discharge_date &&
+ Number(patient.last_consultation?.review_interval) > 0 &&
+ moment().isAfter(patient.review_time) && (
+
+ )}
{patient.allow_transfer ? (
{
)}
- {showReviewAlert(patient) &&
- moment().isBefore(patient.review_time) && (
-
- Review Missed
-
- )}
diff --git a/src/Components/Patient/PatientHome.tsx b/src/Components/Patient/PatientHome.tsx
index c5484809a7b..33e4e7f46cf 100644
--- a/src/Components/Patient/PatientHome.tsx
+++ b/src/Components/Patient/PatientHome.tsx
@@ -670,22 +670,25 @@ export const PatientHome = (props: any) => {
className="space-y-2 flex-col justify-between flex h-full"
>
- {patientData.review_time && (
-
-
- {(moment().isBefore(patientData.review_time)
- ? "Review at: "
- : "Review Missed: ") +
- formatDate(patientData.review_time)}
-
- )}
+ {patientData.review_time &&
+ !patientData.last_consultation?.discharge_date &&
+ Number(patientData.last_consultation?.review_interval) >
+ 0 && (
+
+
+ {(moment().isBefore(patientData.review_time)
+ ? "Review before: "
+ : "Review Missed: ") +
+ formatDate(patientData.review_time)}
+
+ )}
diff --git a/src/Components/Patient/PatientRegister.tsx b/src/Components/Patient/PatientRegister.tsx
index cde439e9dd8..b15dbabeff5 100644
--- a/src/Components/Patient/PatientRegister.tsx
+++ b/src/Components/Patient/PatientRegister.tsx
@@ -63,7 +63,7 @@ import { goBack } from "../../Utils/utils";
const Loading = loadable(() => import("../Common/Loading"));
const PageTitle = loadable(() => import("../Common/PageTitle"));
-const debounce = require("lodash.debounce");
+import { debounce } from "lodash";
interface PatientRegisterProps extends PatientModel {
facilityId: number;
diff --git a/src/Components/Patient/models.tsx b/src/Components/Patient/models.tsx
index c84fd267119..04e67d84d7a 100644
--- a/src/Components/Patient/models.tsx
+++ b/src/Components/Patient/models.tsx
@@ -90,6 +90,7 @@ export interface PatientModel {
last_vaccinated_date?: string;
date_of_birth?: string;
blood_group?: string;
+ review_interval?: number;
review_time?: string;
date_of_return?: string;
cluster_name?: string;
diff --git a/src/Components/TeleIcu/Patient/InfoCard.tsx b/src/Components/TeleIcu/Patient/InfoCard.tsx
index b1926c32ab9..e131866fcfc 100644
--- a/src/Components/TeleIcu/Patient/InfoCard.tsx
+++ b/src/Components/TeleIcu/Patient/InfoCard.tsx
@@ -3,8 +3,18 @@ import { getDimensionOrDash } from "../../../Common/utils";
import { PatientModel } from "../../Patient/models";
import { Modal } from "@material-ui/core";
import Beds from "../../Facility/Consultations/Beds";
-import CloseRoundedIcon from "@material-ui/icons/CloseRounded";
import { useState } from "react";
+import moment from "moment";
+import { PatientCategoryTailwindClass } from "../../../Common/constants";
+import { PatientCategory } from "../../Facility/models";
+
+const PatientCategoryDisplayText: Record
= {
+ "Comfort Care": "COMFORT CARE",
+ Stable: "STABLE",
+ "Slightly Abnormal": "SLIGHTLY ABNORMAL",
+ Critical: "CRITICAL",
+ unknown: "UNKNOWN",
+};
export default function TeleICUPatientInfoCard(props: {
patient: PatientModel;
@@ -16,6 +26,10 @@ export default function TeleICUPatientInfoCard(props: {
const patient = props.patient;
const ip_no = props.ip_no;
+ const category: PatientCategory =
+ patient?.last_consultation?.category || "unknown";
+ const categoryClass = PatientCategoryTailwindClass[category];
+
return (
{/* Can support for patient picture in the future */}
-
+
{patient?.last_consultation &&
patient?.last_consultation?.current_bed ? (
)}
+ {category !== "unknown" && (
+
+ {PatientCategoryDisplayText[category]}
+
+ )}
-
+
{patient.name}
+
+ {patient.review_time &&
+ !patient.last_consultation?.discharge_date &&
+ Number(patient.last_consultation?.review_interval) > 0 && (
+
+
+ {(moment().isBefore(patient.review_time)
+ ? "Review before: "
+ : "Review Missed: ") +
+ moment(patient.review_time).format("lll")}
+
+ )}
+
Blood Pressure,
@@ -150,7 +150,7 @@ export default function TeleICUPatientVitalsCard({
vitalKey: "resp",
waveformKey: "Respiration",
waveformColor: "green",
- waveformDefaultSpace: true
+ waveformDefaultSpace: true,
},
{
label: <>Temperature (F),
@@ -166,40 +166,35 @@ export default function TeleICUPatientVitalsCard({
{waveforms ? (
<>
{vitals.map((v, i) => {
- const waveform = waveforms.filter(w=>w["wave-name"] === v.waveformKey)[0];
- return (
- (v.waveformKey && waveform) ?
-
w["wave-name"] === v.waveformKey)
- .map(w=>w.data)
- .join(" ")
- }}
- title={v.waveformName || v.waveformKey}
- color={v.waveformColor}
- metrics={stats}
- classes={"h-[150px]"}
- defaultSpace={v.waveformDefaultSpace}
- /> : (
-
-
)
- )
+ const waveform = waveforms.filter(
+ (w) => w["wave-name"] === v.waveformKey
+ )[0];
+ return v.waveformKey && waveform ? (
+ w["wave-name"] === v.waveformKey)
+ .map((w) => w.data)
+ .join(" "),
+ }}
+ title={v.waveformName || v.waveformKey}
+ color={v.waveformColor}
+ metrics={stats}
+ classes={"h-[150px]"}
+ defaultSpace={v.waveformDefaultSpace}
+ />
+ ) : (
+
+ );
})}
-
-
) : (
diff --git a/src/Components/TeleIcu/Patient/Waveform.tsx b/src/Components/TeleIcu/Patient/Waveform.tsx
index ebc2b0fe226..0ee1cb4ffa3 100644
--- a/src/Components/TeleIcu/Patient/Waveform.tsx
+++ b/src/Components/TeleIcu/Patient/Waveform.tsx
@@ -16,10 +16,17 @@ export type WaveformType = {
"wave-name": string;
};
-export default function Waveform(props: { wave: WaveformType, color?: string, title: string, metrics?: boolean, classes?: string, defaultSpace?: boolean }) {
+export default function Waveform(props: {
+ wave: WaveformType;
+ color?: string;
+ title: string;
+ metrics?: boolean;
+ classes?: string;
+ defaultSpace?: boolean;
+}) {
const wave = props.wave;
const data = wave.data.split(" ").map(Number);
- const [queueData, setQueueData] = useState([]);
+ const [queueData, setQueueData] = useState(Array(200).fill(0));
const [xData, setXData] = useState([]);
const [lastStream, setLastStream] = useState(0);
@@ -29,18 +36,18 @@ export default function Waveform(props: { wave: WaveformType, color?: string, ti
useEffect(() => {
setQueueData(queueData.concat(data));
setXData(Array.from(Array(viewable).keys()));
-
+
let seconds = 1;
setLastStream(0);
- let timer = setInterval(() => {
+ const timer = setInterval(() => {
setLastStream(seconds);
seconds++;
}, 1000);
return () => clearInterval(timer);
- }, [props]);
+ }, [props.wave.data]);
useEffect(() => {
- let timeout = setTimeout(() => {
+ const timeout = setTimeout(() => {
setQueueData(queueData.slice(1));
}, tpf);
return () => clearTimeout(timeout);
@@ -67,34 +74,32 @@ export default function Waveform(props: { wave: WaveformType, color?: string, ti
{props.metrics && (
- Lowest: {Math.min(...queueData.slice(0, viewable))}
-
-
- Highest: {Math.max(...queueData.slice(0, viewable))}
-
-
- Stream Length: {data.length}
-
-
- Buffer Length: {queueData.length}
+
Lowest: {Math.min(...queueData.slice(0, viewable))}
+
Highest: {Math.max(...queueData.slice(0, viewable))}
+
Stream Length: {data.length}
+
+ Lag:{" "}
+ {Number((tpf * (queueData.length - viewable)) / 1000).toFixed(
+ 2
+ )}{" "}
+ sec
+
- Flow Rate: {Number(tpf).toFixed(2)} ms
+
Buffer Length: {queueData.length}
+
Flow Rate: {Number(tpf).toFixed(2)} ms
+
Sampling Rate: {wave["sampling rate"]}
+
Last response: {lastStream} sec ago
-
- Sampling Rate: {wave["sampling rate"]}
-
-
- Lag: {Number(tpf * (queueData.length - viewable) / 1000).toFixed(2)} sec
-
-
- Last response: {lastStream} sec ago
-
- {queueData.length > viewable &&
-
- }
+
+ {queueData.length > viewable && (
+
+ )}
)}
diff --git a/src/Components/TeleIcu/PatientList.tsx b/src/Components/TeleIcu/PatientList.tsx
index 2eea9e8d351..f00750badab 100644
--- a/src/Components/TeleIcu/PatientList.tsx
+++ b/src/Components/TeleIcu/PatientList.tsx
@@ -140,7 +140,7 @@ export const TeleICUPatientsList = (props: any) => {
{7 + index}
-
{item.name}
+
{item.name}
{item?.age} years
{" "}
diff --git a/src/Components/Users/ManageUsers.tsx b/src/Components/Users/ManageUsers.tsx
index eaaafccd9ba..fe08b657ab6 100644
--- a/src/Components/Users/ManageUsers.tsx
+++ b/src/Components/Users/ManageUsers.tsx
@@ -429,7 +429,7 @@ export default function ManageUsers() {
)}
-
+
{`${user.first_name} ${user.last_name}`}
{user.last_login && cur_online ? (
diff --git a/src/style/index.css b/src/style/index.css
index 0f220f3672e..5da46ba2777 100644
--- a/src/style/index.css
+++ b/src/style/index.css
@@ -10,7 +10,6 @@ html {
}
body {
- font-family: "Open Sans", sans-serif;
color: #453c52;
@apply font-sans text-gray-900 w-full h-full antialiased;
}
@@ -893,6 +892,55 @@ button:disabled,
@apply text-primary-500 focus:ring-1 focus:ring-primary-500 focus:outline-none;
}
+/* Patient Category Styles */
+
+.patient-comfort {
+ @apply bg-patient-comfort text-patient-comfort-fore
+}
+.patient-stable {
+ @apply bg-patient-stable text-patient-stable-fore
+}
+.patient-abnormal {
+ @apply bg-patient-abnormal text-patient-abnormal-fore
+}
+.patient-critical {
+ @apply bg-patient-critical text-patient-critical-fore
+}
+.patient-unknown {
+ @apply bg-patient-unknown text-patient-unknown-fore
+}
+
+.patient-comfort-ring {
+ @apply ring-patient-comfort
+}
+.patient-stable-ring {
+ @apply ring-patient-stable
+}
+.patient-abnormal-ring {
+ @apply ring-patient-abnormal
+}
+.patient-critical-ring {
+ @apply ring-patient-critical
+}
+.patient-unknown-ring {
+ @apply ring-patient-unknown
+}
+
+.patient-comfort-profile {
+ @apply border-2 border-patient-comfort rounded-t
+}
+.patient-stable-profile {
+ @apply border-2 border-patient-stable rounded-t
+}
+.patient-abnormal-profile {
+ @apply border-2 border-patient-abnormal rounded-t
+}
+.patient-critical-profile {
+ @apply border-2 border-patient-critical rounded-t
+}
+.patient-unknown-profile {
+ @apply border border-patient-unknown rounded
+}
/* for gmaps search dropdown */
.pac-container {
diff --git a/tailwind.config.js b/tailwind.config.js
index a14e2ad374c..a2899c3a6af 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -10,6 +10,9 @@ module.exports = {
...defaultTheme.screens,
},
extend: {
+ fontFamily: {
+ sans: ['Inter', 'sans-serif'],
+ },
colors: {
error: colors.red["500"],
green: colors.emerald,
@@ -37,6 +40,28 @@ module.exports = {
800: "#6A5F7A",
900: "#453C52",
},
+ patient: {
+ comfort: {
+ DEFAULT: colors.slate[200],
+ fore: colors.slate[700],
+ },
+ stable: {
+ DEFAULT: "#59D4FF",
+ fore: colors.white,
+ },
+ abnormal: {
+ DEFAULT: "#F6CB23",
+ fore: colors.yellow[900],
+ },
+ critical: {
+ DEFAULT: colors.red[500],
+ fore: colors.red[100],
+ },
+ unknown: {
+ DEFAULT: colors.gray[400],
+ fore: colors.gray[800],
+ },
+ },
},
padding: {
"1/5": "20%",