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

Migrated ShiftingBoard.tsx from MaterialUI to Custom Components #5324

Merged
merged 5 commits into from
Apr 18, 2023
Merged

Migrated ShiftingBoard.tsx from MaterialUI to Custom Components #5324

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc39340
Migrated ShiftingBoard.tsx from MaterialUI to Custom Components
suprabathk Apr 11, 2023
2c527e1
Update src/Components/Shifting/ShiftingBoard.tsx
suprabathk Apr 12, 2023
5080395
Update src/Components/Shifting/ShiftingBoard.tsx
suprabathk Apr 12, 2023
b3303e8
Merge branch 'develop' into issue-5000
suprabathk Apr 12, 2023
41c3001
Merge branch 'develop' into issue-5000
nihal467 Apr 17, 2023
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
2 changes: 1 addition & 1 deletion src/Components/Common/ConfirmDialogV2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const ConfirmDialogV2 = ({
onClose={onClose}
title={title}
description={
<span className={`font-medium text-${variant || "secondary"}-500`}>
<span className={`font-medium text-${variant || "secondary"}-600`}>
{description}
</span>
}
Expand Down
66 changes: 17 additions & 49 deletions src/Components/Shifting/ShiftingBoard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@ import {
completeTransfer,
downloadShiftRequests,
} from "../../Redux/actions";
import Button from "@material-ui/core/Button";
import { navigate } from "raviger";
import moment from "moment";
import { Modal } from "@material-ui/core";
import ConfirmDialogV2 from "../Common/ConfirmDialogV2";
import { CSVLink } from "react-csv";
import CircularProgress from "@material-ui/core/CircularProgress";
import CircularProgress from "../Common/components/CircularProgress";
import { useDrag, useDrop } from "react-dnd";
import { classNames, formatDate } from "../../Utils/utils";
import ButtonV2 from "../Common/components/ButtonV2";
Expand Down Expand Up @@ -204,60 +203,29 @@ const ShiftCard = ({ shift, filter }: any) => {
</div>
{filter === "TRANSFER IN PROGRESS" && shift.assigned_facility && (
<div className="mt-2">
<Button
<ButtonV2
size="small"
variant="outlined"
fullWidth
variant="secondary"
border={true}
onClick={() => setModalFor(shift.external_id)}
>
{t("transfer_to_receiving_facility")}
</Button>
</ButtonV2>

<Modal
open={modalFor === shift.external_id}
onClose={(_) =>
<ConfirmDialogV2
title={t("confirm_transfer_complete")}
description={t("mark_this_transfer_as_complete_question")}
show={modalFor === shift.external_id}
onClose={() =>
setModalFor({ externalId: undefined, loading: false })
}
action={t("confirm")}
onConfirm={() => handleTransferComplete(shift)}
>
<div className="h-screen w-full absolute flex items-center justify-center bg-modal">
<div className="bg-white rounded shadow p-8 m-4 max-w-sm max-h-full text-center">
<div className="mb-4">
<h1 className="text-2xl">
{t("confirm_transfer_complete")}
</h1>
</div>
<div className="mb-8">
<p>{t("mark_this_transfer_as_complete_question")}</p>
<p className="mt-2 text-yellow-600">
{t("redirected_to_create_consultation")}
</p>
</div>
<div className="flex gap-2 justify-center">
<Button
size="small"
variant="outlined"
fullWidth
onClick={() => {
setModalFor({
externalId: undefined,
loading: false,
});
}}
>
{t("Cancel")}
</Button>
<Button
size="small"
variant="outlined"
fullWidth
onClick={(_) => handleTransferComplete(shift)}
>
{t("confirm")}
</Button>
</div>
</div>
</div>
</Modal>
<p className="mt-2 text-sm text-yellow-600">
{t("redirected_to_create_consultation")}
</p>
</ConfirmDialogV2>
</div>
)}
</div>
Expand Down