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

fix: added tooltips for Discussion Notes icons (#8618) #8637

Open
wants to merge 31 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
729edf2
fix: add tooltips for Discussion Notes icons (#8618)
syedfardeenjeelani Sep 26, 2024
1c590d4
Update Page.tsx
syedfardeenjeelani Sep 26, 2024
59197ed
Update PatientNoteCard.tsx
syedfardeenjeelani Sep 26, 2024
0b98c7a
added representable texts in i18n locale files
syedfardeenjeelani Sep 26, 2024
adb4a9b
Merge branch 'fix/issue-8618' of https://github.com/syedfardeenjeelan…
syedfardeenjeelani Sep 26, 2024
5f564f8
Merge branch 'develop' into fix/issue-8618
syedfardeenjeelani Sep 26, 2024
7316d32
moved texts to commonJs
syedfardeenjeelani Sep 26, 2024
9148491
Merge branch 'fix/issue-8618' of https://github.com/syedfardeenjeelan…
syedfardeenjeelani Sep 26, 2024
f77d4af
Revert: Moved resume file from 'common' back to 'assets' directory du…
syedfardeenjeelani Sep 26, 2024
ea9d99a
Merge branch 'develop' into fix/issue-8618
nihal467 Sep 27, 2024
6f4559d
Merge branch 'develop' into fix/issue-8618
nihal467 Sep 27, 2024
d8634dd
Update src/Components/Common/components/Page.tsx
rithviknishad Oct 1, 2024
aeb9a9a
Merge branch 'develop' into fix/issue-8618
rithviknishad Oct 1, 2024
aba2350
fix: changed the name of tooltips
syedfardeenjeelani Oct 3, 2024
af4fce5
fix: changed the name of tooltips
syedfardeenjeelani Oct 3, 2024
7d9e423
fix: changed the name of tooltips
syedfardeenjeelani Oct 3, 2024
6184727
Update PatientNotesSlideover.tsx
syedfardeenjeelani Oct 8, 2024
b16603e
fix: add tooltips for Discussion Notes icons (#8618)
syedfardeenjeelani Sep 26, 2024
2d071d3
added representable texts in i18n locale files
syedfardeenjeelani Sep 26, 2024
246b51f
Update Page.tsx
syedfardeenjeelani Sep 26, 2024
0352002
Update PatientNoteCard.tsx
syedfardeenjeelani Sep 26, 2024
94044c2
moved texts to commonJs
syedfardeenjeelani Sep 26, 2024
3d9614c
fix: changed the name of tooltips
syedfardeenjeelani Oct 3, 2024
4838926
Update src/Components/Common/components/Page.tsx
rithviknishad Oct 1, 2024
082f271
fix: changed the name of tooltips
syedfardeenjeelani Oct 3, 2024
8701a7e
fix: forked the latest changes
syedfardeenjeelani Oct 13, 2024
cd9c325
fix: forked the latest changes
syedfardeenjeelani Oct 13, 2024
9ce188a
Update en.json
syedfardeenjeelani Oct 13, 2024
e454e25
Update src/Locale/en.json
rithviknishad Oct 13, 2024
a7a3f95
added tooltip for edit icon
nihal467 Oct 14, 2024
3c8ac9e
Merge branch 'develop' into fix/issue-8618
khavinshankar Oct 16, 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
2 changes: 1 addition & 1 deletion src/Components/Common/components/Page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default function Page(props: PageProps) {

return (
<div className={classNames(padding, props.className)} ref={props.ref}>
<div className="flex flex-col justify-between gap-2 md:flex-row md:items-center md:gap-6">
<div className="flex flex-col justify-between gap-2 md:flex-row md:items-center md:gap-6">
rithviknishad marked this conversation as resolved.
Show resolved Hide resolved
<PageTitle
changePageMetadata={props.changePageMetadata}
title={props.title}
Expand Down
9 changes: 8 additions & 1 deletion src/Components/Facility/PatientNoteCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,19 @@ const PatientNoteCard = ({
</ButtonV2>
)}
<ButtonV2
className="tooltip"
ghost
onClick={() => {
setReplyTo && setReplyTo(note);
}}
>
<CareIcon icon="l-corner-up-left-alt" className="h-5 w-5" />
<CareIcon
icon="l-corner-up-left-alt"
className="tooltip h-5 w-5"
/>
<span className="tooltip-text tooltip-bottom -translate-x-11 -translate-y-1 text-xs">
{t("reply")}
</span>
</ButtonV2>
</div>
</div>
Expand Down
28 changes: 20 additions & 8 deletions src/Components/Facility/PatientNotesSlideover.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -137,36 +137,45 @@ export default function PatientNotesSlideover(props: PatientNotesProps) {
<div className="flex gap-1">
{show && (
<Link
className="flex h-8 w-8 cursor-pointer items-center justify-center rounded bg-primary-800 text-secondary-100 text-opacity-70 hover:bg-primary-700 hover:text-opacity-100"
className="tooltip flex h-8 w-8 cursor-pointer items-center justify-center rounded bg-primary-800 text-secondary-100 text-opacity-70 hover:bg-primary-700 hover:text-opacity-100"
href={`/facility/${facilityId}/patient/${patientId}/consultation/${consultationId}/notes`}
>
<CareIcon
icon="l-window-maximize"
className="text-lg transition-all delay-150 duration-300 ease-out"
className="tooltip text-lg transition-all delay-150 duration-300 ease-out"
/>
<span className="tooltip-text tooltip-bottom -translate-x-[7.3rem] text-xs">
{t(`open_in_full_window`)}
</span>
</Link>
)}
<div
id="expand_doctor_notes"
className={classNames(
"flex h-8 w-8 cursor-pointer items-center justify-center rounded bg-primary-800 text-secondary-100 text-opacity-70 hover:bg-primary-700 hover:text-opacity-100",
"tooltip flex h-8 w-8 cursor-pointer items-center justify-center rounded bg-primary-800 text-secondary-100 text-opacity-70 hover:bg-primary-700 hover:text-opacity-100",
show && "rotate-180",
)}
onClick={() => setShow(!show)}
>
<CareIcon
icon="l-angle-up"
className="text-lg transition-all delay-150 duration-300 ease-out"
className="tooltip text-lg transition-all delay-150 duration-300 ease-out"
/>
<span className="tooltip-text tooltip-top rotate-[-180deg] text-xs">
{t(`minimize_screen`)}
</span>
</div>
<div
className="flex h-8 w-8 cursor-pointer items-center justify-center rounded bg-primary-800 text-secondary-100 text-opacity-70 hover:bg-primary-700 hover:text-opacity-100"
className="tooltip flex h-8 w-8 cursor-pointer items-center justify-center rounded bg-primary-800 text-secondary-100 text-opacity-70 hover:bg-primary-700 hover:text-opacity-100"
onClick={() => setShowPatientNotesPopup(false)}
>
<CareIcon
icon="l-times"
className="text-lg transition-all delay-150 duration-300 ease-out"
className="tooltip text-lg transition-all delay-150 duration-300 ease-out"
/>
<span className="tooltip-text tooltip-bottom -translate-x-11 text-xs">
{t(`close_screen`)}
</span>
</div>
</div>
);
Expand Down Expand Up @@ -248,13 +257,16 @@ export default function PatientNotesSlideover(props: PatientNotesProps) {
id="add_doctor_note_button"
onClick={onAddNote}
border={false}
className="absolute right-2"
className="tooltip absolute right-2"
ghost
size="small"
disabled={!patientActive}
authorizeFor={NonReadOnlyUsers}
>
<CareIcon icon="l-message" className="text-lg" />
<CareIcon icon="l-message" className="tooltip text-lg" />
<span className="tooltip-text tooltip-bottom -translate-x-11 -translate-y-1 text-xs">
{t("send_message")}
</span>
</ButtonV2>
</div>
</DoctorNoteReplyPreviewCard>
Expand Down
3 changes: 2 additions & 1 deletion src/Locale/en/Asset.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,6 @@
"stream_stop_due_to_inativity": "The live feed will stop streaming due to inactivity",
"stream_stopped_due_to_inativity": "The live feed has stopped streaming due to inactivity",
"continue_watching": "Continue watching",
"resume": "Resume"
"resume": "Resume",
"reply":"Reply"
rithviknishad marked this conversation as resolved.
Show resolved Hide resolved
}
6 changes: 5 additions & 1 deletion src/Locale/en/Consultation.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,5 +75,9 @@
"consultation_notes": "General Instructions (Advice)",
"procedure_suggestions": "Procedure Suggestions",
"patient_notes_thread__Doctors": "Doctor's Discussions",
"patient_notes_thread__Nurses": "Nurse's Discussions"
"patient_notes_thread__Nurses": "Nurse's Discussions",
"open_in_full_window": "Open in full window",
"minimize_screen":"Minimize",
"close_screen":"Close",
"send_message":"Send"
Copy link
Member

@rithviknishad rithviknishad Sep 26, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's keep it in Common.json as these texts by themselves are generic although maybe used in Consultation and/or anywhere else.

}
Loading