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.

Sign up for GitHub

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

Jump to bottom

Fixed Tabs View and added Strong Types #8899

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
+23 −18
Open

Fixed Tabs View and added Strong Types #8899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9601de4
Fixed Tabs View and added Strong Types
nithish1018 Oct 23, 2024
5d86b02
minor changes
nithish1018 Oct 24, 2024
6465310
removed undefined
nithish1018 Oct 25, 2024
1a56714
fixed tabs view in resource board view
nithish1018 Oct 25, 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
14 changes: 8 additions & 6 deletions src/components/Resource/ResourceBoardView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,14 @@ export default function BoardView() {
</div>

<div className="flex w-full flex-col items-center justify-between gap-2 pt-2 xl:flex-row">
<SearchInput
name="title"
value={qParams.title}
onChange={(e) => updateQuery({ [e.name]: e.value })}
placeholder={t("search_resource")}
/>
<div className="w-full md:w-60">
<SearchInput
name="patient_name"
value={qParams.patient_name}
onChange={(e) => updateQuery({ [e.name]: e.value })}
placeholder={t("search_patient")}
/>
</div>
<Tabs
tabs={[
{ text: t("active"), value: 0 },
Expand Down
27 changes: 15 additions & 12 deletions src/components/Shifting/BoardView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import useAuthUser from "@/common/hooks/useAuthUser";
import request from "../../Utils/request/request";
import routes from "../../Redux/api";
import PageTitle from "@/components/Common/PageTitle";
import { IShift } from "./models";

export default function BoardView() {
const { qParams, updateQuery, FilterBadges, advancedFilter } = useFilters({
Expand All @@ -35,16 +36,16 @@ export default function BoardView() {
});

const [modalFor, setModalFor] = useState<{
externalId?: string;
external_id?: string;
loading: boolean;
}>({
externalId: undefined,
external_id: undefined,
loading: false,
});

const authUser = useAuthUser();

const handleTransferComplete = async (shift: any) => {
const handleTransferComplete = async (shift: IShift) => {
setModalFor({ ...modalFor, loading: true });
await request(routes.completeTransfer, {
pathParams: { externalId: shift.external_id },
Expand Down Expand Up @@ -101,12 +102,14 @@ export default function BoardView() {
/>
</div>
<div className="flex w-full flex-col items-center justify-between gap-2 pt-2 xl:flex-row">
<SearchInput
name="patient_name"
value={qParams.patient_name}
onChange={(e) => updateQuery({ [e.name]: e.value })}
placeholder={t("search_patient")}
/>
<div className="w-full md:w-60">
<SearchInput
name="patient_name"
value={qParams.patient_name}
onChange={(e) => updateQuery({ [e.name]: e.value })}
placeholder={t("search_patient")}
/>
</div>

<Tabs
tabs={[
Expand Down Expand Up @@ -303,12 +306,12 @@ export default function BoardView() {
<ConfirmDialog
title={t("confirm_transfer_complete")}
description={t("mark_this_transfer_as_complete_question")}
show={modalFor.externalId === shift.external_id}
show={modalFor.external_id === shift.external_id}
onClose={() =>
setModalFor({ externalId: undefined, loading: false })
setModalFor({ external_id: undefined, loading: false })
}
action={t("confirm")}
onConfirm={() => handleTransferComplete(shift)}
onConfirm={() => handleTransferComplete(shift as IShift)}
>
<p className="mt-2 text-sm text-yellow-600">
{t("redirected_to_create_consultation")}
Expand Down
Loading