From 729edf2454f94ae40ff7eed3bb009547e38026fe Mon Sep 17 00:00:00 2001 From: syedfardeenjeelani Date: Thu, 26 Sep 2024 16:56:55 +0530 Subject: [PATCH 01/10] fix: add tooltips for Discussion Notes icons (#8618) --- src/Components/Common/components/Page.tsx | 2 +- src/Components/Facility/PatientNoteCard.tsx | 11 ++++++-- .../Facility/PatientNotesSlideover.tsx | 28 +++++++++++++------ 3 files changed, 30 insertions(+), 11 deletions(-) diff --git a/src/Components/Common/components/Page.tsx b/src/Components/Common/components/Page.tsx index 437a4ef21f7..a15a3666828 100644 --- a/src/Components/Common/components/Page.tsx +++ b/src/Components/Common/components/Page.tsx @@ -38,7 +38,7 @@ export default function Page(props: PageProps) { return (
-
+
@@ -144,12 +144,19 @@ const PatientNoteCard = ({ )} { setReplyTo && setReplyTo(note); }} > - + + + Reply +
diff --git a/src/Components/Facility/PatientNotesSlideover.tsx b/src/Components/Facility/PatientNotesSlideover.tsx index 52f99aee763..ee8370e59f1 100644 --- a/src/Components/Facility/PatientNotesSlideover.tsx +++ b/src/Components/Facility/PatientNotesSlideover.tsx @@ -137,36 +137,45 @@ export default function PatientNotesSlideover(props: PatientNotesProps) {
{show && ( + + Open in full window + )}
setShow(!show)} > + + Minimize +
setShowPatientNotesPopup(false)} > + + Close +
); @@ -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} > - + + + Send +
From 1c590d42787f4391a6571a774aab2c9291d8988f Mon Sep 17 00:00:00 2001 From: Fardeen <154688163+syedfardeenjeelani@users.noreply.github.com> Date: Thu, 26 Sep 2024 17:05:14 +0530 Subject: [PATCH 02/10] Update Page.tsx --- src/Components/Common/components/Page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/Common/components/Page.tsx b/src/Components/Common/components/Page.tsx index a15a3666828..9abf8427dbb 100644 --- a/src/Components/Common/components/Page.tsx +++ b/src/Components/Common/components/Page.tsx @@ -38,7 +38,7 @@ export default function Page(props: PageProps) { return (
-
+
Date: Thu, 26 Sep 2024 17:06:07 +0530 Subject: [PATCH 03/10] Update PatientNoteCard.tsx --- src/Components/Facility/PatientNoteCard.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/Facility/PatientNoteCard.tsx b/src/Components/Facility/PatientNoteCard.tsx index 89e6ee82f80..02206f7f580 100644 --- a/src/Components/Facility/PatientNoteCard.tsx +++ b/src/Components/Facility/PatientNoteCard.tsx @@ -77,7 +77,7 @@ const PatientNoteCard = ({ {" "}
From 0b98c7a4370559c07009884b004d5426f7b52eb4 Mon Sep 17 00:00:00 2001 From: syedfardeenjeelani Date: Thu, 26 Sep 2024 19:31:38 +0530 Subject: [PATCH 04/10] added representable texts in i18n locale files --- src/Components/Facility/PatientNoteCard.tsx | 2 +- src/Components/Facility/PatientNotesSlideover.tsx | 8 ++++---- src/Locale/en/Asset.json | 3 ++- src/Locale/en/Consultation.json | 6 +++++- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/Components/Facility/PatientNoteCard.tsx b/src/Components/Facility/PatientNoteCard.tsx index 89e6ee82f80..d8bd23d8804 100644 --- a/src/Components/Facility/PatientNoteCard.tsx +++ b/src/Components/Facility/PatientNoteCard.tsx @@ -155,7 +155,7 @@ const PatientNoteCard = ({ className="tooltip h-5 w-5" /> - Reply + {t("reply")}
diff --git a/src/Components/Facility/PatientNotesSlideover.tsx b/src/Components/Facility/PatientNotesSlideover.tsx index ee8370e59f1..fa1a9851316 100644 --- a/src/Components/Facility/PatientNotesSlideover.tsx +++ b/src/Components/Facility/PatientNotesSlideover.tsx @@ -145,7 +145,7 @@ export default function PatientNotesSlideover(props: PatientNotesProps) { className="tooltip text-lg transition-all delay-150 duration-300 ease-out" /> - Open in full window + {t(`open_in_full_window`)} )} @@ -162,7 +162,7 @@ export default function PatientNotesSlideover(props: PatientNotesProps) { className="tooltip text-lg transition-all delay-150 duration-300 ease-out" /> - Minimize + {t(`minimize_screen`)}
- Close + {t(`close_screen`)}
@@ -265,7 +265,7 @@ export default function PatientNotesSlideover(props: PatientNotesProps) { > - Send + {t("send_message")}
diff --git a/src/Locale/en/Asset.json b/src/Locale/en/Asset.json index 182bb25a4fe..b9024497b72 100644 --- a/src/Locale/en/Asset.json +++ b/src/Locale/en/Asset.json @@ -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" } \ No newline at end of file diff --git a/src/Locale/en/Consultation.json b/src/Locale/en/Consultation.json index d12a6cb16ac..dc603ae8cc4 100644 --- a/src/Locale/en/Consultation.json +++ b/src/Locale/en/Consultation.json @@ -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" } \ No newline at end of file From 7316d32ebe8058afd3029bf909aecb4fee89fb03 Mon Sep 17 00:00:00 2001 From: syedfardeenjeelani Date: Thu, 26 Sep 2024 22:36:10 +0530 Subject: [PATCH 05/10] moved texts to commonJs --- src/Locale/en/Asset.json | 4 +--- src/Locale/en/Common.json | 8 +++++++- src/Locale/en/Consultation.json | 6 +----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Locale/en/Asset.json b/src/Locale/en/Asset.json index b9024497b72..6841bc64f5b 100644 --- a/src/Locale/en/Asset.json +++ b/src/Locale/en/Asset.json @@ -15,7 +15,5 @@ "are_you_still_watching": "Are you still watching?", "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", - "reply":"Reply" + "continue_watching": "Continue watching" } \ No newline at end of file diff --git a/src/Locale/en/Common.json b/src/Locale/en/Common.json index 7f0b9f51802..db5ea98cadf 100644 --- a/src/Locale/en/Common.json +++ b/src/Locale/en/Common.json @@ -230,5 +230,11 @@ "SORT_OPTIONS__name": "Patient name A-Z", "SORT_OPTIONS__-name": "Patient name Z-A", "SORT_OPTIONS__bed__name": "Bed No. 1-N", - "SORT_OPTIONS__-bed__name": "Bed No. N-1" + "SORT_OPTIONS__-bed__name": "Bed No. N-1", + "open_in_full_window": "Open in full window", + "minimize_screen":"Minimize", + "close_screen":"Close", + "send_discussion_message":"Send", + "resume": "Resume", + "reply":"Reply" } \ No newline at end of file diff --git a/src/Locale/en/Consultation.json b/src/Locale/en/Consultation.json index dc603ae8cc4..d12a6cb16ac 100644 --- a/src/Locale/en/Consultation.json +++ b/src/Locale/en/Consultation.json @@ -75,9 +75,5 @@ "consultation_notes": "General Instructions (Advice)", "procedure_suggestions": "Procedure Suggestions", "patient_notes_thread__Doctors": "Doctor'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" + "patient_notes_thread__Nurses": "Nurse's Discussions" } \ No newline at end of file From f77d4afecc23f0018d19f0d97b35e98d44448895 Mon Sep 17 00:00:00 2001 From: syedfardeenjeelani Date: Thu, 26 Sep 2024 22:41:39 +0530 Subject: [PATCH 06/10] Revert: Moved resume file from 'common' back to 'assets' directory due to incorrect previous placement --- src/Locale/en/Asset.json | 3 ++- src/Locale/en/Common.json | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Locale/en/Asset.json b/src/Locale/en/Asset.json index 6841bc64f5b..182bb25a4fe 100644 --- a/src/Locale/en/Asset.json +++ b/src/Locale/en/Asset.json @@ -15,5 +15,6 @@ "are_you_still_watching": "Are you still watching?", "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" + "continue_watching": "Continue watching", + "resume": "Resume" } \ No newline at end of file diff --git a/src/Locale/en/Common.json b/src/Locale/en/Common.json index db5ea98cadf..8dee384222d 100644 --- a/src/Locale/en/Common.json +++ b/src/Locale/en/Common.json @@ -235,6 +235,5 @@ "minimize_screen":"Minimize", "close_screen":"Close", "send_discussion_message":"Send", - "resume": "Resume", "reply":"Reply" } \ No newline at end of file From d8634dd30ca2ba6c08939e8fd87309da9cafd39d Mon Sep 17 00:00:00 2001 From: Rithvik Nishad Date: Tue, 1 Oct 2024 09:07:07 +0530 Subject: [PATCH 07/10] Update src/Components/Common/components/Page.tsx Co-authored-by: Bodhish Thomas --- src/Components/Common/components/Page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Components/Common/components/Page.tsx b/src/Components/Common/components/Page.tsx index 9abf8427dbb..437a4ef21f7 100644 --- a/src/Components/Common/components/Page.tsx +++ b/src/Components/Common/components/Page.tsx @@ -38,7 +38,7 @@ export default function Page(props: PageProps) { return (
-
+
Date: Thu, 3 Oct 2024 10:33:43 +0530 Subject: [PATCH 08/10] fix: changed the name of tooltips --- src/Components/Facility/PatientNotesSlideover.tsx | 6 +++--- src/Locale/en/Common.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Components/Facility/PatientNotesSlideover.tsx b/src/Components/Facility/PatientNotesSlideover.tsx index fa1a9851316..4d0c1986f48 100644 --- a/src/Components/Facility/PatientNotesSlideover.tsx +++ b/src/Components/Facility/PatientNotesSlideover.tsx @@ -144,8 +144,8 @@ export default function PatientNotesSlideover(props: PatientNotesProps) { icon="l-window-maximize" className="tooltip text-lg transition-all delay-150 duration-300 ease-out" /> - - {t(`open_in_full_window`)} + + {t(`full_screen`)} )} @@ -265,7 +265,7 @@ export default function PatientNotesSlideover(props: PatientNotesProps) { > - {t("send_message")} + {t("send")}
diff --git a/src/Locale/en/Common.json b/src/Locale/en/Common.json index 8dee384222d..6324c641e90 100644 --- a/src/Locale/en/Common.json +++ b/src/Locale/en/Common.json @@ -231,9 +231,9 @@ "SORT_OPTIONS__-name": "Patient name Z-A", "SORT_OPTIONS__bed__name": "Bed No. 1-N", "SORT_OPTIONS__-bed__name": "Bed No. N-1", - "open_in_full_window": "Open in full window", + "full_screen": "Full screen", "minimize_screen":"Minimize", "close_screen":"Close", - "send_discussion_message":"Send", + "send":"Send", "reply":"Reply" } \ No newline at end of file From 7d9e42341eee688501afedfad641d06169eb9391 Mon Sep 17 00:00:00 2001 From: syedfardeenjeelani Date: Thu, 3 Oct 2024 20:03:01 +0530 Subject: [PATCH 09/10] fix: changed the name of tooltips --- src/Components/Facility/PatientNotesSlideover.tsx | 4 ++-- src/Locale/en/Common.json | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Components/Facility/PatientNotesSlideover.tsx b/src/Components/Facility/PatientNotesSlideover.tsx index 4d0c1986f48..96f463d50da 100644 --- a/src/Components/Facility/PatientNotesSlideover.tsx +++ b/src/Components/Facility/PatientNotesSlideover.tsx @@ -162,7 +162,7 @@ export default function PatientNotesSlideover(props: PatientNotesProps) { className="tooltip text-lg transition-all delay-150 duration-300 ease-out" /> - {t(`minimize_screen`)} + {t(`minimize`)}
- {t(`close_screen`)} + {t(`close`)}
diff --git a/src/Locale/en/Common.json b/src/Locale/en/Common.json index 6324c641e90..6554b52c4b6 100644 --- a/src/Locale/en/Common.json +++ b/src/Locale/en/Common.json @@ -232,8 +232,7 @@ "SORT_OPTIONS__bed__name": "Bed No. 1-N", "SORT_OPTIONS__-bed__name": "Bed No. N-1", "full_screen": "Full screen", - "minimize_screen":"Minimize", - "close_screen":"Close", + "minimize":"Minimize", "send":"Send", "reply":"Reply" } \ No newline at end of file From 61847273800418afcef35a9a60ba5725b8e563c8 Mon Sep 17 00:00:00 2001 From: Fardeen <154688163+syedfardeenjeelani@users.noreply.github.com> Date: Tue, 8 Oct 2024 12:07:37 +0530 Subject: [PATCH 10/10] Update PatientNotesSlideover.tsx --- src/Components/Facility/PatientNotesSlideover.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Components/Facility/PatientNotesSlideover.tsx b/src/Components/Facility/PatientNotesSlideover.tsx index 96f463d50da..fe716950aa9 100644 --- a/src/Components/Facility/PatientNotesSlideover.tsx +++ b/src/Components/Facility/PatientNotesSlideover.tsx @@ -145,7 +145,7 @@ export default function PatientNotesSlideover(props: PatientNotesProps) { className="tooltip text-lg transition-all delay-150 duration-300 ease-out" /> - {t(`full_screen`)} + {t("full_screen")} )} @@ -162,7 +162,7 @@ export default function PatientNotesSlideover(props: PatientNotesProps) { className="tooltip text-lg transition-all delay-150 duration-300 ease-out" /> - {t(`minimize`)} + {t("minimize")}
- {t(`close`)} + {t("close")}