chore: replace refferal word

dhis2 · Nov 5, 2024 · f8ece37 · f8ece37
1 parent ba1eab7
commit f8ece37
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 34 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-10-25T18:18:11.518Z\n"
-"PO-Revision-Date: 2024-10-25T18:18:11.518Z\n"
+"POT-Creation-Date: 2024-11-05T09:50:50.070Z\n"
+"PO-Revision-Date: 2024-11-05T09:50:50.070Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
@@ -1493,26 +1493,20 @@ msgstr "{{ scheduledEvents }} scheduled"
 msgid "Stages and Events"
 msgstr "Stages and Events"
 
-msgid "Referral details"
-msgstr "Referral details"
-
 msgid "View linked event"
 msgstr "View linked event"
 
 msgid "An error occurred while loading the widget."
 msgstr "An error occurred while loading the widget."
 
-msgid "Refferal response"
-msgstr "Refferal response"
-
 msgid "Linked event"
 msgstr "Linked event"
 
 msgid ""
-"This refferal response event is linked to a Refferal details event. Review "
+"This {{stageName}} event is linked to a {{linkedStageName}} event. Review "
 "the linked event details before entering data below"
 msgstr ""
-"This refferal response event is linked to a Refferal details event. Review "
+"This {{stageName}} event is linked to a {{linkedStageName}} event. Review "
 "the linked event details before entering data below"
 
 msgid "Scheduled"

diff --git a/...ges/common/EnrollmentOverviewDomain/EnrollmentPageLayout/DefaultEnrollmentLayout.types.js b/...ges/common/EnrollmentOverviewDomain/EnrollmentPageLayout/DefaultEnrollmentLayout.types.js
@@ -8,7 +8,6 @@ type DefaultComponents = 'QuickActions'
     | 'AssigneeWidget'
     | 'NewEventWorkspace'
     | 'EditEventWorkspace'
-    | 'TwoEventWorkspace'
     | 'EnrollmentNote'
     | 'EventNote'
     | 'TrackedEntityRelationship'

diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js b/src/core_modules/capture-core/components/WidgetEventEdit/WidgetEventEdit.container.js
@@ -112,6 +112,7 @@ export const WidgetEventEditPlain = ({
                 programId={programId}
                 orgUnitId={orgUnitId}
                 stageId={stageId}
+                stage={stage}
             />
             <div data-test="widget-enrollment-event">
                 <Widget

diff --git a/...es/capture-core/components/WidgetTwoEventWorkspace/WidgetHeader/WidgetHeader.container.js b/...es/capture-core/components/WidgetTwoEventWorkspace/WidgetHeader/WidgetHeader.container.js
@@ -10,7 +10,6 @@ import { EnrollmentPageKeys }
     from '../../Pages/common/EnrollmentOverviewDomain/EnrollmentPageLayout/DefaultEnrollmentLayout.constants';
 import { NonBundledDhis2Icon } from '../../NonBundledDhis2Icon';
 import type { PlainProps, Props } from './WidgetHeader.types';
-import { WidgetTwoEventWorkspaceWrapperTypes } from '../index';
 
 const styles = {
     menu: {
@@ -21,20 +20,11 @@ const styles = {
     },
 };
 
-const getTitle = ({ type, stage }) => {
-    if (type === WidgetTwoEventWorkspaceWrapperTypes.EDIT_EVENT) {
-        return i18n.t('Referral details');
-    }
 
-    return stage.name;
-};
-
-const WidgetHeaderPlain = ({ stage, linkedEvent, orgUnitId, currentPage, type, classes }: Props) => {
+const WidgetHeaderPlain = ({ linkedStage, linkedEvent, orgUnitId, currentPage, classes }: Props) => {
     const [actionsIsOpen, setActionsIsOpen] = useState(false);
     const { push } = useHistory();
-    const { icon } = stage;
-    const title = getTitle({ type, stage });
-
+    const { icon } = linkedStage;
     return (
         <>
             {icon && (
@@ -48,7 +38,7 @@ const WidgetHeaderPlain = ({ stage, linkedEvent, orgUnitId, currentPage, type, c
                     />
                 </div>
             )}
-            <span> {title} </span>
+            <span> {linkedStage.name} </span>
             {currentPage === EnrollmentPageKeys.VIEW_EVENT && (
                 <div className={classes.menu}>
                     <OverflowButton

diff --git a/...odules/capture-core/components/WidgetTwoEventWorkspace/WidgetHeader/WidgetHeader.types.js b/...odules/capture-core/components/WidgetTwoEventWorkspace/WidgetHeader/WidgetHeader.types.js
@@ -2,14 +2,12 @@
 import { EnrollmentPageKeys }
     from '../../Pages/common/EnrollmentOverviewDomain/EnrollmentPageLayout/DefaultEnrollmentLayout.constants';
 import type { ProgramStage } from '../../../metaData';
-import { WidgetTwoEventWorkspaceWrapperTypes } from '../index';
 
 export type PlainProps = {|
     orgUnitId: string,
     linkedEvent: { event: string },
-    stage: ProgramStage,
+    linkedStage: ProgramStage,
     currentPage: $Values<typeof EnrollmentPageKeys> | string,
-    type?: $Values<typeof WidgetTwoEventWorkspaceWrapperTypes>,
 |};
 
 export type Props = {|

diff --git a/...ules/capture-core/components/WidgetTwoEventWorkspace/WidgetTwoEventWorkspace.container.js b/...ules/capture-core/components/WidgetTwoEventWorkspace/WidgetTwoEventWorkspace.container.js
@@ -15,6 +15,7 @@ export const WidgetTwoEventWorkspace = ({
     programId,
     orgUnitId,
     currentPage,
+    stage,
     type,
 }: Props) => {
     const {
@@ -26,7 +27,7 @@ export const WidgetTwoEventWorkspace = ({
 
     const {
         formFoundation,
-        stage,
+        stage: linkedStage,
         isLoading: isLoadingMetadata,
         isError: isMetadataError,
     } = useMetadataForProgramStage({
@@ -56,22 +57,23 @@ export const WidgetTwoEventWorkspace = ({
         );
     }
 
-    if (!linkedEvent || !formFoundation || !stage) {
+    if (!linkedEvent || !formFoundation || !linkedStage) {
         return null;
     }
 
     return (
         <WidgetWrapper
             type={type}
+            stage={stage}
+            linkedStage={linkedStage}
             widget={
                 <Widget
                     header={
                         <WidgetHeader
-                            stage={stage}
+                            linkedStage={linkedStage}
                             linkedEvent={linkedEvent}
                             orgUnitId={orgUnitId}
                             currentPage={currentPage}
-                            type={type}
                         />
                     }
                     noncollapsible

diff --git a/..._modules/capture-core/components/WidgetTwoEventWorkspace/WidgetTwoEventWorkspace.types.js b/..._modules/capture-core/components/WidgetTwoEventWorkspace/WidgetTwoEventWorkspace.types.js
@@ -3,13 +3,15 @@ import {
     EnrollmentPageKeys,
 } from '../Pages/common/EnrollmentOverviewDomain/EnrollmentPageLayout/DefaultEnrollmentLayout.constants';
 import { WidgetTwoEventWorkspaceWrapperTypes } from './index';
+import type { ProgramStage } from '../../metaData';
 
 export type Props = {|
     programId: string,
     eventId: string,
     orgUnitId: string,
     stageId: string,
     currentPage: $Values<typeof EnrollmentPageKeys> | string,
+    stage?: ProgramStage,
     type?: $Values<typeof WidgetTwoEventWorkspaceWrapperTypes>,
 |}
 

diff --git a/.../capture-core/components/WidgetTwoEventWorkspace/WidgetWrapper/WidgetWrapper.container.js b/.../capture-core/components/WidgetTwoEventWorkspace/WidgetWrapper/WidgetWrapper.container.js
@@ -39,11 +39,11 @@ const styles = {
     },
 };
 
-const WidgetWrapperPlain = ({ widget, type, classes }: Props) => {
+const WidgetWrapperPlain = ({ widget, type, stage, linkedStage, classes }: Props) => {
     if (type === WidgetTwoEventWorkspaceWrapperTypes.EDIT_EVENT) {
         return (
             <div className={classes.container}>
-                <div className={classes.header}> {i18n.t('Refferal response')} </div>
+                <div className={classes.header}> {stage?.name} </div>
                 <div className={classes.referalResponse}>
                     <div className={classes.linkedEvent}>
                         <span className={classes.icon}>
@@ -53,7 +53,12 @@ const WidgetWrapperPlain = ({ widget, type, classes }: Props) => {
                     </div>
                     <div className={classes.decription}>
                         {i18n.t(
-                            'This refferal response event is linked to a Refferal details event. Review the linked event details before entering data below',
+                            'This {{stageName}} event is linked to a {{linkedStageName}} event. Review the linked event details before entering data below',
+                            {
+                                linkedStageName: linkedStage?.name,
+                                stageName: stage?.name,
+                                interpolation: { escapeValue: false },
+                            },
                         )}
                     </div>
                     {widget}

diff --git a/...ules/capture-core/components/WidgetTwoEventWorkspace/WidgetWrapper/WidgetWrapper.types.js b/...ules/capture-core/components/WidgetTwoEventWorkspace/WidgetWrapper/WidgetWrapper.types.js
@@ -1,8 +1,11 @@
 // @flow
 import { WidgetTwoEventWorkspaceWrapperTypes } from '../index';
+import type { ProgramStage } from '../../../metaData';
 
 type PlainProps = {|
     widget: any,
+    linkedStage: ProgramStage,
+    stage?: ProgramStage,
     type?: $Values<typeof WidgetTwoEventWorkspaceWrapperTypes>,
 |};