Changes 'CONSULTATION NOTES' to 'GENERAL INSTRUCTIONS (ADVICE)' (#8216)

* Changes 'CONSULTATION NOTES' to 'GENERAL INSTRUCTIONS (ADVICE)' * Minor Changes * Minor changes * Apply suggestions from Code Review --------- Co-authored-by: rithviknishad <[email protected]>
ohcnetwork · Jul 31, 2024 · 2ba8471 · 2ba8471
1 parent 5a47aed
commit 2ba8471
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 14 deletions.
diff --git a/src/CAREUI/display/Timeline.tsx b/src/CAREUI/display/Timeline.tsx
@@ -92,9 +92,12 @@ export const TimelineNode = (props: TimelineNodeProps) => {
                             }`}{" "}
                       </span>
                     )}
-                    {props.titleSuffix
-                      ? props.titleSuffix
-                      : `${props.event.type} the ${props.name || name}.`}
+                    {props.titleSuffix || (
+                      <>
+                        {`${props.event.type} the `}
+                        <span className="capitalize">{props.name || name}</span>
+                      </>
+                    )}
                   </p>
                   <div className="md:w-fit">
                     {props.actions && (

diff --git a/src/Components/Facility/ConsultationDetails/Events/EventsList.tsx b/src/Components/Facility/ConsultationDetails/Events/EventsList.tsx
@@ -30,13 +30,10 @@ export default function EventsList() {
                 {(item, items) => (
                   <TimelineNode
                     name={
-                      item.event_type.name
-                        .split("_")
-                        .map(
-                          (text) =>
-                            text[0].toUpperCase() + text.toLowerCase().slice(1),
-                        )
-                        .join(" ") + " Event"
+                      t(item.event_type.name.toLowerCase()).replaceAll(
+                        /_/g,
+                        " ",
+                      ) + " Event"
                     }
                     event={{
                       type: item.change_type.replace(/_/g, " ").toLowerCase(),

diff --git a/src/Components/Facility/ConsultationDetails/Events/GenericEvent.tsx b/src/Components/Facility/ConsultationDetails/Events/GenericEvent.tsx
@@ -1,4 +1,6 @@
 import type { ReactNode } from "react";
+import { useTranslation } from "react-i18next";
+
 interface IProps {
   values: Record<string, unknown>;
 }
@@ -80,12 +82,13 @@ const formatValue = (value: unknown, key?: string): ReactNode => {
 };
 
 export default function GenericEvent(props: IProps) {
+  const { t } = useTranslation();
   return (
     <div className="flex w-full flex-col gap-4 rounded-lg border border-secondary-400 p-4 @container">
       {Object.entries(props.values).map(([key, value]) => (
         <div className="flex w-full flex-col items-start gap-2">
-          <span className="text-xs uppercase text-secondary-700">
-            {key.replaceAll(/_/g, " ")}
+          <span className="text-xs capitalize text-secondary-700">
+            {t(key).replaceAll(/_/g, " ")}
           </span>
           <span className="break-all text-sm font-semibold text-secondary-700">
             {formatValue(value, key)}

diff --git a/src/Locale/en/Consultation.json b/src/Locale/en/Consultation.json
@@ -44,5 +44,6 @@
   "encounter_date_field_label__HI": "Date & Time of Consultation",
   "encounter_date_field_label__R": "Date & Time of Consultation",
   "back_dated_encounter_date_caution": "You are creating an encounter for",
-  "encounter_duration_confirmation": "The duration of this encounter would be"
-}
+  "encounter_duration_confirmation": "The duration of this encounter would be",
+  "consultation_notes": "General Instructions (Advice)"
+}