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

Fix: PatientNoteCard Text Overflowing and Current Address #9609

Merged
merged 14 commits into from
Dec 30, 2024
Merged

Fix: PatientNoteCard Text Overflowing and Current Address #9609

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1fd83f9
fix note card issue
AdityaJ2305 Dec 27, 2024
70edafe
fix current address issue
AdityaJ2305 Dec 27, 2024
0e72cb1
fix shift enter not working
AdityaJ2305 Dec 27, 2024
4e905b4
fix broken action button
AdityaJ2305 Dec 27, 2024
b63b4a3
Merge branch 'develop' into issue/9592/patientnote_card_and_address
AdityaJ2305 Dec 28, 2024
befa1de
Merge branch 'develop' into issue/9592/patientnote_card_and_address
AdityaJ2305 Dec 28, 2024
559b3e3
browser default submit
AdityaJ2305 Dec 28, 2024
95bb772
Merge branch 'develop' into issue/9592/patientnote_card_and_address
AdityaJ2305 Dec 29, 2024
82fcb57
Fix:on note tab
AdityaJ2305 Dec 29, 2024
d3b1d60
Fix:on note tab
AdityaJ2305 Dec 30, 2024
77f3c3b
Merge branch 'develop' into issue/9592/patientnote_card_and_address
AdityaJ2305 Dec 30, 2024
c666722
revert third changes
AdityaJ2305 Dec 30, 2024
60106b4
fix lint issue
AdityaJ2305 Dec 30, 2024
aacec80
fix line break
AdityaJ2305 Dec 30, 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
1 change: 1 addition & 0 deletions src/components/Common/Breadcrumbs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ export default function Breadcrumbs({
<li className="mr-3 flex items-center">
<Button
variant="link"
type="button"
className="rounded bg-gray-200/50 px-1 text-sm font-normal text-gray-800 transition hover:bg-gray-200/75 hover:no-underline"
size="xs"
onClick={() => {
Expand Down
4 changes: 3 additions & 1 deletion src/components/Facility/PatientNoteCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,9 @@ const PatientNoteCard = ({
</div>
</div>
) : (
<div className="text-sm text-secondary-700">{noteField}</div>
<div className="text-sm text-secondary-700 break-all">
AdityaJ2305 marked this conversation as resolved.
Show resolved Hide resolved
{noteField}
</div>
)}
</div>
}
Expand Down
5 changes: 0 additions & 5 deletions src/components/Form/Form.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,6 @@ const Form = <T extends FormDetails>({
return (
<form
onSubmit={handleSubmit}
onKeyDown={(e) => {
if (e.key === "Enter") {
handleSubmit(e);
}
}}
className={classNames(
"mx-auto w-full",
!props.noPadding && "px-8 py-5 md:px-16 md:py-11",
Expand Down
10 changes: 5 additions & 5 deletions src/components/Patient/PatientHome.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import CareIcon from "@/CAREUI/icons/CareIcon";

import { Button } from "@/components/ui/button";

import { AuthorizedButton } from "@/components/Common/AuthorizedButton";
import ConfirmDialog from "@/components/Common/ConfirmDialog";
import UserAutocomplete from "@/components/Common/UserAutocompleteFormField";

Expand Down Expand Up @@ -37,6 +36,7 @@ import {
relativeDate,
} from "../../Utils/utils";
import { Avatar } from "../Common/Avatar";
import ButtonV2 from "../Common/ButtonV2";
import Loading from "../Common/Loading";
import Page from "../Common/Page";
import { SkillModel, UserBareMinimum } from "../Users/models";
Expand Down Expand Up @@ -523,7 +523,7 @@ export const PatientHome = (props: {

{NonReadOnlyUsers(authUser.user_type) && (
<div>
<AuthorizedButton
<ButtonV2
AdityaJ2305 marked this conversation as resolved.
Show resolved Hide resolved
id="assign-volunteer"
onClick={() => setOpenAssignVolunteerDialog(true)}
disabled={false}
Expand All @@ -536,12 +536,12 @@ export const PatientHome = (props: {
? t("update_volunteer")
: t("assign_to_volunteer")}
</span>
</AuthorizedButton>
</ButtonV2>
</div>
)}

<div>
<AuthorizedButton
<ButtonV2
id="patient-allow-transfer"
className="flex w-full flex-row bg-white font-semibold text-green-800 hover:bg-secondary-200"
disabled={
Expand All @@ -564,7 +564,7 @@ export const PatientHome = (props: {
? t("disable_transfer")
: t("allow_transfer")}
</span>
</AuthorizedButton>
</ButtonV2>
</div>
</div>
</div>
Expand Down
Loading