Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Search UI for discharge patients #9320

Merged
Merged
Changes from 6 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
2005d1d
added search ui
Mahendar0701 Dec 6, 2024
0812047
added loading
Mahendar0701 Dec 6, 2024
5771207
handling loading
Mahendar0701 Dec 6, 2024
0fc4605
Merge branch 'develop' into search-ui-for-discharge-patients
Mahendar0701 Dec 6, 2024
89956a6
handled loading state
Mahendar0701 Dec 7, 2024
1ee55dd
refactored handlSearch
Mahendar0701 Dec 7, 2024
3d2a7b3
removed unused usestate
Mahendar0701 Dec 7, 2024
a8406ed
reordered search buttons
Mahendar0701 Dec 8, 2024
35d9453
Merge branch 'develop' into search-ui-for-discharge-patients
Mahendar0701 Dec 9, 2024
12f3b6e
Merge branch 'develop' into search-ui-for-discharge-patients
Mahendar0701 Dec 10, 2024
9f52905
added absolute imports
Mahendar0701 Dec 11, 2024
2a52bfc
Merge branch 'develop' into search-ui-for-discharge-patients
Mahendar0701 Dec 11, 2024
06ab022
Merge branch 'develop' into search-ui-for-discharge-patients
Mahendar0701 Dec 11, 2024
0af0dd2
Merge branch 'develop' into search-ui-for-discharge-patients
Mahendar0701 Dec 11, 2024
2152169
Merge branch 'develop' into search-ui-for-discharge-patients
Mahendar0701 Dec 11, 2024
bc539f8
Merge branch 'develop' into search-ui-for-discharge-patients
Mahendar0701 Dec 12, 2024
a5b2cb3
changes
Mahendar0701 Dec 12, 2024
26ca581
Update src/components/Facility/DischargedPatientsList.tsx
rithviknishad Dec 13, 2024
459f3e2
Merge branch 'develop' into search-ui-for-discharge-patients
Mahendar0701 Dec 13, 2024
4d27d99
Merge branch 'search-ui-for-discharge-patients' of https://github.com…
Mahendar0701 Dec 13, 2024
89be10a
Merge branch 'develop' into search-ui-for-discharge-patients
Mahendar0701 Dec 15, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
204 changes: 97 additions & 107 deletions src/components/Facility/DischargedPatientsList.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Link, navigate } from "raviger";
import { useEffect, useState } from "react";
import { useCallback, useEffect, useState } from "react";
import { useTranslation } from "react-i18next";

import CountBlock from "@/CAREUI/display/Count";
Expand All @@ -15,9 +15,6 @@ import SortDropdownMenu from "@/components/Common/SortDropdown";
import Tabs from "@/components/Common/Tabs";
import { getDiagnosesByIds } from "@/components/Diagnosis/utils";
import { ICD11DiagnosisModel } from "@/components/Facility/models";
import PhoneNumberFormField from "@/components/Form/FormFields/PhoneNumberFormField";
import { FieldChangeEvent } from "@/components/Form/FormFields/Utils";
import SearchInput from "@/components/Form/SearchInput";
import {
DIAGNOSES_FILTER_LABELS,
DiagnosesFilterKey,
Expand All @@ -42,6 +39,8 @@ import routes from "@/Utils/request/api";
import useQuery from "@/Utils/request/useQuery";
import { formatPatientAge, humanizeStrings } from "@/Utils/utils";

import SearchByMultipleFields from "../Common/SearchByMultipleFields";
Mahendar0701 marked this conversation as resolved.
Show resolved Hide resolved

const DischargedPatientsList = ({
facility_external_id,
}: {
Expand All @@ -52,16 +51,79 @@ const DischargedPatientsList = ({
pathParams: { id: facility_external_id },
});

const { qParams, updateQuery, advancedFilter, FilterBadges, updatePage } =
useFilters({
limit: 12,
cacheBlacklist: [
"name",
"patient_no",
"phone_number",
"emergency_phone_number",
],
});
const {
qParams,
updateQuery,
advancedFilter,
FilterBadges,
updatePage,
clearSearch,
} = useFilters({
limit: 12,
cacheBlacklist: [
"name",
"patient_no",
"phone_number",
"emergency_phone_number",
],
});

const searchOptions = [
{
key: "phone_number",
label: "Phone Number",
type: "phone" as const,
placeholder: "Search_by_phone_number",
value: qParams.phone_number || "",
shortcutKey: "p",
},
{
key: "name",
label: "Name",
type: "text" as const,
placeholder: "search_by_patient_name",
value: qParams.name || "",
shortcutKey: "n",
},
{
key: "patient_no",
label: "IP/OP No",
type: "text" as const,
placeholder: "search_by_patient_no",
value: qParams.patient_no || "",
shortcutKey: "u",
},
{
key: "emergency_contact_number",
label: "Emergency Contact Phone Number",
type: "phone" as const,
placeholder: "search_by_emergency_phone_number",
value: qParams.emergency_phone_number || "",
shortcutKey: "e",
},
];

const handleSearch = useCallback(
(key: string, value: string) => {
const isValidPhoneNumber = (val: string) =>
val.length >= 13 || val === "";

const updatedQuery = {
phone_number:
key === "phone_number" && isValidPhoneNumber(value)
? value
: undefined,
name: key === "name" ? value : undefined,
patient_no: key === "patient_no" ? value : undefined,
emergency_phone_number:
key === "emergency_contact_number" && isValidPhoneNumber(value)
? value
: undefined,
};
updateQuery(updatedQuery);
},
[updateQuery],
);

useEffect(() => {
if (!qParams.phone_number && phone_number.length >= 13) {
Expand Down Expand Up @@ -200,56 +262,12 @@ const DischargedPatientsList = ({
});
};

const queryField = <T,>(name: string, defaultValue?: T) => {
return {
name,
value: qParams[name] || defaultValue,
onChange: (e: FieldChangeEvent<T>) => updateQuery({ [e.name]: e.value }),
className: "grow w-full mb-2",
};
};
const [diagnoses, setDiagnoses] = useState<ICD11DiagnosisModel[]>([]);
const [phone_number, setPhoneNumber] = useState("");
const [phoneNumberError, setPhoneNumberError] = useState("");
const [emergency_phone_number, setEmergencyPhoneNumber] = useState("");
const [emergencyPhoneNumberError, setEmergencyPhoneNumberError] =
useState("");
useState("");
Mahendar0701 marked this conversation as resolved.
Show resolved Hide resolved
const [count, setCount] = useState(0);

const setPhoneNum = (phone_number: string) => {
setPhoneNumber(phone_number);
if (phone_number.length >= 13) {
setPhoneNumberError("");
updateQuery({ phone_number });
return;
}

if (phone_number === "+91" || phone_number === "") {
setPhoneNumberError("");
qParams.phone_number && updateQuery({ phone_number: null });
return;
}

setPhoneNumberError("Enter a valid number");
};

const setEmergencyPhoneNum = (emergency_phone_number: string) => {
setEmergencyPhoneNumber(emergency_phone_number);
if (emergency_phone_number.length >= 13) {
setEmergencyPhoneNumberError("");
updateQuery({ emergency_phone_number });
return;
}

if (emergency_phone_number === "+91" || emergency_phone_number === "") {
setEmergencyPhoneNumberError("");
qParams.emergency_phone_number &&
updateQuery({ emergency_phone_number: null });
return;
}

setEmergencyPhoneNumberError("Enter a valid number");
};
const [isLoading, setIsLoading] = useState(false);

return (
<Page
Expand Down Expand Up @@ -281,53 +299,22 @@ const DischargedPatientsList = ({
</>
}
>
<div className="manualGrid my-4 mb-[-12px] mt-5 grid-cols-1 gap-3 px-2 sm:grid-cols-4 md:px-0">
<div className="mt-2 flex h-full flex-col gap-3 xl:flex-row">
<div className="flex-1">
<CountBlock
text="Discharged Patients"
count={count}
loading={facilityQuery.loading}
icon="d-patient"
className="pb-12"
/>
</div>
</div>
<div className="col-span-3 w-full">
<div className="col-span-2 mt-2">
<div className="mt-1 md:flex md:gap-4">
<SearchInput
label="Search by Patient"
placeholder="Enter patient name"
{...queryField("name")}
/>
<SearchInput
label="Search by IP/OP Number"
placeholder="Enter IP/OP Number"
secondary
{...queryField("patient_no")}
/>
</div>
<div className="md:flex md:gap-4">
<PhoneNumberFormField
label="Search by Primary Number"
{...queryField("phone_number", "+91")}
value={phone_number}
onChange={(e) => setPhoneNum(e.value)}
error={phoneNumberError}
types={["mobile", "landline"]}
/>
<PhoneNumberFormField
label="Search by Emergency Number"
{...queryField("emergency_phone_number", "+91")}
value={emergency_phone_number}
onChange={(e) => setEmergencyPhoneNum(e.value)}
error={emergencyPhoneNumberError}
types={["mobile", "landline"]}
/>
</div>
</div>
<div className="mt-4 gap-4 lg:gap-16 flex flex-col lg:flex-row lg:items-center">
<div id="total-patientcount">
<CountBlock
text={t("total_patients")}
count={count || 0}
loading={isLoading}
icon="d-patient"
/>
</div>
<SearchByMultipleFields
id="patient-search"
options={searchOptions}
onSearch={handleSearch}
clearSearch={clearSearch}
className="w-full"
/>
</div>
<div className="col-span-3 mt-6 flex flex-wrap">
<FilterBadges
Expand Down Expand Up @@ -440,7 +427,10 @@ const DischargedPatientsList = ({
route={routes.listFacilityDischargedPatients}
pathParams={{ facility_external_id }}
query={{ ordering: "-modified_date", ...qParams }}
queryCB={(query) => setCount(query.data?.count || 0)}
queryCB={(query) => {
setCount(query.data?.count || 0);
setIsLoading(query.loading);
}}
initialPage={qParams.page}
onPageChange={updatePage}
>
Expand Down
Loading