diff --git a/SECURITY.md b/SECURITY.md index 0b3730ed9ad..03d8dec4837 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,4 +23,4 @@ ## Reporting a Vulnerability -Please create a ticket at https://support.coronasafe.network +Please create an issue at https://github.com/coronasafe/care_fe/issues/new diff --git a/cypress/e2e/patient_spec/patient_consultation.cy.ts b/cypress/e2e/patient_spec/patient_consultation.cy.ts index 8caea111ca1..d5732a6619d 100644 --- a/cypress/e2e/patient_spec/patient_consultation.cy.ts +++ b/cypress/e2e/patient_spec/patient_consultation.cy.ts @@ -66,7 +66,7 @@ describe("Patient Consultation in multiple combination", () => { ); patientConsultationPage.typePatientWeight(patientWeight); patientConsultationPage.typePatientHeight(patientHeight); - patientConsultationPage.selectPatientCategory("Stable"); + patientConsultationPage.selectPatientCategory("Mild"); // icd 11 - 4 diagnosis with one principal patientConsultationPage.selectPatientDiagnosis( diagnosis1, @@ -236,7 +236,7 @@ describe("Patient Consultation in multiple combination", () => { // Asymptomatic cy.searchAndSelectOption("#symptoms", "ASYMPTOMATIC"); // Abnormal category - patientConsultationPage.selectPatientCategory("Abnormal"); + patientConsultationPage.selectPatientCategory("Moderate"); patientConsultationPage.selectPatientSuggestion("Domiciliary Care"); // one ICD-11 diagnosis patientConsultationPage.selectPatientDiagnosis( @@ -299,7 +299,7 @@ describe("Patient Consultation in multiple combination", () => { "SORE THROAT", ]); // Stable category - patientConsultationPage.selectPatientCategory("Stable"); + patientConsultationPage.selectPatientCategory("Mild"); // Date of symptoms patientConsultationPage.selectSymptomsDate( "#symptoms_onset_date", diff --git a/cypress/e2e/patient_spec/patient_logupdate.cy.ts b/cypress/e2e/patient_spec/patient_logupdate.cy.ts index 8cf83b1c5a8..a55b86e464b 100644 --- a/cypress/e2e/patient_spec/patient_logupdate.cy.ts +++ b/cypress/e2e/patient_spec/patient_logupdate.cy.ts @@ -10,7 +10,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => { const patientPage = new PatientPage(); const patientLogupdate = new PatientLogupdate(); const domicilaryPatient = "Dummy Patient 11"; - const patientCategory = "Abnormal"; + const patientCategory = "Moderate"; const additionalSymptoms = "ASYMPTOMATIC"; const physicalExamination = "physical examination details"; const otherExamination = "Other"; diff --git a/cypress/e2e/shifting_spec/filter.cy.ts b/cypress/e2e/shifting_spec/filter.cy.ts index a142a657013..82fad9d99e4 100644 --- a/cypress/e2e/shifting_spec/filter.cy.ts +++ b/cypress/e2e/shifting_spec/filter.cy.ts @@ -20,7 +20,7 @@ describe("Shifting section filter", () => { shiftingPage.filterByFacility( "Dummy Shifting", "Dummy Shifting", - "District" + "District", ); shiftingPage.facilityAssignedBadge().should("exist"); @@ -32,13 +32,10 @@ describe("Shifting section filter", () => { "ASC Created Date", "yes", "yes", - "POSITIVE", "no", "MODERATE", - "9999999999" + "9999999999", ); - - shiftingPage.diseaseStatusBadge().should("exist"); shiftingPage.orderingBadge().should("exist"); shiftingPage.breathlessnessLevelBadge().should("exist"); shiftingPage.phoneNumberBadge().should("exist"); diff --git a/cypress/pageobject/Shift/ShiftFilters.ts b/cypress/pageobject/Shift/ShiftFilters.ts index 87d3f33c37e..1f824cebbb3 100644 --- a/cypress/pageobject/Shift/ShiftFilters.ts +++ b/cypress/pageobject/Shift/ShiftFilters.ts @@ -27,10 +27,6 @@ class ShiftingPage { return cy.get("#is-up-shift"); } - diseaseStatusInput() { - return cy.get("#disease-status"); - } - isAntenatalInput() { return cy.get("#is-antenatal"); } @@ -63,10 +59,6 @@ class ShiftingPage { return cy.get("[data-testid='Current facility']"); } - diseaseStatusBadge() { - return cy.get("[data-testid='Disease status']"); - } - orderingBadge() { return cy.get("[data-testid='Ordering']"); } @@ -98,7 +90,7 @@ class ShiftingPage { filterByFacility( origin_facility: string, assigned_facility: string, - assigned_to: string + assigned_to: string, ) { this.originFacilityInput().click().type(origin_facility); cy.get("[role='option']").contains(origin_facility).click(); @@ -116,10 +108,9 @@ class ShiftingPage { ordering: string, emergency: string, is_up_shift: string, - disease_status: string, is_antenatal: string, breathlessness_level: string, - patient_phone_number: string + patient_phone_number: string, ) { this.orderingInput().click(); cy.get("[role='option']").contains(ordering).click(); @@ -130,9 +121,6 @@ class ShiftingPage { this.isUpShiftInput().click(); cy.get("[role='option']").contains(is_up_shift).click(); - this.diseaseStatusInput().click(); - cy.get("[role='option']").contains(disease_status).click(); - this.isAntenatalInput().click(); cy.get("[role='option']").contains(is_antenatal).click(); @@ -148,7 +136,7 @@ class ShiftingPage { created_date_start: string, created_date_end: string, modified_date_start: string, - modified_date_end: string + modified_date_end: string, ) { this.createdDateStartInput().click(); cy.get("[id^='headlessui-popover-panel-'] .care-l-angle-left-b") diff --git a/src/CAREUI/misc/AuthorizedChild.tsx b/src/CAREUI/misc/AuthorizedChild.tsx index ce9ec69d546..935f0c51f3c 100644 --- a/src/CAREUI/misc/AuthorizedChild.tsx +++ b/src/CAREUI/misc/AuthorizedChild.tsx @@ -1,4 +1,7 @@ +import { ReactNode } from "react"; +import useAuthUser from "../../Common/hooks/useAuthUser"; import { useIsAuthorized } from "../../Common/hooks/useIsAuthorized"; +import useSlug from "../../Common/hooks/useSlug"; import { AuthorizedForCB } from "../../Utils/AuthorizeFor"; interface Props { @@ -12,3 +15,20 @@ const AuthorizedChild = (props: Props) => { }; export default AuthorizedChild; + +export const AuthorizedForConsultationRelatedActions = (props: { + children: ReactNode; +}) => { + const me = useAuthUser(); + const facilityId = useSlug("facility"); + + if ( + me.home_facility_object?.id === facilityId || + me.user_type === "DistrictAdmin" || + me.user_type === "StateAdmin" + ) { + return props.children; + } + + return null; +}; diff --git a/src/CAREUI/misc/PaginatedList.tsx b/src/CAREUI/misc/PaginatedList.tsx index db68c6f042c..ec270bf8134 100644 --- a/src/CAREUI/misc/PaginatedList.tsx +++ b/src/CAREUI/misc/PaginatedList.tsx @@ -1,4 +1,4 @@ -import { createContext, useContext, useState } from "react"; +import { createContext, useContext, useEffect, useState } from "react"; import { PaginatedResponse, QueryRoute } from "../../Utils/request/types"; import useQuery, { QueryOptions } from "../../Utils/request/useQuery"; import ButtonV2, { @@ -33,6 +33,9 @@ function useContextualized() { interface Props extends QueryOptions> { route: QueryRoute>; perPage?: number; + queryCB?: ( + query: ReturnType>>, + ) => void; children: ( ctx: PaginatedListContext, query: ReturnType>>, @@ -43,6 +46,7 @@ export default function PaginatedList({ children, route, perPage = DEFAULT_PER_PAGE_LIMIT, + queryCB, ...queryOptions }: Props) { const [currentPage, setPage] = useState(1); @@ -57,6 +61,12 @@ export default function PaginatedList({ const items = query.data?.results ?? []; + useEffect(() => { + if (queryCB) { + queryCB(query); + } + }, [query]); + return ( diff --git a/src/Components/CameraFeed/AssetBedSelect.tsx b/src/Components/CameraFeed/AssetBedSelect.tsx index 17701dccbde..c8a2d5451bc 100644 --- a/src/Components/CameraFeed/AssetBedSelect.tsx +++ b/src/Components/CameraFeed/AssetBedSelect.tsx @@ -1,39 +1,28 @@ import { Fragment } from "react"; -import useSlug from "../../Common/hooks/useSlug"; -import routes from "../../Redux/api"; -import useQuery from "../../Utils/request/useQuery"; -import { AssetBedModel, AssetData } from "../Assets/AssetTypes"; -import { BedModel } from "../Facility/models"; +import { AssetBedModel } from "../Assets/AssetTypes"; import { Listbox, Transition } from "@headlessui/react"; import CareIcon from "../../CAREUI/icons/CareIcon"; interface Props { - asset?: AssetData; - bed?: BedModel; + options: AssetBedModel[]; value?: AssetBedModel; + label?: (value: AssetBedModel) => string; onChange?: (value: AssetBedModel) => void; } export default function AssetBedSelect(props: Props) { - const facility = useSlug("facility"); + const selected = props.value; - const { data, loading } = useQuery(routes.listAssetBeds, { - query: { - limit: 100, - facility, - asset: props.asset?.id, - bed: props.bed?.id, - }, - }); + const options = props.options.filter(({ meta }) => meta.type !== "boundary"); - const selected = props.value; + const label = props.label ?? defaultLabel; return ( - -
+ +
- {selected?.bed_object.name ?? "No Preset"} + {selected ? label(selected) : "No Preset"} @@ -46,7 +35,7 @@ export default function AssetBedSelect(props: Props) { leaveTo="opacity-0" > - {data?.results.map((obj) => ( + {options?.map((obj) => ( @@ -63,7 +52,7 @@ export default function AssetBedSelect(props: Props) { selected ? "font-bold text-white" : "font-normal" }`} > - {obj.bed_object.name}: {obj.meta.preset_name} + {label(obj)} )} @@ -75,3 +64,7 @@ export default function AssetBedSelect(props: Props) { ); } + +const defaultLabel = ({ bed_object, meta }: AssetBedModel) => { + return `${bed_object.name}: ${meta.preset_name}`; +}; diff --git a/src/Components/CameraFeed/CameraFeed.tsx b/src/Components/CameraFeed/CameraFeed.tsx index d5ea120e126..8f7659cf730 100644 --- a/src/Components/CameraFeed/CameraFeed.tsx +++ b/src/Components/CameraFeed/CameraFeed.tsx @@ -24,6 +24,7 @@ interface Props { // Controls constrolsDisabled?: boolean; shortcutsDisabled?: boolean; + onMove?: () => void; } export default function CameraFeed(props: Props) { @@ -76,7 +77,7 @@ export default function CameraFeed(props: Props) { }, onError: props.onStreamError, }); - }, [player.initializeStream, props.onStreamSuccess, props.onStreamError]); + }, [player.initializeStream]); // Start stream on mount useEffect(() => initializeStream(), [initializeStream]); @@ -90,7 +91,7 @@ export default function CameraFeed(props: Props) { setFullscreen(false)}>
@@ -180,6 +181,7 @@ export default function CameraFeed(props: Props) { setFullscreen={setFullscreen} onReset={resetStream} onMove={async (data) => { + props.onMove?.(); setState("moving"); const { res } = await operate({ type: "relative_move", data }); setTimeout(() => { diff --git a/src/Components/CameraFeed/CameraFeedWithBedPresets.tsx b/src/Components/CameraFeed/CameraFeedWithBedPresets.tsx index 386b93325b0..4c205c0e9c6 100644 --- a/src/Components/CameraFeed/CameraFeedWithBedPresets.tsx +++ b/src/Components/CameraFeed/CameraFeedWithBedPresets.tsx @@ -2,14 +2,22 @@ import { useState } from "react"; import { AssetBedModel, AssetData } from "../Assets/AssetTypes"; import CameraFeed from "./CameraFeed"; import AssetBedSelect from "./AssetBedSelect"; +import useQuery from "../../Utils/request/useQuery"; +import routes from "../../Redux/api"; +import useSlug from "../../Common/hooks/useSlug"; interface Props { asset: AssetData; } export default function LocationFeedTile(props: Props) { + const facility = useSlug("facility"); const [preset, setPreset] = useState(); + const { data, loading } = useQuery(routes.listAssetBeds, { + query: { limit: 100, facility, asset: props.asset?.id }, + }); + return (
- + {loading ? ( + loading presets... + ) : ( + + )}
); diff --git a/src/Components/CameraFeed/FeedControls.tsx b/src/Components/CameraFeed/FeedControls.tsx index 3a5afb76209..46258114fc0 100644 --- a/src/Components/CameraFeed/FeedControls.tsx +++ b/src/Components/CameraFeed/FeedControls.tsx @@ -87,6 +87,7 @@ export default function FeedControls({ shortcutsDisabled, ...props }: Props) { helpText="Up" shortcut={Shortcuts.MoveUp} shortcutsDisabled={shortcutsDisabled} + tooltipClassName="-translate-y-20 md:translate-y-0" > @@ -102,6 +103,7 @@ export default function FeedControls({ shortcutsDisabled, ...props }: Props) { helpText="Left" shortcut={Shortcuts.MoveLeft} shortcutsDisabled={shortcutsDisabled} + tooltipClassName="-translate-y-20 -translate-x-1 md:translate-x-0 md:translate-y-0" > @@ -114,6 +116,7 @@ export default function FeedControls({ shortcutsDisabled, ...props }: Props) { shortcut={Shortcuts.TogglePrecision} className="font-bold" shortcutsDisabled={shortcutsDisabled} + tooltipClassName="-translate-y-20 -translate-x-20 md:translate-x-0 md:translate-y-0" > {precision}x @@ -125,6 +128,7 @@ export default function FeedControls({ shortcutsDisabled, ...props }: Props) { helpText="Right" shortcut={Shortcuts.MoveRight} shortcutsDisabled={shortcutsDisabled} + tooltipClassName="-translate-y-20 -translate-x-2 md:translate-x-0 md:translate-y-0" > @@ -142,7 +146,7 @@ export default function FeedControls({ shortcutsDisabled, ...props }: Props) { helpText="Down" shortcut={Shortcuts.MoveDown} shortcutsDisabled={shortcutsDisabled} - tooltipClassName="tooltip-top" + tooltipClassName="-translate-y-20 -translate-x-2 md:-translate-x-14" > @@ -185,16 +189,6 @@ export default function FeedControls({ shortcutsDisabled, ...props }: Props) { > - {/* TODO: implement this when this is used in where presets can be saved. */} - {/* console.error("Not implemented")} - shortcutsDisabled={shortcutsDisabled} - > - - */} delay || delay > 5) { props.onReset(); } - }, 500); + }, 1000); return () => { clearInterval(interval); diff --git a/src/Components/Common/BedSelect.tsx b/src/Components/Common/BedSelect.tsx index 2e7bf09072e..5c31055a3a4 100644 --- a/src/Components/Common/BedSelect.tsx +++ b/src/Components/Common/BedSelect.tsx @@ -4,6 +4,7 @@ import AutoCompleteAsync from "../Form/AutoCompleteAsync"; import { useTranslation } from "react-i18next"; import request from "../../Utils/request/request"; import routes from "../../Redux/api"; +import { AssetClass } from "../Assets/AssetTypes"; interface BedSelectProps { name: string; @@ -17,6 +18,7 @@ interface BedSelectProps { showAll?: boolean; showNOptions?: number; selected: BedModel | BedModel[] | null; + not_occupied_by_asset_type?: AssetClass; setSelected: (selected: BedModel | BedModel[] | null) => void; } @@ -33,6 +35,7 @@ export const BedSelect = (props: BedSelectProps) => { facility, location, showNOptions = 20, + not_occupied_by_asset_type, } = props; const { t } = useTranslation(); @@ -45,8 +48,8 @@ export const BedSelect = (props: BedSelectProps) => { all: searchAll, facility, location, + not_occupied_by_asset_type, }; - const { data } = await request(routes.listFacilityBeds, { query }); if (unoccupiedOnly) { diff --git a/src/Components/Common/PageTitle.tsx b/src/Components/Common/PageTitle.tsx index 6fb38a36f08..990dc7b72cc 100644 --- a/src/Components/Common/PageTitle.tsx +++ b/src/Components/Common/PageTitle.tsx @@ -47,7 +47,7 @@ export default function PageTitle({ useEffect(() => { if (divRef.current && focusOnLoad) { - divRef.current.scrollIntoView(); + divRef.current.scrollIntoView({ behavior: "smooth" }); } }, [divRef, focusOnLoad]); diff --git a/src/Components/CriticalCareRecording/components/Slider.res b/src/Components/CriticalCareRecording/components/Slider.res index d3ab996683e..9dc8dfd2d2c 100644 --- a/src/Components/CriticalCareRecording/components/Slider.res +++ b/src/Components/CriticalCareRecording/components/Slider.res @@ -47,6 +47,9 @@ let make = ( let (text, setText) = React.useState(() => "Normal") let (precision, setPrecision) = React.useState(() => 1) let (displayValue, setDisplayValue) = React.useState(() => value) + let justifyContentClassName = title != "" ? "justify-between" : "justify-center" + let alignItemClassName = title != "" ? "items-end" : "items-center" + let boxWidthClassName = title != "" ? "" : "w-16" React.useEffect1(() => { let (text, color) = getLabel(value->Belt.Float.fromString->Belt.Option.getWithDefault(0.0)) @@ -76,11 +79,11 @@ let make = ( <>
-
+

{title->str}

titleNeighbour
-
+
- {prescription_type === "REGULAR" && ( -
- - - {t("edit_prescriptions")} - {t("edit")} - - setShowBulkAdminister(true)} - className="w-full lg:w-auto" - > - - - {t("administer_medicines")} - - {t("administer")} - -
- )}
@@ -209,63 +113,6 @@ export default function PrescriptionsTable({ } objectKeys={Object.values(tkeys)} fieldsToDisplay={[2, 3]} - actions={ - !readonly - ? (med: Prescription) => { - if (med.prescription_type === "DISCHARGE") { - return ( -
- - {t("discharge_prescription")} - -
- ); - } - - if (med.discontinued) { - return ( -
- - {t("discontinued")} -
- ); - } - - return ( -
- { - e.stopPropagation(); - setShowAdministerFor(med); - }} - > - - {t("administer")} - - { - e.stopPropagation(); - setShowDiscontinueFor(med); - }} - > - - {t("discontinue")} - -
- ); - } - : undefined - } /> {data?.results.length === 0 && (
diff --git a/src/Components/Medicine/PrescrpitionTimeline.tsx b/src/Components/Medicine/PrescrpitionTimeline.tsx index 9422d349b3a..f26957f63c6 100644 --- a/src/Components/Medicine/PrescrpitionTimeline.tsx +++ b/src/Components/Medicine/PrescrpitionTimeline.tsx @@ -15,6 +15,7 @@ import ConfirmDialog from "../Common/ConfirmDialog"; import request from "../../Utils/request/request"; import RecordMeta from "../../CAREUI/display/RecordMeta"; import CareIcon from "../../CAREUI/icons/CareIcon"; +import { AuthorizedForConsultationRelatedActions } from "../../CAREUI/misc/AuthorizedChild"; interface MedicineAdministeredEvent extends TimelineEvent<"administered"> { administration: MedicineAdministrationRecord; @@ -131,15 +132,17 @@ const MedicineAdministeredNode = ({ actions={ !event.cancelled && !hideArchive && ( - setShowArchiveConfirmation(true)} - > - Archive - + + setShowArchiveConfirmation(true)} + > + Archive + + ) } isLast={isLastNode} diff --git a/src/Components/Patient/ManagePatients.tsx b/src/Components/Patient/ManagePatients.tsx index b9a5cc6f34c..ac716f7bf45 100644 --- a/src/Components/Patient/ManagePatients.tsx +++ b/src/Components/Patient/ManagePatients.tsx @@ -77,13 +77,6 @@ function TabPanel(props: TabPanelProps) { ); } -const PatientCategoryDisplayText: Record = { - "Comfort Care": "COMFORT CARE", - Stable: "STABLE", - Abnormal: "ABNORMAL", - Critical: "CRITICAL", -}; - export const PatientManager = () => { const { t } = useTranslation(); const { @@ -164,7 +157,6 @@ export const PatientManager = () => { is_active: !qParams.last_consultation__new_discharge_reason && (qParams.is_active || "True"), - disease_status: qParams.disease_status || undefined, phone_number: qParams.phone_number ? parsePhoneNumber(qParams.phone_number) : undefined, @@ -189,8 +181,6 @@ export const PatientManager = () => { qParams.date_declared_positive_before || undefined, date_declared_positive_after: qParams.date_declared_positive_after || undefined, - date_of_result_before: qParams.date_of_result_before || undefined, - date_of_result_after: qParams.date_of_result_after || undefined, last_consultation_medico_legal_case: qParams.last_consultation_medico_legal_case || undefined, last_consultation_encounter_date_before: @@ -207,7 +197,6 @@ export const PatientManager = () => { qParams.last_consultation__new_discharge_reason || undefined, last_consultation_current_bed__location: qParams.last_consultation_current_bed__location || undefined, - srf_id: qParams.srf_id || undefined, number_of_doses: qParams.number_of_doses || undefined, covin_id: qParams.covin_id || undefined, is_kasp: qParams.is_kasp || undefined, @@ -259,7 +248,6 @@ export const PatientManager = () => { [params.created_date_before, params.created_date_after], [params.modified_date_before, params.modified_date_after], [params.date_declared_positive_before, params.date_declared_positive_after], - [params.date_of_result_before, params.date_of_result_after], [params.last_vaccinated_date_before, params.last_vaccinated_date_after], [ params.last_consultation_encounter_date_before, @@ -478,7 +466,7 @@ export const PatientManager = () => { className={`absolute inset-y-0 left-0 flex h-full w-1 items-center rounded-l-lg transition-all duration-200 ease-in-out group-hover:w-5 ${categoryClass}`} > - {category ? PatientCategoryDisplayText[category] : "UNKNOWN"} + {category || "UNKNOWN"}
@@ -595,14 +583,6 @@ export const PatientManager = () => { text={`IP Days: ${dayjs().diff(patient.last_consultation.encounter_date, "day")}`} /> )} - {patient.disease_status === "POSITIVE" && ( - - )} {patient.gender === 2 && patient.is_antenatal && isAntenatal(patient.last_menstruation_start_date) && @@ -624,14 +604,6 @@ export const PatientManager = () => { text="Medical Worker" /> )} - {patient.disease_status === "EXPIRED" && ( - - )} {(!patient.last_consultation || patient.last_consultation?.facility !== patient.facility || (patient.last_consultation?.discharge_date && @@ -1009,7 +981,6 @@ export const PatientManager = () => { ), ordering(), value("Category", "category", getTheCategoryFromId()), - badge("Disease Status", "disease_status"), value( "Respiratory Support", "ventilator_interface", @@ -1027,7 +998,6 @@ export const PatientManager = () => { paramKey: "last_consultation_admitted_to", }, ...range("Age", "age"), - badge("SRF ID", "srf_id"), { name: "LSG Body", value: qParams.lsgBody ? LocalBodyData?.name || "" : "", @@ -1041,7 +1011,6 @@ export const PatientManager = () => { ), ), badge("Declared Status", "is_declared_positive"), - ...dateRange("Result", "date_of_result"), ...dateRange("Declared positive", "date_declared_positive"), ...dateRange( "Symptoms onset", diff --git a/src/Components/Patient/PatientFilter.tsx b/src/Components/Patient/PatientFilter.tsx index 7c68dce8fbc..0d8ebaae2b0 100644 --- a/src/Components/Patient/PatientFilter.tsx +++ b/src/Components/Patient/PatientFilter.tsx @@ -4,7 +4,6 @@ import FiltersSlideover from "../../CAREUI/interactive/FiltersSlideover"; import { ADMITTED_TO, DISCHARGE_REASONS, - DISEASE_STATUS, FACILITY_TYPES, GENDER_TYPES, PATIENT_FILTER_CATEGORIES, @@ -51,18 +50,14 @@ export default function PatientFilter(props: any) { district_ref: null, date_declared_positive_before: filter.date_declared_positive_before || null, date_declared_positive_after: filter.date_declared_positive_after || null, - date_of_result_before: filter.date_of_result_before || null, - date_of_result_after: filter.date_of_result_after || null, created_date_before: filter.created_date_before || null, created_date_after: filter.created_date_after || null, modified_date_before: filter.modified_date_before || null, modified_date_after: filter.modified_date_after || null, category: filter.category || null, gender: filter.gender || null, - disease_status: filter.disease_status || null, age_min: filter.age_min || null, age_max: filter.age_max || null, - date_of_result: filter.date_of_result || null, date_declared_positive: filter.date_declared_positive || null, last_consultation_medico_legal_case: filter.last_consultation_medico_legal_case || null, @@ -82,7 +77,6 @@ export default function PatientFilter(props: any) { filter.last_consultation_current_bed__location || "", last_consultation__new_discharge_reason: filter.last_consultation__new_discharge_reason || null, - srf_id: filter.srf_id || null, number_of_doses: filter.number_of_doses || null, covin_id: filter.covin_id || null, is_kasp: filter.is_kasp || null, @@ -169,18 +163,14 @@ export default function PatientFilter(props: any) { lsgBody, date_declared_positive_before, date_declared_positive_after, - date_of_result_before, - date_of_result_after, created_date_before, created_date_after, modified_date_before, modified_date_after, category, gender, - disease_status, age_min, age_max, - date_of_result, last_consultation_medico_legal_case, last_consultation_encounter_date_before, last_consultation_encounter_date_after, @@ -191,7 +181,6 @@ export default function PatientFilter(props: any) { last_consultation_current_bed__location, number_of_doses, covin_id, - srf_id, is_kasp, is_declared_positive, last_consultation_symptoms_onset_date_before, @@ -221,13 +210,10 @@ export default function PatientFilter(props: any) { date_declared_positive_after: dateQueryString( date_declared_positive_after, ), - date_of_result_before: dateQueryString(date_of_result_before), - date_of_result_after: dateQueryString(date_of_result_after), created_date_before: dateQueryString(created_date_before), created_date_after: dateQueryString(created_date_after), modified_date_before: dateQueryString(modified_date_before), modified_date_after: dateQueryString(modified_date_after), - date_of_result: dateQueryString(date_of_result), last_consultation_medico_legal_case: last_consultation_medico_legal_case || "", last_consultation_encounter_date_before: dateQueryString( @@ -244,15 +230,12 @@ export default function PatientFilter(props: any) { ), category: category || "", gender: gender || "", - disease_status: - (disease_status == "Show All" ? "" : disease_status) || "", age_min: age_min || "", age_max: age_max || "", last_consultation_admitted_bed_type_list: last_consultation_admitted_bed_type_list || [], last_consultation__new_discharge_reason: last_consultation__new_discharge_reason || "", - srf_id: srf_id || "", number_of_doses: number_of_doses || "", covin_id: covin_id || "", is_kasp: is_kasp || "", @@ -362,26 +345,31 @@ export default function PatientFilter(props: any) { />
-
- Admitted to (Bed Types) - o.id} - optionLabel={(o) => o.text} - onChange={(o) => - setFilterState({ - ...filterState, - last_consultation_admitted_bed_type_list: o, - }) - } - /> -
- {["StateAdmin", "StateReadOnlyAdmin"].includes( - authUser.user_type, - ) && ( + {props.dischargePage || ( +
+ + {props.dischargePage && "Last "}Admitted to (Bed Types) + + o.id} + optionLabel={(o) => o.text} + onChange={(o) => + setFilterState({ + ...filterState, + last_consultation_admitted_bed_type_list: o, + }) + } + /> +
+ )} + {(props.dischargePage || + ["StateAdmin", "StateReadOnlyAdmin"].includes( + authUser.user_type, + )) && (
Discharge Reason
-
+ {/*
Is Antenatal o === "true" ? "Antenatal" : "Non-antenatal" } - optionDescription={(o) => - o === "true" - ? "i.e., last menstruation start date is within the last 9 months" - : undefined - } value={filterState.is_antenatal} onChange={(v) => setFilterState({ ...filterState, is_antenatal: v }) } /> -
+
*/}
- Review Missed - (o === "true" ? "Yes" : "No")} - value={filterState.review_missed} - onChange={(v) => - setFilterState({ ...filterState, review_missed: v }) - } - /> + {props.dischargePage || ( + <> + Review Missed + (o === "true" ? "Yes" : "No")} + value={filterState.review_missed} + onChange={(v) => + setFilterState({ ...filterState, review_missed: v }) + } + /> + + )}
Is Medico-Legal Case @@ -585,16 +572,18 @@ export default function PatientFilter(props: any) { className="rounded-md" >
-
- Facility - setFilterWithRef("facility", obj)} - /> -
+ {!props.dischargePage && ( +
+ Facility + setFilterWithRef("facility", obj)} + /> +
+ )} {filterState.facility && (
Location @@ -613,22 +602,24 @@ export default function PatientFilter(props: any) { />
)} -
- Facility type - o.text} - optionValue={(o) => o.text} - value={filterState.facility_type} - onChange={(v) => - setFilterState({ ...filterState, facility_type: v }) - } - optionIcon={() => ( - - )} - /> -
+ {!props.dischargePage && ( +
+ Facility type + o.text} + optionValue={(o) => o.text} + value={filterState.facility_type} + onChange={(v) => + setFilterState({ ...filterState, facility_type: v }) + } + optionIcon={() => ( + + )} + /> +
+ )}
LSG Body
@@ -680,18 +671,6 @@ export default function PatientFilter(props: any) {
)} -
- COVID Disease status - o} - value={filterState.disease_status} - onChange={(v) => - setFilterState({ ...filterState, disease_status: v }) - } - /> -
COVID Vaccinated
-
- SRF ID} - value={filterState.srf_id} - onChange={handleFormFieldChange} - errorClassName="hidden" - /> -
- { {patientData.name} - {formatPatientAge(patientData, true)}
- {patientData.is_vaccinated ? ( + {patientData.is_vaccinated && ( - ) : ( - )} {patientData.allow_transfer ? ( { )} )} - {patientData.contact_with_confirmed_carrier && ( - - )} - {patientData.contact_with_suspected_carrier && ( - - )} {patientData.past_travel && ( { activeShiftingData.results.map((shift: any) => (
-
+
diff --git a/src/Components/Patient/PatientInfoCard.tsx b/src/Components/Patient/PatientInfoCard.tsx index cd99d169544..7a88c478bba 100644 --- a/src/Components/Patient/PatientInfoCard.tsx +++ b/src/Components/Patient/PatientInfoCard.tsx @@ -37,7 +37,27 @@ import { Mews } from "../Facility/Consultations/Mews.js"; import DischargeSummaryModal from "../Facility/DischargeSummaryModal.js"; import DischargeModal from "../Facility/DischargeModal.js"; import { useTranslation } from "react-i18next"; +import useQuery from "../../Utils/request/useQuery.js"; import FetchRecordsModal from "../ABDM/FetchRecordsModal.js"; +import { SkillModel } from "../Users/models.js"; + +const formatSkills = (arr: SkillModel[]) => { + const skills = arr.map((skill) => skill.skill_object.name); + + if (skills.length === 1) { + return skills[0]; + } + + if (skills.length === 2) { + return `${skills[0]} and ${skills[1]}`; + } + + if (skills.length === 3) { + return `${skills[0]}, ${skills[1]} and ${skills[2]}`; + } + + return `${skills[0]}, ${skills[1]} and ${skills.length - 2} other skills...`; +}; export default function PatientInfoCard(props: { patient: PatientModel; @@ -113,6 +133,12 @@ export default function PatientInfoCard(props: { return false; }; + const skillsQuery = useQuery(routes.userListSkill, { + pathParams: { + username: consultation?.treating_physician_object?.username ?? "", + }, + prefetch: !!consultation?.treating_physician_object?.username, + }); return ( <> @@ -450,7 +476,7 @@ export default function PatientInfoCard(props: { : null} {(consultation?.treating_physician_object || consultation?.deprecated_verified_by) && ( -
+ {t("treating_doctor")}:{" "} @@ -459,9 +485,21 @@ export default function PatientInfoCard(props: { : consultation?.deprecated_verified_by} -
+
+ + {!!skillsQuery.data?.results?.length && + formatSkills(skillsQuery.data?.results)} + {(skillsQuery.data?.results?.length || 0) > 3 && ( +
    + {skillsQuery.data?.results.map((skill) => ( +
  • {skill.skill_object.name}
    • + ))} +
+ )} + + )}
diff --git a/src/Components/Patient/PatientRegister.tsx b/src/Components/Patient/PatientRegister.tsx index c62ad2a8a0d..07e682c137f 100644 --- a/src/Components/Patient/PatientRegister.tsx +++ b/src/Components/Patient/PatientRegister.tsx @@ -2,11 +2,9 @@ import * as Notification from "../../Utils/Notifications.js"; import { BLOOD_GROUPS, - DISEASE_STATUS, GENDER_TYPES, MEDICAL_HISTORY_CHOICES, OCCUPATION_TYPES, - TEST_TYPE, VACCINES, } from "../../Common/constants"; import { @@ -89,11 +87,9 @@ const medicalHistoryChoices = MEDICAL_HISTORY_CHOICES.reduce( [], ); const genderTypes = GENDER_TYPES; -const diseaseStatus = [...DISEASE_STATUS]; const bloodGroups = [...BLOOD_GROUPS]; const occupationTypes = OCCUPATION_TYPES; -const testType = [...TEST_TYPE]; -const vaccines = ["Select", ...VACCINES]; +const vaccines = [...VACCINES]; const initForm: any = { name: "", @@ -103,7 +99,6 @@ const initForm: any = { phone_number: "+91", emergency_phone_number: "+91", blood_group: "", - disease_status: diseaseStatus[2], is_declared_positive: "false", date_declared_positive: new Date(), date_of_birth: null, @@ -121,25 +116,13 @@ const initForm: any = { allergies: "", pincode: "", present_health: "", - contact_with_confirmed_carrier: "false", - contact_with_suspected_carrier: "false", - - estimated_contact_date: null, date_of_return: null, - - number_of_primary_contacts: "", - number_of_secondary_contacts: "", is_antenatal: "false", date_of_test: null, - date_of_result: null, - test_id: "", - srf_id: "", - test_type: testType[0], treatment_plan: false, ongoing_medication: "", designation_of_health_care_worker: "", instituion_of_health_care_worker: "", - cluster_name: "", covin_id: "", is_vaccinated: "false", number_of_doses: "0", @@ -323,14 +306,6 @@ export const PatientRegister = (props: PatientRegisterProps) => { ? parseGenderFromExt(data.gender, state.form.gender) : state.form.gender, }); - field.onChange({ - name: "test_id", - value: data.test_id ? data.test_id : state.form.test_id, - }); - field.onChange({ - name: "srf_id", - value: data.srf_id ? data.srf_id : state.form.srf_id, - }); field.onChange({ name: "state", value: data.district_object @@ -353,28 +328,12 @@ export const PatientRegister = (props: PatientRegisterProps) => { name: "village", value: data.village ? data.village : state.form.village, }); - field.onChange({ - name: "disease_status", - value: data.result - ? data.result.toUpperCase() - : state.form.disease_status, - }); - field.onChange({ - name: "test_type", - value: data.test_type - ? data.test_type.toUpperCase() - : state.form.test_type, - }); field.onChange({ name: "date_of_test", value: data.sample_collection_date ? data.sample_collection_date : state.form.date_of_test, }); - field.onChange({ - name: "date_of_result", - value: data.result_date ? data.result_date : state.form.date_of_result, - }); field.onChange({ name: "phone_number", value: data.mobile_number @@ -416,7 +375,6 @@ export const PatientRegister = (props: PatientRegisterProps) => { health_id: data.abha_number_object?.health_id || "", nationality: data.nationality ? data.nationality : "India", gender: data.gender ? data.gender : undefined, - cluster_name: data.cluster_name ? data.cluster_name : "", state: data.state ? data.state : "", district: data.district ? data.district : "", blood_group: data.blood_group @@ -453,19 +411,6 @@ export const PatientRegister = (props: PatientRegisterProps) => { occupation: data.meta_info?.occupation ? parseOccupationFromExt(data.meta_info.occupation) : null, - - number_of_primary_contacts: data.number_of_primary_contacts - ? data.number_of_primary_contacts - : "", - number_of_secondary_contacts: data.number_of_secondary_contacts - ? data.number_of_secondary_contacts - : "", - contact_with_confirmed_carrier: data.contact_with_confirmed_carrier - ? String(data.contact_with_confirmed_carrier) - : "false", - contact_with_suspected_carrier: data.contact_with_suspected_carrier - ? String(data.contact_with_suspected_carrier) - : "false", is_vaccinated: String(data.is_vaccinated), number_of_doses: data.number_of_doses ? String(data.number_of_doses) @@ -645,39 +590,11 @@ export const PatientRegister = (props: PatientRegisterProps) => { errors[field] = "Please enter valid phone number"; } return; - - case "estimated_contact_date": - if ( - JSON.parse(form.contact_with_confirmed_carrier) || - JSON.parse(form.contact_with_suspected_carrier) - ) { - if (!form[field]) { - errors[field] = "Please enter the estimated date of contact"; - } - } - return; - case "cluster_name": - if ( - JSON.parse(form.contact_with_confirmed_carrier) || - JSON.parse(form.contact_with_suspected_carrier) - ) { - if (!form[field]) { - errors[field] = "Please enter the name / cluster of the contact"; - } - } - return; case "blood_group": if (!form[field]) { errors[field] = "Please select a blood group"; } return; - case "number_of_primary_contacts": - case "number_of_secondary_contacts": - if (form[field] && form[field] < 0) { - errors[field] = "Value cannot be negative"; - } - return; - case "is_vaccinated": if (form.is_vaccinated === "true") { if (form.number_of_doses === "0") { @@ -694,23 +611,6 @@ export const PatientRegister = (props: PatientRegisterProps) => { } } return; - - case "date_of_result": - if (form[field] < form.date_of_test) { - errors[field] = - "Date should not be before the date of sample collection"; - } - return; - case "disease_status": - if (form[field] === "POSITIVE") { - if (!form.date_of_test) { - errors["date_of_test"] = "Please fill the date of sample testing"; - } - if (!form.date_of_result) { - errors["date_of_result"] = "Please fill the date of result"; - } - } - return; case "medical_history": if (!form[field].length) { errors[field] = "Please fill the medical history"; @@ -780,18 +680,12 @@ export const PatientRegister = (props: PatientRegisterProps) => { ? dateQueryString(formData.date_of_birth) : null, year_of_birth: ageInputType === "age" ? formData.year_of_birth : null, - disease_status: formData.disease_status, date_of_test: formData.date_of_test ? formData.date_of_test : undefined, - date_of_result: formData.date_of_result - ? formData.date_of_result - : undefined, date_declared_positive: JSON.parse(formData.is_declared_positive) && formData.date_declared_positive ? formData.date_declared_positive : null, - test_id: formData.test_id, - srf_id: formData.srf_id, covin_id: formData.is_vaccinated === "true" ? formData.covin_id : undefined, is_vaccinated: formData.is_vaccinated, @@ -811,7 +705,6 @@ export const PatientRegister = (props: PatientRegisterProps) => { ? formData.last_vaccinated_date : null : null, - test_type: formData.test_type, name: _.startCase(_.toLower(formData.name)), pincode: formData.pincode ? formData.pincode : undefined, gender: Number(formData.gender), @@ -847,33 +740,7 @@ export const PatientRegister = (props: PatientRegisterProps) => { present_health: formData.present_health ? formData.present_health : undefined, - contact_with_confirmed_carrier: JSON.parse( - formData.contact_with_confirmed_carrier, - ), - contact_with_suspected_carrier: JSON.parse( - formData.contact_with_suspected_carrier, - ), - estimated_contact_date: - (JSON.parse(formData.contact_with_confirmed_carrier) || - JSON.parse(formData.contact_with_suspected_carrier)) && - formData.estimated_contact_date - ? formData.estimated_contact_date - : null, - cluster_name: - (JSON.parse(formData.contact_with_confirmed_carrier) || - JSON.parse(formData.contact_with_suspected_carrier)) && - formData.cluster_name - ? formData.cluster_name - : null, allergies: formData.allergies, - number_of_primary_contacts: Number(formData.number_of_primary_contacts) - ? Number(formData.number_of_primary_contacts) - : undefined, - number_of_secondary_contacts: Number( - formData.number_of_secondary_contacts, - ) - ? Number(formData.number_of_secondary_contacts) - : undefined, ongoing_medication: formData.ongoing_medication, is_declared_positive: JSON.parse(formData.is_declared_positive), designation_of_health_care_worker: @@ -1864,7 +1731,7 @@ export const PatientRegister = (props: PatientRegisterProps) => { >
-
+
{ optionValue={(option) => option.value} />
-
- option.label} - optionValue={(option) => option.value} - /> -
-
- option.label} - optionValue={(option) => option.value} - /> -
{
} - -
-
- -
- -
- -
-
- -
- o} - optionValue={(o) => o} - required - /> -
-
- o} - optionValue={(o) => o} - required - /> -
-
- -
+
+
{
-
- -
-
{ position="LEFT" />
-
- -
- -
- -
-
- -
diff --git a/src/Components/Patient/models.tsx b/src/Components/Patient/models.tsx index 81a06ff659d..b6f6fae7ea2 100644 --- a/src/Components/Patient/models.tsx +++ b/src/Components/Patient/models.tsx @@ -49,7 +49,6 @@ export interface AbhaObject { } export interface PatientModel { - test_id?: string; id?: string; action?: number; name?: string; @@ -87,19 +86,14 @@ export interface PatientModel { sameAddress?: boolean; village?: string; pincode?: number; - contact_with_confirmed_carrier?: boolean; - contact_with_suspected_carrier?: boolean; is_medical_worker?: boolean; designation_of_health_care_worker?: string; instituion_of_health_care_worker?: string; frontline_worker?: string; - estimated_contact_date?: string; past_travel?: boolean; ongoing_medication?: string; countries_travelled?: Array; transit_details?: string; - number_of_primary_contacts?: number; - number_of_secondary_contacts?: number; present_health?: string; has_SARI?: boolean; local_body?: number; @@ -107,11 +101,8 @@ export interface PatientModel { state?: number; nationality?: string; passport_no?: string; - disease_status?: string; - test_type?: string; date_of_test?: string; - date_of_result?: string; - srf_id?: string; + date_of_result?: string; // keeping this to avoid errors in Death report covin_id?: string; is_vaccinated?: boolean; vaccine_name?: string; @@ -124,7 +115,6 @@ export interface PatientModel { review_interval?: number; review_time?: string; date_of_return?: string; - cluster_name?: string; number_of_aged_dependents?: number; number_of_chronic_diseased_dependents?: number; will_donate_blood?: boolean; diff --git a/src/Components/Shifting/BadgesList.tsx b/src/Components/Shifting/BadgesList.tsx index 4490d948cbd..b16d831a96b 100644 --- a/src/Components/Shifting/BadgesList.tsx +++ b/src/Components/Shifting/BadgesList.tsx @@ -48,7 +48,6 @@ export default function BadgesList(props: any) { badge(t("patient_name"), "patient_name"), ...dateRange(t("created"), "created_date"), ...dateRange(t("modified"), "modified_date"), - badge(t("disease_status"), "disease_status"), badge(t("breathlessness_level"), "breathlessness_level"), value( t("assigned_to"), diff --git a/src/Components/Shifting/Commons.tsx b/src/Components/Shifting/Commons.tsx index 57f0b1f8209..284b6e4ce5a 100644 --- a/src/Components/Shifting/Commons.tsx +++ b/src/Components/Shifting/Commons.tsx @@ -19,7 +19,6 @@ export const initialFilterData = { ordering: null, is_kasp: "", assigned_to: "", - disease_status: "", is_antenatal: "", breathlessness_level: "", }; @@ -55,7 +54,6 @@ export const formatFilter = (params: any) => { patient_phone_number: filter.patient_phone_number || undefined, ordering: filter.ordering || undefined, assigned_to: filter.assigned_to || undefined, - disease_status: filter.disease_status || undefined, breathlessness_level: filter.breathlessness_level || undefined, is_kasp: (filter.is_kasp && filter.is_kasp) === "" diff --git a/src/Components/Shifting/ListFilter.tsx b/src/Components/Shifting/ListFilter.tsx index 09393dfdb5c..af98f524ed2 100644 --- a/src/Components/Shifting/ListFilter.tsx +++ b/src/Components/Shifting/ListFilter.tsx @@ -1,6 +1,5 @@ import { BREATHLESSNESS_LEVEL, - DISEASE_STATUS, SHIFTING_FILTER_ORDER, } from "../../Common/constants"; import { DateRange } from "../Common/DateRangeInputV2"; @@ -60,7 +59,6 @@ export default function ListFilter(props: any) { status: filter.status || null, assigned_user_ref: null, assigned_to: filter.assigned_to || "", - disease_status: filter.disease_status || "", is_antenatal: filter.is_antenatal || "", breathlessness_level: filter.breathlessness_level || "", @@ -155,7 +153,6 @@ export default function ListFilter(props: any) { is_kasp, status, assigned_to, - disease_status, is_antenatal, breathlessness_level, } = filterState; @@ -177,7 +174,6 @@ export default function ListFilter(props: any) { is_kasp: is_kasp || "", status: status || "", assigned_to: assigned_to || "", - disease_status: disease_status || "", is_antenatal: is_antenatal || "", breathlessness_level: breathlessness_level || "", }; @@ -340,19 +336,6 @@ export default function ListFilter(props: any) { errorClassName="hidden" /> - option} - optionValue={(option) => option} - onChange={(option) => handleFormFieldChange(option)} - errorClassName="hidden" - /> - (
-
+
diff --git a/src/Components/Shifting/ShiftDetails.tsx b/src/Components/Shifting/ShiftDetails.tsx index 5d29e0c890a..457f110c271 100644 --- a/src/Components/Shifting/ShiftDetails.tsx +++ b/src/Components/Shifting/ShiftDetails.tsx @@ -4,7 +4,6 @@ import { GENDER_TYPES, SHIFTING_CHOICES_PEACETIME, SHIFTING_CHOICES_WARTIME, - TEST_TYPE_CHOICES, } from "../../Common/constants"; import { Link, navigate } from "raviger"; import { lazy, useState } from "react"; @@ -85,10 +84,6 @@ export default function ShiftDetails(props: { id: string }) { const copyContent = (data: any) => { let formattedText = - t("disease_status") + - ": *" + - data?.patient_object?.disease_status + - "* \n" + t("name") + ":" + data?.patient_object?.name + @@ -129,9 +124,6 @@ export default function ShiftDetails(props: { id: string }) { const patientGender = GENDER_TYPES.find( (i) => i.id === patientData?.gender, )?.text; - const testType = TEST_TYPE_CHOICES.find( - (i) => i.id === patientData?.test_type, - )?.text; return (
@@ -150,20 +142,6 @@ export default function ShiftDetails(props: { id: string }) { {t("yes")}
)} -
- - {t("disease_status")}{" "} - - - {patientData?.disease_status} - -
-
- - {t("test_type")}:{" "} - - {(patientData?.test_type && testType) || "-"} -
{t("facility")}:{" "} @@ -319,9 +297,6 @@ export default function ShiftDetails(props: { id: string }) { const patientGender = GENDER_TYPES.find( (i) => i.id === patientData?.gender, )?.text; - const testType = TEST_TYPE_CHOICES.find( - (i) => i.id === patientData?.test_type, - )?.text; return (
@@ -427,12 +402,6 @@ export default function ShiftDetails(props: { id: string }) { formatDateTime(patientData?.date_of_test)) || "-"}
-
- - {t("test_type")}:{" "} - - {(patientData?.test_type && testType) || "-"} -
{/*
diff --git a/src/Components/Shifting/ShiftingBoard.tsx b/src/Components/Shifting/ShiftingBoard.tsx index 088f3d66276..3203b5027f5 100644 --- a/src/Components/Shifting/ShiftingBoard.tsx +++ b/src/Components/Shifting/ShiftingBoard.tsx @@ -82,12 +82,7 @@ const ShiftCard = ({ shift, filter }: any) => { cursor: isDragging ? "grabbing" : "grab", }} > -
+
@@ -316,7 +311,6 @@ export default function ShiftingBoard({ filterProp.ordering, filterProp.is_kasp, filterProp.assigned_to, - filterProp.disease_status, filterProp.is_antenatal, filterProp.breathlessness_level, ]);