From 005877ce88a2d28dfc053b39869090cd9573bfdd Mon Sep 17 00:00:00 2001
From: Simona Domnisoru <simona.domnisoru@gmail.com>
Date: Mon, 22 Apr 2024 16:21:34 +0200
Subject: [PATCH 01/19] fix: [DHIS2-14938] trigger error on complete (#3594)

---
 .../EditEventDataEntry.component.js                |  2 +-
 .../EditEventDataEntry/editEventDataEntry.epics.js | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/EditEventDataEntry/EditEventDataEntry.component.js b/src/core_modules/capture-core/components/WidgetEventEdit/EditEventDataEntry/EditEventDataEntry.component.js
index 94bd13407c..ac2df74641 100644
--- a/src/core_modules/capture-core/components/WidgetEventEdit/EditEventDataEntry/EditEventDataEntry.component.js
+++ b/src/core_modules/capture-core/components/WidgetEventEdit/EditEventDataEntry/EditEventDataEntry.component.js
@@ -357,7 +357,7 @@ const AOCSettings = {
 };
 
 const saveHandlerConfig = {
-    onIsCompleting: (props: Object) => props.completeDataEntryFieldValue,
+    onIsCompleting: (props: Object) => props.completeDataEntryFieldValue === 'true',
     onFilterProps: (props: Object) => {
         const { completeDataEntryFieldValue, ...passOnProps } = props;
         return passOnProps;
diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/EditEventDataEntry/editEventDataEntry.epics.js b/src/core_modules/capture-core/components/WidgetEventEdit/EditEventDataEntry/editEventDataEntry.epics.js
index 72f595a621..1ab650c1a4 100644
--- a/src/core_modules/capture-core/components/WidgetEventEdit/EditEventDataEntry/editEventDataEntry.epics.js
+++ b/src/core_modules/capture-core/components/WidgetEventEdit/EditEventDataEntry/editEventDataEntry.epics.js
@@ -163,15 +163,21 @@ export const saveEditedEventEpic = (action$: InputObservable, store: ReduxStore)
 export const saveEditedEventSucceededEpic = (action$: InputObservable) =>
     action$.pipe(
         ofType(actionTypes.EDIT_EVENT_DATA_ENTRY_SAVED),
+        filter((action) => {
+            const {
+                meta: { triggerAction },
+            } = action;
+            return (
+                triggerAction === enrollmentSiteActionTypes.COMMIT_ENROLLMENT_EVENT ||
+                triggerAction === enrollmentEditEventActionTypes.EVENT_SAVE_ENROLLMENT_COMPLETE_SUCCESS
+            );
+        }),
         map((action) => {
             const meta = action.meta;
-            if (meta.triggerAction === enrollmentSiteActionTypes.COMMIT_ENROLLMENT_EVENT) {
-                return commitEnrollmentEvent(meta.eventId);
-            }
             if (meta.triggerAction === enrollmentEditEventActionTypes.EVENT_SAVE_ENROLLMENT_COMPLETE_SUCCESS) {
                 return commitEnrollmentAndEvents();
             }
-            return EMPTY;
+            return commitEnrollmentEvent(meta.eventId);
         }));
 
 export const saveEditedEventFailedEpic = (action$: InputObservable, store: ReduxStore) =>

From f2007e368b0844730ed36c654e1e01323fb92ed2 Mon Sep 17 00:00:00 2001
From: Simona Domnisoru <simona.domnisoru@gmail.com>
Date: Mon, 22 Apr 2024 16:22:20 +0200
Subject: [PATCH 02/19] fix: [DHIS2-16999] filter assign rule effects in the
 view event page (#3597)

---
 .../ViewEventDataEntry/viewEventDataEntry.actions.js        | 6 ++++--
 .../capture-core/rules/filterApplicableRuleEffects.js       | 6 ++++++
 src/core_modules/capture-core/rules/index.js                | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 src/core_modules/capture-core/rules/filterApplicableRuleEffects.js

diff --git a/src/core_modules/capture-core/components/WidgetEventEdit/ViewEventDataEntry/viewEventDataEntry.actions.js b/src/core_modules/capture-core/components/WidgetEventEdit/ViewEventDataEntry/viewEventDataEntry.actions.js
index cf1aeba1b3..281525eebc 100644
--- a/src/core_modules/capture-core/components/WidgetEventEdit/ViewEventDataEntry/viewEventDataEntry.actions.js
+++ b/src/core_modules/capture-core/components/WidgetEventEdit/ViewEventDataEntry/viewEventDataEntry.actions.js
@@ -1,6 +1,6 @@
 // @flow
 import i18n from '@dhis2/d2-i18n';
-import { type OrgUnit } from '@dhis2/rules-engine-javascript';
+import { type OrgUnit, effectActions } from '@dhis2/rules-engine-javascript';
 import { actionCreator } from '../../../actions/actions.utils';
 import type { RenderFoundation, Program } from '../../../metaData';
 import { getConvertGeometryIn, convertGeometryOut, convertStatusOut } from '../../DataEntries';
@@ -10,6 +10,7 @@ import {
     getApplicableRuleEffectsForTrackerProgram,
     getApplicableRuleEffectsForEventProgram,
     updateRulesEffects,
+    filterApplicableRuleEffects,
 } from '../../../rules';
 import { dataElementTypes } from '../../../metaData';
 import { convertClientToForm } from '../../../converters';
@@ -145,10 +146,11 @@ export const loadViewEventDataEntry =
                 currentEvent,
             });
         }
+        const filteredEffects = filterApplicableRuleEffects(effects, effectActions.ASSIGN_VALUE);
 
         return [
             ...dataEntryActions,
-            updateRulesEffects(effects, formId),
+            updateRulesEffects(filteredEffects, formId),
             actionCreator(actionTypes.VIEW_EVENT_DATA_ENTRY_LOADED)({
                 loadedValues: { dataEntryValues, formValues, eventContainer, orgUnit },
                 // $FlowFixMe[prop-missing] automated comment
diff --git a/src/core_modules/capture-core/rules/filterApplicableRuleEffects.js b/src/core_modules/capture-core/rules/filterApplicableRuleEffects.js
new file mode 100644
index 0000000000..f47b0b1ec9
--- /dev/null
+++ b/src/core_modules/capture-core/rules/filterApplicableRuleEffects.js
@@ -0,0 +1,6 @@
+// @flow
+
+export const filterApplicableRuleEffects = (rulesEffects: Object = {}, effectAction: string) => {
+    const { [effectAction]: _, ...filteredEffects } = rulesEffects;
+    return filteredEffects;
+};
diff --git a/src/core_modules/capture-core/rules/index.js b/src/core_modules/capture-core/rules/index.js
index 2dfc96f6c7..7eedf9ff6d 100644
--- a/src/core_modules/capture-core/rules/index.js
+++ b/src/core_modules/capture-core/rules/index.js
@@ -9,3 +9,4 @@ export { updateRulesEffects, rulesEffectsActionTypes } from './rulesEngine.actio
 export type { FieldData } from './inputHelpers';
 export { postProcessRulesEffects } from './postProcessRulesEffects';
 export { buildEffectsHierarchy } from './buildEffectsHierarchy';
+export { filterApplicableRuleEffects } from './filterApplicableRuleEffects';

From eb9152a0fddba635853c944a187c3b03da83be25 Mon Sep 17 00:00:00 2001
From: "@dhis2-bot" <apps@dhis2.org>
Date: Mon, 22 Apr 2024 14:37:44 +0000
Subject: [PATCH 03/19] chore(release): cut 100.67.12 [skip release]

## [100.67.12](https://github.com/dhis2/capture-app/compare/v100.67.11...v100.67.12) (2024-04-22)

### Bug Fixes

* [DHIS2-14938] trigger error on complete ([#3594](https://github.com/dhis2/capture-app/issues/3594)) ([005877c](https://github.com/dhis2/capture-app/commit/005877ce88a2d28dfc053b39869090cd9573bfdd))
* [DHIS2-16999] filter assign rule effects in the view event page ([#3597](https://github.com/dhis2/capture-app/issues/3597)) ([f2007e3](https://github.com/dhis2/capture-app/commit/f2007e368b0844730ed36c654e1e01323fb92ed2))
---
 CHANGELOG.md                       | 8 ++++++++
 package.json                       | 4 ++--
 packages/rules-engine/package.json | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 90cb62dded..4e24c98c0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## [100.67.12](https://github.com/dhis2/capture-app/compare/v100.67.11...v100.67.12) (2024-04-22)
+
+
+### Bug Fixes
+
+* [DHIS2-14938] trigger error on complete ([#3594](https://github.com/dhis2/capture-app/issues/3594)) ([005877c](https://github.com/dhis2/capture-app/commit/005877ce88a2d28dfc053b39869090cd9573bfdd))
+* [DHIS2-16999] filter assign rule effects in the view event page ([#3597](https://github.com/dhis2/capture-app/issues/3597)) ([f2007e3](https://github.com/dhis2/capture-app/commit/f2007e368b0844730ed36c654e1e01323fb92ed2))
+
 ## [100.67.11](https://github.com/dhis2/capture-app/compare/v100.67.10...v100.67.11) (2024-04-14)
 
 
diff --git a/package.json b/package.json
index db16b93213..05ab5030bd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "capture-app",
     "homepage": ".",
-    "version": "100.67.11",
+    "version": "100.67.12",
     "cacheVersion": "7",
     "serverVersion": "38",
     "license": "BSD-3-Clause",
@@ -10,7 +10,7 @@
         "packages/rules-engine"
     ],
     "dependencies": {
-        "@dhis2/rules-engine-javascript": "100.67.11",
+        "@dhis2/rules-engine-javascript": "100.67.12",
         "@dhis2/app-runtime": "^3.9.3",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-icons": "^1.0.1",
diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json
index 7484fc82eb..7e5afcc77a 100644
--- a/packages/rules-engine/package.json
+++ b/packages/rules-engine/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/rules-engine-javascript",
-    "version": "100.67.11",
+    "version": "100.67.12",
     "license": "BSD-3-Clause",
     "main": "./build/cjs/index.js",
     "scripts": {

From 85f38bedd60c307788cf17237338765bf9fed7f0 Mon Sep 17 00:00:00 2001
From: eirikhaugstulen <eirik.haugstulen@gmail.com>
Date: Thu, 25 Apr 2024 10:24:08 +0200
Subject: [PATCH 04/19] feat: [DHIS2-13299][DHIS2-16291] Related Stages (#3488)

---
 i18n/en.pot                                   |  31 +++
 .../storage/IndexedDBAdapter.js               |  10 +-
 .../storage/StorageController.js              |   4 +-
 .../validators/form/orgUnit.validator.js      |   2 +-
 .../withAskToCompleteEnrollment.js            |   8 +-
 .../DataEntry/CancelButton.component.js       |   2 +
 .../DataEntry/DataEntry.component.js          |   1 -
 .../components/DataEntry/withCancelButton.js  |   4 +-
 .../DataSection/DataSection.component.js      |   5 +-
 .../EnrollmentAddEventPage.epics.js           | 116 +++++++---
 ...EnrollmentAddEventPageDefault.container.js |  44 ++--
 .../EnrollmentAddEventPageDefault.types.js    |   1 -
 .../NewEventWorkspace.component.js            |   2 -
 .../newEventWorkspace.types.js                |   1 -
 .../Pages/EnrollmentAddEvent/index.js         |   2 -
 .../LayoutComponentConfig.js                  |   2 -
 .../enrollment.actions.js                     |  29 ++-
 .../common/EnrollmentOverviewDomain/index.js  |   3 +-
 .../Relationships/relationships.types.js      |   1 +
 .../WidgetEnrollment/enrollment.types.js      |   7 +
 .../accessVerification.types.js               |   1 -
 .../DataEntry/dataEntryFieldLabels.module.css |   2 +-
 .../FinishButtons/FinishButtons.component.js  |  18 +-
 .../FinishButtons/finishButtons.types.js      |   3 +
 .../Validated/Validated.component.js          |  14 ++
 .../Validated/Validated.container.js          | 215 ++++++++++--------
 .../Validated/getConvertedAddEvent.js         |  43 ++--
 .../getConvertedRelatedStageEvent.js          | 120 ++++++++++
 .../getConvertedRelatedStageEvent.types.js    |  29 +++
 .../getConvertedRelatedStageEvent/index.js    |   2 +
 .../Validated/index.js                        |   2 +-
 .../Validated/useBuildNewEventPayload.js      | 168 ++++++++++++++
 .../Validated/validated.actions.js            | 159 ++++---------
 .../Validated/validated.epics.js              | 122 ++--------
 .../Validated/validated.types.js              |  35 +++
 .../WidgetEnrollmentEventNew.container.js     |   2 -
 .../WidgetEnrollmentEventNew.types.js         |   1 -
 .../WidgetEnrollmentEventNew/common.types.js  |   1 -
 .../WidgetEnrollmentEventNew/index.js         |   2 +-
 .../WidgetEventSchedule.epics.js              |   3 +-
 .../DateFieldForRelatedStages.js              |  66 ++++++
 .../OrgUnitSelectorForRelatedStages.js        |  77 +++++++
 .../FormComponents/commonProps.js             |   6 +
 .../dataEntryFieldLabels.module.css           |   3 +
 .../FormComponents/index.js                   |   4 +
 .../LinkToExisting.component.js               |  74 ++++++
 .../LinkToExisting/LinkToExisting.types.js    |  14 ++
 .../LinkToExisting/index.js                   |   2 +
 .../RelatedStagesActions.component.js         | 149 ++++++++++++
 .../RelatedStagesActions.types.js             |  38 ++++
 .../RelatedStagesActions/index.js             |   3 +
 .../ScheduleInOrgUnit.container.js            | 107 +++++++++
 .../ScheduleInOrgUnit/index.js                |   2 +
 .../WidgetRelatedStages.component.js          | 110 +++++++++
 .../WidgetRelatedStages.constants.js          |  11 +
 .../WidgetRelatedStages.types.js              |  33 +++
 .../WidgetRelatedStages/constants.js          |  19 ++
 .../hooks/useAvailableRelatedStageEvents.js   |  83 +++++++
 .../hooks/useStageLabels.js                   |  34 +++
 .../components/WidgetRelatedStages/index.js   |   4 +
 .../ValidationFunctions.js                    |  70 ++++++
 .../relatedStageEventIsValid.js               |  32 +++
 .../relatedStageEventIsValid.types.js         |  15 ++
 .../WidgetRelatedStages/useRelatedStages.js   |  90 ++++++++
 .../RelationshipType/RelationshipType.js      |   9 +
 .../storeRelationshipTypes.js                 |   2 +-
 .../enrollmentDomain.reducerDescription.js    | 141 ++++++++----
 .../query/useApiDataQuery.js                  |   2 +-
 src/epics/trackerCapture.epics.js             |   6 -
 69 files changed, 1952 insertions(+), 471 deletions(-)
 create mode 100644 src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedRelatedStageEvent/getConvertedRelatedStageEvent.js
 create mode 100644 src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedRelatedStageEvent/getConvertedRelatedStageEvent.types.js
 create mode 100644 src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedRelatedStageEvent/index.js
 create mode 100644 src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/useBuildNewEventPayload.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/DateFieldForRelatedStages.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/OrgUnitSelectorForRelatedStages.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/commonProps.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/dataEntryFieldLabels.module.css
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/index.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/LinkToExisting/LinkToExisting.component.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/LinkToExisting/LinkToExisting.types.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/LinkToExisting/index.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.component.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.types.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/RelatedStagesActions/index.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/ScheduleInOrgUnit/ScheduleInOrgUnit.container.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/ScheduleInOrgUnit/index.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.component.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.constants.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.types.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/constants.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/hooks/useAvailableRelatedStageEvents.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/hooks/useStageLabels.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/index.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/ValidationFunctions.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/relatedStageEventIsValid.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/relatedStageEventIsValid.types.js
 create mode 100644 src/core_modules/capture-core/components/WidgetRelatedStages/useRelatedStages.js

diff --git a/i18n/en.pot b/i18n/en.pot
index 6c9c678fbc..723eb3a41d 100644
--- a/i18n/en.pot
+++ b/i18n/en.pot
@@ -1448,6 +1448,37 @@ msgstr "{{trackedEntityTypeName}} profile"
 msgid "tracked entity instance"
 msgstr "tracked entity instance"
 
+msgid "Link to an existing {{linkableStageLabel}}"
+msgstr "Link to an existing {{linkableStageLabel}}"
+
+msgid "Choose a {{linkableStageLabel}}"
+msgstr "Choose a {{linkableStageLabel}}"
+
+msgid "Ambiguous relationships, contact system administrator"
+msgstr "Ambiguous relationships, contact system administrator"
+
+msgid ""
+"Enter {{linkableStageLabel}} details in the next step after completing this "
+"{{currentStageLabel}}."
+msgstr ""
+"Enter {{linkableStageLabel}} details in the next step after completing this "
+"{{currentStageLabel}}."
+
+msgid "Enter details now"
+msgstr "Enter details now"
+
+msgid "Link to an existing"
+msgstr "Link to an existing"
+
+msgid "Scheduled date"
+msgstr "Scheduled date"
+
+msgid "Report date"
+msgstr "Report date"
+
+msgid "Please select a valid event"
+msgstr "Please select a valid event"
+
 msgid "New {{ eventName }} event"
 msgstr "New {{ eventName }} event"
 
diff --git a/src/core_modules/capture-core-utils/storage/IndexedDBAdapter.js b/src/core_modules/capture-core-utils/storage/IndexedDBAdapter.js
index 40b4400d99..df48a1512a 100644
--- a/src/core_modules/capture-core-utils/storage/IndexedDBAdapter.js
+++ b/src/core_modules/capture-core-utils/storage/IndexedDBAdapter.js
@@ -78,7 +78,7 @@ export class IndexedDBAdapter {
         });
     }
 
-    static get(store, key, db, keyPath) {
+    static get(store, key, options, db, keyPath) {
         return new Promise((resolve, reject) => {
             let tx;
             let catchError;
@@ -105,11 +105,13 @@ export class IndexedDBAdapter {
                 const request = objectStore.get(key);
                 request.onsuccess = (e) => {
                     const object = e.target.result;
+                    const { project } = options || {};
 
                     if (isDefined(object)) {
                         object[keyPath] = key;
                     }
-                    resultObject = object;
+
+                    resultObject = project ? project(object) : object;
                 };
             } catch (error) {
                 if (tx) {
@@ -392,8 +394,8 @@ export class IndexedDBAdapter {
         });
     }
 
-    get(store, key) {
-        return IndexedDBAdapter.get(store, key, this.db, this.keyPath);
+    get(store, key, options) {
+        return IndexedDBAdapter.get(store, key, options, this.db, this.keyPath);
     }
 
     // eslint-disable-next-line class-methods-use-this
diff --git a/src/core_modules/capture-core-utils/storage/StorageController.js b/src/core_modules/capture-core-utils/storage/StorageController.js
index 3bd315ec03..be7fdd3ae1 100644
--- a/src/core_modules/capture-core-utils/storage/StorageController.js
+++ b/src/core_modules/capture-core-utils/storage/StorageController.js
@@ -188,7 +188,7 @@ export class StorageController {
     }
 
     // using async ensures that the the return value is wrapped in a promise
-    async get(store, key) {
+    async get(store, key, options) {
         this.throwIfNotOpen();
         this.throwIfStoreNotFound(store, 'get');
 
@@ -200,7 +200,7 @@ export class StorageController {
             );
         }
 
-        return this.adapter.get(store, key);
+        return this.adapter.get(store, key, options);
     }
 
     // using async ensures that the the return value is wrapped in a promise
diff --git a/src/core_modules/capture-core-utils/validators/form/orgUnit.validator.js b/src/core_modules/capture-core-utils/validators/form/orgUnit.validator.js
index 43b9a8d83e..abd7ce48ba 100644
--- a/src/core_modules/capture-core-utils/validators/form/orgUnit.validator.js
+++ b/src/core_modules/capture-core-utils/validators/form/orgUnit.validator.js
@@ -13,7 +13,7 @@ type OrgUnitValue = {
     path: string,
 }
 
-export const isValidOrgUnit = (value: OrgUnitValue) => {
+export const isValidOrgUnit = (value: ?OrgUnitValue) => {
     const valid = !!(value && value.id && value.name);
     return valid;
 };
diff --git a/src/core_modules/capture-core/components/DataEntries/common/trackerEvent/withAskToCompleteEnrollment/withAskToCompleteEnrollment.js b/src/core_modules/capture-core/components/DataEntries/common/trackerEvent/withAskToCompleteEnrollment/withAskToCompleteEnrollment.js
index 84e955b839..b1d2cee393 100644
--- a/src/core_modules/capture-core/components/DataEntries/common/trackerEvent/withAskToCompleteEnrollment/withAskToCompleteEnrollment.js
+++ b/src/core_modules/capture-core/components/DataEntries/common/trackerEvent/withAskToCompleteEnrollment/withAskToCompleteEnrollment.js
@@ -6,6 +6,8 @@ import { CompleteModal } from './CompleteModal';
 import { statusTypes as eventStatuses } from '../../../../../events/statusTypes';
 import { type RenderFoundation } from '../../../../../metaData';
 import { addEventSaveTypes } from '../../../../WidgetEnrollmentEventNew/DataEntry/addEventSaveTypes';
+import { actions as LinkModes } from '../../../../WidgetRelatedStages/constants';
+import type { RelatedStageRefPayload } from '../../../../WidgetEnrollmentEventNew/Validated/validated.types';
 
 type Props = {
     onSave: (eventId: string, dataEntryId: string, formFoundation: RenderFoundation, saveType?: ?string) => void,
@@ -13,6 +15,7 @@ type Props = {
     isCompleted?: boolean,
     eventId?: ?string,
     formFoundation: RenderFoundation,
+    relatedStageRef: { current?: ?RelatedStageRefPayload },
     onSaveAndCompleteEnrollment: (
         eventId: string,
         dataEntryId: string,
@@ -28,6 +31,7 @@ const getAskToCompleteEnrollment = (InnerComponent: ComponentType<any>) => (prop
         isCompleted,
         onSaveAndCompleteEnrollment,
         eventId,
+        relatedStageRef,
         ...passOnProps
     } = props;
     const enrollment = useSelector(({ enrollmentDomain }) => enrollmentDomain?.enrollment);
@@ -54,8 +58,9 @@ const getAskToCompleteEnrollment = (InnerComponent: ComponentType<any>) => (prop
         formFoundation: RenderFoundation,
         saveType?: string,
     ) => {
+        const { linkMode } = relatedStageRef?.current?.getLinkedStageValues() ?? {};
         eventDataToSave.current = { itemId, dataEntryId, formFoundation, saveType };
-        if (askCompleteEnrollmentOnEventComplete && (isCompleted || saveType === addEventSaveTypes.COMPLETE)) {
+        if (askCompleteEnrollmentOnEventComplete && (isCompleted || saveType === addEventSaveTypes.COMPLETE) && linkMode !== LinkModes.ENTER_DATA) {
             setOpenCompleteModal(true);
         } else {
             onSave(itemId, dataEntryId, formFoundation, saveType);
@@ -66,6 +71,7 @@ const getAskToCompleteEnrollment = (InnerComponent: ComponentType<any>) => (prop
         <>
             <InnerComponent
                 {...passOnProps}
+                relatedStageRef={relatedStageRef}
                 askCompleteEnrollmentOnEventComplete={askCompleteEnrollmentOnEventComplete}
                 onSave={handleOnSave}
                 isCompleted={isCompleted}
diff --git a/src/core_modules/capture-core/components/DataEntry/CancelButton.component.js b/src/core_modules/capture-core/components/DataEntry/CancelButton.component.js
index ca41bcaec2..679e1ade59 100644
--- a/src/core_modules/capture-core/components/DataEntry/CancelButton.component.js
+++ b/src/core_modules/capture-core/components/DataEntry/CancelButton.component.js
@@ -7,6 +7,7 @@ import { defaultDialogProps } from '../Dialogs/DiscardDialog.constants';
 
 type Props = {
     dataEntryHasChanges: boolean,
+    disabled: boolean,
     onCancel: () => void,
 }
 
@@ -36,6 +37,7 @@ export class CancelButtonComponent extends React.Component<Props, State> {
             <div>
                 <Button
                     onClick={this.handleCancel}
+                    disabled={this.props.disabled}
                     secondary
                 >
                     { i18n.t('Cancel') }
diff --git a/src/core_modules/capture-core/components/DataEntry/DataEntry.component.js b/src/core_modules/capture-core/components/DataEntry/DataEntry.component.js
index c0c818c491..7ff1ce7056 100644
--- a/src/core_modules/capture-core/components/DataEntry/DataEntry.component.js
+++ b/src/core_modules/capture-core/components/DataEntry/DataEntry.component.js
@@ -44,7 +44,6 @@ const styles = theme => ({
     verticalFormContainer: {
         flexGrow: 10,
         maxWidth: '100%',
-        marginBottom: spacers.dp12,
     },
     verticalFormInnerContainer: {
         maxWidth: theme.typography.pxToRem(892),
diff --git a/src/core_modules/capture-core/components/DataEntry/withCancelButton.js b/src/core_modules/capture-core/components/DataEntry/withCancelButton.js
index 7def594049..76689ba911 100644
--- a/src/core_modules/capture-core/components/DataEntry/withCancelButton.js
+++ b/src/core_modules/capture-core/components/DataEntry/withCancelButton.js
@@ -5,6 +5,7 @@ import { CancelButton } from './CancelButton.container';
 type Props = {
     id: string,
     onCancel: () => void,
+    cancelButtonIsDisabled?: boolean,
     cancelButtonRef?: ?Function,
 };
 
@@ -22,7 +23,7 @@ const getCancelButton = (InnerComponent: React.ComponentType<any>, optionsFn?: ?
         getWrappedInstance = () => this.innerInstance;
 
         render() {
-            const { onCancel, cancelButtonRef, ...passOnProps } = this.props;
+            const { onCancel, cancelButtonIsDisabled, cancelButtonRef, ...passOnProps } = this.props;
             const options = (optionsFn && optionsFn(this.props)) || {};
 
             return (
@@ -34,6 +35,7 @@ const getCancelButton = (InnerComponent: React.ComponentType<any>, optionsFn?: ?
                             id={this.props.id}
                             onCancel={onCancel}
                             options={options}
+                            disabled={cancelButtonIsDisabled}
                         />
                     }
                     {...passOnProps}
diff --git a/src/core_modules/capture-core/components/DataSection/DataSection.component.js b/src/core_modules/capture-core/components/DataSection/DataSection.component.js
index f069efc794..953714939f 100644
--- a/src/core_modules/capture-core/components/DataSection/DataSection.component.js
+++ b/src/core_modules/capture-core/components/DataSection/DataSection.component.js
@@ -5,11 +5,12 @@ import { withStyles } from '@material-ui/core';
 import type { Props } from './dataSection.type';
 
 
-const styles = {
+const styles = theme => ({
     sectionWrapper: {
         border: `1px solid ${colors.grey300}`,
         borderRadius: '3px',
         marginBottom: spacersNum.dp16,
+        maxWidth: theme.typography.pxToRem(892),
     },
     sectionHeader: {
         color: colors.grey900,
@@ -20,7 +21,7 @@ const styles = {
         marginBottom: '8px',
         width: 'fit-content',
     },
-};
+});
 
 const DataSectionPlain = ({ sectionName, children, classes, dataTest }: Props) => (
     <div
diff --git a/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPage.epics.js b/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPage.epics.js
index 65f2743e22..ea90f8b0fc 100644
--- a/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPage.epics.js
+++ b/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPage.epics.js
@@ -6,23 +6,92 @@ import {
     addEnrollmentEventPageDefaultActionTypes,
 } from './EnrollmentAddEventPageDefault/EnrollmentAddEventPageDefault.actions';
 import {
-    commitEnrollmentEventWithoutId,
-    rollbackEnrollmentEventWithoutId,
+    addPersistedEnrollmentEvents,
+    commitEnrollmentEvents,
+    rollbackEnrollmentEvents,
     saveFailed,
-    commitEnrollmentAndEvents,
-    rollbackEnrollmentAndEvents,
 } from '../common/EnrollmentOverviewDomain/enrollment.actions';
+import { actions as RelatedStageActions } from '../../WidgetRelatedStages/constants';
+import { buildUrlQueryString } from '../../../utils/routing';
 
-export const saveNewEventSucceededEpic = (action$: InputObservable) =>
+const shouldNavigateWithRelatedStage = ({
+    linkMode,
+    linkedEventId,
+    linkedOrgUnitId,
+    history,
+}) => {
+    if (linkMode && linkedEventId) {
+        if (linkMode === RelatedStageActions.ENTER_DATA) {
+            const navigate = () => history.push(`/enrollmentEventEdit?${buildUrlQueryString({
+                eventId: linkedEventId,
+                orgUnitId: linkedOrgUnitId,
+            })}`);
+            return { navigate };
+        }
+    }
+    return {};
+};
+
+export const saveNewEventSucceededEpic = (action$: InputObservable, state: ReduxStore, { history }: ApiUtils) =>
     action$.pipe(
         ofType(
             addEnrollmentEventPageDefaultActionTypes.EVENT_SAVE_SUCCESS,
             addEnrollmentEventPageDefaultActionTypes.EVENT_SCHEDULE_SUCCESS,
         ),
         map((action) => {
-            const meta = action.meta;
-            const eventId = action.payload.bundleReport.typeReportMap.EVENT.objectReports[0].uid;
-            return commitEnrollmentEventWithoutId(meta.uid, eventId);
+            const actions = [];
+            const { enrollmentDomain } = state.value;
+            const eventsFromApi = action.payload.bundleReport.typeReportMap.EVENT.objectReports;
+            const { serverData: { events, enrollments } } = action.meta;
+            const serverDataEvents = events ?? enrollments[0].events;
+            const enrollmentEvents = enrollmentDomain.enrollment.events;
+
+            const { eventsToCommit, eventsToAdd } = serverDataEvents.reduce((acc, event) => {
+                const eventFromRedux = enrollmentEvents.find(e => e.event === event.event);
+
+                if (!eventFromRedux) {
+                    acc.eventsToAdd.push(event);
+                } else if (eventFromRedux.pendingApiResponse) {
+                    const eventToCommit = eventsFromApi.find(e => e.uid === event.event);
+                    acc.eventsToCommit.push(eventToCommit);
+                }
+                return acc;
+            }, { eventsToCommit: [], eventsToAdd: [] });
+
+            if (eventsToAdd.length > 0) {
+                actions.push(
+                    addPersistedEnrollmentEvents({ events: eventsToAdd }),
+                );
+            }
+
+            if (eventsToCommit.length > 0) {
+                actions.push(
+                    commitEnrollmentEvents({ events: eventsToCommit }),
+                );
+            }
+
+            if (enrollmentDomain.eventSaveInProgress) {
+                const {
+                    linkMode,
+                    requestEventId,
+                    linkedEventId,
+                    linkedOrgUnitId,
+                } = enrollmentDomain.eventSaveInProgress;
+                const requestEvent = eventsFromApi.find(event => event.uid === requestEventId);
+
+                if (requestEvent) {
+                    const { navigate } = shouldNavigateWithRelatedStage({
+                        linkMode,
+                        linkedEventId,
+                        linkedOrgUnitId,
+                        history,
+                    });
+
+                    navigate && navigate();
+                }
+            }
+
+            return batchActions(actions);
         }),
     );
 
@@ -33,30 +102,15 @@ export const saveNewEventFailedEpic = (action$: InputObservable) =>
             addEnrollmentEventPageDefaultActionTypes.EVENT_SCHEDULE_ERROR,
         ),
         map((action) => {
-            const meta = action.meta;
-            return batchActions([saveFailed(), rollbackEnrollmentEventWithoutId(meta.uid)]);
-        }),
-    );
+            const { serverData: { events, enrollments } } = action.meta;
+            const rollbackEvents = events ?? enrollments[0].events;
 
-export const saveEventAndCompleteEnrollmentSucceededEpic = (action$: InputObservable) =>
-    action$.pipe(
-        ofType(addEnrollmentEventPageDefaultActionTypes.EVENT_SAVE_ENROLLMENT_COMPLETE_SUCCESS),
-        map((action) => {
-            const meta = action.meta;
-            // the bundleReport returns the events in the same order as the payload order. Therefore, we know that the first event is the newly added one.
-            const eventId = action.payload.bundleReport.typeReportMap.EVENT.objectReports[0].uid;
-            return commitEnrollmentAndEvents(meta.uid, eventId);
+            return batchActions([
+                saveFailed(),
+                rollbackEnrollmentEvents({
+                    events: rollbackEvents,
+                }),
+            ]);
         }),
     );
 
-export const saveEventAndCompleteEnrollmentFailedEpic = (action$: InputObservable) =>
-    action$.pipe(
-        ofType(addEnrollmentEventPageDefaultActionTypes.EVENT_SAVE_ENROLLMENT_COMPLETE_ERROR),
-        map((action) => {
-            const meta = action.meta;
-            return batchActions(
-                [saveFailed(), rollbackEnrollmentAndEvents(meta.uid)],
-                'NewEvent.saveEventAndCompleteEnrollmentFailed',
-            );
-        }),
-    );
diff --git a/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPageDefault/EnrollmentAddEventPageDefault.container.js b/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPageDefault/EnrollmentAddEventPageDefault.container.js
index 6092130e06..e6ffef29a9 100644
--- a/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPageDefault/EnrollmentAddEventPageDefault.container.js
+++ b/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPageDefault/EnrollmentAddEventPageDefault.container.js
@@ -1,7 +1,9 @@
 // @flow
 import React, { useCallback, useMemo } from 'react';
+import moment from 'moment';
 // $FlowFixMe
 import { useDispatch, useSelector } from 'react-redux';
+import { useTimeZoneConversion } from '@dhis2/app-runtime';
 import i18n from '@dhis2/d2-i18n';
 import { useHistory } from 'react-router-dom';
 import { NoticeBox } from '@dhis2/ui';
@@ -9,24 +11,24 @@ import { buildUrlQueryString, useLocationQuery } from '../../../../utils/routing
 import { useProgramInfo } from '../../../../hooks/useProgramInfo';
 import { useEnrollmentAddEventTopBar, EnrollmentAddEventTopBar } from '../TopBar';
 import { deleteEnrollment, fetchEnrollments } from '../../Enrollment/EnrollmentPage.actions';
+import { actions as RelatedStageModes } from '../../../WidgetRelatedStages/constants';
 
 import { useWidgetDataFromStore } from '../hooks';
 import {
     useHideWidgetByRuleLocations,
 } from '../../Enrollment/EnrollmentPageDefault/hooks';
 import {
-    updateEnrollmentEventWithoutId,
+    updateOrAddEnrollmentEvents,
     showEnrollmentError,
     updateEnrollmentAndEvents,
-    commitEnrollmentAndEvents,
     rollbackEnrollmentAndEvents,
-    setExternalEnrollmentStatus,
+    setExternalEnrollmentStatus, commitEnrollmentAndEvents,
 } from '../../common/EnrollmentOverviewDomain';
 import { dataEntryHasChanges as getDataEntryHasChanges } from '../../../DataEntry/common/dataEntryHasChanges';
 import type { ContainerProps } from './EnrollmentAddEventPageDefault.types';
-import { statusTypes } from '../../../../enrollment';
 import { WidgetsForEnrollmentEventNew } from '../PageLayout/DefaultPageLayout.constants';
 import { EnrollmentAddEventPageDefaultComponent } from './EnrollmentAddEventPageDefault.component';
+import { convertEventAttributeOptions } from '../../../../events/convertEventAttributeOptions';
 
 export const EnrollmentAddEventPageDefault = ({
     pageLayout,
@@ -38,6 +40,7 @@ export const EnrollmentAddEventPageDefault = ({
 
     const history = useHistory();
     const dispatch = useDispatch();
+    const { fromClientDate } = useTimeZoneConversion();
 
     const handleCancel = useCallback(() => {
         history.push(`enrollment?${buildUrlQueryString({ programId, orgUnitId, teiId, enrollmentId })}`);
@@ -62,20 +65,28 @@ export const EnrollmentAddEventPageDefault = ({
     }, [dispatch, history, programId, orgUnitId, teiId, enrollmentId]);
 
     const handleSave = useCallback(
-        (data, uid) => {
-            dispatch(updateEnrollmentEventWithoutId(uid, data.events[0]));
-            history.push(`enrollment?${buildUrlQueryString({ programId, orgUnitId, teiId, enrollmentId })}`);
-        },
-        [dispatch, history, programId, orgUnitId, teiId, enrollmentId],
-    );
+        ({ enrollments, events, linkMode }) => {
+            if (linkMode && linkMode === RelatedStageModes.ENTER_DATA) return;
+
+            const nowClient = fromClientDate(new Date());
+            const nowServer = new Date(nowClient.getServerZonedISOString());
+            const updatedAt = moment(nowServer).format('YYYY-MM-DDTHH:mm:ss');
+
+            const eventsWithUpdatedDate = events.map(event => ({
+                ...convertEventAttributeOptions(event),
+                updatedAt,
+            }));
+
+            if (enrollments) {
+                dispatch(setExternalEnrollmentStatus(enrollments[0].status));
+                dispatch(updateEnrollmentAndEvents(enrollments[0]));
+            } else if (events) {
+                dispatch(updateOrAddEnrollmentEvents({ events: eventsWithUpdatedDate }));
+            }
 
-    const handleSaveAndCompleteEnrollment = useCallback(
-        (enrollmentToUpdate) => {
-            dispatch(setExternalEnrollmentStatus(statusTypes.COMPLETED));
-            dispatch(updateEnrollmentAndEvents(enrollmentToUpdate));
             history.push(`enrollment?${buildUrlQueryString({ programId, orgUnitId, teiId, enrollmentId })}`);
         },
-        [dispatch, history, programId, orgUnitId, teiId, enrollmentId],
+        [fromClientDate, dispatch, history, programId, orgUnitId, teiId, enrollmentId],
     );
 
     const handleAddNew = useCallback(() => {
@@ -170,7 +181,6 @@ export const EnrollmentAddEventPageDefault = ({
                 teiId={teiId}
                 enrollmentId={enrollmentId}
                 onSave={handleSave}
-                onSaveAndCompleteEnrollment={handleSaveAndCompleteEnrollment}
                 onCancel={handleCancel}
                 onDelete={handleDelete}
                 onDeleteTrackedEntitySuccess={onDeleteTrackedEntitySuccess}
@@ -185,8 +195,8 @@ export const EnrollmentAddEventPageDefault = ({
                 onEnrollmentError={onEnrollmentError}
                 onEnrollmentSuccess={onEnrollmentSuccess}
                 events={enrollment?.events}
-                onUpdateEnrollmentStatus={onUpdateEnrollmentStatus}
                 onUpdateEnrollmentStatusSuccess={onUpdateEnrollmentStatusSuccess}
+                onUpdateEnrollmentStatus={onUpdateEnrollmentStatus}
                 onUpdateEnrollmentStatusError={onUpdateEnrollmentStatusError}
                 onAccessLostFromTransfer={onAccessLostFromTransfer}
             />
diff --git a/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPageDefault/EnrollmentAddEventPageDefault.types.js b/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPageDefault/EnrollmentAddEventPageDefault.types.js
index 9b360a3555..d900462c76 100644
--- a/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPageDefault/EnrollmentAddEventPageDefault.types.js
+++ b/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPageDefault/EnrollmentAddEventPageDefault.types.js
@@ -27,7 +27,6 @@ export type Props = {|
     ready: boolean,
     widgetReducerName: string,
     events?: Array<ApiEnrollmentEvent>,
-    onSaveAndCompleteEnrollment: (enrollment: ApiEnrollment) => void,
     onUpdateEnrollmentStatus: (enrollment: Object) => void,
     onUpdateEnrollmentStatusSuccess: ({ redirect?: boolean }) => void,
     onUpdateEnrollmentStatusError: (message: string) => void,
diff --git a/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/NewEventWorkspace/NewEventWorkspace.component.js b/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/NewEventWorkspace/NewEventWorkspace.component.js
index 057f03f0e3..36dc29f928 100644
--- a/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/NewEventWorkspace/NewEventWorkspace.component.js
+++ b/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/NewEventWorkspace/NewEventWorkspace.component.js
@@ -31,7 +31,6 @@ const NewEventWorkspacePlain = ({
     dataEntryHasChanges,
     onCancel,
     onSave,
-    onSaveAndCompleteEnrollment,
     classes,
     ...passOnProps
 }: PlainProps) => {
@@ -88,7 +87,6 @@ const NewEventWorkspacePlain = ({
                         enrollmentId={enrollmentId}
                         onSaveSuccessActionType={addEnrollmentEventPageDefaultActionTypes.EVENT_SAVE_SUCCESS}
                         onSaveErrorActionType={addEnrollmentEventPageDefaultActionTypes.EVENT_SAVE_ERROR}
-                        onSaveAndCompleteEnrollment={onSaveAndCompleteEnrollment}
                         onSaveAndCompleteEnrollmentSuccessActionType={
                             addEnrollmentEventPageDefaultActionTypes.EVENT_SAVE_ENROLLMENT_COMPLETE_SUCCESS
                         }
diff --git a/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/NewEventWorkspace/newEventWorkspace.types.js b/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/NewEventWorkspace/newEventWorkspace.types.js
index eba4568ea5..0621fb2b54 100644
--- a/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/NewEventWorkspace/newEventWorkspace.types.js
+++ b/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/NewEventWorkspace/newEventWorkspace.types.js
@@ -11,7 +11,6 @@ export type Props = {|
     widgetReducerName: string,
     rulesExecutionDependencies: Object,
     onSave: ExternalSaveHandler,
-    onSaveAndCompleteEnrollment: (enrollment: ApiEnrollment) => void,
     onCancel: () => void,
 |};
 
diff --git a/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/index.js b/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/index.js
index 5e05e6788f..db5561724a 100644
--- a/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/index.js
+++ b/src/core_modules/capture-core/components/Pages/EnrollmentAddEvent/index.js
@@ -3,6 +3,4 @@ export { EnrollmentAddEventPage } from './EnrollmentAddEventPage.container';
 export {
     saveNewEventFailedEpic,
     saveNewEventSucceededEpic,
-    saveEventAndCompleteEnrollmentSucceededEpic,
-    saveEventAndCompleteEnrollmentFailedEpic,
 } from './EnrollmentAddEventPage.epics';
diff --git a/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/EnrollmentPageLayout/LayoutComponentConfig/LayoutComponentConfig.js b/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/EnrollmentPageLayout/LayoutComponentConfig/LayoutComponentConfig.js
index 5ce30c6f96..1ec4177636 100644
--- a/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/EnrollmentPageLayout/LayoutComponentConfig/LayoutComponentConfig.js
+++ b/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/EnrollmentPageLayout/LayoutComponentConfig/LayoutComponentConfig.js
@@ -150,7 +150,6 @@ export const NewEventWorkspace: WidgetConfig = {
         widgetReducerName,
         rulesExecutionDependencies,
         onSave,
-        onSaveAndCompleteEnrollment,
         onCancel,
     }): NewEventWorkspaceWrapperProps => ({
         programId: program.id,
@@ -162,7 +161,6 @@ export const NewEventWorkspace: WidgetConfig = {
         widgetReducerName,
         rulesExecutionDependencies,
         onSave,
-        onSaveAndCompleteEnrollment,
         onCancel,
     }),
 };
diff --git a/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/enrollment.actions.js b/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/enrollment.actions.js
index 7b2632988f..9b74bba99e 100644
--- a/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/enrollment.actions.js
+++ b/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/enrollment.actions.js
@@ -1,19 +1,22 @@
 // @flow
 import { actionCreator } from '../../../../actions/actions.utils';
+import type { EventReducerProps } from '../../../WidgetEnrollment/enrollment.types';
 
 export const enrollmentSiteActionTypes = {
     COMMON_ENROLLMENT_SITE_DATA_SET: 'EnrollmentSite.SetCommonData',
     UPDATE_ENROLLMENT_DATE: 'Enrollment.UpdateEnrollmentDate',
     UPDATE_INCIDENT_DATE: 'Enrollment.UpdateIncidentDate',
     UPDATE_ENROLLMENT_EVENT: 'Enrollment.UpdateEnrollmentEvent',
+    UPDATE_OR_ADD_ENROLLMENT_EVENTS: 'Enrollment.UpdateOrAddEnrollmentEvents',
     UPDATE_ENROLLMENT_EVENT_WITHOUT_ID: 'Enrollment.UpdateEnrollmentEventWithoutId',
     UPDATE_ENROLLMENT_ATTRIBUTE_VALUES: 'Enrollment.UpdateEnrollmentAttributeValues',
     ROLLBACK_ENROLLMENT_EVENT: 'Enrollment.RollbackEnrollmentEvent',
-    ROLLBACK_ENROLLMENT_EVENT_WITHOUT_ID: 'Enrollment.RollbackEnrollmentEventWithoutId',
+    ROLLBACK_ENROLLMENT_EVENTS: 'Enrollment.RollbackEnrollmentEvents',
     COMMIT_ENROLLMENT_EVENT: 'Enrollment.CommitEnrollmentEvent',
-    COMMIT_ENROLLMENT_EVENT_WITHOUT_ID: 'Enrollment.CommitEnrollmentEventWithoutId',
+    COMMIT_ENROLLMENT_EVENTS: 'Enrollment.CommitEnrollmentEvents',
     SAVE_FAILED: 'Enrollment.SaveFailed',
     ERROR_ENROLLMENT: 'Enrollment.ErrorEnrollment',
+    ADD_PERSISTED_ENROLLMENT_EVENTS: 'Enrollment.AddPersistedEnrollmentEvents',
     UPDATE_ENROLLMENT_AND_EVENTS: 'Enrollment.UpdateEnrollmentAndEvents',
     ROLLBACK_ENROLLMENT_AND_EVENTS: 'Enrollment.RollbackEnrollmentAndEvents',
     COMMIT_ENROLLMENT_AND_EVENTS: 'Enrollment.CommitEnrollmentAndEvents',
@@ -49,22 +52,21 @@ export const commitEnrollmentEvent = (eventId: string) =>
         eventId,
     });
 
+export const updateOrAddEnrollmentEvents = ({ events }: EventReducerProps) =>
+    actionCreator(enrollmentSiteActionTypes.UPDATE_OR_ADD_ENROLLMENT_EVENTS)({ events });
+
+export const rollbackEnrollmentEvents = ({ events }: EventReducerProps) =>
+    actionCreator(enrollmentSiteActionTypes.ROLLBACK_ENROLLMENT_EVENTS)({ events });
+
+export const commitEnrollmentEvents = ({ events }: EventReducerProps) =>
+    actionCreator(enrollmentSiteActionTypes.COMMIT_ENROLLMENT_EVENTS)({ events });
+
 export const updateEnrollmentEventWithoutId = (uid: string, eventData: Object) =>
     actionCreator(enrollmentSiteActionTypes.UPDATE_ENROLLMENT_EVENT_WITHOUT_ID)({
         eventData,
         uid,
     });
 
-export const rollbackEnrollmentEventWithoutId = (uid: string) =>
-    actionCreator(enrollmentSiteActionTypes.ROLLBACK_ENROLLMENT_EVENT_WITHOUT_ID)({
-        uid,
-    });
-
-export const commitEnrollmentEventWithoutId = (uid: string, eventId: string) =>
-    actionCreator(enrollmentSiteActionTypes.COMMIT_ENROLLMENT_EVENT_WITHOUT_ID)({
-        eventId,
-        uid,
-    });
 export const saveFailed = () => actionCreator(enrollmentSiteActionTypes.SAVE_FAILED)();
 
 export const updateEnrollmentAttributeValues = (attributeValues: Array<{ [key: string]: string }>) =>
@@ -97,3 +99,6 @@ export const setExternalEnrollmentStatus = (status: string) =>
     actionCreator(enrollmentSiteActionTypes.SET_EXTERNAL_ENROLLMENT_STATUS)({
         status,
     });
+
+export const addPersistedEnrollmentEvents = ({ events }: EventReducerProps) =>
+    actionCreator(enrollmentSiteActionTypes.ADD_PERSISTED_ENROLLMENT_EVENTS)({ events });
diff --git a/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/index.js b/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/index.js
index 1413f4470a..a4447b6310 100644
--- a/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/index.js
+++ b/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/index.js
@@ -2,11 +2,12 @@
 export type { HideWidgets, WidgetEffects } from './enrollmentOverviewDomain.types';
 export {
     enrollmentSiteActionTypes,
+    updateEnrollmentEvent,
     updateEnrollmentDate,
     updateIncidentDate,
-    updateEnrollmentEvent,
     commitEnrollmentEvent,
     rollbackEnrollmentEvent,
+    updateOrAddEnrollmentEvents,
     updateEnrollmentEventWithoutId,
     updateEnrollmentAttributeValues,
     showEnrollmentError,
diff --git a/src/core_modules/capture-core/components/Relationships/relationships.types.js b/src/core_modules/capture-core/components/Relationships/relationships.types.js
index 4c6a776327..1c596c96bc 100644
--- a/src/core_modules/capture-core/components/Relationships/relationships.types.js
+++ b/src/core_modules/capture-core/components/Relationships/relationships.types.js
@@ -14,6 +14,7 @@ export type Entity = {
 export type Relationship = {
     clientId: string,
     id?: ?string,
+    referral?: boolean,
     from: Entity,
     to: Entity,
     relationshipType: RelationshipType,
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/enrollment.types.js b/src/core_modules/capture-core/components/WidgetEnrollment/enrollment.types.js
index 9a9d1340f0..f9b317a953 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/enrollment.types.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/enrollment.types.js
@@ -1,6 +1,13 @@
 // @flow
 import type { FetchError, QueryRefetchFunction } from '@dhis2/app-runtime';
 
+export type EventReducerProps = {|
+    enrollments?: ?Array<Object>,
+    events: Array<{
+        event: string,
+    }>
+|}
+
 export type Props = {|
     teiId: string,
     enrollmentId: string,
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/AccessVerification/accessVerification.types.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/AccessVerification/accessVerification.types.js
index a91a624e7e..43ada9633c 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/AccessVerification/accessVerification.types.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/AccessVerification/accessVerification.types.js
@@ -13,7 +13,6 @@ export type ContainerProps = {|
     onSaveExternal?: ExternalSaveHandler,
     onSaveSuccessActionType?: string,
     onSaveErrorActionType?: string,
-    onSaveAndCompleteEnrollmentExternal?: (enrollment: ApiEnrollment) => void,
     onSaveAndCompleteEnrollmentSuccessActionType?: string,
     onSaveAndCompleteEnrollmentErrorActionType?: string,
     widgetReducerName: string,
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/dataEntryFieldLabels.module.css b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/dataEntryFieldLabels.module.css
index fd7b90c1bd..19bf2d5799 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/dataEntryFieldLabels.module.css
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/DataEntry/dataEntryFieldLabels.module.css
@@ -46,4 +46,4 @@
 
 .selectLabel {
     padding-top: 13px;
-}
\ No newline at end of file
+}
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/FinishButtons.component.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/FinishButtons.component.js
index 465f807ace..e825929543 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/FinishButtons.component.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/FinishButtons.component.js
@@ -17,15 +17,27 @@ const styles = {
     },
 };
 
-const FinishButtonsPlain = ({ onSave, cancelButton, classes }: Props) => (
+const FinishButtonsPlain = ({
+    onSave,
+    cancelButton,
+    isLoading,
+    classes,
+}: Props) => (
     <div className={classes.container}>
         <div className={classes.button}>
-            <Button onClick={() => onSave(addEventSaveTypes.COMPLETE)} primary>
+            <Button
+                onClick={() => onSave(addEventSaveTypes.COMPLETE)}
+                primary
+                loading={isLoading}
+            >
                 {i18n.t('Complete')}
             </Button>
         </div>
         <div className={classes.button}>
-            <Button onClick={() => onSave(addEventSaveTypes.SAVE_WITHOUT_COMPLETING)}>
+            <Button
+                onClick={() => onSave(addEventSaveTypes.SAVE_WITHOUT_COMPLETING)}
+                disabled={isLoading}
+            >
                 {i18n.t('Save without completing')}
             </Button>
         </div>
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/finishButtons.types.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/finishButtons.types.js
index dd3acb8e32..b87b575b36 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/finishButtons.types.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/FinishButtons/finishButtons.types.js
@@ -5,11 +5,14 @@ import { typeof addEventSaveTypes } from '../DataEntry/addEventSaveTypes';
 export type InputProps = {|
     onSave: (saveType: $Keys<addEventSaveTypes>) => void,
     onCancel: () => void,
+    isLoading: ?boolean,
+    cancelButtonIsDisabled?: boolean,
     id: string,
 |};
 
 export type Props = {|
     onSave: (saveType: $Keys<addEventSaveTypes>) => void,
     cancelButton: Element<any>,
+    isLoading: ?boolean,
     ...CssClasses,
 |};
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.component.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.component.js
index 4e3f2f96ef..b3ba7c2d14 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.component.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.component.js
@@ -6,6 +6,7 @@ import { Widget } from '../../Widget';
 import { DataEntry } from '../DataEntry';
 import { FinishButtons } from '../FinishButtons';
 import { SavingText } from '../SavingText';
+import { WidgetRelatedStages } from '../../WidgetRelatedStages';
 import type { Props } from './validated.types';
 
 const styles = () => ({
@@ -18,8 +19,12 @@ const ValidatedPlain = ({
     ready,
     stage,
     programName,
+    programId,
+    enrollmentId,
+    eventSaveInProgress,
     formFoundation,
     classes,
+    relatedStageRef,
     onSave,
     onCancel,
     orgUnit,
@@ -42,9 +47,18 @@ const ValidatedPlain = ({
                     id={id}
                     orgUnit={orgUnit}
                 />
+                <WidgetRelatedStages
+                    ref={relatedStageRef}
+                    enrollmentId={enrollmentId}
+                    programId={programId}
+                    programStageId={stage?.id}
+                    currentStageLabel={stage.name}
+                />
                 <FinishButtons
                     onSave={onSave}
                     onCancel={onCancel}
+                    isLoading={eventSaveInProgress}
+                    cancelButtonIsDisabled={eventSaveInProgress}
                     id={id}
                 />
                 <SavingText programName={programName} stageName={stage.name} orgUnitName={orgUnit.name} />
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.container.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.container.js
index 93b4cee585..a04a234fb2 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.container.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/Validated.container.js
@@ -1,17 +1,24 @@
 // @flow
-import React, { useCallback } from 'react';
-import { useDispatch } from 'react-redux';
-import { useTimeZoneConversion } from '@dhis2/app-runtime';
+import React, { useCallback, useEffect, useRef } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { batchActions } from 'redux-batched-actions';
 import { withAskToCompleteEnrollment } from '../../DataEntries';
 import { withAskToCreateNew, withSaveHandler } from '../../DataEntry';
 import { useLifecycle } from './useLifecycle';
 import { useClientFormattedRulesExecutionDependencies } from './useClientFormattedRulesExecutionDependencies';
 import { ValidatedComponent } from './Validated.component';
-import { requestSaveEvent, startCreateNewAfterCompleting, requestSaveAndCompleteEnrollment } from './validated.actions';
-import type { ContainerProps } from './validated.types';
+import {
+    cleanUpEventSaveInProgress,
+    newEventBatchActionTypes,
+    requestSaveEvent,
+    setSaveEnrollmentEventInProgress,
+    startCreateNewAfterCompleting,
+} from './validated.actions';
+import type { ContainerProps, RelatedStageRefPayload } from './validated.types';
 import type { RenderFoundation } from '../../../metaData';
-import { addEventSaveTypes } from '../../WidgetEnrollmentEventNew/DataEntry/addEventSaveTypes';
+import { addEventSaveTypes } from '../DataEntry/addEventSaveTypes';
 import { useAvailableProgramStages } from '../../../hooks';
+import { createServerData, useBuildNewEventPayload } from './useBuildNewEventPayload';
 
 const SaveHandlerHOC = withSaveHandler()(ValidatedComponent);
 const AskToCreateNewHandlerHOC = withAskToCreateNew()(SaveHandlerHOC);
@@ -28,14 +35,26 @@ export const Validated = ({
     teiId,
     enrollmentId,
     rulesExecutionDependencies,
-    onSaveAndCompleteEnrollmentExternal,
     onSaveAndCompleteEnrollmentSuccessActionType,
     onSaveAndCompleteEnrollmentErrorActionType,
     ...passOnProps
 }: ContainerProps) => {
     const dataEntryId = 'enrollmentEvent';
     const itemId = 'newEvent';
-    const { fromClientDate } = useTimeZoneConversion();
+    const relatedStageRef = useRef<?RelatedStageRefPayload>(null);
+    const eventSaveInProgress = useSelector(
+        ({ enrollmentDomain }) => !!enrollmentDomain.eventSaveInProgress?.requestEventId,
+    );
+    const { buildNewEventPayload } = useBuildNewEventPayload({
+        dataEntryId,
+        itemId,
+        programId: program.id,
+        orgUnitId: orgUnit.id,
+        orgUnitName: orgUnit.name,
+        teiId,
+        enrollmentId,
+        formFoundation,
+    });
 
     const rulesExecutionDependenciesClientFormatted =
         useClientFormattedRulesExecutionDependencies(rulesExecutionDependencies, program);
@@ -51,114 +70,107 @@ export const Validated = ({
         rulesExecutionDependenciesClientFormatted,
     });
 
-
     const availableProgramStages = useAvailableProgramStages(stage, teiId, enrollmentId, program.id);
 
     const dispatch = useDispatch();
     const handleSave = useCallback((
-        eventId: string,
+        dataEntryItemId: string,
         dataEntryIdArgument: string,
         formFoundationArgument: RenderFoundation,
-        saveType?: ?string,
-    ) => {
+        saveType: ?$Values<typeof addEventSaveTypes>,
+        enrollment: ?Object,
+    ) => new Promise((resolve, reject) => {
+        // Creating a promise to be able to stop navigation if related stages has an error
         window.scrollTo(0, 0);
-        const completed = saveType === addEventSaveTypes.COMPLETE;
-        dispatch(requestSaveEvent({
-            eventId,
-            dataEntryId: dataEntryIdArgument,
-            formFoundation: formFoundationArgument,
-            completed,
-            programId: program.id,
-            orgUnitId: orgUnit.id,
-            orgUnitName: orgUnit.name || '',
-            teiId,
-            enrollmentId,
-            fromClientDate,
-            onSaveExternal,
-            onSaveSuccessActionType,
-            onSaveErrorActionType,
-        }));
-    }, [
-        dispatch,
-        program.id,
-        orgUnit,
-        teiId,
-        enrollmentId,
-        fromClientDate,
-        onSaveExternal,
-        onSaveSuccessActionType,
-        onSaveErrorActionType,
-    ]);
-
-    const handleCreateNew = useCallback((isCreateNew?: boolean) => {
-        dispatch(requestSaveEvent({
-            eventId: itemId,
-            dataEntryId,
-            formFoundation,
-            completed: true,
-            programId: program.id,
-            orgUnitId: orgUnit.id,
-            orgUnitName: orgUnit.name || '',
-            teiId,
-            enrollmentId,
-            fromClientDate,
-            onSaveExternal,
-            onSaveSuccessActionType,
-            onSaveErrorActionType,
-        }));
-        dispatch(startCreateNewAfterCompleting({
-            enrollmentId, isCreateNew, orgUnitId: orgUnit.id, programId: program.id, teiId, availableProgramStages,
-        }));
-    }, [dispatch,
-        program.id,
-        orgUnit,
-        teiId,
-        enrollmentId,
-        fromClientDate,
-        onSaveExternal,
-        onSaveSuccessActionType,
-        onSaveErrorActionType,
-        formFoundation,
-        availableProgramStages,
-    ]);
+        const {
+            clientRequestEvent,
+            linkedEvent,
+            relationship,
+            linkMode,
+            formHasError,
+        } = buildNewEventPayload(
+            saveType,
+            relatedStageRef,
+        );
+
+        if (formHasError) {
+            reject(new Error('Form has error'));
+            return;
+        }
+
+        const serverData = createServerData({
+            clientRequestEvent,
+            linkedEvent,
+            relationship,
+            enrollment,
+        });
+
+        dispatch(batchActions([
+            requestSaveEvent({
+                requestEvent: clientRequestEvent,
+                linkedEvent,
+                relationship,
+                serverData,
+                linkMode,
+                onSaveExternal,
+                onSaveSuccessActionType: enrollment ? onSaveAndCompleteEnrollmentSuccessActionType : onSaveSuccessActionType,
+                onSaveErrorActionType: enrollment ? onSaveAndCompleteEnrollmentErrorActionType : onSaveErrorActionType,
+            }),
+
+            // stores meta in redux to be used when navigating after save
+            setSaveEnrollmentEventInProgress({
+                requestEventId: clientRequestEvent?.event,
+                linkedEventId: linkedEvent?.event,
+                linkedOrgUnitId: linkedEvent?.orgUnit,
+                linkMode,
+            }),
+        ], newEventBatchActionTypes.REQUEST_SAVE_AND_SET_SUBMISSION_IN_PROGRESS),
+        );
+
+        resolve();
+    }), [buildNewEventPayload, dispatch, onSaveExternal, onSaveAndCompleteEnrollmentSuccessActionType, onSaveSuccessActionType, onSaveAndCompleteEnrollmentErrorActionType, onSaveErrorActionType]);
+
+    const handleCreateNew = useCallback(async (isCreateNew?: boolean) => {
+        try {
+            await handleSave(itemId, dataEntryId, formFoundation, addEventSaveTypes.COMPLETE);
+
+            dispatch(startCreateNewAfterCompleting({
+                enrollmentId,
+                isCreateNew,
+                orgUnitId: orgUnit.id,
+                programId: program.id,
+                teiId,
+                availableProgramStages,
+            }));
+        } catch (error) {
+            // Related stages has displayed an error message. No need to do anything here.
+        }
+    }, [handleSave, formFoundation, dispatch, enrollmentId, orgUnit.id, program.id, teiId, availableProgramStages]);
+
 
     const handleSaveAndCompleteEnrollment = useCallback(
         (
-            eventId: string,
+            dataEntryItemId: string,
             dataEntryIdArgument: string,
             formFoundationArgument: RenderFoundation,
-            enrollment: string,
+            enrollment: Object,
         ) => {
-            dispatch(requestSaveAndCompleteEnrollment({
-                eventId,
-                dataEntryId: dataEntryIdArgument,
-                formFoundation: formFoundationArgument,
-                completed: true,
-                programId: program.id,
-                orgUnitId: orgUnit.id,
-                orgUnitName: orgUnit.name || '',
-                teiId,
-                enrollmentId,
+            handleSave(
+                dataEntryItemId,
+                dataEntryIdArgument,
+                formFoundationArgument,
+                addEventSaveTypes.COMPLETE,
                 enrollment,
-                fromClientDate,
-                onSaveAndCompleteEnrollmentExternal,
-                onSaveAndCompleteEnrollmentSuccessActionType,
-                onSaveAndCompleteEnrollmentErrorActionType,
-            }));
+            );
         },
-        [
-            dispatch,
-            program.id,
-            orgUnit,
-            teiId,
-            enrollmentId,
-            fromClientDate,
-            onSaveAndCompleteEnrollmentExternal,
-            onSaveAndCompleteEnrollmentSuccessActionType,
-            onSaveAndCompleteEnrollmentErrorActionType,
-        ],
+        [handleSave],
     );
 
+    // Clean up data entry on unmount in case the user navigates away, stopping delayed navigation
+    useEffect(() => () => {
+        dispatch(cleanUpEventSaveInProgress());
+    }, [dispatch]);
+
     return (
         <DataEntry
             {...passOnProps}
@@ -166,13 +178,18 @@ export const Validated = ({
             allowGenerateNextVisit={stage.allowGenerateNextVisit}
             askCompleteEnrollmentOnEventComplete={stage.askCompleteEnrollmentOnEventComplete}
             availableProgramStages={availableProgramStages}
+            eventSaveInProgress={eventSaveInProgress}
             ready={ready}
             id={dataEntryId}
             itemId={itemId}
+            enrollmentId={enrollmentId}
             formFoundation={formFoundation}
+            relatedStageRef={relatedStageRef}
+            // $FlowFixMe - Promise should be ignored downstream
             onSave={handleSave}
             onCancelCreateNew={() => handleCreateNew()}
             onConfirmCreateNew={() => handleCreateNew(true)}
+            programId={program.id}
             onSaveAndCompleteEnrollment={handleSaveAndCompleteEnrollment}
             programName={program.name}
             orgUnit={orgUnit}
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedAddEvent.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedAddEvent.js
index f33b1ea5d5..ebcc5f3408 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedAddEvent.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedAddEvent.js
@@ -10,6 +10,7 @@ export const getAddEventEnrollmentServerData = ({
     formFoundation,
     formClientValues,
     mainDataClientValues,
+    eventId,
     programId,
     orgUnitId,
     orgUnitName,
@@ -22,6 +23,7 @@ export const getAddEventEnrollmentServerData = ({
     formFoundation: RenderFoundation,
     formClientValues: Object,
     mainDataClientValues: Object,
+    eventId: string,
     programId: string,
     orgUnitId: string,
     orgUnitName: string,
@@ -29,7 +31,7 @@ export const getAddEventEnrollmentServerData = ({
     enrollmentId: string,
     completed?: boolean,
     fromClientDate: (date: Date) => { getServerZonedISOString: () => string },
-    uid: string,
+    uid?: string,
 }) => {
     const formServerValues = formFoundation.convertValues(formClientValues, convertToServerValue);
     const mainDataServerValues: Object = convertMainEventClientToServer(mainDataClientValues);
@@ -45,27 +47,24 @@ export const getAddEventEnrollmentServerData = ({
     }
 
     return {
-        events: [
-            {
-                ...mainDataServerValues,
-                program: programId,
-                programStage: formFoundation.id,
-                orgUnit: orgUnitId,
-                trackedEntity: teiId,
-                enrollment: enrollmentId,
-                scheduledAt: mainDataServerValues.occurredAt,
-                orgUnitName,
-                updatedAt,
-                uid,
-                dataValues: Object
-                    .keys(formServerValues)
-                    .map(key => ({
-                        dataElement: key,
-                        value: formServerValues[key],
-                    }))
-                    .filter(({ value }) => value != null),
-            },
-        ],
+        ...mainDataServerValues,
+        event: eventId,
+        program: programId,
+        programStage: formFoundation.id,
+        orgUnit: orgUnitId,
+        trackedEntity: teiId,
+        enrollment: enrollmentId,
+        scheduledAt: mainDataServerValues.occurredAt,
+        orgUnitName,
+        updatedAt,
+        uid,
+        dataValues: Object
+            .keys(formServerValues)
+            .map(key => ({
+                dataElement: key,
+                value: formServerValues[key],
+            }))
+            .filter(({ value }) => value != null),
     };
 };
 
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedRelatedStageEvent/getConvertedRelatedStageEvent.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedRelatedStageEvent/getConvertedRelatedStageEvent.js
new file mode 100644
index 0000000000..3bae2a173c
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedRelatedStageEvent/getConvertedRelatedStageEvent.js
@@ -0,0 +1,120 @@
+// @flow
+import log from 'loglevel';
+import { generateUID } from '../../../../utils/uid/generateUID';
+import { actions as RelatedStageModes } from '../../../WidgetRelatedStages/constants';
+import type { ConvertedRelatedStageEventProps } from './getConvertedRelatedStageEvent.types';
+import { errorCreator } from '../../../../../capture-core-utils';
+import { type LinkedRequestEvent } from '../validated.types';
+
+const getEventDetailsByLinkMode = ({
+    relatedStageDataValues,
+    requestEventIsFromConstraint,
+    linkMode,
+    relatedStageType,
+    programId,
+    teiId,
+    enrollmentId,
+    clientRequestEvent,
+}): {
+    linkedEvent: ?LinkedRequestEvent,
+    linkedEventId: ?string,
+} => {
+    const baseEventDetails = {
+        event: generateUID(),
+        program: programId,
+        programStage: requestEventIsFromConstraint ?
+            relatedStageType.toConstraint.programStage.id
+            : relatedStageType.fromConstraint.programStage.id,
+        trackedEntity: teiId,
+        enrollment: enrollmentId,
+        dataValues: [],
+        notes: [],
+        status: 'SCHEDULE',
+    };
+
+    if (linkMode === RelatedStageModes.SCHEDULE_IN_ORG) {
+        const { scheduledAt: linkedEventScheduledAt, orgUnit: linkedEventOrgUnit } = relatedStageDataValues;
+        if (!linkedEventScheduledAt || !linkedEventOrgUnit) {
+            // Business logic dictates that these values will not be null here
+            throw new Error(
+                errorCreator('Missing required data for creating related stage event')({
+                    linkedEventOrgUnit,
+                    linkedEventScheduledAt,
+                }),
+            );
+        }
+
+        return ({
+            linkedEvent: {
+                ...baseEventDetails,
+                scheduledAt: linkedEventScheduledAt,
+                orgUnit: linkedEventOrgUnit.id,
+            },
+            linkedEventId: baseEventDetails.event,
+        });
+    } else if (linkMode === RelatedStageModes.ENTER_DATA) {
+        return ({
+            linkedEvent: {
+                ...baseEventDetails,
+                scheduledAt: clientRequestEvent.occurredAt,
+                orgUnit: clientRequestEvent.orgUnit,
+            },
+            linkedEventId: baseEventDetails.event,
+        });
+    } else if (linkMode === RelatedStageModes.LINK_EXISTING_RESPONSE) {
+        const { linkedEventId } = relatedStageDataValues;
+        return {
+            linkedEvent: null,
+            linkedEventId,
+        };
+    }
+
+    log.error(errorCreator(`Referral mode ${linkMode} is not supported`)());
+    return {
+        linkedEvent: null,
+        linkedEventId: null,
+    };
+};
+
+export const getConvertedRelatedStageEvent = ({
+    linkMode,
+    relatedStageDataValues,
+    programId,
+    teiId,
+    currentProgramStageId,
+    clientRequestEvent,
+    enrollmentId,
+    relatedStageType,
+}: ConvertedRelatedStageEventProps) => {
+    const requestEventIsFromConstraint = relatedStageType.fromConstraint.programStage.id === currentProgramStageId;
+
+    const { linkedEvent, linkedEventId } = getEventDetailsByLinkMode({
+        relatedStageDataValues,
+        requestEventIsFromConstraint,
+        linkMode,
+        relatedStageType,
+        programId,
+        teiId,
+        enrollmentId,
+        clientRequestEvent,
+    });
+
+    const relationship = linkedEventId && {
+        relationshipType: relatedStageType.id,
+        from: {
+            event: {
+                event: requestEventIsFromConstraint ? clientRequestEvent.event : linkedEventId,
+            },
+        },
+        to: {
+            event: {
+                event: requestEventIsFromConstraint ? linkedEventId : clientRequestEvent.event,
+            },
+        },
+    };
+
+    return {
+        linkedEvent,
+        relationship,
+    };
+};
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedRelatedStageEvent/getConvertedRelatedStageEvent.types.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedRelatedStageEvent/getConvertedRelatedStageEvent.types.js
new file mode 100644
index 0000000000..ef2ae727a7
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedRelatedStageEvent/getConvertedRelatedStageEvent.types.js
@@ -0,0 +1,29 @@
+// @flow
+import type { RelatedStageDataValueStates } from '../../../WidgetRelatedStages';
+import { actions as LinkModes } from '../../../WidgetRelatedStages/constants';
+import type { RequestEvent } from '../validated.types';
+
+type RelatedStageType = {|
+    id: string,
+    fromConstraint: {|
+        programStage: {
+            id: string,
+        },
+    |},
+    toConstraint: {
+        programStage: {
+            id: string,
+        },
+    }
+|}
+
+export type ConvertedRelatedStageEventProps = {|
+    linkMode: $Keys<typeof LinkModes>,
+    relatedStageDataValues: RelatedStageDataValueStates,
+    programId: string,
+    teiId: string,
+    currentProgramStageId: string,
+    enrollmentId: string,
+    relatedStageType: RelatedStageType,
+    clientRequestEvent: RequestEvent,
+|}
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedRelatedStageEvent/index.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedRelatedStageEvent/index.js
new file mode 100644
index 0000000000..1771ccf5b3
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/getConvertedRelatedStageEvent/index.js
@@ -0,0 +1,2 @@
+// @flow
+export { getConvertedRelatedStageEvent } from './getConvertedRelatedStageEvent';
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/index.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/index.js
index d750ceb247..656c97a501 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/index.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/index.js
@@ -1,3 +1,3 @@
 // @flow
 export { Validated } from './Validated.container';
-export { saveNewEnrollmentEventEpic, saveEventAndCompleteEnrollmentEpic } from './validated.epics';
+export { saveNewEnrollmentEventEpic } from './validated.epics';
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/useBuildNewEventPayload.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/useBuildNewEventPayload.js
new file mode 100644
index 0000000000..2d81257a16
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/useBuildNewEventPayload.js
@@ -0,0 +1,168 @@
+// @flow
+import { useSelector } from 'react-redux';
+import { useTimeZoneConversion } from '@dhis2/app-runtime';
+import type { RenderFoundation } from '../../../metaData';
+import { getAddEventEnrollmentServerData } from './getConvertedAddEvent';
+import { convertDataEntryToClientValues } from '../../DataEntry/common/convertDataEntryToClientValues';
+import { generateUID } from '../../../utils/uid/generateUID';
+import { addEventSaveTypes } from '../DataEntry/addEventSaveTypes';
+import { getConvertedRelatedStageEvent } from './getConvertedRelatedStageEvent';
+import type { LinkedRequestEvent, RelatedStageRefPayload, RequestEvent } from './validated.types';
+
+type Props = {
+    dataEntryId: string,
+    itemId: string,
+    orgUnitId: string,
+    programId: string,
+    formFoundation: RenderFoundation,
+    enrollmentId: string,
+    orgUnitName: string,
+    teiId: string,
+};
+
+export const createServerData = ({
+    clientRequestEvent,
+    linkedEvent,
+    relationship,
+    enrollment,
+}: {
+    clientRequestEvent: RequestEvent,
+    linkedEvent: ?LinkedRequestEvent,
+    relationship: ?Object,
+    enrollment: ?Object,
+}) => {
+    const relationships = relationship ? [relationship] : undefined;
+    const newEvents = linkedEvent ? [clientRequestEvent, linkedEvent] : [clientRequestEvent];
+
+    if (enrollment) {
+        const updatedEnrollment = { ...enrollment, events: [...(enrollment.events || []), ...newEvents] };
+        return {
+            enrollments: [updatedEnrollment],
+            relationships,
+        };
+    }
+
+    return {
+        events: newEvents,
+        relationships,
+    };
+};
+
+export const useBuildNewEventPayload = ({
+    dataEntryId,
+    itemId,
+    orgUnitId,
+    programId,
+    teiId,
+    enrollmentId,
+    orgUnitName,
+    formFoundation,
+}: Props) => {
+    const dataEntryKey = `${dataEntryId}-${itemId}`;
+    const formValues = useSelector(({ formsValues }) => formsValues[dataEntryKey]);
+    const dataEntryValues = useSelector(({ dataEntriesFieldsValue }) => dataEntriesFieldsValue[dataEntryKey]);
+    const dataEntryValuesMeta = useSelector(({ dataEntriesFieldsMeta }) => dataEntriesFieldsMeta[dataEntryKey]);
+    const notes = useSelector(({ dataEntriesNotes }) => dataEntriesNotes[dataEntryKey]);
+    const { fromClientDate } = useTimeZoneConversion();
+
+    const buildRelatedStageEventPayload = (clientRequestEvent, saveType: ?$Values<typeof addEventSaveTypes>, relatedStageRef) => {
+        if (
+            relatedStageRef.current
+            && relatedStageRef.current.eventHasLinkableStageRelationship()
+        ) {
+            const isValid = relatedStageRef.current.formIsValidOnSave();
+            if (!isValid || !relatedStageRef.current?.getLinkedStageValues) {
+                return {
+                    formHasError: true,
+                    linkedEvent: null,
+                    relationship: null,
+                    linkMode: null,
+                };
+            }
+
+            const { selectedRelationshipType, relatedStageDataValues, linkMode } = relatedStageRef.current
+                .getLinkedStageValues();
+
+            if (!linkMode) {
+                return {
+                    formHasError: false,
+                    linkedEvent: null,
+                    relationship: null,
+                    linkMode: null,
+                };
+            }
+
+            const { linkedEvent, relationship } = getConvertedRelatedStageEvent({
+                linkMode,
+                relatedStageDataValues,
+                clientRequestEvent,
+                relatedStageType: selectedRelationshipType,
+                programId,
+                currentProgramStageId: formFoundation.id,
+                teiId,
+                enrollmentId,
+            });
+
+            return {
+                formHasError: false,
+                linkedEvent,
+                relationship,
+                linkMode,
+            };
+        }
+        return {
+            formHasError: false,
+            linkedEvent: null,
+            relationship: null,
+            linkMode: null,
+        };
+    };
+
+    const buildNewEventPayload = (
+        saveType: ?$Values<typeof addEventSaveTypes>,
+        relatedStageRef: {| current: (?RelatedStageRefPayload) |},
+    ) => {
+        const requestEventId = generateUID();
+
+        const { formClientValues, dataEntryClientValues } = convertDataEntryToClientValues(
+            formFoundation,
+            formValues,
+            dataEntryValues,
+            dataEntryValuesMeta,
+        );
+        const notesValues = notes ? notes.map(note => ({ value: note.value })) : [];
+
+        const clientRequestEvent = getAddEventEnrollmentServerData({
+            formFoundation,
+            formClientValues,
+            eventId: requestEventId,
+            mainDataClientValues: { ...dataEntryClientValues, notes: notesValues },
+            programId,
+            orgUnitId,
+            enrollmentId,
+            teiId,
+            orgUnitName,
+            completed: saveType === addEventSaveTypes.COMPLETE,
+            fromClientDate,
+        });
+
+        const {
+            formHasError,
+            linkedEvent,
+            relationship,
+            linkMode,
+        } = buildRelatedStageEventPayload(clientRequestEvent, saveType, relatedStageRef);
+
+        return {
+            formHasError,
+            clientRequestEvent,
+            linkedEvent,
+            relationship,
+            linkMode,
+        };
+    };
+
+    return {
+        buildNewEventPayload,
+    };
+};
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.actions.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.actions.js
index 826aa3cd19..0aa4c1292b 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.actions.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.actions.js
@@ -1,8 +1,14 @@
 // @flow
 import { actionCreator } from '../../../actions/actions.utils';
 import { effectMethods } from '../../../trackerOffline';
+import { actions as RelatedStageModes } from '../../WidgetRelatedStages/constants';
+import type { RequestEvent, LinkedRequestEvent } from './validated.types';
 import type { ExternalSaveHandler } from '../common.types';
 
+export const newEventBatchActionTypes = {
+    REQUEST_SAVE_AND_SET_SUBMISSION_IN_PROGRESS: 'NewEvent.RequestSaveAndSetSubmissionInProgress',
+};
+
 export const newEventWidgetActionTypes = {
     RULES_ON_UPDATE_EXECUTE: 'NewEvent.ExecuteRulesOnUpdate',
     EVENT_SAVE_REQUEST: 'NewEvent.RequestSaveEvent',
@@ -11,56 +17,60 @@ export const newEventWidgetActionTypes = {
     EVENT_SAVE_ERROR: 'NewEvent.SaveEventError', // TEMPORARY - pass in error action name to the widget
     EVENT_NOTE_ADD: 'NewEvent.AddEventNote',
     START_CREATE_NEW_AFTER_COMPLETING: 'NewEvent.StartCreateNewAfterCompleting',
+    SET_SAVE_ENROLLMENT_EVENT_IN_PROGRESS: 'NewEvent.SetSaveEnrollmentEventInProgress',
+    CLEAN_UP_EVENT_SAVE_IN_PROGRESS: 'NewEvent.CleanUpDataEntry',
     EVENT_SAVE_ENROLLMENT_COMPLETE_REQUEST: 'NewEvent.EventSaveAndEnrollmentCompleteRequest',
     EVENT_SAVE_ENROLLMENT_COMPLETE: 'NewEvent.EventSaveAndEnrollmentComplete',
 };
 
 export const requestSaveEvent = ({
-    eventId,
-    dataEntryId,
-    formFoundation,
-    programId,
-    orgUnitId,
-    orgUnitName,
-    teiId,
-    enrollmentId,
-    completed,
-    fromClientDate,
+    requestEvent,
+    linkedEvent,
+    relationship,
+    serverData,
+    linkMode,
     onSaveExternal,
     onSaveSuccessActionType,
     onSaveErrorActionType,
 }: {
-    eventId: string,
-    dataEntryId: string,
-    formFoundation: Object,
-    programId: string,
-    orgUnitId: string,
-    orgUnitName: string,
-    teiId: string,
-    enrollmentId: string,
-    completed?: boolean,
-    fromClientDate: (date: Date) => { getServerZonedISOString: () => string },
-    onSaveExternal?: ExternalSaveHandler,
+    requestEvent: RequestEvent,
+    linkedEvent: ?LinkedRequestEvent,
+    relationship: ?Object,
+    serverData: Object,
+    linkMode: ?$Keys<typeof RelatedStageModes>,
+    onSaveExternal: ?ExternalSaveHandler,
     onSaveSuccessActionType?: string,
     onSaveErrorActionType?: string,
 }) =>
     actionCreator(newEventWidgetActionTypes.EVENT_SAVE_REQUEST)({
-        eventId,
-        dataEntryId,
-        formFoundation,
-        programId,
-        orgUnitId,
-        orgUnitName,
-        teiId,
-        enrollmentId,
-        completed,
-        fromClientDate,
+        requestEvent,
+        linkedEvent,
+        relationship,
+        serverData,
+        linkMode,
         onSaveExternal,
         onSaveSuccessActionType,
         onSaveErrorActionType,
     }, { skipLogging: ['formFoundation'] });
 
-export const saveEvent = (serverData: Object, onSaveSuccessActionType?: string, onSaveErrorActionType?: string, uid: string) =>
+export const setSaveEnrollmentEventInProgress = ({
+    requestEventId,
+    linkedEventId,
+    linkedOrgUnitId,
+    linkMode,
+}: {
+    requestEventId: string,
+    linkedEventId: ?string,
+    linkedOrgUnitId: ?string,
+    linkMode: ?$Keys<typeof RelatedStageModes>,
+}) => actionCreator(newEventWidgetActionTypes.SET_SAVE_ENROLLMENT_EVENT_IN_PROGRESS)({
+    requestEventId,
+    linkedEventId,
+    linkedOrgUnitId,
+    linkMode,
+});
+
+export const saveEvents = ({ serverData, onSaveErrorActionType, onSaveSuccessActionType }: Object) =>
     actionCreator(newEventWidgetActionTypes.EVENT_SAVE)({}, {
         offline: {
             effect: {
@@ -68,88 +78,13 @@ export const saveEvent = (serverData: Object, onSaveSuccessActionType?: string,
                 method: effectMethods.POST,
                 data: serverData,
             },
-            commit: onSaveSuccessActionType && { type: onSaveSuccessActionType, meta: { serverData, uid } },
-            rollback: onSaveErrorActionType && { type: onSaveErrorActionType, meta: { serverData, uid } },
+            commit: onSaveSuccessActionType && { type: onSaveSuccessActionType, meta: { serverData } },
+            rollback: onSaveErrorActionType && { type: onSaveErrorActionType, meta: { serverData } },
         },
     });
+
 export const startCreateNewAfterCompleting = ({ enrollmentId, isCreateNew, orgUnitId, programId, teiId, availableProgramStages }: Object) =>
     actionCreator(newEventWidgetActionTypes.START_CREATE_NEW_AFTER_COMPLETING)({ enrollmentId, isCreateNew, orgUnitId, programId, teiId, availableProgramStages });
 
-
-export const requestSaveAndCompleteEnrollment = ({
-    eventId,
-    dataEntryId,
-    formFoundation,
-    programId,
-    orgUnitId,
-    orgUnitName,
-    teiId,
-    enrollmentId,
-    completed,
-    fromClientDate,
-    onSaveAndCompleteEnrollmentExternal,
-    onSaveAndCompleteEnrollmentSuccessActionType,
-    onSaveAndCompleteEnrollmentErrorActionType,
-    enrollment,
-}: {
-    eventId: string,
-    dataEntryId: string,
-    formFoundation: Object,
-    programId: string,
-    orgUnitId: string,
-    orgUnitName: string,
-    teiId: string,
-    enrollmentId: string,
-    completed?: boolean,
-    fromClientDate: (date: Date) => { getServerZonedISOString: () => string },
-    onSaveAndCompleteEnrollmentExternal?: (enrollmnet: ApiEnrollment) => void,
-    onSaveAndCompleteEnrollmentSuccessActionType?: string,
-    onSaveAndCompleteEnrollmentErrorActionType?: string,
-    enrollment: Object,
-}) =>
-    actionCreator(newEventWidgetActionTypes.EVENT_SAVE_ENROLLMENT_COMPLETE_REQUEST)(
-        {
-            eventId,
-            dataEntryId,
-            formFoundation,
-            programId,
-            orgUnitId,
-            orgUnitName,
-            teiId,
-            enrollmentId,
-            completed,
-            fromClientDate,
-            onSaveAndCompleteEnrollmentExternal,
-            onSaveAndCompleteEnrollmentSuccessActionType,
-            onSaveAndCompleteEnrollmentErrorActionType,
-            enrollment,
-        },
-        { skipLogging: ['formFoundation'] },
-    );
-
-export const saveEventAndCompleteEnrollment = (
-    serverData: Object,
-    onCompleteEnrollmentSuccessActionType?: string,
-    onCompleteEnrollmentErrorActionType?: string,
-    uid: string,
-) =>
-    actionCreator(newEventWidgetActionTypes.EVENT_SAVE_ENROLLMENT_COMPLETE)(
-        {},
-        {
-            offline: {
-                effect: {
-                    url: 'tracker?async=false&importStrategy=CREATE_AND_UPDATE',
-                    method: effectMethods.POST,
-                    data: serverData,
-                },
-                commit: onCompleteEnrollmentSuccessActionType && {
-                    type: onCompleteEnrollmentSuccessActionType,
-                    meta: { serverData, uid },
-                },
-                rollback: onCompleteEnrollmentErrorActionType && {
-                    type: onCompleteEnrollmentErrorActionType,
-                    meta: { serverData, uid },
-                },
-            },
-        },
-    );
+export const cleanUpEventSaveInProgress = () =>
+    actionCreator(newEventWidgetActionTypes.CLEAN_UP_EVENT_SAVE_IN_PROGRESS)();
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.epics.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.epics.js
index 675360f999..79f77da5e8 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.epics.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.epics.js
@@ -1,112 +1,40 @@
 // @flow
 import { ofType } from 'redux-observable';
-import { v4 as uuid } from 'uuid';
 import { map } from 'rxjs/operators';
-import { newEventWidgetActionTypes, saveEvent, saveEventAndCompleteEnrollment } from './validated.actions';
+import {
+    newEventBatchActionTypes,
+    newEventWidgetActionTypes,
+    saveEvents,
+} from './validated.actions';
 
-import { getDataEntryKey } from '../../DataEntry/common/getDataEntryKey';
-import { getAddEventEnrollmentServerData, getNewEventClientValues } from './getConvertedAddEvent';
-
-export const saveNewEnrollmentEventEpic = (action$: InputObservable, store: ReduxStore) =>
+export const saveNewEnrollmentEventEpic = (action$: InputObservable) =>
     action$.pipe(
-        ofType(newEventWidgetActionTypes.EVENT_SAVE_REQUEST),
+        ofType(
+            newEventBatchActionTypes.REQUEST_SAVE_AND_SET_SUBMISSION_IN_PROGRESS,
+        ),
+        map(actionBatch =>
+            actionBatch
+                .payload
+                .find(action => action.type === newEventWidgetActionTypes.EVENT_SAVE_REQUEST),
+        ),
         map((action) => {
-            const state = store.value;
-            const uid = uuid();
             const {
-                formFoundation,
-                dataEntryId,
-                eventId,
-                completed,
-                programId,
-                orgUnitId,
-                orgUnitName,
-                teiId,
-                enrollmentId,
-                fromClientDate,
+                relationship,
+                serverData,
+                linkMode,
                 onSaveExternal,
                 onSaveSuccessActionType,
                 onSaveErrorActionType,
             } = action.payload;
+            const events = serverData.events ?? serverData.enrollments[0].events;
+            const relationships = relationship ? [relationship] : [];
 
-            const dataEntryKey = getDataEntryKey(dataEntryId, eventId);
-            const { formClientValues, mainDataClientValues }
-                = getNewEventClientValues(state, dataEntryKey, formFoundation);
-
-            const serverData = getAddEventEnrollmentServerData({
-                formFoundation,
-                formClientValues,
-                mainDataClientValues,
-                programId,
-                orgUnitId,
-                orgUnitName,
-                teiId,
-                enrollmentId,
-                completed,
-                fromClientDate,
-                uid,
-            });
-            onSaveExternal && onSaveExternal(serverData, uid);
-            return saveEvent(serverData, onSaveSuccessActionType, onSaveErrorActionType, uid);
-        }),
-    );
-
-export const saveEventAndCompleteEnrollmentEpic = (action$: InputObservable, store: ReduxStore) =>
-    action$.pipe(
-        ofType(newEventWidgetActionTypes.EVENT_SAVE_ENROLLMENT_COMPLETE_REQUEST),
-        map((action) => {
-            const state = store.value;
-            const uid = uuid();
-            const {
-                formFoundation,
-                dataEntryId,
-                eventId,
-                completed,
-                programId,
-                orgUnitId,
-                orgUnitName,
-                teiId,
-                enrollmentId,
-                fromClientDate,
-                onSaveAndCompleteEnrollmentExternal,
-                onSaveAndCompleteEnrollmentSuccessActionType,
-                onSaveAndCompleteEnrollmentErrorActionType,
-                enrollment,
-            } = action.payload;
-
-            const dataEntryKey = getDataEntryKey(dataEntryId, eventId);
-            const { formClientValues, mainDataClientValues } = getNewEventClientValues(
-                state,
-                dataEntryKey,
-                formFoundation,
-            );
-
-            const newEvent = getAddEventEnrollmentServerData({
-                formFoundation,
-                formClientValues,
-                mainDataClientValues,
-                programId,
-                orgUnitId,
-                orgUnitName,
-                teiId,
-                enrollmentId,
-                completed,
-                fromClientDate,
-                uid,
-            }).events[0];
-
-            const enrollmentWithAllEvents = enrollment.events
-                ? { ...enrollment, events: [newEvent, ...enrollment.events] }
-                : { ...enrollment, events: [newEvent] };
-            const serverData = { enrollments: [enrollmentWithAllEvents] };
-
-            onSaveAndCompleteEnrollmentExternal && onSaveAndCompleteEnrollmentExternal(enrollmentWithAllEvents);
-            return saveEventAndCompleteEnrollment(
+            onSaveExternal && onSaveExternal({ linkMode, events, relationships, ...serverData });
+            return saveEvents({
                 serverData,
-                onSaveAndCompleteEnrollmentSuccessActionType,
-                onSaveAndCompleteEnrollmentErrorActionType,
-                uid,
-            );
+                onSaveSuccessActionType,
+                onSaveErrorActionType,
+                ...action.payload,
+            });
         }),
     );
-
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.types.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.types.js
index df3acd51bc..e0af3da0ff 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.types.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/Validated/validated.types.js
@@ -7,6 +7,37 @@ import type {
     RulesExecutionDependenciesClientFormatted,
 } from '../common.types';
 
+type CommonEventDetails = {
+    event: string,
+    program: string,
+    programStage: string,
+    orgUnit: string,
+    trackedEntity: string,
+    enrollment: string,
+    scheduledAt: string,
+    dataValues: Array<{ dataElement: string, value: any }>,
+    status?: string,
+}
+
+export type RequestEvent = {
+    ...CommonEventDetails,
+    occurredAt: string,
+    notes?: Array<{ value: string }>,
+    completedAt?: string,
+}
+
+export type LinkedRequestEvent = {
+    ...CommonEventDetails,
+    occurredAt?: string,
+    completedAt?: string,
+}
+
+export type RelatedStageRefPayload = {|
+    getLinkedStageValues: () => any,
+    eventHasLinkableStageRelationship: () => boolean,
+    formIsValidOnSave: () => boolean,
+|}
+
 export type ContainerProps = {|
     ...CommonValidatedProps,
     orgUnit: OrgUnit,
@@ -14,6 +45,9 @@ export type ContainerProps = {|
 
 export type Props = {|
     programName: string,
+    programId: string,
+    enrollmentId: string,
+    eventSaveInProgress: boolean,
     stage: ProgramStage,
     formFoundation: RenderFoundation,
     orgUnit: OrgUnit,
@@ -24,6 +58,7 @@ export type Props = {|
     onCancel: () => void,
     onSaveAndCompleteEnrollment: (enrollment: ApiEnrollment) => void,
     formRef: (formInstance: any) => void,
+    relatedStageRef: (relatedStageInstance: any) => void,
     dataEntryFieldRef: (instance: any, id: string) => void,
     rulesExecutionDependenciesClientFormatted: RulesExecutionDependenciesClientFormatted,
     ...CssClasses,
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/WidgetEnrollmentEventNew.container.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/WidgetEnrollmentEventNew.container.js
index a71db5c02b..359c66d9e4 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/WidgetEnrollmentEventNew.container.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/WidgetEnrollmentEventNew.container.js
@@ -9,7 +9,6 @@ export const WidgetEnrollmentEventNew = ({
     programId,
     stageId,
     onSave,
-    onSaveAndCompleteEnrollment,
     ...passOnProps
 }: WidgetProps) => {
     const { program, stage } = useMemo(() => getProgramAndStageForProgram(programId, stageId), [programId, stageId]);
@@ -31,7 +30,6 @@ export const WidgetEnrollmentEventNew = ({
             formFoundation={formFoundation}
             program={program}
             onSaveExternal={onSave}
-            onSaveAndCompleteEnrollmentExternal={onSaveAndCompleteEnrollment}
         />
     );
 };
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/WidgetEnrollmentEventNew.types.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/WidgetEnrollmentEventNew.types.js
index 917fb4f66b..1759cf04c5 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/WidgetEnrollmentEventNew.types.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/WidgetEnrollmentEventNew.types.js
@@ -11,7 +11,6 @@ export type WidgetProps = {|
     onSave?: ExternalSaveHandler,
     onSaveSuccessActionType?: string,
     onSaveErrorActionType?: string,
-    onSaveAndCompleteEnrollment: (enrollment: ApiEnrollment) => void,
     onSaveAndCompleteEnrollmentSuccessActionType?: string,
     onSaveAndCompleteEnrollmentErrorActionType?: string,
     onCancel?: () => void,
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/common.types.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/common.types.js
index d5f8bcae97..93d31ea8f1 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/common.types.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/common.types.js
@@ -58,7 +58,6 @@ export type CommonValidatedProps = {|
     onSaveExternal?: ExternalSaveHandler,
     onSaveSuccessActionType?: string,
     onSaveErrorActionType?: string,
-    onSaveAndCompleteEnrollmentExternal?: (enrollment: ApiEnrollment) => void,
     onSaveAndCompleteEnrollmentSuccessActionType?: string,
     onSaveAndCompleteEnrollmentErrorActionType?: string,
     widgetReducerName: string,
diff --git a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/index.js b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/index.js
index bda5d3b720..603f570cd5 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/index.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollmentEventNew/index.js
@@ -5,5 +5,5 @@ export {
     runRulesOnUpdateDataEntryFieldForNewEnrollmentEventEpic,
     runRulesOnUpdateFieldForNewEnrollmentEventEpic,
 } from './DataEntry';
-export { saveNewEnrollmentEventEpic, saveEventAndCompleteEnrollmentEpic } from './Validated';
+export { saveNewEnrollmentEventEpic } from './Validated';
 export type { ExternalSaveHandler, RulesExecutionDependencies } from './common.types';
diff --git a/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.epics.js b/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.epics.js
index 4dad5a415f..677bde57d1 100644
--- a/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.epics.js
+++ b/src/core_modules/capture-core/components/WidgetEventSchedule/WidgetEventSchedule.epics.js
@@ -9,6 +9,7 @@ import {
 } from './WidgetEventSchedule.actions';
 import { statusTypes } from '../../events/statusTypes';
 import { convertCategoryOptionsToServer } from '../../converters/clientToServer';
+import { generateUID } from '../../utils/uid/generateUID';
 
 export const scheduleEnrollmentEventEpic = (action$: InputObservable, store: ReduxStore) =>
     action$.pipe(
@@ -23,7 +24,7 @@ export const scheduleEnrollmentEventEpic = (action$: InputObservable, store: Red
                 stageId,
                 teiId,
                 enrollmentId,
-                eventId,
+                eventId = generateUID(),
                 categoryOptions,
                 onSaveExternal,
                 onSaveSuccessActionType,
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/DateFieldForRelatedStages.js b/src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/DateFieldForRelatedStages.js
new file mode 100644
index 0000000000..d605f177cc
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/DateFieldForRelatedStages.js
@@ -0,0 +1,66 @@
+// @flow
+import React, { useState } from 'react';
+import { convertStringToDateFormat } from '../../../utils/converters/date';
+import {
+    DateField,
+    withDefaultFieldContainer,
+    withDisplayMessages,
+    withInternalChangeHandler,
+    withLabel,
+} from '../../FormFields/New';
+import labelTypeClasses from './dataEntryFieldLabels.module.css';
+import { baseInputStyles } from './commonProps';
+import type { ErrorMessagesForRelatedStages } from '../RelatedStagesActions';
+import type { RelatedStageDataValueStates } from '../WidgetRelatedStages.types';
+
+type Props = {|
+    scheduledLabel: string,
+    relatedStagesDataValues: RelatedStageDataValueStates,
+    onBlurDateField: (value: string) => void,
+    saveAttempted: boolean,
+    errorMessages: ErrorMessagesForRelatedStages,
+|}
+
+const DateFieldForForm =
+    withDefaultFieldContainer()(
+        withLabel({
+            onGetCustomFieldLabeClass: () => labelTypeClasses.dateLabel,
+        })(
+            withDisplayMessages()(
+                withInternalChangeHandler()(
+                    DateField,
+                ),
+            ),
+        ),
+    );
+
+export const DateFieldForRelatedStages = ({
+    scheduledLabel,
+    relatedStagesDataValues,
+    onBlurDateField,
+    saveAttempted,
+    errorMessages,
+}: Props) => {
+    const [touched, setTouched] = useState(false);
+
+    const onBlur = (event) => {
+        setTouched(true);
+        onBlurDateField(event);
+    };
+
+    const shouldShowError = (touched || saveAttempted);
+    return (
+        <DateFieldForForm
+            label={scheduledLabel}
+            value={relatedStagesDataValues.scheduledAt ? convertStringToDateFormat(relatedStagesDataValues.scheduledAt) : ''}
+            required
+            onSetFocus={() => {}}
+            onFocus={() => {}}
+            onRemoveFocus={() => {}}
+            styles={baseInputStyles}
+            calendarWidth={350}
+            onBlur={onBlur}
+            errorMessage={shouldShowError && errorMessages?.scheduledAt}
+        />
+    );
+};
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/OrgUnitSelectorForRelatedStages.js b/src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/OrgUnitSelectorForRelatedStages.js
new file mode 100644
index 0000000000..400494ed0c
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/OrgUnitSelectorForRelatedStages.js
@@ -0,0 +1,77 @@
+// @flow
+import React, { useState } from 'react';
+import i18n from '@dhis2/d2-i18n';
+import {
+    SingleOrgUnitSelectField,
+    withDefaultFieldContainer,
+    withDisplayMessages,
+    withInternalChangeHandler,
+    withLabel,
+} from '../../FormFields/New';
+import labelTypeClasses from './dataEntryFieldLabels.module.css';
+import { baseInputStyles } from './commonProps';
+import type { ErrorMessagesForRelatedStages } from '../RelatedStagesActions';
+import type { RelatedStageDataValueStates } from '../WidgetRelatedStages.types';
+
+type OrgUnitValue = {|
+    checked: boolean,
+    id: string,
+    children: number,
+    displayName: string,
+    path: string,
+    selected: string[],
+|}
+
+type Props = {
+    relatedStagesDataValues: RelatedStageDataValueStates,
+    onSelectOrgUnit: (orgUnit: OrgUnitValue) => void,
+    onDeselectOrgUnit: () => void,
+    saveAttempted: boolean,
+    errorMessages: ErrorMessagesForRelatedStages,
+};
+
+const OrgUnitFieldForForm = withDefaultFieldContainer()(
+    withLabel({
+        onGetCustomFieldLabeClass: () => labelTypeClasses.dateLabel,
+    })(
+        withDisplayMessages()(
+            withInternalChangeHandler()(
+                SingleOrgUnitSelectField,
+            ),
+        ),
+    ),
+);
+
+export const OrgUnitSelectorForRelatedStages = ({
+    relatedStagesDataValues,
+    onSelectOrgUnit,
+    onDeselectOrgUnit,
+    errorMessages,
+    saveAttempted,
+}: Props) => {
+    const [touched, setTouched] = useState(false);
+
+    const handleSelect = (event) => {
+        setTouched(true);
+        onSelectOrgUnit(event);
+    };
+
+    const handleDeselect = () => {
+        setTouched(true);
+        onDeselectOrgUnit();
+    };
+
+    const shouldShowError = (saveAttempted || touched);
+
+    return (
+        <OrgUnitFieldForForm
+            label={i18n.t('Organisation unit')}
+            value={relatedStagesDataValues.orgUnit}
+            required
+            onSelectClick={handleSelect}
+            onBlur={handleDeselect}
+            styles={baseInputStyles}
+            errorMessage={shouldShowError && errorMessages?.orgUnit}
+        />
+    );
+};
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/commonProps.js b/src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/commonProps.js
new file mode 100644
index 0000000000..909d053c6d
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/commonProps.js
@@ -0,0 +1,6 @@
+// @flow
+
+export const baseInputStyles = {
+    inputContainerStyle: { flexBasis: 150 },
+    labelContainerStyle: { flexBasis: 200 },
+};
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/dataEntryFieldLabels.module.css b/src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/dataEntryFieldLabels.module.css
new file mode 100644
index 0000000000..c795dd8efc
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/dataEntryFieldLabels.module.css
@@ -0,0 +1,3 @@
+.dateLabel {
+    padding-top: 13px;
+}
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/index.js b/src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/index.js
new file mode 100644
index 0000000000..3399fd9b84
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/FormComponents/index.js
@@ -0,0 +1,4 @@
+// @flow
+
+export { DateFieldForRelatedStages } from './DateFieldForRelatedStages';
+export { OrgUnitSelectorForRelatedStages } from './OrgUnitSelectorForRelatedStages';
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/LinkToExisting/LinkToExisting.component.js b/src/core_modules/capture-core/components/WidgetRelatedStages/LinkToExisting/LinkToExisting.component.js
new file mode 100644
index 0000000000..85bf2dae37
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/LinkToExisting/LinkToExisting.component.js
@@ -0,0 +1,74 @@
+// @flow
+import React from 'react';
+import i18n from '@dhis2/d2-i18n';
+import {
+    SingleSelectField,
+    SingleSelectOption,
+    spacers,
+} from '@dhis2/ui';
+import { withStyles } from '@material-ui/core';
+import type { LinkToExistingProps } from './LinkToExisting.types';
+
+const styles = () => ({
+    searchRow: {
+        padding: spacers.dp16,
+        display: 'flex',
+        alignItems: 'center',
+        gap: spacers.dp16,
+    },
+    label: {
+        width: '150px',
+        fontSize: '14px',
+    },
+    singleSelectField: {
+        flexGrow: 1,
+    },
+});
+
+export const LinkToExistingPlain = ({
+    relatedStagesDataValues,
+    setRelatedStagesDataValues,
+    linkableEvents,
+    linkableStageLabel,
+    errorMessages,
+    saveAttempted,
+    classes,
+}: LinkToExistingProps) => {
+    const onChange = (value) => {
+        setRelatedStagesDataValues({
+            ...relatedStagesDataValues,
+            linkedEventId: value,
+        });
+    };
+
+    return (
+        <div className={classes.searchRow}>
+            <p className={classes.label}>
+                {i18n.t('Link to an existing {{linkableStageLabel}}', {
+                    linkableStageLabel,
+                })}
+            </p>
+            <SingleSelectField
+                selected={relatedStagesDataValues.linkedEventId}
+                onChange={({ selected }) => onChange(selected)}
+                placeholder={i18n.t('Choose a {{linkableStageLabel}}', {
+                    linkableStageLabel,
+                })}
+                className={classes.singleSelectField}
+                error={saveAttempted && !!errorMessages.linkedEventId}
+                validationText={saveAttempted && errorMessages.linkedEventId}
+            >
+                {linkableEvents.map(event => (
+                    <SingleSelectOption
+                        key={event.id}
+                        value={event.id}
+                        label={event.label}
+                    />
+                ))}
+            </SingleSelectField>
+        </div>
+    );
+};
+
+export const LinkToExisting =
+    withStyles(styles)(LinkToExistingPlain);
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/LinkToExisting/LinkToExisting.types.js b/src/core_modules/capture-core/components/WidgetRelatedStages/LinkToExisting/LinkToExisting.types.js
new file mode 100644
index 0000000000..386160b8e2
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/LinkToExisting/LinkToExisting.types.js
@@ -0,0 +1,14 @@
+// @flow
+
+import type { ErrorMessagesForRelatedStages, LinkableEvent } from '../RelatedStagesActions/RelatedStagesActions.types';
+import type { RelatedStageDataValueStates } from '../WidgetRelatedStages.types';
+
+export type LinkToExistingProps = {|
+    relatedStagesDataValues: RelatedStageDataValueStates,
+    setRelatedStagesDataValues: (RelatedStageDataValueStates) => void,
+    linkableEvents: Array<LinkableEvent>,
+    errorMessages: ErrorMessagesForRelatedStages,
+    saveAttempted: boolean,
+    linkableStageLabel: string,
+    ...CssClasses,
+|}
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/LinkToExisting/index.js b/src/core_modules/capture-core/components/WidgetRelatedStages/LinkToExisting/index.js
new file mode 100644
index 0000000000..ca80cff8b3
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/LinkToExisting/index.js
@@ -0,0 +1,2 @@
+// @flow
+export { LinkToExisting } from './LinkToExisting.component';
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.component.js b/src/core_modules/capture-core/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.component.js
new file mode 100644
index 0000000000..fc690d4340
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.component.js
@@ -0,0 +1,149 @@
+// @flow
+import React, { type ComponentType, useMemo } from 'react';
+import i18n from '@dhis2/d2-i18n';
+import { Radio, colors, spacers, spacersNum, IconInfo16, Button } from '@dhis2/ui';
+import { withStyles } from '@material-ui/core';
+import { actions as RelatedStagesActionTypes, mainOptionTranslatedTexts, relatedStageStatus } from '../constants';
+import { DataSection } from '../../DataSection';
+import { ScheduleInOrgUnit } from '../ScheduleInOrgUnit';
+import { useProgramStageInfo } from '../../../metaDataMemoryStores/programCollection/helpers';
+import type { Props } from './RelatedStagesActions.types';
+import { LinkToExisting } from '../LinkToExisting';
+
+const styles = () => ({
+    wrapper: {
+        padding: `${spacers.dp8}`,
+    },
+    fieldWrapper: {
+        display: 'flex',
+        flexWrap: 'wrap',
+        justifyContent: 'space-between',
+        padding: `${spacers.dp8}  ${spacers.dp16}`,
+    },
+    fieldLabel: {
+        color: colors.grey900,
+        flexGrow: 0,
+        flexShrink: 0,
+        paddingTop: spacersNum.dp16,
+        paddingRight: spacersNum.dp16,
+    },
+    fieldContent: {
+        flexGrow: 1,
+        flexShrink: 0,
+    },
+    clearSelections: {
+        marginTop: spacers.dp8,
+    },
+    infoBox: {
+        margin: '8px 8px',
+        display: 'flex',
+        fontSize: '14px',
+        gap: '5px',
+        background: colors.grey100,
+        padding: '12px 8px',
+        border: `1px solid ${colors.grey600}`,
+    },
+});
+
+export const RelatedStagesActionsPlain = ({
+    classes,
+    type,
+    relationshipName,
+    scheduledLabel,
+    linkableEvents,
+    relatedStagesDataValues,
+    setRelatedStagesDataValues,
+    constraint,
+    currentStageLabel,
+    errorMessages,
+    saveAttempted,
+}: Props) => {
+    const { programStage } = useProgramStageInfo(constraint?.programStage?.id);
+
+    const selectedAction = useMemo(() => relatedStagesDataValues.linkMode, [relatedStagesDataValues.linkMode]);
+
+    const updateSelectedAction = (action: ?$Values<typeof RelatedStagesActionTypes>) => {
+        setRelatedStagesDataValues(prevState => ({
+            ...prevState,
+            linkMode: action,
+        }));
+    };
+
+    if (!programStage) {
+        return null;
+    }
+
+    return (
+        <DataSection
+            dataTest="related-stages-section"
+            sectionName={i18n.t('Actions: {{relationshipName}}', { relationshipName })}
+        >
+            <div className={classes.wrapper}>
+                {type === relatedStageStatus.LINKABLE ? Object.keys(mainOptionTranslatedTexts).map(key => (
+                    <Radio
+                        key={key}
+                        name={`related-stage-action-${key}`}
+                        checked={key === selectedAction}
+                        disabled={key === RelatedStagesActionTypes.LINK_EXISTING_RESPONSE && !linkableEvents.length}
+                        label={mainOptionTranslatedTexts[key]}
+                        onChange={(e: Object) => updateSelectedAction(e.value)}
+                        value={key}
+                    />
+                )) : null}
+                {type === relatedStageStatus.AMBIGUOUS_RELATIONSHIPS ?
+                    <div>{i18n.t('Ambiguous relationships, contact system administrator')}</div>
+                    : null
+                }
+                {!!selectedAction && (
+                    <div className={classes.clearSelections}>
+                        <Button
+                            secondary
+                            small
+                            onClick={() => updateSelectedAction(undefined)}
+                        >
+                            {i18n.t('Clear selection')}
+                        </Button>
+                    </div>
+                )}
+            </div>
+
+            {selectedAction === RelatedStagesActionTypes.SCHEDULE_IN_ORG && (
+                <ScheduleInOrgUnit
+                    relatedStagesDataValues={relatedStagesDataValues}
+                    setRelatedStagesDataValues={setRelatedStagesDataValues}
+                    scheduledLabel={scheduledLabel}
+                    saveAttempted={saveAttempted}
+                    errorMessages={errorMessages}
+                />
+            )}
+
+            {selectedAction === RelatedStagesActionTypes.ENTER_DATA && (
+                <div
+                    className={classes.infoBox}
+                >
+                    <IconInfo16 />
+                    {i18n.t(
+                        'Enter {{linkableStageLabel}} details in the next step after completing this {{currentStageLabel}}.',
+                        {
+                            linkableStageLabel: programStage.stageForm.name,
+                            currentStageLabel,
+                        },
+                    )}
+                </div>
+            )}
+
+            {selectedAction === RelatedStagesActionTypes.LINK_EXISTING_RESPONSE && linkableEvents.length > 0 && (
+                <LinkToExisting
+                    relatedStagesDataValues={relatedStagesDataValues}
+                    setRelatedStagesDataValues={setRelatedStagesDataValues}
+                    linkableEvents={linkableEvents}
+                    linkableStageLabel={programStage.stageForm.name}
+                    errorMessages={errorMessages}
+                    saveAttempted={saveAttempted}
+                />
+            )}
+
+        </DataSection>);
+};
+
+export const RelatedStagesActions: ComponentType<$Diff<Props, CssClasses>> = withStyles(styles)(RelatedStagesActionsPlain);
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.types.js b/src/core_modules/capture-core/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.types.js
new file mode 100644
index 0000000000..ea381b6374
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/RelatedStagesActions/RelatedStagesActions.types.js
@@ -0,0 +1,38 @@
+// @flow
+import type { RelatedStageDataValueStates } from '../WidgetRelatedStages.types';
+
+export type Constraint = {|
+    programStage: {
+        id: string,
+        program: {
+            id: string,
+        },
+    },
+    relationshipEntity: 'PROGRAM_STAGE_INSTANCE',
+|}
+
+export type ErrorMessagesForRelatedStages = {|
+    scheduledAt?: ?string,
+    orgUnit?: ?string,
+    linkedEventId?: ?string,
+|}
+
+export type LinkableEvent = {
+    id: string,
+    label: string,
+}
+
+export type Props = {|
+    type: string,
+    relationshipName: string,
+    relatedStagesDataValues: RelatedStageDataValueStates,
+    linkableEvents: Array<LinkableEvent>,
+    scheduledLabel: string,
+    saveAttempted: boolean,
+    errorMessages: ErrorMessagesForRelatedStages,
+    constraint: ?Constraint,
+    addErrorMessage: (ErrorMessagesForRelatedStages) => void,
+    setRelatedStagesDataValues: (() => Object) => void,
+    currentStageLabel: string,
+    ...CssClasses
+|}
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/RelatedStagesActions/index.js b/src/core_modules/capture-core/components/WidgetRelatedStages/RelatedStagesActions/index.js
new file mode 100644
index 0000000000..9655a91302
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/RelatedStagesActions/index.js
@@ -0,0 +1,3 @@
+// @flow
+export { RelatedStagesActions } from './RelatedStagesActions.component';
+export type { ErrorMessagesForRelatedStages } from './RelatedStagesActions.types';
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/ScheduleInOrgUnit/ScheduleInOrgUnit.container.js b/src/core_modules/capture-core/components/WidgetRelatedStages/ScheduleInOrgUnit/ScheduleInOrgUnit.container.js
new file mode 100644
index 0000000000..33c556f0ed
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/ScheduleInOrgUnit/ScheduleInOrgUnit.container.js
@@ -0,0 +1,107 @@
+// @flow
+import React from 'react';
+import type { ComponentType } from 'react';
+import { withStyles } from '@material-ui/core';
+import { colors, spacers, spacersNum } from '@dhis2/ui';
+import { convertStringToDateFormat } from '../../../utils/converters/date';
+import { DateFieldForRelatedStages, OrgUnitSelectorForRelatedStages } from '../FormComponents';
+import type { ErrorMessagesForRelatedStages } from '../RelatedStagesActions';
+import type { RelatedStageDataValueStates } from '../WidgetRelatedStages.types';
+
+const styles = {
+    wrapper: {
+        padding: `${spacers.dp16} 0`,
+        maxWidth: '55.75rem',
+    },
+    fieldWrapper: {
+        display: 'flex',
+        flexWrap: 'wrap',
+        alignItems: 'start',
+        justifyContent: 'space-between',
+        padding: `${spacers.dp8}  ${spacers.dp16}`,
+    },
+    fieldLabel: {
+        color: colors.grey900,
+        paddingTop: spacersNum.dp12,
+        paddingRight: spacersNum.dp16,
+        flexBasis: '200px',
+    },
+    fieldContent: {
+        flexBasis: '150px',
+        flexGrow: 1,
+    },
+    alternateColor: {
+        backgroundColor: colors.grey100,
+    },
+};
+
+type Props = {
+    relatedStagesDataValues: RelatedStageDataValueStates,
+    setRelatedStagesDataValues: (() => Object) => void,
+    errorMessages: ErrorMessagesForRelatedStages,
+    scheduledLabel: string,
+    saveAttempted: boolean,
+    ...CssClasses,
+}
+
+export const ScheduleInOrgUnitPlain = ({
+    relatedStagesDataValues,
+    setRelatedStagesDataValues,
+    saveAttempted,
+    errorMessages,
+    scheduledLabel,
+    classes,
+}: Props) => {
+    const onBlurDateField = (e) => {
+        setRelatedStagesDataValues(prevValues => ({
+            ...prevValues,
+            scheduledAt: convertStringToDateFormat(e),
+        }));
+    };
+
+    const onSelectOrgUnit = (e: { id: string, displayName: string, path: string }) => {
+        const orgUnit = {
+            id: e.id,
+            name: e.displayName,
+            path: e.path,
+        };
+
+        setRelatedStagesDataValues(prevValues => ({
+            ...prevValues,
+            orgUnit,
+        }));
+    };
+
+    const onDeselectOrgUnit = () => {
+        setRelatedStagesDataValues(prevValues => ({
+            ...prevValues,
+            orgUnit: null,
+        }));
+    };
+
+    return (
+        <div className={classes.wrapper}>
+            <div>
+                <DateFieldForRelatedStages
+                    scheduledLabel={scheduledLabel}
+                    errorMessages={errorMessages}
+                    saveAttempted={saveAttempted}
+                    onBlurDateField={onBlurDateField}
+                    relatedStagesDataValues={relatedStagesDataValues}
+                />
+            </div>
+
+            <div>
+                <OrgUnitSelectorForRelatedStages
+                    relatedStagesDataValues={relatedStagesDataValues}
+                    onSelectOrgUnit={onSelectOrgUnit}
+                    onDeselectOrgUnit={onDeselectOrgUnit}
+                    errorMessages={errorMessages}
+                    saveAttempted={saveAttempted}
+                />
+            </div>
+        </div>
+    );
+};
+
+export const ScheduleInOrgUnit: ComponentType<$Diff<Props, CssClasses>> = withStyles(styles)(ScheduleInOrgUnitPlain);
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/ScheduleInOrgUnit/index.js b/src/core_modules/capture-core/components/WidgetRelatedStages/ScheduleInOrgUnit/index.js
new file mode 100644
index 0000000000..2e1a21bf88
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/ScheduleInOrgUnit/index.js
@@ -0,0 +1,2 @@
+// @flow
+export { ScheduleInOrgUnit } from './ScheduleInOrgUnit.container';
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.component.js b/src/core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.component.js
new file mode 100644
index 0000000000..3050b4d3e9
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.component.js
@@ -0,0 +1,110 @@
+// @flow
+import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useState } from 'react';
+import { useRelatedStages } from './useRelatedStages';
+import type { Props, RelatedStageDataValueStates } from './WidgetRelatedStages.types';
+import { RelatedStagesActions } from './RelatedStagesActions';
+import { relatedStageStatus } from './constants';
+import { useStageLabels } from './hooks/useStageLabels';
+import type { ErrorMessagesForRelatedStages } from './RelatedStagesActions';
+import { relatedStageWidgetIsValid } from './relatedStageEventIsValid/relatedStageEventIsValid';
+import { useAvailableRelatedStageEvents } from './hooks/useAvailableRelatedStageEvents';
+
+const WidgetRelatedStagesPlain = ({
+    programId,
+    enrollmentId,
+    programStageId,
+    currentStageLabel,
+    ...passOnProps
+}: Props, ref) => {
+    const { currentRelatedStagesStatus, selectedRelationshipType, constraint } = useRelatedStages({
+        programStageId,
+        programId,
+    });
+    const { scheduledLabel, occurredLabel } = useStageLabels(programId, constraint?.programStage?.id);
+    const { linkableEvents, isLoading: isLoadingEvents } = useAvailableRelatedStageEvents({
+        stageId: constraint?.programStage?.id,
+        relationshipTypeId: selectedRelationshipType?.id,
+        scheduledLabel,
+        occurredLabel,
+        enrollmentId,
+    });
+    const [saveAttempted, setSaveAttempted] = useState(false);
+    const [errorMessages, setErrorMessages] = useState({});
+    const [relatedStageDataValues, setRelatedStageDataValues] = useState<RelatedStageDataValueStates>({
+        linkMode: undefined,
+        scheduledAt: '',
+        orgUnit: undefined,
+        linkedEventId: undefined,
+    });
+
+    const addErrorMessage = (message: ErrorMessagesForRelatedStages) => {
+        setErrorMessages((prevMessages: Object) => ({
+            ...prevMessages,
+            ...message,
+        }));
+    };
+
+    const eventHasLinkableStageRelationship = () => currentRelatedStagesStatus === relatedStageStatus.LINKABLE;
+
+    const formIsValidOnSave = () => {
+        setSaveAttempted(true);
+        return formIsValid();
+    };
+
+    const formIsValid = useCallback(() => {
+        const { scheduledAt, orgUnit, linkedEventId, linkMode } = relatedStageDataValues;
+        return relatedStageWidgetIsValid({
+            linkMode,
+            scheduledAt,
+            orgUnit,
+            linkedEventId,
+            setErrorMessages: addErrorMessage,
+        });
+    }, [relatedStageDataValues]);
+
+    const getLinkedStageValues = () => ({
+        linkMode: relatedStageDataValues.linkMode,
+        relatedStageDataValues,
+        selectedRelationshipType,
+    });
+
+    // useImperativeHandler for exposing functions to ref
+    useImperativeHandle(ref, () => ({
+        eventHasLinkableStageRelationship,
+        formIsValidOnSave,
+        getLinkedStageValues,
+    }));
+
+    useEffect(() => {
+        if (relatedStageDataValues) {
+            formIsValid();
+        }
+    }, [formIsValid, relatedStageDataValues]);
+
+    if (!currentRelatedStagesStatus || !selectedRelationshipType || isLoadingEvents) {
+        return null;
+    }
+
+    return (
+        <RelatedStagesActions
+            relationshipName={selectedRelationshipType.displayName}
+            scheduledLabel={scheduledLabel}
+            type={currentRelatedStagesStatus}
+            linkableEvents={linkableEvents}
+            relatedStagesDataValues={relatedStageDataValues}
+            setRelatedStagesDataValues={setRelatedStageDataValues}
+            addErrorMessage={addErrorMessage}
+            saveAttempted={saveAttempted}
+            errorMessages={errorMessages}
+            constraint={constraint}
+            currentStageLabel={currentStageLabel}
+            {...passOnProps}
+        />
+    );
+};
+
+export const WidgetRelatedStages = forwardRef<Props, {|
+    eventHasLinkableStageRelationship: Function,
+    formIsValidOnSave: Function,
+    getLinkedStageValues: Function
+|}>(WidgetRelatedStagesPlain);
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.constants.js b/src/core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.constants.js
new file mode 100644
index 0000000000..28f2186254
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.constants.js
@@ -0,0 +1,11 @@
+// @flow
+
+export const RELATIONSHIP_ENTITIES: {|
+    PROGRAM_STAGE_INSTANCE: 'PROGRAM_STAGE_INSTANCE',
+    TRACKED_ENTITY_INSTANCE: 'TRACKED_ENTITY_INSTANCE',
+    PROGRAM_INSTANCE: 'PROGRAM_INSTANCE',
+|} = Object.freeze({
+    PROGRAM_STAGE_INSTANCE: 'PROGRAM_STAGE_INSTANCE',
+    TRACKED_ENTITY_INSTANCE: 'TRACKED_ENTITY_INSTANCE',
+    PROGRAM_INSTANCE: 'PROGRAM_INSTANCE',
+});
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.types.js b/src/core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.types.js
new file mode 100644
index 0000000000..6f9288bb30
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/WidgetRelatedStages.types.js
@@ -0,0 +1,33 @@
+// @flow
+import { actions as LinkModes } from './constants';
+import type { Constraint } from './RelatedStagesActions/RelatedStagesActions.types';
+
+export type RelationshipType = {|
+    fromConstraint: Constraint,
+    toConstraint: Constraint,
+    bidirectional: boolean,
+    displayName: string,
+    id: string,
+    access: {
+        data: {
+            write: boolean,
+        }
+    }
+|}
+
+export type Props = {|
+    programId: string,
+    enrollmentId: string,
+    programStageId: string,
+    currentStageLabel: string,
+|}
+export type RelatedStageDataValueStates = {|
+    linkMode: ?$Keys<typeof LinkModes>,
+    scheduledAt: string,
+    orgUnit: ?{
+        path: string,
+        id: string,
+        name: string,
+    },
+    linkedEventId: ?string,
+|}
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/constants.js b/src/core_modules/capture-core/components/WidgetRelatedStages/constants.js
new file mode 100644
index 0000000000..bb46ba298d
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/constants.js
@@ -0,0 +1,19 @@
+// @flow
+import i18n from '@dhis2/d2-i18n';
+
+export const relatedStageStatus = Object.freeze({
+    LINKABLE: 'LINKABLE',
+    AMBIGUOUS_RELATIONSHIPS: 'AMBIGUOUS_RELATIONSHIPS',
+});
+
+export const actions = Object.freeze({
+    SCHEDULE_IN_ORG: 'SCHEDULE_IN_ORG',
+    LINK_EXISTING_RESPONSE: 'LINK_EXISTING_RESPONSE',
+    ENTER_DATA: 'ENTER_DATA',
+});
+
+export const mainOptionTranslatedTexts = {
+    [actions.SCHEDULE_IN_ORG]: i18n.t('Schedule'),
+    [actions.ENTER_DATA]: i18n.t('Enter details now'),
+    [actions.LINK_EXISTING_RESPONSE]: i18n.t('Link to an existing'),
+};
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/hooks/useAvailableRelatedStageEvents.js b/src/core_modules/capture-core/components/WidgetRelatedStages/hooks/useAvailableRelatedStageEvents.js
new file mode 100644
index 0000000000..53d023b24a
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/hooks/useAvailableRelatedStageEvents.js
@@ -0,0 +1,83 @@
+// @flow
+import { useMemo } from 'react';
+import { convertDateObjectToDateFormatString } from '../../../utils/converters/date';
+import type { LinkableEvent } from '../RelatedStagesActions/RelatedStagesActions.types';
+import { useApiDataQuery } from '../../../utils/reactQueryHelpers';
+import { handleAPIResponse, REQUESTED_ENTITIES } from '../../../utils/api';
+
+type Props = {
+    stageId: ?string,
+    enrollmentId: string,
+    scheduledLabel: string,
+    occurredLabel: string,
+    relationshipTypeId: ?string,
+    enabled?: boolean,
+}
+
+
+type ReturnType = {
+    linkableEvents: Array<LinkableEvent>,
+    isLoading: boolean,
+    isError: boolean,
+}
+
+export const useAvailableRelatedStageEvents = ({
+    stageId,
+    enrollmentId,
+    relationshipTypeId,
+    scheduledLabel,
+    occurredLabel,
+    enabled = true,
+}: Props): ReturnType => {
+    const query = useMemo(() => ({
+        resource: 'tracker/events',
+        params: {
+            programStage: stageId,
+            enrollments: enrollmentId,
+            fields: 'event,occurredAt,scheduledAt,status,relationships',
+        },
+    }), [stageId, enrollmentId]);
+    const { data, isLoading, isError } = useApiDataQuery<Array<LinkableEvent>>(
+        ['availableRelatedStageEvents', stageId, enrollmentId, relationshipTypeId],
+        query,
+        {
+            enabled: !!stageId && enabled,
+            cacheTime: 0,
+            staleTime: 0,
+            select: (response: any) => {
+                const events = handleAPIResponse(REQUESTED_ENTITIES.events, response);
+
+                if (events.length === 0) return [];
+
+                return events.reduce((acc, event) => {
+                    if (!event.relationships) return acc;
+
+                    if (event.relationships.length === 0) acc.push(event);
+
+                    const hasRelationship = !event
+                        .relationships
+                        .some(relationship => relationship.relationshipType === relationshipTypeId);
+                    if (!hasRelationship) acc.push(event);
+
+                    return acc;
+                }, [])
+                    .map((event) => {
+                        const label = event.occurredAt
+                            ? `${occurredLabel}: ${convertDateObjectToDateFormatString(new Date(event.occurredAt))}`
+                            : `${scheduledLabel}: ${convertDateObjectToDateFormatString(new Date(event.scheduledAt))}`;
+
+                        return ({
+                            id: event.event,
+                            label,
+                        });
+                    });
+            },
+        },
+    );
+
+    return {
+        linkableEvents: data ?? [],
+        isLoading,
+        isError,
+    };
+};
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/hooks/useStageLabels.js b/src/core_modules/capture-core/components/WidgetRelatedStages/hooks/useStageLabels.js
new file mode 100644
index 0000000000..b3072022ce
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/hooks/useStageLabels.js
@@ -0,0 +1,34 @@
+// @flow
+import i18n from '@dhis2/d2-i18n';
+import { getUserStorageController } from '../../../storageControllers';
+import { userStores } from '../../../storageControllers/stores';
+import { useIndexedDBQuery } from '../../../utils/reactQueryHelpers';
+
+export const useStageLabels = (programId: string, programStageId?: string) => {
+    const storageController = getUserStorageController();
+
+    const { data, error, isLoading } = useIndexedDBQuery(
+        // $FlowFixMe - react-query types are not up-to-date
+        ['programStageLabels', programStageId],
+        () =>
+            storageController.get(userStores.PROGRAMS, programId, {
+                project: ({ programStages }) => {
+                    const stage = programStages
+                        ?.find(storeStage => storeStage.id === programStageId);
+                    if (!stage) return {};
+                    const { displayDueDateLabel, displayExecutionDateLabel } = stage;
+                    return { displayDueDateLabel, displayExecutionDateLabel };
+                },
+            }),
+        {
+            enabled: !!programStageId,
+        },
+    );
+
+    return {
+        scheduledLabel: data?.displayDueDateLabel ?? i18n.t('Scheduled date'),
+        occurredLabel: data?.displayExecutionDateLabel ?? i18n.t('Report date'),
+        isLoading,
+        error,
+    };
+};
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/index.js b/src/core_modules/capture-core/components/WidgetRelatedStages/index.js
new file mode 100644
index 0000000000..1cba4d9943
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/index.js
@@ -0,0 +1,4 @@
+// @flow
+export { WidgetRelatedStages } from './WidgetRelatedStages.component';
+export type { RelatedStageDataValueStates } from './WidgetRelatedStages.types';
+export { relatedStageWidgetIsValid } from './relatedStageEventIsValid/relatedStageEventIsValid';
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/ValidationFunctions.js b/src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/ValidationFunctions.js
new file mode 100644
index 0000000000..07ad6a17a8
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/ValidationFunctions.js
@@ -0,0 +1,70 @@
+// @flow
+import i18n from '@dhis2/d2-i18n';
+import { systemSettingsStore } from '../../../metaDataMemoryStores';
+import { isValidDate, isValidOrgUnit } from '../../../../capture-core-utils/validators/form';
+import { actions as RelatedStageModes } from '../constants';
+
+type Props = {
+    scheduledAt: ?string,
+    orgUnit: ?Object,
+    linkedEventId: ?string,
+    setErrorMessages: (messages: Object) => void,
+};
+
+export const isScheduledDateValid = (scheduledDate: string) => {
+    const dateFormat = systemSettingsStore.get().dateFormat;
+    return isValidDate(scheduledDate, dateFormat);
+};
+
+const scheduleInOrgUnit = (props) => {
+    const { scheduledAt, orgUnit, setErrorMessages } = props ?? {};
+    const scheduledAtIsValid = !!scheduledAt && isScheduledDateValid(scheduledAt);
+    const orgUnitIsValid = isValidOrgUnit(orgUnit);
+
+    if (!scheduledAtIsValid) {
+        setErrorMessages({
+            scheduledAt: i18n.t('Please provide a valid date'),
+        });
+    } else {
+        setErrorMessages({
+            scheduledAt: null,
+        });
+    }
+
+    if (!orgUnitIsValid) {
+        setErrorMessages({
+            orgUnit: i18n.t('Please provide a valid organisation unit'),
+        });
+    } else {
+        setErrorMessages({
+            orgUnit: null,
+        });
+    }
+
+    return scheduledAtIsValid && orgUnitIsValid;
+};
+
+const linkToExistingResponse = (props) => {
+    const { linkedEventId, setErrorMessages } = props ?? {};
+    const linkedEventIdIsValid = !!linkedEventId;
+
+    if (!linkedEventIdIsValid) {
+        setErrorMessages({
+            linkedEventId: i18n.t('Please select a valid event'),
+        });
+    } else {
+        setErrorMessages({
+            linkedEventId: null,
+        });
+    }
+
+    return linkedEventIdIsValid;
+};
+
+
+export const ValidationFunctionsByLinkMode: { [key: string]: (props: ?Props) => boolean } = {
+    [RelatedStageModes.SCHEDULE_IN_ORG]: props => scheduleInOrgUnit(props),
+    [RelatedStageModes.ENTER_DATA]: () => true,
+    [RelatedStageModes.LINK_EXISTING_RESPONSE]: props => linkToExistingResponse(props),
+};
+
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/relatedStageEventIsValid.js b/src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/relatedStageEventIsValid.js
new file mode 100644
index 0000000000..21e7693f2f
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/relatedStageEventIsValid.js
@@ -0,0 +1,32 @@
+// @flow
+import log from 'loglevel';
+import type { RelatedStageIsValidProps } from './relatedStageEventIsValid.types';
+import { errorCreator } from '../../../../capture-core-utils';
+import { ValidationFunctionsByLinkMode } from './ValidationFunctions';
+
+
+export const relatedStageWidgetIsValid = ({
+    linkMode,
+    scheduledAt,
+    orgUnit,
+    linkedEventId,
+    setErrorMessages,
+}: RelatedStageIsValidProps): boolean => {
+    if (!linkMode) {
+        return true;
+    }
+
+    const validationFunction = ValidationFunctionsByLinkMode[linkMode];
+
+    if (!validationFunction) {
+        log.error(errorCreator('No validation function found for referral mode'));
+        return false;
+    }
+
+    return validationFunction({
+        scheduledAt,
+        orgUnit,
+        linkedEventId,
+        setErrorMessages,
+    });
+};
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/relatedStageEventIsValid.types.js b/src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/relatedStageEventIsValid.types.js
new file mode 100644
index 0000000000..c97648e958
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/relatedStageEventIsValid/relatedStageEventIsValid.types.js
@@ -0,0 +1,15 @@
+// @flow
+import type { ErrorMessagesForRelatedStages } from '../RelatedStagesActions';
+import { actions as LinkModes } from '../constants';
+
+export type RelatedStageIsValidProps = {|
+    linkMode: ?$Keys<typeof LinkModes>,
+    scheduledAt: ?string,
+    orgUnit: ?{
+        id: string,
+        name: string,
+        path: string,
+    },
+    linkedEventId: ?string,
+    setErrorMessages: (message: ErrorMessagesForRelatedStages) => void,
+|}
diff --git a/src/core_modules/capture-core/components/WidgetRelatedStages/useRelatedStages.js b/src/core_modules/capture-core/components/WidgetRelatedStages/useRelatedStages.js
new file mode 100644
index 0000000000..6472c0b801
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetRelatedStages/useRelatedStages.js
@@ -0,0 +1,90 @@
+// @flow
+import { useMemo } from 'react';
+import { relatedStageStatus } from './constants';
+import { getUserStorageController, userStores } from '../../storageControllers';
+import { useIndexedDBQuery } from '../../utils/reactQueryHelpers';
+import { RELATIONSHIP_ENTITIES } from './WidgetRelatedStages.constants';
+import type { RelationshipType } from './WidgetRelatedStages.types';
+
+const getRelationshipTypeFromIndexedDB = () => {
+    const storageController = getUserStorageController();
+    return storageController.getAll(userStores.RELATIONSHIP_TYPES);
+};
+
+type Props = {|
+    programStageId: string,
+    programId: string,
+|};
+
+const filterBidirectionalRelationship = (): boolean => true;
+
+const filterUnidirectionalRelationship = (relationshipType: RelationshipType, programStageId: string): boolean => {
+    const { fromConstraint, toConstraint } = relationshipType;
+
+    const isSelfReferencing = fromConstraint.programStage.id === programStageId
+        && toConstraint.programStage.id === programStageId;
+
+    if (fromConstraint.programStage.id !== programStageId && !isSelfReferencing) {
+        return false;
+    }
+
+    return true;
+};
+export const useRelatedStages = ({ programStageId, programId }: Props) => {
+    const { data: relationshipTypes } = useIndexedDBQuery(
+        ['RelatedStages', 'relationshipTypes', programId, programStageId],
+        () => getRelationshipTypeFromIndexedDB(), {
+            select: (allRelationshipTypes: Array<RelationshipType>) => allRelationshipTypes
+                ?.filter((relationshipType) => {
+                    if (!relationshipType.access.data.write) {
+                        return false;
+                    }
+                    const { fromConstraint, toConstraint, bidirectional } = relationshipType;
+
+                    // Related stages should be of type program stage
+                    if (fromConstraint.relationshipEntity !== RELATIONSHIP_ENTITIES.PROGRAM_STAGE_INSTANCE
+                        || toConstraint.relationshipEntity !== RELATIONSHIP_ENTITIES.PROGRAM_STAGE_INSTANCE) {
+                        return false;
+                    }
+
+                    // Either the from or to side should be the current stage
+                    if (fromConstraint.programStage.id !== programStageId
+                        && toConstraint.programStage.id !== programStageId) {
+                        return false;
+                    }
+
+                    // Related stages should only be able to refer to stages in the same program
+                    if (fromConstraint.programStage.program.id !== programId
+                        || toConstraint.programStage.program.id !== programId) {
+                        return false;
+                    }
+
+                    return bidirectional ?
+                        filterBidirectionalRelationship() :
+                        filterUnidirectionalRelationship(relationshipType, programStageId);
+                }) ?? [],
+        });
+
+    const currentRelatedStagesStatus = useMemo(() => {
+        if (relationshipTypes) {
+            if (relationshipTypes.length === 1) {
+                return relatedStageStatus.LINKABLE;
+            } else if (relationshipTypes.length > 1) {
+                return relatedStageStatus.AMBIGUOUS_RELATIONSHIPS;
+            }
+        }
+        return null;
+    }, [relationshipTypes]);
+
+    const selectedRelationshipType = currentRelatedStagesStatus === relatedStageStatus.LINKABLE ?
+        relationshipTypes?.[0] : undefined;
+    const constraint = selectedRelationshipType?.toConstraint?.programStage?.id === programStageId ?
+        selectedRelationshipType?.fromConstraint : selectedRelationshipType?.toConstraint;
+
+
+    return {
+        currentRelatedStagesStatus,
+        selectedRelationshipType,
+        constraint,
+    };
+};
diff --git a/src/core_modules/capture-core/metaData/RelationshipType/RelationshipType.js b/src/core_modules/capture-core/metaData/RelationshipType/RelationshipType.js
index ce6fc5e114..bb98819c92 100644
--- a/src/core_modules/capture-core/metaData/RelationshipType/RelationshipType.js
+++ b/src/core_modules/capture-core/metaData/RelationshipType/RelationshipType.js
@@ -13,6 +13,7 @@ type RelationshipConstraint = {
 export class RelationshipType {
     _id: string;
     _name: string;
+    _referral: boolean;
     _fromToName: string;
     _toFromName: string;
     _access: Access;
@@ -43,6 +44,14 @@ export class RelationshipType {
         this._access = access;
     }
 
+    set referral(value: boolean) {
+        this._referral = value;
+    }
+
+    get referral(): boolean {
+        return this._referral;
+    }
+
     get access(): Access {
         return this._access;
     }
diff --git a/src/core_modules/capture-core/metaDataStoreLoaders/baseLoader/quickStoreOperations/storeRelationshipTypes.js b/src/core_modules/capture-core/metaDataStoreLoaders/baseLoader/quickStoreOperations/storeRelationshipTypes.js
index be55829ea8..c7246fc4ca 100644
--- a/src/core_modules/capture-core/metaDataStoreLoaders/baseLoader/quickStoreOperations/storeRelationshipTypes.js
+++ b/src/core_modules/capture-core/metaDataStoreLoaders/baseLoader/quickStoreOperations/storeRelationshipTypes.js
@@ -6,7 +6,7 @@ export const storeRelationshipTypes = () => {
     const query = {
         resource: 'relationshipTypes',
         params: {
-            fields: 'id,displayName,bidirectional,fromToName,toFromName,fromConstraint[relationshipEntity,trackerDataView,trackedEntityType[id,name],program[id,name],programStage[id,name]],toConstraint[relationshipEntity,trackerDataView,trackedEntityType[id,name],program[id,name],programStage[id,name]],access[*]',
+            fields: 'id,displayName,bidirectional,fromToName,toFromName,fromConstraint[relationshipEntity,trackerDataView,trackedEntityType[id,name],program[id,name],programStage[id,name,program[id]]],toConstraint[relationshipEntity,trackerDataView,trackedEntityType[id,name],program[id,name],programStage[id,name,program[id]]],access[*],referral',
         },
     };
 
diff --git a/src/core_modules/capture-core/reducers/descriptions/enrollmentDomain.reducerDescription.js b/src/core_modules/capture-core/reducers/descriptions/enrollmentDomain.reducerDescription.js
index 84222aae48..97964a6457 100644
--- a/src/core_modules/capture-core/reducers/descriptions/enrollmentDomain.reducerDescription.js
+++ b/src/core_modules/capture-core/reducers/descriptions/enrollmentDomain.reducerDescription.js
@@ -1,9 +1,10 @@
 // @flow
-import { createReducerDescription } from '../../trackerRedux/trackerReducer';
+import { createReducerDescription } from '../../trackerRedux';
 import { enrollmentSiteActionTypes } from '../../components/Pages/common/EnrollmentOverviewDomain';
 import { actionTypes as enrollmentNoteActionTypes }
     from '../../components/WidgetEnrollmentComment/WidgetEnrollmentComment.actions';
 import { actionTypes as editEventActionTypes } from '../../components/WidgetEventEdit/EditEventDataEntry/editEventDataEntry.actions';
+import { newEventWidgetActionTypes } from '../../components/WidgetEnrollmentEventNew/Validated/validated.actions';
 import { enrollmentEditEventActionTypes } from '../../components/Pages/EnrollmentEditEvent';
 
 const initialReducerValue = {};
@@ -12,14 +13,15 @@ const {
     UPDATE_ENROLLMENT_DATE,
     UPDATE_INCIDENT_DATE,
     UPDATE_ENROLLMENT_EVENT,
-    UPDATE_ENROLLMENT_EVENT_WITHOUT_ID,
+    UPDATE_OR_ADD_ENROLLMENT_EVENTS,
     UPDATE_ENROLLMENT_ATTRIBUTE_VALUES,
     UPDATE_ENROLLMENT_AND_EVENTS,
     ROLLBACK_ENROLLMENT_EVENT,
-    ROLLBACK_ENROLLMENT_EVENT_WITHOUT_ID,
+    ROLLBACK_ENROLLMENT_EVENTS,
     ROLLBACK_ENROLLMENT_AND_EVENTS,
     COMMIT_ENROLLMENT_EVENT,
-    COMMIT_ENROLLMENT_EVENT_WITHOUT_ID,
+    COMMIT_ENROLLMENT_EVENTS,
+    ADD_PERSISTED_ENROLLMENT_EVENTS,
     COMMIT_ENROLLMENT_AND_EVENTS,
 } = enrollmentSiteActionTypes;
 
@@ -56,6 +58,7 @@ export const enrollmentDomainDesc = createReducerDescription(
                 occurredAt: incidentDate,
             },
         }),
+        // Update a single event - used in EditEventDataEntry
         [UPDATE_ENROLLMENT_EVENT]: (
             state,
             { payload: { eventId, eventData } },
@@ -72,6 +75,7 @@ export const enrollmentDomainDesc = createReducerDescription(
 
             return { ...state, enrollment: { ...state.enrollment, events } };
         },
+        // Rollback a single event - used in EditEventDataEntry
         [ROLLBACK_ENROLLMENT_EVENT]: (state, { payload: { eventId } }) => {
             const events = state.enrollment.events?.map(event =>
                 (event.event === eventId ? event.dataToRollback : event),
@@ -94,70 +98,112 @@ export const enrollmentDomainDesc = createReducerDescription(
 
             return { ...state, enrollment: { ...state.enrollment, events } };
         },
-        [UPDATE_ENROLLMENT_EVENT_WITHOUT_ID]: (
+        [UPDATE_OR_ADD_ENROLLMENT_EVENTS]: (
             state,
-            { payload: { eventData, uid } },
+            { payload: { events } },
         ) => {
-            const events = [...state.enrollment.events, { ...eventData, uid, pendingApiResponse: true }];
+            const eventsSentToServer = events.map(event => ({ ...event, pendingApiResponse: true }));
 
-            return { ...state, enrollment: { ...state.enrollment, events } };
+            // Update if the event already exists in state.enrollment.events or add if it doesn't
+            const enrollmentEvents = state.enrollment.events
+                .map((event) => {
+                    const eventToUpdate = eventsSentToServer.find(e => e.event === event.event);
+                    return eventToUpdate
+                        ? {
+                            ...eventToUpdate,
+                            dataToRollback: event,
+                        }
+                        : event;
+                })
+                .concat(
+                    eventsSentToServer.filter(
+                        event => !state.enrollment.events.some(e => e.event === event.event),
+                    ),
+                );
+
+            return {
+                ...state,
+                enrollment: {
+                    ...state.enrollment,
+                    events: enrollmentEvents,
+                },
+            };
         },
-        [ROLLBACK_ENROLLMENT_EVENT_WITHOUT_ID]: (state, { payload: { uid } }) => {
-            const events = state.enrollment.events.filter(event => (event.uid !== uid));
+        [ADD_PERSISTED_ENROLLMENT_EVENTS]: (
+            state,
+            { payload: { events } },
+        ) => {
+            const enrollmentEvents = [...state.enrollment.events, ...events];
 
-            return { ...state, enrollment: { ...state.enrollment, events } };
+            return { ...state, enrollment: { ...state.enrollment, events: enrollmentEvents } };
         },
-        [COMMIT_ENROLLMENT_EVENT_WITHOUT_ID]: (state, { payload: { eventId, uid } }) => {
-            const events = state.enrollment?.events?.map((event) => {
-                if (event.uid === uid) {
-                    const { pendingApiResponse, uid: uidToRemove, ...dataToCommit } = event;
-                    return { ...dataToCommit, event: eventId };
+        [ROLLBACK_ENROLLMENT_EVENTS]: (state, { payload: { events } }) => {
+            const eventsToRollback = events.map(event => event.event);
+
+            // Iterate over the events in state.enrollment.events and rollback the ones that are in eventsToRollback. If the event has dataToRollback, use that, otherwise remove it from state.enrollment.events
+            const enrollmentEvents = state.enrollment.events.map((event) => {
+                if (eventsToRollback.includes(event.event)) {
+                    return event.dataToRollback ? event.dataToRollback : null;
+                }
+                return event;
+            }).filter(Boolean);
+
+            return { ...state, enrollment: { ...state.enrollment, events: enrollmentEvents } };
+        },
+        [COMMIT_ENROLLMENT_EVENTS]: (state, { payload: { events } }) => {
+            const comittedEventIds = events.map(event => event.uid);
+            const enrollmentEvents = state.enrollment?.events?.map((event) => {
+                if (comittedEventIds.includes(event.event)) {
+                    const { pendingApiResponse, uid: uidToRemove, dataToRollback, ...dataToCommit } = event;
+                    return { ...dataToCommit };
                 }
                 return event;
             });
-            return { ...state, enrollment: { ...state.enrollment, events } };
+            return { ...state, enrollment: { ...state.enrollment, events: enrollmentEvents } };
         },
-        [UPDATE_ENROLLMENT_ATTRIBUTE_VALUES]: (state, { payload: { attributeValues } }) => ({
-            ...state,
-            attributeValues,
-        }),
         [UPDATE_ENROLLMENT_AND_EVENTS]: (state, { payload: { enrollment } }) => {
             const enrollmentToUpdate = { ...enrollment, pendingApiResponse: true, dataToRollback: state.enrollment };
 
             if (enrollmentToUpdate.events?.length > 0) {
-                const eventsToUpdate = state.enrollment.events.map((event) => {
-                    const eventToUpdate = enrollmentToUpdate.events.find(e => e.event === event.event);
-                    return eventToUpdate
-                        ? {
-                            ...eventToUpdate,
-                            pendingApiResponse: true,
-                            dataToRollback: event,
-                        }
-                        : event;
-                });
-                const eventWithoutId = enrollmentToUpdate.events.find(event => event.uid);
-                const eventsToUpdateAndAdd = eventWithoutId ?
-                    [...eventsToUpdate, { ...eventWithoutId, pendingApiResponse: true }] : eventsToUpdate;
-
-                return {
-                    ...state,
-                    enrollment: { ...state.enrollment, ...enrollmentToUpdate, events: eventsToUpdateAndAdd },
-                };
+                // Update if the event already exists in state.enrollment.events or add if it doesn't
+                const events = state.enrollment.events
+                    .map((event) => {
+                        const eventToUpdate = enrollmentToUpdate.events.find(e => e.event === event.event);
+                        return eventToUpdate
+                            ? {
+                                ...eventToUpdate,
+                                pendingApiResponse: true,
+                                dataToRollback: event,
+                            }
+                            : event;
+                    })
+                    .concat(
+                        enrollmentToUpdate.events
+                            .filter(
+                                event => !state.enrollment.events.some(e => e.event === event.event),
+                            )
+                            .map(event => ({ ...event, pendingApiResponse: true })),
+                    );
+
+                return { ...state, enrollment: { ...state.enrollment, ...enrollmentToUpdate, events } };
             }
 
             return { ...state, enrollment: { ...state.enrollment, ...enrollmentToUpdate } };
         },
         [ROLLBACK_ENROLLMENT_AND_EVENTS]: (state, { payload: { uid } }) => {
             const enrollment = state.enrollment.dataToRollback;
+
             const events = state.enrollment.events.reduce((acc, event) => {
                 if (uid && event.uid === uid) {
                     return acc;
+                } else if (event.pendingApiResponse && !event.dataToRollback) {
+                    return acc;
                 }
                 const eventToRollback = event.dataToRollback ? event.dataToRollback : event;
                 return [...acc, eventToRollback];
             }, []);
 
-            return { ...state, enrollment: { ...state.enrollment, ...enrollment, events } };
+            return { ...state, enrollment: { ...enrollment, events } };
         },
         [COMMIT_ENROLLMENT_AND_EVENTS]: (state, { payload: { eventId, uid } }) => {
             const { pendingApiResponse, dataToRollback, ...enrollmentToCommit } = state.enrollment;
@@ -174,6 +220,11 @@ export const enrollmentDomainDesc = createReducerDescription(
 
             return { ...state, enrollment: { ...enrollmentToCommit, events: eventsToCommit } };
         },
+
+        [UPDATE_ENROLLMENT_ATTRIBUTE_VALUES]: (state, { payload: { attributeValues } }) => ({
+            ...state,
+            attributeValues,
+        }),
         [enrollmentNoteActionTypes.ADD_ENROLLMENT_NOTE]:
         (state, { payload: { note } }) => ({
             ...state,
@@ -211,6 +262,16 @@ export const enrollmentDomainDesc = createReducerDescription(
             });
             return { ...state, enrollment: { ...state.enrollment, events } };
         },
+        // Used to determine navigation logic in the new event widget
+        [newEventWidgetActionTypes.SET_SAVE_ENROLLMENT_EVENT_IN_PROGRESS]: (state, { payload }) => ({
+            ...state,
+            eventSaveInProgress: payload,
+        }),
+        [newEventWidgetActionTypes.CLEAN_UP_EVENT_SAVE_IN_PROGRESS]: (state) => {
+            const { eventSaveInProgress, ...newState } = state;
+            return newState;
+        },
+        // Assignee
         [enrollmentEditEventActionTypes.ASSIGNEE_SET]: setAssignee,
         [enrollmentEditEventActionTypes.ASSIGNEE_SAVE_FAILED]: setAssignee,
     },
diff --git a/src/core_modules/capture-core/utils/reactQueryHelpers/query/useApiDataQuery.js b/src/core_modules/capture-core/utils/reactQueryHelpers/query/useApiDataQuery.js
index cab589a69f..fdecaf0a20 100644
--- a/src/core_modules/capture-core/utils/reactQueryHelpers/query/useApiDataQuery.js
+++ b/src/core_modules/capture-core/utils/reactQueryHelpers/query/useApiDataQuery.js
@@ -17,11 +17,11 @@ export const useApiDataQuery = <TResultData>(
         [ReactQueryAppNamespace, ...queryKey],
         queryFn,
         {
-            ...queryOptions,
             refetchOnWindowFocus: false,
             refetchOnMount: false,
             refetchOnReconnect: false,
             staleTime: 2 * 60 * 1000,
             cacheTime: 5 * 60 * 1000,
+            ...queryOptions,
         });
 };
diff --git a/src/epics/trackerCapture.epics.js b/src/epics/trackerCapture.epics.js
index d0206db8b9..8d3dcfb76f 100644
--- a/src/epics/trackerCapture.epics.js
+++ b/src/epics/trackerCapture.epics.js
@@ -208,8 +208,6 @@ import {
 import {
     saveNewEventSucceededEpic,
     saveNewEventFailedEpic,
-    saveEventAndCompleteEnrollmentSucceededEpic,
-    saveEventAndCompleteEnrollmentFailedEpic,
 } from '../core_modules/capture-core/components/Pages/EnrollmentAddEvent/EnrollmentAddEventPage.epics';
 import {
     updateEventSucceededEpic,
@@ -219,7 +217,6 @@ import {
     runRulesOnUpdateDataEntryFieldForNewEnrollmentEventEpic,
     runRulesOnUpdateFieldForNewEnrollmentEventEpic,
     saveNewEnrollmentEventEpic,
-    saveEventAndCompleteEnrollmentEpic,
     addNoteForNewEnrollmentEventEpic,
 } from '../core_modules/capture-core/components/WidgetEnrollmentEventNew';
 import {
@@ -365,9 +362,6 @@ export const epics = combineEpics(
     saveNewEnrollmentEventEpic,
     saveNewEventSucceededEpic,
     saveNewEventFailedEpic,
-    saveEventAndCompleteEnrollmentEpic,
-    saveEventAndCompleteEnrollmentSucceededEpic,
-    saveEventAndCompleteEnrollmentFailedEpic,
     updateEventSucceededEpic,
     updateEventFailedEpic,
     addNoteForNewEnrollmentEventEpic,

From f727abb8bcd5d22018fdbba02984f8b1965c2839 Mon Sep 17 00:00:00 2001
From: "@dhis2-bot" <apps@dhis2.org>
Date: Thu, 25 Apr 2024 08:32:37 +0000
Subject: [PATCH 05/19] chore(release): cut 100.68.0 [skip release]

# [100.68.0](https://github.com/dhis2/capture-app/compare/v100.67.12...v100.68.0) (2024-04-25)

### Features

* [DHIS2-13299][DHIS2-16291] Related Stages ([#3488](https://github.com/dhis2/capture-app/issues/3488)) ([85f38be](https://github.com/dhis2/capture-app/commit/85f38bedd60c307788cf17237338765bf9fed7f0))
---
 CHANGELOG.md                       | 7 +++++++
 package.json                       | 4 ++--
 packages/rules-engine/package.json | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e24c98c0c..766c604c00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# [100.68.0](https://github.com/dhis2/capture-app/compare/v100.67.12...v100.68.0) (2024-04-25)
+
+
+### Features
+
+* [DHIS2-13299][DHIS2-16291] Related Stages ([#3488](https://github.com/dhis2/capture-app/issues/3488)) ([85f38be](https://github.com/dhis2/capture-app/commit/85f38bedd60c307788cf17237338765bf9fed7f0))
+
 ## [100.67.12](https://github.com/dhis2/capture-app/compare/v100.67.11...v100.67.12) (2024-04-22)
 
 
diff --git a/package.json b/package.json
index 05ab5030bd..51b284c4de 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "capture-app",
     "homepage": ".",
-    "version": "100.67.12",
+    "version": "100.68.0",
     "cacheVersion": "7",
     "serverVersion": "38",
     "license": "BSD-3-Clause",
@@ -10,7 +10,7 @@
         "packages/rules-engine"
     ],
     "dependencies": {
-        "@dhis2/rules-engine-javascript": "100.67.12",
+        "@dhis2/rules-engine-javascript": "100.68.0",
         "@dhis2/app-runtime": "^3.9.3",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-icons": "^1.0.1",
diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json
index 7e5afcc77a..dccfa10f5c 100644
--- a/packages/rules-engine/package.json
+++ b/packages/rules-engine/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/rules-engine-javascript",
-    "version": "100.67.12",
+    "version": "100.68.0",
     "license": "BSD-3-Clause",
     "main": "./build/cjs/index.js",
     "scripts": {

From 2dc29b8e3b1e97b9a9f6304359387a7fe8980685 Mon Sep 17 00:00:00 2001
From: "@dhis2-bot" <apps@dhis2.org>
Date: Sun, 28 Apr 2024 03:37:30 +0200
Subject: [PATCH 06/19] fix(translations): sync translations from transifex
 (master)

Automatically merged.
---
 i18n/ar.po    |  71 ++++--
 i18n/bn.po    | 658 +++++++++++++++++++++++++++++++++++++-------------
 i18n/cs.po    |  86 +++++--
 i18n/es.po    |  33 ++-
 i18n/fr.po    |  95 +++++---
 i18n/lo.po    |  71 ++++--
 i18n/nb.po    |  73 ++++--
 i18n/nl.po    |  71 ++++--
 i18n/pt.po    |  83 +++++--
 i18n/pt_BR.po |  71 ++++--
 i18n/ru.po    |  71 ++++--
 i18n/sv.po    |  70 ++++--
 i18n/uk.po    |  67 +++--
 i18n/ur.po    |  67 +++--
 14 files changed, 1180 insertions(+), 407 deletions(-)

diff --git a/i18n/ar.po b/i18n/ar.po
index 9402c2172d..2d3efc2460 100644
--- a/i18n/ar.po
+++ b/i18n/ar.po
@@ -2,15 +2,15 @@
 # Translators:
 # KRG HIS <antonia.bezenchek@informa.pro>, 2020
 # Philip Larsen Donnelly, 2023
-# Viktor Varland <viktor@dhis2.org>, 2024
 # Hamza Assada <7amza.it@gmail.com>, 2024
+# Viktor Varland <viktor@dhis2.org>, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-03-07T14:47:33.932Z\n"
+"POT-Creation-Date: 2024-03-16T14:40:27.542Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
-"Last-Translator: Hamza Assada <7amza.it@gmail.com>, 2024\n"
+"Last-Translator: Viktor Varland <viktor@dhis2.org>, 2024\n"
 "Language-Team: Arabic (https://app.transifex.com/hisp-uio/teams/100509/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -693,6 +693,12 @@ msgid ""
 "An error occurred while fetching enrollments. Please enter a valid url."
 msgstr ""
 
+msgid "No feedback for this enrollment yet"
+msgstr ""
+
+msgid "No indicator output for this enrollment yet"
+msgstr ""
+
 msgid "Quick actions"
 msgstr ""
 
@@ -776,6 +782,12 @@ msgstr ""
 msgid "Choose a registering unit to start reporting"
 msgstr "اختر وحدة تسجيل لبدء الإبلاغ"
 
+msgid "No feedback for this event yet"
+msgstr ""
+
+msgid "No indicator output for this event yet"
+msgstr ""
+
 msgid "Program stage is invalid"
 msgstr ""
 
@@ -938,12 +950,6 @@ msgstr ""
 msgid "View Event"
 msgstr ""
 
-msgid "No feedback for this enrollment yet"
-msgstr ""
-
-msgid "No indicator output for this enrollment yet"
-msgstr ""
-
 msgid "Selected program"
 msgstr "البرنامج المحدد"
 
@@ -1427,6 +1433,35 @@ msgstr ""
 msgid "tracked entity instance"
 msgstr "نموذج الكيان المتتبع"
 
+msgid "Link to an existing {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Choose a {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Ambiguous relationships, contact system administrator"
+msgstr ""
+
+msgid ""
+"Enter {{linkableStageLabel}} details in the next step after completing this "
+"{{currentStageLabel}}."
+msgstr ""
+
+msgid "Enter details now"
+msgstr ""
+
+msgid "Link to an existing"
+msgstr ""
+
+msgid "Scheduled date"
+msgstr "التاريخ المقرر"
+
+msgid "Report date"
+msgstr "تاريخ التقرير"
+
+msgid "Please select a valid event"
+msgstr ""
+
 msgid "New {{ eventName }} event"
 msgstr ""
 
@@ -1538,15 +1573,6 @@ msgstr "اسم مرحلة البرنامج"
 msgid "Working list could not be loaded"
 msgstr "تعذر تحميل قائمة العمل"
 
-msgid "Download as JSON"
-msgstr "تنزيل كملف JSON"
-
-msgid "Download as CSV"
-msgstr "تنزيل كملف CSV"
-
-msgid "Download with current filters"
-msgstr "تنزيل مع اعتماد عوامل التصفية الحالية"
-
 msgid "Download data..."
 msgstr "تنزيل البيانات"
 
@@ -1619,6 +1645,15 @@ msgstr "إظهار أقل"
 msgid "Show All"
 msgstr "إظهار الكل"
 
+msgid "Download as JSON"
+msgstr "تنزيل كملف JSON"
+
+msgid "Download as CSV"
+msgstr "تنزيل كملف CSV"
+
+msgid "Download with current filters"
+msgstr "تنزيل مع اعتماد عوامل التصفية الحالية"
+
 msgid "An error has occured. See log for details"
 msgstr "حدث خطأ. انظر السجل للحصول على التفاصيل"
 
diff --git a/i18n/bn.po b/i18n/bn.po
index d536082666..01f90ba01c 100644
--- a/i18n/bn.po
+++ b/i18n/bn.po
@@ -1,15 +1,15 @@
 # 
 # Translators:
-# Viktor Varland <viktor@dhis2.org>, 2021
 # Rahman Monjur <simran.monjur@gmail.com>, 2021
+# Viktor Varland <viktor@dhis2.org>, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2022-08-17T08:14:13.865Z\n"
+"POT-Creation-Date: 2024-03-16T14:40:27.542Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
-"Last-Translator: Rahman Monjur <simran.monjur@gmail.com>, 2021\n"
-"Language-Team: Bengali (https://www.transifex.com/hisp-uio/teams/100509/bn/)\n"
+"Last-Translator: Viktor Varland <viktor@dhis2.org>, 2024\n"
+"Language-Team: Bengali (https://app.transifex.com/hisp-uio/teams/100509/bn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -37,6 +37,27 @@ msgid ""
 "again, but be aware that this will close other versions."
 msgstr ""
 
+msgid "View {{programName}} dashboard"
+msgstr ""
+
+msgid "View dashboard"
+msgstr ""
+
+msgid "View active enrollment"
+msgstr ""
+
+msgid "Re-enroll"
+msgstr ""
+
+msgid "in"
+msgstr ""
+
+msgid "Enrolled"
+msgstr ""
+
+msgid "Previously enrolled"
+msgstr ""
+
 msgid "Organisation unit"
 msgstr ""
 
@@ -46,10 +67,10 @@ msgstr ""
 msgid "Last updated"
 msgstr ""
 
-msgid "Enrolled"
+msgid "error encountered during field validation"
 msgstr ""
 
-msgid "Previously enrolled"
+msgid "error"
 msgstr ""
 
 msgid "This value is validating"
@@ -88,7 +109,7 @@ msgstr ""
 msgid "Please provide a valid time"
 msgstr ""
 
-msgid "Please provide a valid percentage"
+msgid "Please provide an integer between 0 and 100"
 msgstr ""
 
 msgid "Please provide a valid url"
@@ -127,6 +148,21 @@ msgstr ""
 msgid "Enrollment"
 msgstr "নিবন্ধন"
 
+msgid "Complete event"
+msgstr ""
+
+msgid "{{ stageName }} - Basic info"
+msgstr ""
+
+msgid "{{ stageName }} - Assignee"
+msgstr ""
+
+msgid "{{ stageName }} - Status"
+msgstr ""
+
+msgid "Please select {{categoryName}}"
+msgstr ""
+
 msgid "A future date is not allowed"
 msgstr ""
 
@@ -142,13 +178,16 @@ msgstr ""
 msgid "Metadata error. see log for details"
 msgstr ""
 
-msgid "Assigned user"
+msgid "{{ stageName }} - Details"
 msgstr ""
 
-msgid "Search for user"
+msgid "{{ stageName }} - {{ sectionName }}"
 msgstr ""
 
-msgid "Complete event"
+msgid "Assigned user"
+msgstr ""
+
+msgid "Search for user"
 msgstr ""
 
 msgid "Basic info"
@@ -233,7 +272,7 @@ msgstr ""
 msgid "Go back to event without saving relationship"
 msgstr ""
 
-msgid "Unsaved changes"
+msgid "Discard unsaved changes?"
 msgstr ""
 
 msgid ""
@@ -241,10 +280,10 @@ msgid ""
 "relationship"
 msgstr ""
 
-msgid "Yes, discard"
+msgid "Yes, discard changes"
 msgstr ""
 
-msgid "No, stay here"
+msgid "No, cancel"
 msgstr ""
 
 msgid "New event"
@@ -265,15 +304,36 @@ msgstr ""
 msgid "enrollment"
 msgstr ""
 
-msgid "in"
-msgstr ""
-
 msgid "Enroll in a program by selecting a program from the top bar."
 msgstr ""
 
 msgid "An error has occurred. See log for details"
 msgstr ""
 
+msgid "{{programStageName}} completed"
+msgstr ""
+
+msgid ""
+"Would you like to complete the enrollment and all active events as well?"
+msgstr ""
+
+msgid "{{count}} event in {{programStageName}}"
+msgid_plural "{{count}} event in {{programStageName}}"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Yes, complete enrollment and events"
+msgstr ""
+
+msgid "Complete enrollment only"
+msgstr ""
+
+msgid "Would you like to complete the enrollment?"
+msgstr ""
+
+msgid "Complete enrollment"
+msgstr ""
+
 msgid "A duplicate exists (but there were some errors, see log for details"
 msgstr ""
 
@@ -296,9 +356,6 @@ msgstr ""
 msgid "Registered person"
 msgstr ""
 
-msgid "Leaving this page will discard the changes you made to this event."
-msgstr ""
-
 msgid "validation failed"
 msgstr ""
 
@@ -314,10 +371,13 @@ msgstr ""
 msgid "Warnings"
 msgstr ""
 
-msgid "Warnings found"
+msgid "Generate new event"
 msgstr ""
 
-msgid "Abort"
+msgid "Do you want to create another event?"
+msgstr ""
+
+msgid "Yes, create new event"
 msgstr ""
 
 msgid "Back to form"
@@ -341,7 +401,9 @@ msgstr ""
 msgid "Operations running"
 msgstr ""
 
-msgid "Sort"
+msgid ""
+"This event has unsaved changes. Leaving this page without saving will lose "
+"these changes. Are you sure you want to discard unsaved changes?"
 msgstr ""
 
 msgid "No events to display"
@@ -452,6 +514,12 @@ msgstr ""
 msgid "Select image"
 msgstr ""
 
+msgid "Type to filter options"
+msgstr ""
+
+msgid "No match found"
+msgstr ""
+
 msgid "Search"
 msgstr ""
 
@@ -476,6 +544,9 @@ msgstr ""
 msgid "suggestions could not be retrieved"
 msgstr ""
 
+msgid "No results found"
+msgstr ""
+
 msgid "No items to display"
 msgstr ""
 
@@ -494,6 +565,9 @@ msgstr ""
 msgid "Reset filter"
 msgstr ""
 
+msgid "Remove filter"
+msgstr ""
+
 msgid "{{fromDate}} to {{toDate}}"
 msgstr ""
 
@@ -512,6 +586,9 @@ msgstr ""
 msgid "More filters"
 msgstr ""
 
+msgid "Stage filters"
+msgstr ""
+
 msgid "Rows per page"
 msgstr ""
 
@@ -536,19 +613,46 @@ msgstr ""
 msgid "Add comment"
 msgstr ""
 
-msgid "You dont have access to write comments"
+msgid "You don't have access to write comments"
 msgstr ""
 
 msgid "Write comment"
 msgstr ""
 
+msgid "was blanked out and hidden by your last action"
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "Close the notice"
+msgstr ""
+
 msgid "Use new Enrollment dashboard for {{programName}}"
 msgstr ""
 
 msgid "Opt in for {{programName}}"
 msgstr ""
 
-msgid "No, cancel"
+msgid ""
+"By clicking opt-in below, you will start using the new enrollment dashboard "
+"in the Capture app for this Tracker program. At the moment, there is certain"
+" functionality from Tracker Capture that has not yet been added, including "
+"relationship and referral functionality. The work on including this Tracker "
+"functionality in Capture is ongoing and will be added in upcoming app "
+"releases."
+msgstr ""
+
+msgid ""
+"The core team appreciates any feedback on this new functionality which is "
+"currently being beta tested, please report any issues and feedback in the "
+"DHIS2 JIRA project."
+msgstr ""
+
+msgid ""
+"Click the button below to opt-in to the new enrollment dashboard "
+"functionality in the Capture app (beta) for this Tracker program for all "
+"users."
 msgstr ""
 
 msgid "Yes, opt in"
@@ -560,23 +664,23 @@ msgstr ""
 msgid "Opt out for {{programName}}"
 msgstr ""
 
-msgid "Tracked entity instance with id \"{{teiId}}\" does not exist"
+msgid "Enrollment with id \"{{enrollmentId}}\" does not exist"
 msgstr ""
 
-msgid ""
-"There is an error while opening this enrollment. Please enter a valid url."
+msgid "Tracked entity instance with id \"{{teiId}}\" does not exist"
 msgstr ""
 
-msgid "Enrollment with id \"{{enrollmentId}}\" does not exist"
+msgid "Program with id \"{{programId}}\" does not exist"
 msgstr ""
 
-msgid "Enrollment Dashboard"
+msgid ""
+"An error occurred while fetching enrollments. Please enter a valid url."
 msgstr ""
 
-msgid "No indicator output for this enrollment yet"
+msgid "No feedback for this enrollment yet"
 msgstr ""
 
-msgid "No feedback for this enrollment yet"
+msgid "No indicator output for this enrollment yet"
 msgstr ""
 
 msgid "Quick actions"
@@ -606,9 +710,21 @@ msgid ""
 "{{programName}} has categories. Choose all categories to view dashboard."
 msgstr ""
 
+msgid "Invalid enrollment id {{enrollmentId}}."
+msgstr ""
+
 msgid "Choose an enrollment to view the dashboard."
 msgstr ""
 
+msgid "There are no active enrollments."
+msgstr ""
+
+msgid "Add new enrollment for {{teiDisplayName}} in this program."
+msgstr ""
+
+msgid "No access to program owner."
+msgstr ""
+
 msgid "{{teiDisplayName}} is not enrolled in this program."
 msgstr ""
 
@@ -644,19 +760,16 @@ msgstr ""
 msgid "There was an error opening the Page"
 msgstr ""
 
-msgid "Enrollment{{escape}} New Event"
-msgstr ""
-
 msgid "There was an error loading the page"
 msgstr ""
 
 msgid "Choose a registering unit to start reporting"
 msgstr ""
 
-msgid "There are no feedbacks for this event"
+msgid "No feedback for this event yet"
 msgstr ""
 
-msgid "There are no indicators for this event"
+msgid "No indicator output for this event yet"
 msgstr ""
 
 msgid "Program stage is invalid"
@@ -671,7 +784,7 @@ msgstr ""
 msgid "Refer"
 msgstr ""
 
-msgid "You can’t add any more events in this program"
+msgid "You can't add any more {{ programStageName }} events"
 msgstr ""
 
 msgid "Cancel without saving"
@@ -683,19 +796,7 @@ msgstr ""
 msgid "Program Stages could not be loaded"
 msgstr ""
 
-msgid "stage"
-msgstr ""
-
-msgid "Enrollment{{escape}} View Event"
-msgstr ""
-
-msgid "Enrollment{{escape}} Edit Event"
-msgstr ""
-
-msgid "The enrollment event data could not be found"
-msgstr ""
-
-msgid "There are no feedback for this event"
+msgid "Stage"
 msgstr ""
 
 msgid "Registered events"
@@ -722,9 +823,6 @@ msgstr ""
 msgid "Save as new"
 msgstr ""
 
-msgid "View dashboard"
-msgstr ""
-
 msgid "View enrollment"
 msgstr ""
 
@@ -738,7 +836,10 @@ msgstr ""
 msgid "New Enrollment in program{{escape}} {{programName}}"
 msgstr ""
 
-msgid "Save new"
+msgid "Save {{trackedEntityTypeName}}"
+msgstr ""
+
+msgid "Save {{trackedEntityName}}"
 msgstr ""
 
 msgid "Save new {{trackedEntityTypeName}} and link"
@@ -786,213 +887,243 @@ msgstr ""
 msgid "Register"
 msgstr ""
 
-msgid ""
-"Fill in at least {{minAttributesRequiredToSearch}}  attributes to search"
+msgid "Back"
 msgstr ""
 
-msgid "Search {{name}}"
+msgid "events"
 msgstr ""
 
-msgid "Search by {{name}}"
+msgid "event"
 msgstr ""
 
-msgid "Search by attributes"
+msgid "You don't have access to edit this event"
 msgstr ""
 
-msgid "Fill in these fields to search{{escape}} {{ searchableAttributes }}"
+msgid "Edit event"
+msgstr ""
+
+msgid "View changelog"
+msgstr ""
+
+msgid "Event details"
 msgstr ""
 
 msgid ""
-"Fill in at least {{minAttributesRequiredToSearch}} of these fields to "
-"search{{escape}} {{searchableAttributes}}"
+"Leaving this page will discard any selections you made for a new "
+"relationship"
 msgstr ""
 
-msgid "Fill in this field to search{{escape}} {{searchableAttributes}}"
+msgid "Show all events"
 msgstr ""
 
-msgid "Back"
+msgid "Event could not be loaded. Are you sure it exists?"
 msgstr ""
 
-msgid "Search for {{titleText}}"
+msgid "Event could not be loaded"
 msgstr ""
 
-msgid "Search for"
-msgstr "অনুসন্ধান"
+msgid "Organisation unit could not be loaded"
+msgstr ""
 
-msgid ""
-"You can also choose a program from the top bar and search in that program"
+msgid "Dashboard"
 msgstr ""
 
-msgid "No results found"
+msgid "Edit Event"
 msgstr ""
 
-msgid ""
-"You can change your search terms and search again to find what you are "
-"looking for."
+msgid "View Event"
+msgstr ""
+
+msgid "Selected program"
+msgstr "নির্বাচিত প্রোগ্রাম"
+
+msgid "Search {{uniqueAttrName}}"
 msgstr ""
 
-msgid "Register a user"
+msgid "Search by attributes"
 msgstr ""
 
-msgid "Back to search"
+msgid "Fill in at least {{count}} attribute to search"
+msgid_plural "Fill in at least {{count}} attribute to search"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Could not retrieve metadata. Please try again later."
 msgstr ""
 
-msgid "An error has occurred"
+msgid "The enrollment event data could not be found"
 msgstr ""
 
-msgid ""
-"There is a problem with this search, please change the search terms or try "
-"again later. For more details open the Console tab of the Developer tools"
+msgid "Possible duplicates found"
 msgstr ""
 
-msgid "Too many results"
+msgid "An error occurred loading possible duplicates"
 msgstr ""
 
-msgid ""
-"This search returned too many results to show. Try changing search terms or "
-"searching by more attributes to narrow down the results."
+msgid "You don't have access to delete this relationship"
 msgstr ""
 
-msgid "Cannot search in all programs"
+msgid "You don't have access to create any relationships"
 msgstr ""
 
-msgid "Choose a type to start searching"
+msgid "Add relationship"
 msgstr ""
 
-msgid "View active enrollment"
+msgid "No results found for "
 msgstr ""
 
-msgid "Re-enroll"
+msgid "Registering unit"
+msgstr "নিবন্ধন কেন্দ্র"
+
+msgid "Choose a registering unit"
 msgstr ""
 
-msgid "all programs"
+msgid "Clear selection"
+msgstr ""
+
+msgid "No programs available."
 msgstr ""
 
-msgid "If none of search results match, you can create new "
+msgid "Search for a program"
 msgstr ""
 
-msgid "Create new"
+msgid "Some programs are being filtered by the chosen registering unit"
 msgstr ""
 
-msgid ""
-"Not finding the results you were looking for? Try to search all programs "
-"that use type "
+msgid "Show all programs"
 msgstr ""
 
-msgid "Search in all programs"
+msgid "Choose a program"
 msgstr ""
 
-msgid "events"
+msgid "Search for {{titleText}}"
 msgstr ""
 
-msgid "event"
+msgid "Search for"
+msgstr "অনুসন্ধান"
+
+msgid ""
+"You can also choose a program from the top bar and search in that program"
 msgstr ""
 
-msgid "You dont have access to edit this event"
+msgid "Choose a type to start searching"
 msgstr ""
 
-msgid "Edit event"
+msgid "Search {{name}}"
 msgstr ""
 
-msgid "Event details"
+msgid "Search by {{name}}"
+msgstr ""
+
+msgid "all programs"
 msgstr ""
 
 msgid ""
-"Leaving this page will discard any selections you made for a new "
-"relationship"
+"Not finding the results you were looking for? Try to search all programs "
+"that use type "
 msgstr ""
 
-msgid "No one is assigned to this event"
+msgid "Search in all programs"
 msgstr ""
 
-msgid "Assign"
+msgid "If none of search results match, you can create a new "
 msgstr ""
 
-msgid "Event assigned to {{name}}"
+msgid "Create new"
 msgstr ""
 
-msgid "Feedbacks"
+msgid "Fill in these fields to search{{escape}} {{ searchableAttributes }}"
 msgstr ""
 
-msgid "Show all events"
+msgid ""
+"Fill in at least {{minAttributesRequiredToSearch}} of these fields to "
+"search{{escape}} {{searchableAttributes}}"
 msgstr ""
 
-msgid "Event could not be loaded. Are you sure it exists?"
+msgid "Fill in this field to search{{escape}} {{searchableAttributes}}"
 msgstr ""
 
-msgid "Event could not be loaded"
+msgid ""
+"You can change your search terms and search again to find what you are "
+"looking for."
 msgstr ""
 
-msgid "Organisation unit could not be loaded"
+msgid "Back to search"
 msgstr ""
 
-msgid "Possible duplicates found"
+msgid "An error has occurred"
 msgstr ""
 
-msgid "An error occurred loading possible duplicates"
+msgid "Too many results"
 msgstr ""
 
-msgid "You dont have access to delete this relationship"
+msgid "Cannot search in all programs"
 msgstr ""
 
-msgid "You dont have access to create any relationships"
+msgid "Missing search criteria"
 msgstr ""
 
-msgid "Add relationship"
+msgid "Results found"
 msgstr ""
 
-msgid "Selected registering unit"
+msgid "Saved lists in this program"
 msgstr ""
 
-msgid "Start Again"
+msgid "Saved lists offer quick access to your most used views in a program."
 msgstr ""
 
-msgid "Are you sure? All unsaved data will be lost."
+msgid ""
+"There are no saved lists in this program yet, create one using the button "
+"below."
 msgstr ""
 
-msgid "Accept"
+msgid "Create saved list"
 msgstr ""
 
-msgid "Registering Organisation Unit"
+msgid "Create new in another program"
 msgstr ""
 
-msgid "Select"
+msgid "Create new event"
 msgstr ""
 
-msgid "No programs available."
+msgid "Search for a {{trackedEntityName}} in {{programName}}"
 msgstr ""
 
-msgid "Selected program"
-msgstr "নির্বাচিত প্রোগ্রাম"
+msgid "Assigned to"
+msgstr ""
 
-msgid "Select program"
+msgid "You don't have access to edit this assignee"
 msgstr ""
 
-msgid "Selected"
+msgid "Edit"
 msgstr ""
 
-msgid "Results found"
+msgid "No one is assigned to this event"
 msgstr ""
 
-msgid "Search {{uniqueAttrName}}"
+msgid "You don't have access to assign an assignee"
 msgstr ""
 
-msgid "Fill in at least {{minAttributesRequired}} attributes to search"
+msgid "Assign"
 msgstr ""
 
-msgid "New {{trackedEntityName}} in {{programName}}"
+msgid "This program is protected"
 msgstr ""
 
-msgid "Search for a {{trackedEntityName}} in {{programName}}"
+msgid "Reason to check for enrollments"
 msgstr ""
 
-msgid "Clear selections"
+msgid ""
+"Describe the reason you are checking for enrollments in this protected "
+"program"
 msgstr ""
 
-msgid "To work with the selected program,"
+msgid "Check for enrollments"
 msgstr ""
 
-msgid "open the Tracker Capture app"
+msgid ""
+"You must provide a reason to check for enrollments in this protected "
+"program. All activity will be logged."
 msgstr ""
 
 msgid "Save comment"
@@ -1004,10 +1135,10 @@ msgstr ""
 msgid "We are processing your request."
 msgstr ""
 
-msgid "Add new"
+msgid "Only one enrollment per {{tetName}} is allowed in this program"
 msgstr ""
 
-msgid "Only one enrollment per {{tetName}} is allowed in this program"
+msgid "Add new"
 msgstr ""
 
 msgid "Reactivate"
@@ -1036,6 +1167,57 @@ msgstr ""
 msgid "Mark for follow-up"
 msgstr ""
 
+msgid "Transfer"
+msgstr ""
+
+msgid "An error occurred while transferring ownership"
+msgstr ""
+
+msgid "Existing dates for auto-generated events will not be updated."
+msgstr ""
+
+msgid "Latitude"
+msgstr ""
+
+msgid "Longitude"
+msgstr ""
+
+msgid "Set coordinates"
+msgstr ""
+
+msgid "Coordinates"
+msgstr ""
+
+msgid "Delete polygon"
+msgstr ""
+
+msgid "Close without saving"
+msgstr ""
+
+msgid "Finish drawing before saving"
+msgstr ""
+
+msgid "Set area"
+msgstr ""
+
+msgid ""
+"Transferring enrollment ownership from {{ownerOrgUnit}} to "
+"{{newOrgUnit}}{{escape}}"
+msgstr ""
+
+msgid ""
+"You will lose access to the enrollment when transferring ownership to "
+"{{organisationUnit}}."
+msgstr ""
+
+msgid "Transfer Ownership"
+msgstr ""
+
+msgid ""
+"Choose the organisation unit to which enrollment ownership should be "
+"transferred."
+msgstr ""
+
 msgid "Enrollment date"
 msgstr "নিবন্ধনের তারিখ"
 
@@ -1060,6 +1242,12 @@ msgstr ""
 msgid "Cancelled"
 msgstr ""
 
+msgid "Add coordinates"
+msgstr ""
+
+msgid "Add area"
+msgstr ""
+
 msgid "Comments about this enrollment"
 msgstr ""
 
@@ -1102,25 +1290,31 @@ msgstr ""
 msgid "Yes, delete event"
 msgstr ""
 
+msgid "Go to “Schedule” tab to reschedule this event"
+msgstr ""
+
+msgid "Scheduled date cannot be changed for {{ eventStatus }} events"
+msgstr ""
+
 msgid "Event completed"
 msgstr ""
 
 msgid "Back to all stages and events"
 msgstr ""
 
-msgid "You don't have access to edit this event"
+msgid "Schedule date info"
 msgstr ""
 
-msgid "Schedule date info"
+msgid "Scheduled automatically for {{suggestedScheduleDate}}"
 msgstr ""
 
 msgid ""
-"This date is the suggested scheduled date based on the intervals defined, \n"
-"                    it can be adjusted if needed."
+"The scheduled date matches the suggested date, but can be changed if needed."
 msgstr ""
 
-msgid "This date is {{count}} days {{position}} the suggested date."
-msgid_plural "This date is {{count}} days {{position}} the suggested date."
+msgid "The scheduled date is {{count}} days {{position}} the suggested date."
+msgid_plural ""
+"The scheduled date is {{count}} days {{position}} the suggested date."
 msgstr[0] ""
 msgstr[1] ""
 
@@ -1179,25 +1373,69 @@ msgstr ""
 msgid "Try again or contact your system administrator for support"
 msgstr ""
 
-msgid "tracked entity instance"
+msgid "Fix errors in the form to continue."
 msgstr ""
 
-msgid "Fix errors in the form to continue."
+msgid "You do not have access to delete this {{trackedEntityTypeName}}"
+msgstr ""
+
+msgid "Delete {{trackedEntityTypeName}}"
+msgstr ""
+
+msgid ""
+"Are you sure you want to delete this {{trackedEntityTypeName}}? This will "
+"permanently remove the {{trackedEntityTypeName}} and all its associated "
+"enrollments and events in all programs."
+msgstr ""
+
+msgid "There was a problem deleting the {{trackedEntityTypeName}}"
+msgstr ""
+
+msgid "Yes, delete {{trackedEntityTypeName}}"
 msgstr ""
 
 msgid "Profile widget could not be loaded. Please try again later"
 msgstr ""
 
-msgid "{{TETName}} profile"
+msgid "{{trackedEntityTypeName}} profile"
 msgstr ""
 
-msgid "Edit"
+msgid "tracked entity instance"
+msgstr ""
+
+msgid "Link to an existing {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Choose a {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Ambiguous relationships, contact system administrator"
+msgstr ""
+
+msgid ""
+"Enter {{linkableStageLabel}} details in the next step after completing this "
+"{{currentStageLabel}}."
+msgstr ""
+
+msgid "Enter details now"
+msgstr ""
+
+msgid "Link to an existing"
+msgstr ""
+
+msgid "Scheduled date"
+msgstr "পরবর্তী ভিজিটের তারিখ"
+
+msgid "Report date"
+msgstr "পরিদর্শনের তারিখ"
+
+msgid "Please select a valid event"
 msgstr ""
 
 msgid "New {{ eventName }} event"
 msgstr ""
 
-msgid "This event is not yet preserved and cannot be edited"
+msgid "To open this event, please wait until saving is complete"
 msgstr ""
 
 msgid "Show {{ rest }} more"
@@ -1215,9 +1453,6 @@ msgstr ""
 msgid "Events could not be retrieved. Please try again later."
 msgstr ""
 
-msgid "Registering unit"
-msgstr "নিবন্ধন কেন্দ্র"
-
 msgid "{{ totalEvents }} events"
 msgstr ""
 
@@ -1230,31 +1465,88 @@ msgstr ""
 msgid "Stages and Events"
 msgstr ""
 
-msgid "Working list could not be loaded"
+msgid "Changelog"
 msgstr ""
 
-msgid "Download as JSON"
+msgid "No changes to display"
 msgstr ""
 
-msgid "Download as XML"
+msgid "Created"
 msgstr ""
 
-msgid "Download as CSV"
+msgid "Deleted"
 msgstr ""
 
-msgid "Download with current filters"
+msgid "Date"
+msgstr "তারিখ"
+
+msgid "User"
 msgstr ""
 
-msgid "Download data..."
+msgid "Data item"
 msgstr ""
 
-msgid "an error occurred loading working lists"
+msgid "Change"
 msgstr ""
 
-msgid "Enrollment status"
+msgid "New {{trackedEntityTypeName}} relationship"
 msgstr ""
 
-msgid "Assigned to"
+msgid "Missing implementation step"
+msgstr ""
+
+msgid "Go back without saving relationship"
+msgstr ""
+
+msgid "New Relationship"
+msgstr ""
+
+msgid "Link to an existing {{tetName}}"
+msgstr ""
+
+msgid "An error occurred while adding the relationship"
+msgstr ""
+
+msgid ""
+"Something went wrong while loading relationships. Please try again later."
+msgstr ""
+
+msgid "{{trackedEntityTypeName}} relationships"
+msgstr ""
+
+msgid "Delete relationship"
+msgstr ""
+
+msgid ""
+"Deleting the relationship is permanent and cannot be undone. Are you sure "
+"you want to delete this relationship?"
+msgstr ""
+
+msgid "Yes, delete relationship"
+msgstr ""
+
+msgid "An error occurred while deleting the relationship."
+msgstr ""
+
+msgid "To open this relationship, please wait until saving is complete"
+msgstr ""
+
+msgid "Type"
+msgstr ""
+
+msgid "Created date"
+msgstr ""
+
+msgid "Program stage name"
+msgstr ""
+
+msgid "Working list could not be loaded"
+msgstr ""
+
+msgid "Download data..."
+msgstr ""
+
+msgid "an error occurred loading working lists"
 msgstr ""
 
 msgid "Registration Date"
@@ -1263,9 +1555,30 @@ msgstr ""
 msgid "Inactive"
 msgstr "ফলোআপ সম্পন্ন?"
 
+msgid "Enrollment status"
+msgstr ""
+
+msgid "Follow up"
+msgstr ""
+
+msgid "Choose a program stage to filter by {{label}}"
+msgstr ""
+
+msgid "Active enrollments"
+msgstr ""
+
+msgid "Completed enrollments"
+msgstr ""
+
+msgid "Cancelled enrollments"
+msgstr ""
+
 msgid "Working list could not be updated"
 msgstr ""
 
+msgid "an error occurred loading the working lists"
+msgstr ""
+
 msgid "an error occurred loading Tracked entity instance lists"
 msgstr ""
 
@@ -1302,6 +1615,15 @@ msgstr ""
 msgid "Show All"
 msgstr ""
 
+msgid "Download as JSON"
+msgstr ""
+
+msgid "Download as CSV"
+msgstr ""
+
+msgid "Download with current filters"
+msgstr ""
+
 msgid "An error has occured. See log for details"
 msgstr ""
 
@@ -1320,6 +1642,9 @@ msgstr ""
 msgid "Skipped"
 msgstr ""
 
+msgid "Visited"
+msgstr ""
+
 msgid "{{trackedEntityName}} in program{{escape}} {{programName}}"
 msgstr ""
 
@@ -1365,15 +1690,12 @@ msgstr ""
 msgid "Error editing the event, the changes made were not saved"
 msgstr ""
 
-msgid "Set coordinate"
+msgid "Error updating the Assignee"
 msgstr ""
 
-msgid "Page {{currentPage}}"
+msgid "Set coordinate"
 msgstr ""
 
-msgid "Date"
-msgstr "তারিখ"
-
 msgid "Time"
 msgstr ""
 
@@ -1389,16 +1711,10 @@ msgstr ""
 msgid "To time"
 msgstr ""
 
-msgid "error encountered during field validation"
-msgstr ""
-
-msgid "error"
-msgstr ""
-
-msgid "Delete polygon"
+msgid "Page {{currentPage}}"
 msgstr ""
 
-msgid "Set area"
+msgid "Area on map saved"
 msgstr ""
 
 msgid "Compatibility mode"
diff --git a/i18n/cs.po b/i18n/cs.po
index ad44a9980e..1c5788bfe7 100644
--- a/i18n/cs.po
+++ b/i18n/cs.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-03-07T14:47:33.932Z\n"
+"POT-Creation-Date: 2024-03-16T14:40:27.542Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Jiří Podhorecký, 2024\n"
 "Language-Team: Czech (https://app.transifex.com/hisp-uio/teams/100509/cs/)\n"
@@ -343,7 +343,7 @@ msgid "Would you like to complete the enrollment?"
 msgstr ""
 
 msgid "Complete enrollment"
-msgstr ""
+msgstr "Dokončit zápis"
 
 msgid "A duplicate exists (but there were some errors, see log for details"
 msgstr ""
@@ -707,6 +707,12 @@ msgid ""
 msgstr ""
 "Při načítání registrací došlo k chybě. Zadejte prosím platnou adresu URL."
 
+msgid "No feedback for this enrollment yet"
+msgstr "K tomuto zápisu zatím není žádná zpětná vazba"
+
+msgid "No indicator output for this enrollment yet"
+msgstr "Pro tento zápis zatím neexistuje žádný indikátorový výstup"
+
 msgid "Quick actions"
 msgstr "Rychlé akce"
 
@@ -796,6 +802,12 @@ msgstr "Při načítání stránky došlo k chybě"
 msgid "Choose a registering unit to start reporting"
 msgstr "Vyberte registraci jednotky a začněte hlásit"
 
+msgid "No feedback for this event yet"
+msgstr ""
+
+msgid "No indicator output for this event yet"
+msgstr ""
+
 msgid "Program stage is invalid"
 msgstr "Fáze programu je neplatná"
 
@@ -960,12 +972,6 @@ msgstr ""
 msgid "View Event"
 msgstr ""
 
-msgid "No feedback for this enrollment yet"
-msgstr "K tomuto zápisu zatím není žádná zpětná vazba"
-
-msgid "No indicator output for this enrollment yet"
-msgstr "Pro tento zápis zatím neexistuje žádný indikátorový výstup"
-
 msgid "Selected program"
 msgstr "Vybraný program"
 
@@ -1128,7 +1134,7 @@ msgid "Create new in another program"
 msgstr ""
 
 msgid "Create new event"
-msgstr ""
+msgstr "Vytvořit novou událost"
 
 msgid "Search for a {{trackedEntityName}} in {{programName}}"
 msgstr "Vyhledat {{trackedEntityName}} v {{programName}}"
@@ -1380,10 +1386,13 @@ msgstr "před"
 msgid "There are {{count}} scheduled event in {{orgUnitName}} on this day."
 msgid_plural ""
 "There are {{count}} scheduled event in {{orgUnitName}} on this day."
-msgstr[0] ""
+msgstr[0] "Na tento den je v {{orgUnitName}} naplánovaná {{count}} událost."
 msgstr[1] ""
+"Na tento den jsou v {{orgUnitName}} naplánované {{count}} události."
 msgstr[2] ""
+"Na tento den je v {{orgUnitName}} naplánovaných {{count}} událostí."
 msgstr[3] ""
+"Na tento den je v {{orgUnitName}} naplánovaných {{count}} událostí."
 
 msgid ""
 "Scheduling an event in {{stageName}} for {{programName}} in {{orgUnitName}}"
@@ -1462,6 +1471,35 @@ msgstr ""
 msgid "tracked entity instance"
 msgstr "sledovaná instance entity"
 
+msgid "Link to an existing {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Choose a {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Ambiguous relationships, contact system administrator"
+msgstr ""
+
+msgid ""
+"Enter {{linkableStageLabel}} details in the next step after completing this "
+"{{currentStageLabel}}."
+msgstr ""
+
+msgid "Enter details now"
+msgstr ""
+
+msgid "Link to an existing"
+msgstr ""
+
+msgid "Scheduled date"
+msgstr "Plánované datum"
+
+msgid "Report date"
+msgstr "Datum zprávy"
+
+msgid "Please select a valid event"
+msgstr ""
+
 msgid "New {{ eventName }} event"
 msgstr "Nová událost {{ eventName }}"
 
@@ -1502,10 +1540,10 @@ msgid "No changes to display"
 msgstr ""
 
 msgid "Created"
-msgstr ""
+msgstr "Vytvořeno"
 
 msgid "Deleted"
-msgstr ""
+msgstr "Smazáno"
 
 msgid "Date"
 msgstr "datum"
@@ -1514,7 +1552,7 @@ msgid "User"
 msgstr "Uživatel"
 
 msgid "Data item"
-msgstr ""
+msgstr "Datová položka"
 
 msgid "Change"
 msgstr ""
@@ -1545,7 +1583,7 @@ msgid "{{trackedEntityTypeName}} relationships"
 msgstr "{{trackedEntityTypeName}} vztahy"
 
 msgid "Delete relationship"
-msgstr ""
+msgstr "Smazat vztah"
 
 msgid ""
 "Deleting the relationship is permanent and cannot be undone. Are you sure "
@@ -1573,15 +1611,6 @@ msgstr "Název fáze programu"
 msgid "Working list could not be loaded"
 msgstr "Pracovní seznam nelze načíst"
 
-msgid "Download as JSON"
-msgstr "Stáhnout jako JSON"
-
-msgid "Download as CSV"
-msgstr "Stáhnout jako CSV"
-
-msgid "Download with current filters"
-msgstr "Stáhnout s aktuálními filtry"
-
 msgid "Download data..."
 msgstr "Stáhnout data ..."
 
@@ -1598,7 +1627,7 @@ msgid "Enrollment status"
 msgstr "Stav zápisu"
 
 msgid "Follow up"
-msgstr ""
+msgstr "Následovat"
 
 msgid "Choose a program stage to filter by {{label}}"
 msgstr "Vyberte fázi programu, kterou chcete filtrovat podle {{label}}"
@@ -1654,6 +1683,15 @@ msgstr "Ukázat méně"
 msgid "Show All"
 msgstr "Ukázat vše"
 
+msgid "Download as JSON"
+msgstr "Stáhnout jako JSON"
+
+msgid "Download as CSV"
+msgstr "Stáhnout jako CSV"
+
+msgid "Download with current filters"
+msgstr "Stáhnout s aktuálními filtry"
+
 msgid "An error has occured. See log for details"
 msgstr "Vyskytla se chyba. Podrobnosti najdete v protokolu"
 
diff --git a/i18n/es.po b/i18n/es.po
index d98c0dfbf8..47f05c027e 100644
--- a/i18n/es.po
+++ b/i18n/es.po
@@ -10,16 +10,16 @@
 # Alison Andrade <aandrade@ippfwhr.org>, 2024
 # Philip Larsen Donnelly, 2024
 # Gabriela Rodriguez <grodriguezcoronado@gmail.com>, 2024
-# Viktor Varland <viktor@dhis2.org>, 2024
 # Janeth Cruz, 2024
 # Enzo Nicolas Rossi <enzo@dhis2.org>, 2024
+# Viktor Varland <viktor@dhis2.org>, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
 "POT-Creation-Date: 2024-03-16T14:40:27.542Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
-"Last-Translator: Enzo Nicolas Rossi <enzo@dhis2.org>, 2024\n"
+"Last-Translator: Viktor Varland <viktor@dhis2.org>, 2024\n"
 "Language-Team: Spanish (https://app.transifex.com/hisp-uio/teams/100509/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1521,6 +1521,35 @@ msgstr " Perfil de {{trackedEntityTypeName}}"
 msgid "tracked entity instance"
 msgstr "instancia de entidad rastreada"
 
+msgid "Link to an existing {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Choose a {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Ambiguous relationships, contact system administrator"
+msgstr ""
+
+msgid ""
+"Enter {{linkableStageLabel}} details in the next step after completing this "
+"{{currentStageLabel}}."
+msgstr ""
+
+msgid "Enter details now"
+msgstr ""
+
+msgid "Link to an existing"
+msgstr ""
+
+msgid "Scheduled date"
+msgstr "Fecha planificada"
+
+msgid "Report date"
+msgstr "Fecha de reporte"
+
+msgid "Please select a valid event"
+msgstr ""
+
 msgid "New {{ eventName }} event"
 msgstr "Nuevo evento {{ eventName }}"
 
diff --git a/i18n/fr.po b/i18n/fr.po
index e9da3edd31..bf36f4ff9a 100644
--- a/i18n/fr.po
+++ b/i18n/fr.po
@@ -1,19 +1,19 @@
 # 
 # Translators:
-# Edem Kossi <ekossi@hispwca.org>, 2022
 # Karoline Tufte Lien <karoline@dhis2.org>, 2022
 # tx_e2f_fr r25 <tx_e2f_fr_r25@ate2f.com>, 2022
 # Bram Piot <bram.piot@gmail.com>, 2022
-# Yao Selom SAKA (HISP WCA) <ysaka@hispwca.org>, 2023
-# Gabriela Rodriguez <grodriguezcoronado@gmail.com>, 2023
-# Yayra Gomado <ygomado@hispwca.org>, 2024
 # Philip Larsen Donnelly, 2024
+# Edem Kossi <ekossi@hispwca.org>, 2024
+# Gabriela Rodriguez <grodriguezcoronado@gmail.com>, 2024
+# Yao Selom SAKA (HISP WCA) <ysaka@hispwca.org>, 2024
+# Yayra Gomado <ygomado@hispwca.org>, 2024
 # Viktor Varland <viktor@dhis2.org>, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-03-07T14:47:33.932Z\n"
+"POT-Creation-Date: 2024-03-16T14:40:27.542Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Viktor Varland <viktor@dhis2.org>, 2024\n"
 "Language-Team: French (https://app.transifex.com/hisp-uio/teams/100509/fr/)\n"
@@ -363,7 +363,7 @@ msgid "Would you like to complete the enrollment?"
 msgstr ""
 
 msgid "Complete enrollment"
-msgstr ""
+msgstr "Terminer l'enrôlement"
 
 msgid "A duplicate exists (but there were some errors, see log for details"
 msgstr ""
@@ -718,6 +718,12 @@ msgid ""
 "An error occurred while fetching enrollments. Please enter a valid url."
 msgstr ""
 
+msgid "No feedback for this enrollment yet"
+msgstr "Aucun commentaire pour cet enrôlement pour le moment"
+
+msgid "No indicator output for this enrollment yet"
+msgstr "Aucune sortie d'indicateur pour cet enrôlement pour le moment"
+
 msgid "Quick actions"
 msgstr "Actions rapides"
 
@@ -809,6 +815,12 @@ msgstr "Une erreur s'est produite lors du chargement de la page"
 msgid "Choose a registering unit to start reporting"
 msgstr "Sélectionnez une unité d'enregistrement pour commencer un rapport"
 
+msgid "No feedback for this event yet"
+msgstr ""
+
+msgid "No indicator output for this event yet"
+msgstr ""
+
 msgid "Program stage is invalid"
 msgstr "Le stade de programme n'est pas valide"
 
@@ -975,12 +987,6 @@ msgstr ""
 msgid "View Event"
 msgstr ""
 
-msgid "No feedback for this enrollment yet"
-msgstr "Aucun commentaire pour cet enrôlement pour le moment"
-
-msgid "No indicator output for this enrollment yet"
-msgstr "Aucune sortie d'indicateur pour cet enrôlement pour le moment"
-
 msgid "Selected program"
 msgstr "Programme choisi"
 
@@ -1146,7 +1152,7 @@ msgid "Create new in another program"
 msgstr ""
 
 msgid "Create new event"
-msgstr ""
+msgstr "Créer un nouvel évènement"
 
 msgid "Search for a {{trackedEntityName}} in {{programName}}"
 msgstr "Rechercher un {{trackedEntityName}} dans {{programName}}"
@@ -1386,9 +1392,9 @@ msgstr ""
 msgid "The scheduled date is {{count}} days {{position}} the suggested date."
 msgid_plural ""
 "The scheduled date is {{count}} days {{position}} the suggested date."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "La date prévue est {{count}} jour {{position}} la date suggérée."
+msgstr[1] "xx"
+msgstr[2] "La date prévue est {{count}} jour {{position}} la date suggérée."
 
 msgid "after"
 msgstr "après"
@@ -1484,6 +1490,35 @@ msgstr ""
 msgid "tracked entity instance"
 msgstr "instance d'entité suivie"
 
+msgid "Link to an existing {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Choose a {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Ambiguous relationships, contact system administrator"
+msgstr ""
+
+msgid ""
+"Enter {{linkableStageLabel}} details in the next step after completing this "
+"{{currentStageLabel}}."
+msgstr ""
+
+msgid "Enter details now"
+msgstr ""
+
+msgid "Link to an existing"
+msgstr ""
+
+msgid "Scheduled date"
+msgstr "Date programmée"
+
+msgid "Report date"
+msgstr "Date du rapport"
+
+msgid "Please select a valid event"
+msgstr ""
+
 msgid "New {{ eventName }} event"
 msgstr "Nouvel événement {{ eventName }}"
 
@@ -1525,10 +1560,10 @@ msgid "No changes to display"
 msgstr ""
 
 msgid "Created"
-msgstr ""
+msgstr "Créé"
 
 msgid "Deleted"
-msgstr ""
+msgstr "Supprimé"
 
 msgid "Date"
 msgstr "Date"
@@ -1537,7 +1572,7 @@ msgid "User"
 msgstr "Utilisateur"
 
 msgid "Data item"
-msgstr ""
+msgstr "Item de données"
 
 msgid "Change"
 msgstr ""
@@ -1568,7 +1603,7 @@ msgid "{{trackedEntityTypeName}} relationships"
 msgstr ""
 
 msgid "Delete relationship"
-msgstr ""
+msgstr "Supprimer la relation"
 
 msgid ""
 "Deleting the relationship is permanent and cannot be undone. Are you sure "
@@ -1596,15 +1631,6 @@ msgstr "Nom de l'étape du programme"
 msgid "Working list could not be loaded"
 msgstr "La liste des tâches n'a pas pu être chargée"
 
-msgid "Download as JSON"
-msgstr "Télécharger en JSON"
-
-msgid "Download as CSV"
-msgstr "Télécharger en CSV"
-
-msgid "Download with current filters"
-msgstr "Télécharger avec les filtres actuels"
-
 msgid "Download data..."
 msgstr "Télécharger des données..."
 
@@ -1621,7 +1647,7 @@ msgid "Enrollment status"
 msgstr "Statut de l'enrôlement"
 
 msgid "Follow up"
-msgstr ""
+msgstr "Suivi"
 
 msgid "Choose a program stage to filter by {{label}}"
 msgstr "Choisir un stade de programme pour filtrer par {{label}}"
@@ -1679,6 +1705,15 @@ msgstr "Afficher moins"
 msgid "Show All"
 msgstr "Afficher tout"
 
+msgid "Download as JSON"
+msgstr "Télécharger en JSON"
+
+msgid "Download as CSV"
+msgstr "Télécharger en CSV"
+
+msgid "Download with current filters"
+msgstr "Télécharger avec les filtres actuels"
+
 msgid "An error has occured. See log for details"
 msgstr "Une erreur s'est produite. Voir le journal pour plus de détails"
 
diff --git a/i18n/lo.po b/i18n/lo.po
index 975c2a7313..f975ddc69c 100644
--- a/i18n/lo.po
+++ b/i18n/lo.po
@@ -1,17 +1,17 @@
 # 
 # Translators:
-# Philip Larsen Donnelly, 2023
 # Thuy Nguyen <thuynguyen@hispvietnam.org>, 2023
 # Saysamone Sibounma, 2023
 # Somkhit Bouavong <bouavongk@gmail.com>, 2024
 # Viktor Varland <viktor@dhis2.org>, 2024
+# Philip Larsen Donnelly, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-03-07T14:47:33.932Z\n"
+"POT-Creation-Date: 2024-03-16T14:40:27.542Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
-"Last-Translator: Viktor Varland <viktor@dhis2.org>, 2024\n"
+"Last-Translator: Philip Larsen Donnelly, 2024\n"
 "Language-Team: Lao (https://app.transifex.com/hisp-uio/teams/100509/lo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -679,6 +679,12 @@ msgid ""
 "An error occurred while fetching enrollments. Please enter a valid url."
 msgstr ""
 
+msgid "No feedback for this enrollment yet"
+msgstr ""
+
+msgid "No indicator output for this enrollment yet"
+msgstr ""
+
 msgid "Quick actions"
 msgstr ""
 
@@ -762,6 +768,12 @@ msgstr ""
 msgid "Choose a registering unit to start reporting"
 msgstr ""
 
+msgid "No feedback for this event yet"
+msgstr ""
+
+msgid "No indicator output for this event yet"
+msgstr ""
+
 msgid "Program stage is invalid"
 msgstr ""
 
@@ -924,12 +936,6 @@ msgstr ""
 msgid "View Event"
 msgstr ""
 
-msgid "No feedback for this enrollment yet"
-msgstr ""
-
-msgid "No indicator output for this enrollment yet"
-msgstr ""
-
 msgid "Selected program"
 msgstr "ເລືອກສາຍງານ"
 
@@ -1396,6 +1402,35 @@ msgstr ""
 msgid "tracked entity instance"
 msgstr ""
 
+msgid "Link to an existing {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Choose a {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Ambiguous relationships, contact system administrator"
+msgstr ""
+
+msgid ""
+"Enter {{linkableStageLabel}} details in the next step after completing this "
+"{{currentStageLabel}}."
+msgstr ""
+
+msgid "Enter details now"
+msgstr ""
+
+msgid "Link to an existing"
+msgstr ""
+
+msgid "Scheduled date"
+msgstr "ກຳນົົດວັນທີ"
+
+msgid "Report date"
+msgstr "ວັນທີີລາຍງານ"
+
+msgid "Please select a valid event"
+msgstr ""
+
 msgid "New {{ eventName }} event"
 msgstr ""
 
@@ -1507,15 +1542,6 @@ msgstr "Program stage name"
 msgid "Working list could not be loaded"
 msgstr ""
 
-msgid "Download as JSON"
-msgstr "Download as JSON"
-
-msgid "Download as CSV"
-msgstr "ດາວໂຫຼດເປັນ CSV"
-
-msgid "Download with current filters"
-msgstr ""
-
 msgid "Download data..."
 msgstr ""
 
@@ -1588,6 +1614,15 @@ msgstr ""
 msgid "Show All"
 msgstr ""
 
+msgid "Download as JSON"
+msgstr "Download as JSON"
+
+msgid "Download as CSV"
+msgstr "ດາວໂຫຼດເປັນ CSV"
+
+msgid "Download with current filters"
+msgstr ""
+
 msgid "An error has occured. See log for details"
 msgstr ""
 
diff --git a/i18n/nb.po b/i18n/nb.po
index fe81e36631..c10aed3885 100644
--- a/i18n/nb.po
+++ b/i18n/nb.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-03-07T14:47:33.932Z\n"
+"POT-Creation-Date: 2024-03-16T14:40:27.542Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Karoline Tufte Lien <karoline@dhis2.org>, 2024\n"
 "Language-Team: Norwegian Bokmål (https://app.transifex.com/hisp-uio/teams/100509/nb/)\n"
@@ -709,6 +709,12 @@ msgstr ""
 "Det oppsto en feil under henting av registreringer. Vennligst skriv inn en "
 "gyldig url."
 
+msgid "No feedback for this enrollment yet"
+msgstr "Ingen tilbakemeldinger for denne registreringen enda"
+
+msgid "No indicator output for this enrollment yet"
+msgstr "Ingen indikatorresultat for denne registreringen enda"
+
 msgid "Quick actions"
 msgstr "Snarveier"
 
@@ -798,6 +804,12 @@ msgstr "Det oppsto en feil under lasting av siden"
 msgid "Choose a registering unit to start reporting"
 msgstr "Velg en registreringsenhet for å starte rapportering"
 
+msgid "No feedback for this event yet"
+msgstr ""
+
+msgid "No indicator output for this event yet"
+msgstr ""
+
 msgid "Program stage is invalid"
 msgstr "Programfase er ugyldig"
 
@@ -963,12 +975,6 @@ msgstr "Endre hendelse"
 msgid "View Event"
 msgstr "Se hendelse"
 
-msgid "No feedback for this enrollment yet"
-msgstr "Ingen tilbakemeldinger for denne registreringen enda"
-
-msgid "No indicator output for this enrollment yet"
-msgstr "Ingen indikatorresultat for denne registreringen enda"
-
 msgid "Selected program"
 msgstr "Valgt program"
 
@@ -1126,7 +1132,7 @@ msgid "Create new in another program"
 msgstr ""
 
 msgid "Create new event"
-msgstr ""
+msgstr "Opprett ny hendelse"
 
 msgid "Search for a {{trackedEntityName}} in {{programName}}"
 msgstr "Søk etter {{trackedEntityName}} i {{programName}}"
@@ -1368,7 +1374,9 @@ msgid "The scheduled date is {{count}} days {{position}} the suggested date."
 msgid_plural ""
 "The scheduled date is {{count}} days {{position}} the suggested date."
 msgstr[0] ""
+"Den planlagte datoen er {{count}} dag {{posisjon}} den foreslåtte datoen."
 msgstr[1] ""
+"Den planlagte datoen er {{count}} dager {{posisjon}} den foreslåtte datoen."
 
 msgid "after"
 msgstr "etter"
@@ -1460,6 +1468,35 @@ msgstr ""
 msgid "tracked entity instance"
 msgstr "Sporet enhetforekomst"
 
+msgid "Link to an existing {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Choose a {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Ambiguous relationships, contact system administrator"
+msgstr ""
+
+msgid ""
+"Enter {{linkableStageLabel}} details in the next step after completing this "
+"{{currentStageLabel}}."
+msgstr ""
+
+msgid "Enter details now"
+msgstr ""
+
+msgid "Link to an existing"
+msgstr ""
+
+msgid "Scheduled date"
+msgstr "Planlagt dato"
+
+msgid "Report date"
+msgstr "Rapporteringsdato"
+
+msgid "Please select a valid event"
+msgstr ""
+
 msgid "New {{ eventName }} event"
 msgstr "Ny {{ eventName }} hendelse"
 
@@ -1503,7 +1540,7 @@ msgid "Created"
 msgstr "Opprettet"
 
 msgid "Deleted"
-msgstr ""
+msgstr "Slettet"
 
 msgid "Date"
 msgstr "Dato"
@@ -1571,15 +1608,6 @@ msgstr "Programfase navn"
 msgid "Working list could not be loaded"
 msgstr "Arbeidslisten kunne ikke lastes inn"
 
-msgid "Download as JSON"
-msgstr "Last ned i JSON format"
-
-msgid "Download as CSV"
-msgstr "Last ned i CSV format"
-
-msgid "Download with current filters"
-msgstr "Last ned med gjeldende filtre"
-
 msgid "Download data..."
 msgstr "Last ned data..."
 
@@ -1652,6 +1680,15 @@ msgstr "Vis mindre"
 msgid "Show All"
 msgstr "Vis alle"
 
+msgid "Download as JSON"
+msgstr "Last ned i JSON format"
+
+msgid "Download as CSV"
+msgstr "Last ned i CSV format"
+
+msgid "Download with current filters"
+msgstr "Last ned med gjeldende filtre"
+
 msgid "An error has occured. See log for details"
 msgstr "Det har oppstått en feil. Se logg for detaljer"
 
diff --git a/i18n/nl.po b/i18n/nl.po
index d946b79d5d..20150c29d4 100644
--- a/i18n/nl.po
+++ b/i18n/nl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-03-07T14:47:33.932Z\n"
+"POT-Creation-Date: 2024-03-16T14:40:27.542Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Charel van den Elsen, 2024\n"
 "Language-Team: Dutch (https://app.transifex.com/hisp-uio/teams/100509/nl/)\n"
@@ -722,6 +722,12 @@ msgstr ""
 "Er is een fout opgetreden bij het ophalen van inschrijvingen. Voer een "
 "geldige URL in."
 
+msgid "No feedback for this enrollment yet"
+msgstr "Nog geen feedback voor deze inschrijving"
+
+msgid "No indicator output for this enrollment yet"
+msgstr "Nog geen indicatoroutput voor deze inschrijving"
+
 msgid "Quick actions"
 msgstr "Snelle acties"
 
@@ -814,6 +820,12 @@ msgstr "Er is een fout opgetreden bij het laden van de pagina"
 msgid "Choose a registering unit to start reporting"
 msgstr "Kies een registratie-eenheid om rapportage te starten"
 
+msgid "No feedback for this event yet"
+msgstr ""
+
+msgid "No indicator output for this event yet"
+msgstr ""
+
 msgid "Program stage is invalid"
 msgstr "Programmafase is ongeldig"
 
@@ -981,12 +993,6 @@ msgstr ""
 msgid "View Event"
 msgstr ""
 
-msgid "No feedback for this enrollment yet"
-msgstr "Nog geen feedback voor deze inschrijving"
-
-msgid "No indicator output for this enrollment yet"
-msgstr "Nog geen indicatoroutput voor deze inschrijving"
-
 msgid "Selected program"
 msgstr "Geselecteerd programma"
 
@@ -1150,7 +1156,7 @@ msgid "Create new in another program"
 msgstr ""
 
 msgid "Create new event"
-msgstr ""
+msgstr "Nieuw evenement maken"
 
 msgid "Search for a {{trackedEntityName}} in {{programName}}"
 msgstr "Zoek naar een {{trackedEntityName}} in {{programName}}"
@@ -1394,7 +1400,9 @@ msgid "The scheduled date is {{count}} days {{position}} the suggested date."
 msgid_plural ""
 "The scheduled date is {{count}} days {{position}} the suggested date."
 msgstr[0] ""
+"De geplande datum is {{count}} dag {{position}} de voorgestelde datum."
 msgstr[1] ""
+"De geplande datum is {{getelde}} dagen {{positie}} de voorgestelde datum."
 
 msgid "after"
 msgstr "na"
@@ -1490,6 +1498,35 @@ msgstr ""
 msgid "tracked entity instance"
 msgstr "gevolgd entiteitsexemplaar"
 
+msgid "Link to an existing {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Choose a {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Ambiguous relationships, contact system administrator"
+msgstr ""
+
+msgid ""
+"Enter {{linkableStageLabel}} details in the next step after completing this "
+"{{currentStageLabel}}."
+msgstr ""
+
+msgid "Enter details now"
+msgstr ""
+
+msgid "Link to an existing"
+msgstr ""
+
+msgid "Scheduled date"
+msgstr "Geplande datum"
+
+msgid "Report date"
+msgstr "Rapporteer datum"
+
+msgid "Please select a valid event"
+msgstr ""
+
 msgid "New {{ eventName }} event"
 msgstr "Nieuwe {{ eventName }} evenement"
 
@@ -1602,15 +1639,6 @@ msgstr ""
 msgid "Working list could not be loaded"
 msgstr "Werklijst kon niet worden geladen"
 
-msgid "Download as JSON"
-msgstr "Downloaden als JSON"
-
-msgid "Download as CSV"
-msgstr "Downloaden als CSV"
-
-msgid "Download with current filters"
-msgstr "Downloaden met huidige filters"
-
 msgid "Download data..."
 msgstr "Gegevens downloaden..."
 
@@ -1685,6 +1713,15 @@ msgstr "Laat minder zien"
 msgid "Show All"
 msgstr "Toon alles"
 
+msgid "Download as JSON"
+msgstr "Downloaden als JSON"
+
+msgid "Download as CSV"
+msgstr "Downloaden als CSV"
+
+msgid "Download with current filters"
+msgstr "Downloaden met huidige filters"
+
 msgid "An error has occured. See log for details"
 msgstr "Er is een fout opgetreden. Zie logboek voor details"
 
diff --git a/i18n/pt.po b/i18n/pt.po
index 80e1bfa608..369770bf67 100644
--- a/i18n/pt.po
+++ b/i18n/pt.po
@@ -3,17 +3,17 @@
 # David Júnior <davidjr.mondlane@gmail.com>, 2021
 # Fernando Jorge Bade, 2023
 # Philip Larsen Donnelly, 2024
-# Ge Joao <gsimango@saudigitus.org>, 2024
 # Gabriela Rodriguez <grodriguezcoronado@gmail.com>, 2024
-# Viktor Varland <viktor@dhis2.org>, 2024
 # Sheila André <sandre@saudigitus.org>, 2024
+# Ge Joao <gsimango@saudigitus.org>, 2024
+# Viktor Varland <viktor@dhis2.org>, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-03-07T14:47:33.932Z\n"
+"POT-Creation-Date: 2024-03-16T14:40:27.542Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
-"Last-Translator: Sheila André <sandre@saudigitus.org>, 2024\n"
+"Last-Translator: Viktor Varland <viktor@dhis2.org>, 2024\n"
 "Language-Team: Portuguese (https://app.transifex.com/hisp-uio/teams/100509/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -718,6 +718,12 @@ msgid ""
 msgstr ""
 "Ocorreu um erro ao buscar as inscrições. Por favor, insira um URL válido."
 
+msgid "No feedback for this enrollment yet"
+msgstr "Nenhum feedback para esta inscrição ainda"
+
+msgid "No indicator output for this enrollment yet"
+msgstr "Ainda não há saída de indicador para esta inscrição"
+
 msgid "Quick actions"
 msgstr "Ações rápidas"
 
@@ -808,6 +814,12 @@ msgstr "Ocorreu um erro ao carregar a página"
 msgid "Choose a registering unit to start reporting"
 msgstr "Escolha uma unidade de registro para começar a relatar"
 
+msgid "No feedback for this event yet"
+msgstr ""
+
+msgid "No indicator output for this event yet"
+msgstr ""
+
 msgid "Program stage is invalid"
 msgstr "O estagio do programa é inválida"
 
@@ -974,12 +986,6 @@ msgstr ""
 msgid "View Event"
 msgstr ""
 
-msgid "No feedback for this enrollment yet"
-msgstr "Nenhum feedback para esta inscrição ainda"
-
-msgid "No indicator output for this enrollment yet"
-msgstr "Ainda não há saída de indicador para esta inscrição"
-
 msgid "Selected program"
 msgstr "Programa selecionado"
 
@@ -1144,7 +1150,7 @@ msgid "Create new in another program"
 msgstr ""
 
 msgid "Create new event"
-msgstr ""
+msgstr "Criar um novo evento"
 
 msgid "Search for a {{trackedEntityName}} in {{programName}}"
 msgstr "Procure por um {{trackedEntityName}} em {{programName}}"
@@ -1387,9 +1393,9 @@ msgstr ""
 msgid "The scheduled date is {{count}} days {{position}} the suggested date."
 msgid_plural ""
 "The scheduled date is {{count}} days {{position}} the suggested date."
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr[0] "A data agendada é {{count}} dia {{position}} da data sugerida."
+msgstr[1] "A data agendada é de {{count}} dias {{position}} da data sugerida."
+msgstr[2] "A data agendada é de {{count}} dias {{position}} da data sugerida."
 
 msgid "after"
 msgstr "Depois "
@@ -1485,6 +1491,35 @@ msgstr ""
 msgid "tracked entity instance"
 msgstr "instância de entidade rastreada"
 
+msgid "Link to an existing {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Choose a {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Ambiguous relationships, contact system administrator"
+msgstr ""
+
+msgid ""
+"Enter {{linkableStageLabel}} details in the next step after completing this "
+"{{currentStageLabel}}."
+msgstr ""
+
+msgid "Enter details now"
+msgstr ""
+
+msgid "Link to an existing"
+msgstr ""
+
+msgid "Scheduled date"
+msgstr "Data agendada"
+
+msgid "Report date"
+msgstr "Data do relatório"
+
+msgid "Please select a valid event"
+msgstr ""
+
 msgid "New {{ eventName }} event"
 msgstr "Novo evento de {{ eventName }}"
 
@@ -1531,7 +1566,7 @@ msgid "Created"
 msgstr "Criado"
 
 msgid "Deleted"
-msgstr ""
+msgstr "Apagado"
 
 msgid "Date"
 msgstr "Encontro"
@@ -1599,15 +1634,6 @@ msgstr "Nome do estágio do programa"
 msgid "Working list could not be loaded"
 msgstr "A lista de trabalho não pôde ser carregada"
 
-msgid "Download as JSON"
-msgstr "Baixar como JSON"
-
-msgid "Download as CSV"
-msgstr "Baixar como CSV"
-
-msgid "Download with current filters"
-msgstr "Baixar com filtros atuais"
-
 msgid "Download data..."
 msgstr "Baixar dados ..."
 
@@ -1681,6 +1707,15 @@ msgstr "Mostre menos"
 msgid "Show All"
 msgstr "Mostre tudo"
 
+msgid "Download as JSON"
+msgstr "Baixar como JSON"
+
+msgid "Download as CSV"
+msgstr "Baixar como CSV"
+
+msgid "Download with current filters"
+msgstr "Baixar com filtros atuais"
+
 msgid "An error has occured. See log for details"
 msgstr "Ocorreu um erro. Veja o log para detalhes"
 
diff --git a/i18n/pt_BR.po b/i18n/pt_BR.po
index ba9107ce0a..f64d7513b9 100644
--- a/i18n/pt_BR.po
+++ b/i18n/pt_BR.po
@@ -1,16 +1,16 @@
 # 
 # Translators:
 # Oscar Mesones Lapouble <oscar.lapouble@gmail.com>, 2021
-# Viktor Varland <viktor@dhis2.org>, 2023
 # Philip Larsen Donnelly, 2024
 # Thiago Rocha, 2024
+# Viktor Varland <viktor@dhis2.org>, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-03-07T14:47:33.932Z\n"
+"POT-Creation-Date: 2024-03-16T14:40:27.542Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
-"Last-Translator: Thiago Rocha, 2024\n"
+"Last-Translator: Viktor Varland <viktor@dhis2.org>, 2024\n"
 "Language-Team: Portuguese (Brazil) (https://app.transifex.com/hisp-uio/teams/100509/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -680,6 +680,12 @@ msgid ""
 "An error occurred while fetching enrollments. Please enter a valid url."
 msgstr ""
 
+msgid "No feedback for this enrollment yet"
+msgstr ""
+
+msgid "No indicator output for this enrollment yet"
+msgstr ""
+
 msgid "Quick actions"
 msgstr ""
 
@@ -763,6 +769,12 @@ msgstr ""
 msgid "Choose a registering unit to start reporting"
 msgstr ""
 
+msgid "No feedback for this event yet"
+msgstr ""
+
+msgid "No indicator output for this event yet"
+msgstr ""
+
 msgid "Program stage is invalid"
 msgstr ""
 
@@ -925,12 +937,6 @@ msgstr ""
 msgid "View Event"
 msgstr ""
 
-msgid "No feedback for this enrollment yet"
-msgstr ""
-
-msgid "No indicator output for this enrollment yet"
-msgstr ""
-
 msgid "Selected program"
 msgstr "Programa selecionado"
 
@@ -1403,6 +1409,35 @@ msgstr ""
 msgid "tracked entity instance"
 msgstr ""
 
+msgid "Link to an existing {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Choose a {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Ambiguous relationships, contact system administrator"
+msgstr ""
+
+msgid ""
+"Enter {{linkableStageLabel}} details in the next step after completing this "
+"{{currentStageLabel}}."
+msgstr ""
+
+msgid "Enter details now"
+msgstr ""
+
+msgid "Link to an existing"
+msgstr ""
+
+msgid "Scheduled date"
+msgstr "Data agendada"
+
+msgid "Report date"
+msgstr "Data do relatório"
+
+msgid "Please select a valid event"
+msgstr ""
+
 msgid "New {{ eventName }} event"
 msgstr ""
 
@@ -1514,15 +1549,6 @@ msgstr "Nome do estágio do programa"
 msgid "Working list could not be loaded"
 msgstr ""
 
-msgid "Download as JSON"
-msgstr ""
-
-msgid "Download as CSV"
-msgstr "Baixar como CSV"
-
-msgid "Download with current filters"
-msgstr ""
-
 msgid "Download data..."
 msgstr ""
 
@@ -1595,6 +1621,15 @@ msgstr ""
 msgid "Show All"
 msgstr ""
 
+msgid "Download as JSON"
+msgstr ""
+
+msgid "Download as CSV"
+msgstr "Baixar como CSV"
+
+msgid "Download with current filters"
+msgstr ""
+
 msgid "An error has occured. See log for details"
 msgstr ""
 
diff --git a/i18n/ru.po b/i18n/ru.po
index ecc3a1d5dc..8cc2924a50 100644
--- a/i18n/ru.po
+++ b/i18n/ru.po
@@ -3,15 +3,15 @@
 # Ulanbek Abakirov <ulans@mail.ru>, 2020
 # Wanda <wanda@frontlineaids.org>, 2021
 # Valeriu Plesca <vplesca@gmail.com>, 2022
-# Philip Larsen Donnelly, 2024
 # Viktor Varland <viktor@dhis2.org>, 2024
+# Philip Larsen Donnelly, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-03-07T14:47:33.932Z\n"
+"POT-Creation-Date: 2024-03-16T14:40:27.542Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
-"Last-Translator: Viktor Varland <viktor@dhis2.org>, 2024\n"
+"Last-Translator: Philip Larsen Donnelly, 2024\n"
 "Language-Team: Russian (https://app.transifex.com/hisp-uio/teams/100509/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -702,6 +702,12 @@ msgid ""
 "An error occurred while fetching enrollments. Please enter a valid url."
 msgstr ""
 
+msgid "No feedback for this enrollment yet"
+msgstr ""
+
+msgid "No indicator output for this enrollment yet"
+msgstr ""
+
 msgid "Quick actions"
 msgstr ""
 
@@ -785,6 +791,12 @@ msgstr ""
 msgid "Choose a registering unit to start reporting"
 msgstr ""
 
+msgid "No feedback for this event yet"
+msgstr ""
+
+msgid "No indicator output for this event yet"
+msgstr ""
+
 msgid "Program stage is invalid"
 msgstr ""
 
@@ -949,12 +961,6 @@ msgstr ""
 msgid "View Event"
 msgstr ""
 
-msgid "No feedback for this enrollment yet"
-msgstr ""
-
-msgid "No indicator output for this enrollment yet"
-msgstr ""
-
 msgid "Selected program"
 msgstr "Выбранная программа"
 
@@ -1430,6 +1436,35 @@ msgstr ""
 msgid "tracked entity instance"
 msgstr "Элемент отслеживаемого объекта"
 
+msgid "Link to an existing {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Choose a {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Ambiguous relationships, contact system administrator"
+msgstr ""
+
+msgid ""
+"Enter {{linkableStageLabel}} details in the next step after completing this "
+"{{currentStageLabel}}."
+msgstr ""
+
+msgid "Enter details now"
+msgstr ""
+
+msgid "Link to an existing"
+msgstr ""
+
+msgid "Scheduled date"
+msgstr "Запланированная дата"
+
+msgid "Report date"
+msgstr "Дата отчета"
+
+msgid "Please select a valid event"
+msgstr ""
+
 msgid "New {{ eventName }} event"
 msgstr ""
 
@@ -1541,15 +1576,6 @@ msgstr "Название стадии программы"
 msgid "Working list could not be loaded"
 msgstr "Не могу загрузить Рабочий список "
 
-msgid "Download as JSON"
-msgstr "Скачать как JSON"
-
-msgid "Download as CSV"
-msgstr "Загрузить в формате CSV"
-
-msgid "Download with current filters"
-msgstr "Загрузить с текущими фильрами"
-
 msgid "Download data..."
 msgstr "Загрузка данных..."
 
@@ -1622,6 +1648,15 @@ msgstr "Покажи поменьше"
 msgid "Show All"
 msgstr "Показать все"
 
+msgid "Download as JSON"
+msgstr "Скачать как JSON"
+
+msgid "Download as CSV"
+msgstr "Загрузить в формате CSV"
+
+msgid "Download with current filters"
+msgstr "Загрузить с текущими фильрами"
+
 msgid "An error has occured. See log for details"
 msgstr "Произошла ошибка. Смотрите подробности в лог-файле"
 
diff --git a/i18n/sv.po b/i18n/sv.po
index c893f03cd7..53ac26dbfa 100644
--- a/i18n/sv.po
+++ b/i18n/sv.po
@@ -2,12 +2,13 @@
 # Translators:
 # Jason Pickering <jason@dhis2.org>, 2023
 # Philip Larsen Donnelly, 2024
+# Martin <martin@moid.se>, 2024
 # Viktor Varland <viktor@dhis2.org>, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-03-07T14:47:33.932Z\n"
+"POT-Creation-Date: 2024-03-16T14:40:27.542Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Viktor Varland <viktor@dhis2.org>, 2024\n"
 "Language-Team: Swedish (https://app.transifex.com/hisp-uio/teams/100509/sv/)\n"
@@ -678,6 +679,12 @@ msgid ""
 "An error occurred while fetching enrollments. Please enter a valid url."
 msgstr ""
 
+msgid "No feedback for this enrollment yet"
+msgstr ""
+
+msgid "No indicator output for this enrollment yet"
+msgstr ""
+
 msgid "Quick actions"
 msgstr ""
 
@@ -761,6 +768,12 @@ msgstr ""
 msgid "Choose a registering unit to start reporting"
 msgstr ""
 
+msgid "No feedback for this event yet"
+msgstr ""
+
+msgid "No indicator output for this event yet"
+msgstr ""
+
 msgid "Program stage is invalid"
 msgstr ""
 
@@ -923,12 +936,6 @@ msgstr ""
 msgid "View Event"
 msgstr ""
 
-msgid "No feedback for this enrollment yet"
-msgstr ""
-
-msgid "No indicator output for this enrollment yet"
-msgstr ""
-
 msgid "Selected program"
 msgstr ""
 
@@ -1398,6 +1405,35 @@ msgstr ""
 msgid "tracked entity instance"
 msgstr ""
 
+msgid "Link to an existing {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Choose a {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Ambiguous relationships, contact system administrator"
+msgstr ""
+
+msgid ""
+"Enter {{linkableStageLabel}} details in the next step after completing this "
+"{{currentStageLabel}}."
+msgstr ""
+
+msgid "Enter details now"
+msgstr ""
+
+msgid "Link to an existing"
+msgstr ""
+
+msgid "Scheduled date"
+msgstr "Schemalagd händelse"
+
+msgid "Report date"
+msgstr "Rapportdatum"
+
+msgid "Please select a valid event"
+msgstr ""
+
 msgid "New {{ eventName }} event"
 msgstr ""
 
@@ -1509,15 +1545,6 @@ msgstr ""
 msgid "Working list could not be loaded"
 msgstr ""
 
-msgid "Download as JSON"
-msgstr ""
-
-msgid "Download as CSV"
-msgstr "Ladda ner som CSV"
-
-msgid "Download with current filters"
-msgstr ""
-
 msgid "Download data..."
 msgstr ""
 
@@ -1590,6 +1617,15 @@ msgstr ""
 msgid "Show All"
 msgstr ""
 
+msgid "Download as JSON"
+msgstr ""
+
+msgid "Download as CSV"
+msgstr "Ladda ner som CSV"
+
+msgid "Download with current filters"
+msgstr ""
+
 msgid "An error has occured. See log for details"
 msgstr ""
 
@@ -1597,7 +1633,7 @@ msgid "Scheduled{{ escape }} due {{ time }}"
 msgstr ""
 
 msgid "Scheduled"
-msgstr ""
+msgstr "Schemalagd"
 
 msgid "Overdue{{ escape }} due {{ time }}"
 msgstr ""
diff --git a/i18n/uk.po b/i18n/uk.po
index 9457c2ba1f..99336b21c0 100644
--- a/i18n/uk.po
+++ b/i18n/uk.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-03-07T14:47:33.932Z\n"
+"POT-Creation-Date: 2024-03-16T14:40:27.542Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Viktor Varland <viktor@dhis2.org>, 2024\n"
 "Language-Team: Ukrainian (https://app.transifex.com/hisp-uio/teams/100509/uk/)\n"
@@ -682,6 +682,12 @@ msgid ""
 "An error occurred while fetching enrollments. Please enter a valid url."
 msgstr ""
 
+msgid "No feedback for this enrollment yet"
+msgstr ""
+
+msgid "No indicator output for this enrollment yet"
+msgstr ""
+
 msgid "Quick actions"
 msgstr ""
 
@@ -765,6 +771,12 @@ msgstr ""
 msgid "Choose a registering unit to start reporting"
 msgstr ""
 
+msgid "No feedback for this event yet"
+msgstr ""
+
+msgid "No indicator output for this event yet"
+msgstr ""
+
 msgid "Program stage is invalid"
 msgstr ""
 
@@ -927,12 +939,6 @@ msgstr ""
 msgid "View Event"
 msgstr ""
 
-msgid "No feedback for this enrollment yet"
-msgstr ""
-
-msgid "No indicator output for this enrollment yet"
-msgstr ""
-
 msgid "Selected program"
 msgstr "Обрані програми"
 
@@ -1408,6 +1414,35 @@ msgstr ""
 msgid "tracked entity instance"
 msgstr ""
 
+msgid "Link to an existing {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Choose a {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Ambiguous relationships, contact system administrator"
+msgstr ""
+
+msgid ""
+"Enter {{linkableStageLabel}} details in the next step after completing this "
+"{{currentStageLabel}}."
+msgstr ""
+
+msgid "Enter details now"
+msgstr ""
+
+msgid "Link to an existing"
+msgstr ""
+
+msgid "Scheduled date"
+msgstr "Запланована дата"
+
+msgid "Report date"
+msgstr "Дата звіту"
+
+msgid "Please select a valid event"
+msgstr ""
+
 msgid "New {{ eventName }} event"
 msgstr ""
 
@@ -1519,15 +1554,6 @@ msgstr "Назва етапу програми"
 msgid "Working list could not be loaded"
 msgstr ""
 
-msgid "Download as JSON"
-msgstr ""
-
-msgid "Download as CSV"
-msgstr ""
-
-msgid "Download with current filters"
-msgstr ""
-
 msgid "Download data..."
 msgstr ""
 
@@ -1600,6 +1626,15 @@ msgstr ""
 msgid "Show All"
 msgstr ""
 
+msgid "Download as JSON"
+msgstr ""
+
+msgid "Download as CSV"
+msgstr ""
+
+msgid "Download with current filters"
+msgstr ""
+
 msgid "An error has occured. See log for details"
 msgstr ""
 
diff --git a/i18n/ur.po b/i18n/ur.po
index 8e8dad8a53..4d0916dc9e 100644
--- a/i18n/ur.po
+++ b/i18n/ur.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2024-03-07T14:47:33.932Z\n"
+"POT-Creation-Date: 2024-03-16T14:40:27.542Z\n"
 "PO-Revision-Date: 2019-06-27 07:31+0000\n"
 "Last-Translator: Viktor Varland <viktor@dhis2.org>, 2024\n"
 "Language-Team: Urdu (https://app.transifex.com/hisp-uio/teams/100509/ur/)\n"
@@ -677,6 +677,12 @@ msgid ""
 "An error occurred while fetching enrollments. Please enter a valid url."
 msgstr ""
 
+msgid "No feedback for this enrollment yet"
+msgstr ""
+
+msgid "No indicator output for this enrollment yet"
+msgstr ""
+
 msgid "Quick actions"
 msgstr ""
 
@@ -760,6 +766,12 @@ msgstr ""
 msgid "Choose a registering unit to start reporting"
 msgstr ""
 
+msgid "No feedback for this event yet"
+msgstr ""
+
+msgid "No indicator output for this event yet"
+msgstr ""
+
 msgid "Program stage is invalid"
 msgstr ""
 
@@ -922,12 +934,6 @@ msgstr ""
 msgid "View Event"
 msgstr ""
 
-msgid "No feedback for this enrollment yet"
-msgstr ""
-
-msgid "No indicator output for this enrollment yet"
-msgstr ""
-
 msgid "Selected program"
 msgstr "منتخب کردہ پروگرام"
 
@@ -1397,6 +1403,35 @@ msgstr ""
 msgid "tracked entity instance"
 msgstr ""
 
+msgid "Link to an existing {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Choose a {{linkableStageLabel}}"
+msgstr ""
+
+msgid "Ambiguous relationships, contact system administrator"
+msgstr ""
+
+msgid ""
+"Enter {{linkableStageLabel}} details in the next step after completing this "
+"{{currentStageLabel}}."
+msgstr ""
+
+msgid "Enter details now"
+msgstr ""
+
+msgid "Link to an existing"
+msgstr ""
+
+msgid "Scheduled date"
+msgstr "شیڈول کی تاریخ"
+
+msgid "Report date"
+msgstr "رپورٹ کی تاریخ"
+
+msgid "Please select a valid event"
+msgstr ""
+
 msgid "New {{ eventName }} event"
 msgstr ""
 
@@ -1508,15 +1543,6 @@ msgstr "پروگرام مرحلے کا نام"
 msgid "Working list could not be loaded"
 msgstr ""
 
-msgid "Download as JSON"
-msgstr "JSON کے طور پر ڈاؤن لوڈ کریں"
-
-msgid "Download as CSV"
-msgstr "CSV کے طور پر ڈاؤن لوڈ کریں"
-
-msgid "Download with current filters"
-msgstr ""
-
 msgid "Download data..."
 msgstr ""
 
@@ -1589,6 +1615,15 @@ msgstr ""
 msgid "Show All"
 msgstr ""
 
+msgid "Download as JSON"
+msgstr "JSON کے طور پر ڈاؤن لوڈ کریں"
+
+msgid "Download as CSV"
+msgstr "CSV کے طور پر ڈاؤن لوڈ کریں"
+
+msgid "Download with current filters"
+msgstr ""
+
 msgid "An error has occured. See log for details"
 msgstr ""
 

From 6fd56daaa61ce8b795f52455df4220e4f9eaa35e Mon Sep 17 00:00:00 2001
From: "@dhis2-bot" <apps@dhis2.org>
Date: Sun, 28 Apr 2024 01:44:15 +0000
Subject: [PATCH 07/19] chore(release): cut 100.68.1 [skip release]

## [100.68.1](https://github.com/dhis2/capture-app/compare/v100.68.0...v100.68.1) (2024-04-28)

### Bug Fixes

* **translations:** sync translations from transifex (master) ([2dc29b8](https://github.com/dhis2/capture-app/commit/2dc29b8e3b1e97b9a9f6304359387a7fe8980685))
---
 CHANGELOG.md                       | 7 +++++++
 package.json                       | 4 ++--
 packages/rules-engine/package.json | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 766c604c00..c055acd091 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [100.68.1](https://github.com/dhis2/capture-app/compare/v100.68.0...v100.68.1) (2024-04-28)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([2dc29b8](https://github.com/dhis2/capture-app/commit/2dc29b8e3b1e97b9a9f6304359387a7fe8980685))
+
 # [100.68.0](https://github.com/dhis2/capture-app/compare/v100.67.12...v100.68.0) (2024-04-25)
 
 
diff --git a/package.json b/package.json
index 51b284c4de..75830c309a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "capture-app",
     "homepage": ".",
-    "version": "100.68.0",
+    "version": "100.68.1",
     "cacheVersion": "7",
     "serverVersion": "38",
     "license": "BSD-3-Clause",
@@ -10,7 +10,7 @@
         "packages/rules-engine"
     ],
     "dependencies": {
-        "@dhis2/rules-engine-javascript": "100.68.0",
+        "@dhis2/rules-engine-javascript": "100.68.1",
         "@dhis2/app-runtime": "^3.9.3",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-icons": "^1.0.1",
diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json
index dccfa10f5c..3e55cc7eab 100644
--- a/packages/rules-engine/package.json
+++ b/packages/rules-engine/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/rules-engine-javascript",
-    "version": "100.68.0",
+    "version": "100.68.1",
     "license": "BSD-3-Clause",
     "main": "./build/cjs/index.js",
     "scripts": {

From 8c5ba727d34bd04def952a4065e7fc1facc70989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Storl=C3=B8kken=20Melseth?= <joakim@dhis2.org>
Date: Mon, 29 Apr 2024 12:51:16 +0200
Subject: [PATCH 08/19] chore: switch semantic release branch (#3627)

---
 .github/workflows/verify-app.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/verify-app.yml b/.github/workflows/verify-app.yml
index 4877b7ceed..4d12a6d4dc 100644
--- a/.github/workflows/verify-app.yml
+++ b/.github/workflows/verify-app.yml
@@ -193,7 +193,7 @@ jobs:
           path: '**/node_modules'
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
 
-      - uses: dhis2/action-semantic-release@ignore-app-hub-lib
+      - uses: dhis2/action-semantic-release@use-yarn-version-prepare
         with:
           publish-apphub: true
           publish-github: true

From 3237698f77b62cf0b5c690b9a1db74d627bea5dc Mon Sep 17 00:00:00 2001
From: Tony Valle <79843014+superskip@users.noreply.github.com>
Date: Mon, 29 Apr 2024 16:39:17 +0200
Subject: [PATCH 09/19] fix: [DHIS2-17131] schedule dates with format
 DD-MM-YYYY (#3584)

---
 .../helpers/deriveAutoGenerateEvents.js         | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/core_modules/capture-core/components/Pages/New/RegistrationDataEntry/helpers/deriveAutoGenerateEvents.js b/src/core_modules/capture-core/components/Pages/New/RegistrationDataEntry/helpers/deriveAutoGenerateEvents.js
index e36a6e10e6..eab301fe99 100644
--- a/src/core_modules/capture-core/components/Pages/New/RegistrationDataEntry/helpers/deriveAutoGenerateEvents.js
+++ b/src/core_modules/capture-core/components/Pages/New/RegistrationDataEntry/helpers/deriveAutoGenerateEvents.js
@@ -1,12 +1,9 @@
 // @flow
-import { pipe } from 'capture-core-utils';
 import moment from 'moment';
 import { dataElementTypes, ProgramStage } from '../../../../../metaData';
-import { convertFormToClient, convertClientToServer } from '../../../../../converters';
+import { convertClientToServer } from '../../../../../converters';
 import { convertCategoryOptionsToServer } from '../../../../../converters/clientToServer';
 
-const convertFn = pipe(convertFormToClient, convertClientToServer);
-
 const ignoreAutoGenerateIfApplicable = (stage, firstStageDuringRegistrationEvent) =>
     !firstStageDuringRegistrationEvent || firstStageDuringRegistrationEvent.id !== stage.id;
 
@@ -56,15 +53,17 @@ export const deriveAutoGenerateEvents = ({
                 const eventInfo = openAfterEnrollment
                     ? {
                         status: 'ACTIVE',
-                        occurredAt: convertFn(dateToUseInActiveStatus, dataElementTypes.DATE),
-                        scheduledAt: convertFn(dateToUseInActiveStatus, dataElementTypes.DATE),
+                        occurredAt: dateToUseInActiveStatus,
+                        scheduledAt: dateToUseInActiveStatus,
                     }
                     : {
                         status: 'SCHEDULE',
                         // for schedule type of events we want to add the standard interval days to the date
-                        scheduledAt: moment(convertFn(dateToUseInScheduleStatus, dataElementTypes.DATE))
-                            .add(minDaysFromStart, 'days')
-                            .format('YYYY-MM-DD'),
+                        scheduledAt: convertClientToServer(
+                            moment(dateToUseInScheduleStatus)
+                                .add(minDaysFromStart, 'days')
+                                .format('YYYY-MM-DD'),
+                            dataElementTypes.DATE),
                     };
 
                 return {

From 586ac55a5c1efd121ce10b477e8e41dd71452a2e Mon Sep 17 00:00:00 2001
From: "@dhis2-bot" <apps@dhis2.org>
Date: Mon, 29 Apr 2024 14:45:19 +0000
Subject: [PATCH 10/19] chore(release): cut 100.68.2 [skip release]

## [100.68.2](https://github.com/dhis2/capture-app/compare/v100.68.1...v100.68.2) (2024-04-29)

### Bug Fixes

* [DHIS2-17131] schedule dates with format DD-MM-YYYY ([#3584](https://github.com/dhis2/capture-app/issues/3584)) ([3237698](https://github.com/dhis2/capture-app/commit/3237698f77b62cf0b5c690b9a1db74d627bea5dc))
---
 CHANGELOG.md                       | 7 +++++++
 package.json                       | 4 ++--
 packages/rules-engine/package.json | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c055acd091..2496eeb314 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [100.68.2](https://github.com/dhis2/capture-app/compare/v100.68.1...v100.68.2) (2024-04-29)
+
+
+### Bug Fixes
+
+* [DHIS2-17131] schedule dates with format DD-MM-YYYY ([#3584](https://github.com/dhis2/capture-app/issues/3584)) ([3237698](https://github.com/dhis2/capture-app/commit/3237698f77b62cf0b5c690b9a1db74d627bea5dc))
+
 ## [100.68.1](https://github.com/dhis2/capture-app/compare/v100.68.0...v100.68.1) (2024-04-28)
 
 
diff --git a/package.json b/package.json
index 75830c309a..b8a096a50a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "capture-app",
     "homepage": ".",
-    "version": "100.68.1",
+    "version": "100.68.2",
     "cacheVersion": "7",
     "serverVersion": "38",
     "license": "BSD-3-Clause",
@@ -10,7 +10,7 @@
         "packages/rules-engine"
     ],
     "dependencies": {
-        "@dhis2/rules-engine-javascript": "100.68.1",
+        "@dhis2/rules-engine-javascript": "100.68.2",
         "@dhis2/app-runtime": "^3.9.3",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-icons": "^1.0.1",
diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json
index 3e55cc7eab..0225903449 100644
--- a/packages/rules-engine/package.json
+++ b/packages/rules-engine/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/rules-engine-javascript",
-    "version": "100.68.1",
+    "version": "100.68.2",
     "license": "BSD-3-Clause",
     "main": "./build/cjs/index.js",
     "scripts": {

From 8aa86956d8df15518a536b0dc51fa908cb9cb6db Mon Sep 17 00:00:00 2001
From: Tony Valle <79843014+superskip@users.noreply.github.com>
Date: Mon, 29 Apr 2024 16:57:17 +0200
Subject: [PATCH 11/19] fix: [DHIS2-17096] show/hide option groups in profile
 widget (#3593)

---
 .../WidgetProfile/WidgetProfile.component.js  |  2 +-
 .../WidgetProfile/hooks/useApiProgram.js      | 39 +++++++++++++
 .../WidgetProfile/hooks/useOptionGroups.js    | 58 +++++++++++++++++++
 .../WidgetProfile/hooks/useProgram.js         | 54 ++++++-----------
 4 files changed, 116 insertions(+), 37 deletions(-)
 create mode 100644 src/core_modules/capture-core/components/WidgetProfile/hooks/useApiProgram.js
 create mode 100644 src/core_modules/capture-core/components/WidgetProfile/hooks/useOptionGroups.js

diff --git a/src/core_modules/capture-core/components/WidgetProfile/WidgetProfile.component.js b/src/core_modules/capture-core/components/WidgetProfile/WidgetProfile.component.js
index 66f14d57e5..2ad6516daf 100644
--- a/src/core_modules/capture-core/components/WidgetProfile/WidgetProfile.component.js
+++ b/src/core_modules/capture-core/components/WidgetProfile/WidgetProfile.component.js
@@ -88,7 +88,7 @@ const WidgetProfilePlain = ({
     const error = programsError || trackedEntityInstancesError || userRolesError;
     const clientAttributesWithSubvalues = useClientAttributesWithSubvalues(teiId, program, trackedEntityInstanceAttributes);
     const teiDisplayName = useTeiDisplayName(program, storedAttributeValues, clientAttributesWithSubvalues, teiId);
-    const displayChangelog = supportsChangelog && program.trackedEntityType?.changelogEnabled;
+    const displayChangelog = supportsChangelog && program && program.trackedEntityType?.changelogEnabled;
 
     const displayInListAttributes = useMemo(() => clientAttributesWithSubvalues
         .filter(item => item.displayInList)
diff --git a/src/core_modules/capture-core/components/WidgetProfile/hooks/useApiProgram.js b/src/core_modules/capture-core/components/WidgetProfile/hooks/useApiProgram.js
new file mode 100644
index 0000000000..073ab42e40
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetProfile/hooks/useApiProgram.js
@@ -0,0 +1,39 @@
+// @flow
+import { useMemo } from 'react';
+import { useDataQuery } from '@dhis2/app-runtime';
+
+const fields =
+    'id,version,displayName,displayShortName,description,programType,style,minAttributesRequiredToSearch,enrollmentDateLabel,incidentDateLabel,featureType,selectEnrollmentDatesInFuture,selectIncidentDatesInFuture,displayIncidentDate,' +
+    'access[*],' +
+    'dataEntryForm[id,htmlCode],' +
+    'categoryCombo[id,displayName,isDefault,categories[id,displayName]],' +
+    'programIndicators[id,displayName,code,shortName,style,displayInForm,expression,displayDescription,description,filter,program[id]],' +
+    'programSections[id, displayFormName, sortOrder, trackedEntityAttributes],' +
+    'programRuleVariables[id,displayName,programRuleVariableSourceType,valueType,program[id],programStage[id],dataElement[id],trackedEntityAttribute[id],useCodeForOptionSet],' +
+    'programStages[id,access,autoGenerateEvent,openAfterEnrollment,generatedByEnrollmentDate,reportDateToUse,minDaysFromStart,displayName,description,executionDateLabel,formType,featureType,validationStrategy,enableUserAssignment,style,' +
+        'dataEntryForm[id,htmlCode],' +
+        'programStageSections[id,displayName,displayDescription,sortOrder,dataElements[id]],' +
+        'programStageDataElements[compulsory,displayInReports,renderOptionsAsRadio,allowFutureDate,renderType[*],dataElement[id,displayName,displayShortName,displayFormName,valueType,translations[*],description,optionSetValue,style,optionSet[id,displayName,version,valueType,options[id,displayName,code,style, translations]]]]' +
+    '],' +
+    'programTrackedEntityAttributes[trackedEntityAttribute[id,displayName,displayShortName,displayFormName,description,valueType,optionSetValue,unique,orgunitScope,pattern,translations[property,locale,value],optionSet[id,displayName,version,valueType,options[id,displayName,name,code,style,translations]]],displayInList,searchable,mandatory,renderOptionsAsRadio,allowFutureDate],' +
+    'trackedEntityType[id,access,displayName,allowAuditLog,minAttributesRequiredToSearch,featureType,trackedEntityTypeAttributes[trackedEntityAttribute[id],displayInList,mandatory,searchable],translations[property,locale,value]],' +
+    'userRoles[id,displayName]';
+
+export const useApiProgram = (programId: string) => {
+    const { error, loading, data } = useDataQuery(
+        useMemo(
+            () => ({
+                programs: {
+                    resource: 'programs',
+                    id: programId,
+                    params: {
+                        fields,
+                    },
+                },
+            }),
+            [programId],
+        ),
+    );
+
+    return { error, loading, program: data?.programs };
+};
diff --git a/src/core_modules/capture-core/components/WidgetProfile/hooks/useOptionGroups.js b/src/core_modules/capture-core/components/WidgetProfile/hooks/useOptionGroups.js
new file mode 100644
index 0000000000..fe4533e6a5
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetProfile/hooks/useOptionGroups.js
@@ -0,0 +1,58 @@
+// @flow
+import { useMemo } from 'react';
+import { useApiMetadataQuery } from 'capture-core/utils/reactQueryHelpers';
+
+const createOptionSetToOptionGroupDictionary = ({ optionGroups }) => optionGroups.reduce(
+    (acc, optionGroup) => {
+        const optionSetId = optionGroup.optionSet.id;
+        const transformedOptionGroup = {
+            id: optionGroup.id,
+            options: optionGroup.options.map(option => option.id),
+        };
+        if (acc[optionSetId]) {
+            acc[optionSetId].push(transformedOptionGroup);
+        } else {
+            acc[optionSetId] = [transformedOptionGroup];
+        }
+        return acc;
+    },
+    {},
+);
+
+export const useOptionGroups = (program: any) => {
+    const params = useMemo(() => {
+        if (!program) {
+            return {};
+        }
+
+        const attributes = program.programTrackedEntityAttributes.reduce(
+            (acc, attribute) => {
+                const optionSet = attribute.trackedEntityAttribute.optionSet;
+                if (optionSet) {
+                    acc.push(optionSet.id);
+                }
+                return acc;
+            },
+            [],
+        );
+
+        return {
+            fields: 'id,optionSet,options',
+            filter: `optionSet.id:in:[${attributes.join(',')}]`,
+        };
+    }, [program]);
+
+    const queryKey = ['optionGroups', 'programAttributes', ...(program?.id ? [program.id] : [])];
+    const queryFn = { resource: 'optionGroups', params };
+    const queryOptions = {
+        enabled: Boolean(program),
+        select: createOptionSetToOptionGroupDictionary,
+    };
+    const { data, isLoading, error } = useApiMetadataQuery<any>(queryKey, queryFn, queryOptions);
+
+    return {
+        optionGroups: program ? data : null,
+        loading: isLoading,
+        error,
+    };
+};
diff --git a/src/core_modules/capture-core/components/WidgetProfile/hooks/useProgram.js b/src/core_modules/capture-core/components/WidgetProfile/hooks/useProgram.js
index b9c9a72f64..b23ddc9a9f 100644
--- a/src/core_modules/capture-core/components/WidgetProfile/hooks/useProgram.js
+++ b/src/core_modules/capture-core/components/WidgetProfile/hooks/useProgram.js
@@ -1,51 +1,33 @@
 // @flow
 import { useMemo } from 'react';
-import { useDataQuery } from '@dhis2/app-runtime';
-
-const fields =
-    'id,version,displayName,displayShortName,description,programType,style,minAttributesRequiredToSearch,enrollmentDateLabel,incidentDateLabel,featureType,selectEnrollmentDatesInFuture,selectIncidentDatesInFuture,displayIncidentDate,' +
-    'access[*],' +
-    'dataEntryForm[id,htmlCode],' +
-    'categoryCombo[id,displayName,isDefault,categories[id,displayName]],' +
-    'programIndicators[id,displayName,code,shortName,style,displayInForm,expression,displayDescription,description,filter,program[id]],' +
-    'programSections[id, displayFormName, sortOrder, trackedEntityAttributes],' +
-    'programRuleVariables[id,displayName,programRuleVariableSourceType,valueType,program[id],programStage[id],dataElement[id],trackedEntityAttribute[id],useCodeForOptionSet],' +
-    'programStages[id,access,autoGenerateEvent,openAfterEnrollment,generatedByEnrollmentDate,reportDateToUse,minDaysFromStart,displayName,description,executionDateLabel,formType,featureType,validationStrategy,enableUserAssignment,style,' +
-        'dataEntryForm[id,htmlCode],' +
-        'programStageSections[id,displayName,displayDescription,sortOrder,dataElements[id]],' +
-        'programStageDataElements[compulsory,displayInReports,renderOptionsAsRadio,allowFutureDate,renderType[*],dataElement[id,displayName,displayShortName,displayFormName,valueType,translations[*],description,optionSetValue,style,optionSet[id,displayName,version,valueType,options[id,displayName,code,style, translations]]]]' +
-    '],' +
-    'programTrackedEntityAttributes[trackedEntityAttribute[id,displayName,displayShortName,displayFormName,description,valueType,optionSetValue,unique,orgunitScope,pattern,translations[property,locale,value],optionSet[id,displayName,version,valueType,options[id,displayName,name,code,style,translations]]],displayInList,searchable,mandatory,renderOptionsAsRadio,allowFutureDate],' +
-    'trackedEntityType[id,access,displayName,allowAuditLog,minAttributesRequiredToSearch,featureType,trackedEntityTypeAttributes[trackedEntityAttribute[id],displayInList,mandatory,searchable],translations[property,locale,value]],' +
-    'userRoles[id,displayName]';
+import { useApiProgram } from './useApiProgram';
+import { useOptionGroups } from './useOptionGroups';
 
 export const useProgram = (programId: string) => {
-    const { error, loading, data } = useDataQuery(
-        useMemo(
-            () => ({
-                programs: {
-                    resource: 'programs',
-                    id: programId,
-                    params: {
-                        fields,
-                    },
-                },
-            }),
-            [programId],
-        ),
-    );
+    const { error: programError, loading: programLoading, program } = useApiProgram(programId);
+    const { error: optionGroupsError, loading: optionGroupsLoading, optionGroups } = useOptionGroups(program);
 
     const programMetadata = useMemo(() => {
-        if (data?.programs) {
-            const program = data.programs;
+        if (program && optionGroups) {
             if (program.trackedEntityType) {
                 program.trackedEntityType.changelogEnabled = program.trackedEntityType.allowAuditLog;
                 delete program.trackedEntityType.allowAuditLog;
             }
+            program.programTrackedEntityAttributes = program.programTrackedEntityAttributes.map((attribute) => {
+                const tea = attribute.trackedEntityAttribute;
+                if (tea.optionSet) {
+                    tea.optionSet.optionGroups = optionGroups[tea.optionSet.id];
+                }
+                return attribute;
+            });
             return program;
         }
         return null;
-    }, [data]);
+    }, [program, optionGroups]);
 
-    return { error, loading, program: !loading && programMetadata };
+    return {
+        program: programMetadata,
+        loading: programLoading || optionGroupsLoading,
+        error: programError || optionGroupsError,
+    };
 };

From 83e039951ab7d3188f75cb059f79dd5292f346fd Mon Sep 17 00:00:00 2001
From: eirikhaugstulen <eirik.haugstulen@gmail.com>
Date: Mon, 29 Apr 2024 16:59:16 +0200
Subject: [PATCH 12/19] fix: [DHIS2-17177] Registration page stuck after failed
 save (#3595)

---
 .../RegistrationDataEntry/RegistrationDataEntry.epics.js | 9 +++++++++
 src/epics/trackerCapture.epics.js                        | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/core_modules/capture-core/components/Pages/New/RegistrationDataEntry/RegistrationDataEntry.epics.js b/src/core_modules/capture-core/components/Pages/New/RegistrationDataEntry/RegistrationDataEntry.epics.js
index 686fa6b24e..d14df1119e 100644
--- a/src/core_modules/capture-core/components/Pages/New/RegistrationDataEntry/RegistrationDataEntry.epics.js
+++ b/src/core_modules/capture-core/components/Pages/New/RegistrationDataEntry/RegistrationDataEntry.epics.js
@@ -17,6 +17,7 @@ import {
     getStageWithOpenAfterEnrollment,
     PAGES,
 } from './helpers';
+import { cleanUpUid } from '../NewPage.actions';
 
 export const startSavingNewTrackedEntityInstanceEpic: Epic = (action$: InputObservable) =>
     action$.pipe(
@@ -140,3 +141,11 @@ export const completeSavingNewTrackedEntityInstanceWithEnrollmentEpic = (
             }));
         }),
     );
+
+export const failedSavingNewTrackedEntityInstanceWithEnrollmentEpic = (
+    action$: InputObservable,
+) =>
+    action$.pipe(
+        ofType(registrationFormActionTypes.NEW_TRACKED_ENTITY_INSTANCE_WITH_ENROLLMENT_SAVE_FAILED),
+        map(() => cleanUpUid()),
+    );
diff --git a/src/epics/trackerCapture.epics.js b/src/epics/trackerCapture.epics.js
index 8d3dcfb76f..f014eda6ce 100644
--- a/src/epics/trackerCapture.epics.js
+++ b/src/epics/trackerCapture.epics.js
@@ -182,7 +182,7 @@ import {
 } from '../core_modules/capture-core/components/DataEntries/TeiRegistrationEntry/TeiRegistrationEntry.epics';
 import {
     completeSavingNewTrackedEntityInstanceEpic,
-    completeSavingNewTrackedEntityInstanceWithEnrollmentEpic,
+    completeSavingNewTrackedEntityInstanceWithEnrollmentEpic, failedSavingNewTrackedEntityInstanceWithEnrollmentEpic,
     startSavingNewTrackedEntityInstanceEpic,
     startSavingNewTrackedEntityInstanceWithEnrollmentEpic,
 } from '../core_modules/capture-core/components/Pages/New/RegistrationDataEntry/RegistrationDataEntry.epics';
@@ -338,6 +338,7 @@ export const epics = combineEpics(
     startSavingNewTrackedEntityInstanceWithEnrollmentEpic,
     completeSavingNewTrackedEntityInstanceEpic,
     completeSavingNewTrackedEntityInstanceWithEnrollmentEpic,
+    failedSavingNewTrackedEntityInstanceWithEnrollmentEpic,
     changedEnrollmentIdEpic,
     fetchEnrollmentIdEpic,
     verifyEnrollmentIdSuccessEpic,

From 9a7261c6d43f3667edb162882d841025fb08fff0 Mon Sep 17 00:00:00 2001
From: Simona Domnisoru <simona.domnisoru@gmail.com>
Date: Mon, 29 Apr 2024 17:01:30 +0200
Subject: [PATCH 13/19] fix: [DHIS2-17044] missing singular translation (#3598)

---
 .../EnrollmentPage/EnrollmentPageNavigation/index.js   |  2 +-
 i18n/en.pot                                            | 10 ++++++----
 .../Stage/StageOverview/StageOverview.component.js     |  6 +++++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/cypress/e2e/EnrollmentPage/EnrollmentPageNavigation/index.js b/cypress/e2e/EnrollmentPage/EnrollmentPageNavigation/index.js
index bdc1d2f189..cdaf9408ea 100644
--- a/cypress/e2e/EnrollmentPage/EnrollmentPageNavigation/index.js
+++ b/cypress/e2e/EnrollmentPage/EnrollmentPageNavigation/index.js
@@ -95,7 +95,7 @@ Given('you land on the enrollment page by having typed only the enrollmentId in
         .contains('Enrollment Dashboard');
     cy.contains('[data-test="scope-selector"]', 'Carlos Cruz');
     cy.contains('[data-test="scope-selector"]', 'Taninahun (Malen) CHP');
-    cy.contains('1 events');
+    cy.contains('1 event');
 });
 
 When('you reset the tei selection', () => {
diff --git a/i18n/en.pot b/i18n/en.pot
index 723eb3a41d..4def224e97 100644
--- 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-03-16T14:40:27.542Z\n"
-"PO-Revision-Date: 2024-03-16T14:40:27.542Z\n"
+"POT-Creation-Date: 2024-04-05T13:37:32.910Z\n"
+"PO-Revision-Date: 2024-04-05T13:37:32.910Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."
@@ -1500,8 +1500,10 @@ msgstr "This stage can only have one event"
 msgid "Events could not be retrieved. Please try again later."
 msgstr "Events could not be retrieved. Please try again later."
 
-msgid "{{ totalEvents }} events"
-msgstr "{{ totalEvents }} events"
+msgid "{{ count }} event"
+msgid_plural "{{ count }} event"
+msgstr[0] "{{ count }} event"
+msgstr[1] "{{count}} events"
 
 msgid "{{ overdueEvents }} overdue"
 msgstr "{{ overdueEvents }} overdue"
diff --git a/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageOverview/StageOverview.component.js b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageOverview/StageOverview.component.js
index 6302d58ff0..d219d597ec 100644
--- a/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageOverview/StageOverview.component.js
+++ b/src/core_modules/capture-core/components/WidgetStagesAndEvents/Stages/Stage/StageOverview/StageOverview.component.js
@@ -97,7 +97,11 @@ export const StageOverviewPlain = ({ title, icon, description, events, classes }
             </Tooltip>
         }
         <div className={classes.indicator}>
-            {i18n.t('{{ totalEvents }} events', { totalEvents })}
+            {i18n.t('{{ count }} event', {
+                count: totalEvents,
+                defaultValue: '{{ count }} event',
+                defaultValue_plural: '{{count}} events',
+            })}
         </div>
         {overdueEvents > 0 ? <div className={cx(classes.indicator, classes.warningIndicator)}>
             <div className={classes.indicatorIcon}>

From 21d9d6e985fb17548745c065f8415866fdb19394 Mon Sep 17 00:00:00 2001
From: eirikhaugstulen <eirik.haugstulen@gmail.com>
Date: Mon, 29 Apr 2024 17:03:58 +0200
Subject: [PATCH 14/19] fix: [DHIS2-16931] Working list hides delete button
 (#3603)

---
 .../components/ListView/withEndColumnMenu/RowMenu.component.js   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/core_modules/capture-core/components/ListView/withEndColumnMenu/RowMenu.component.js b/src/core_modules/capture-core/components/ListView/withEndColumnMenu/RowMenu.component.js
index 28778a4ef7..49362c29af 100644
--- a/src/core_modules/capture-core/components/ListView/withEndColumnMenu/RowMenu.component.js
+++ b/src/core_modules/capture-core/components/ListView/withEndColumnMenu/RowMenu.component.js
@@ -127,6 +127,7 @@ class Index extends React.Component<Props, State> {
                 {this.state.menuOpen &&
                 <Popper
                     placement="bottom-end"
+                    strategy={'fixed'}
                 >
                     {
                         ({ ref, style, placement }) => (

From 7750761b3e20a7ed36ff96831c5bbd3cb0e78263 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Storl=C3=B8kken=20Melseth?= <joakim@dhis2.org>
Date: Mon, 29 Apr 2024 17:06:10 +0200
Subject: [PATCH 15/19] fix: [DHIS2-17161] Do not update attribute values from
 enrollment Widget (#3601)

---
 .../useCommonEnrollmentDomainData.js                            | 2 +-
 .../components/WidgetEnrollment/hooks/useEnrollment.js          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/useCommonEnrollmentDomainData/useCommonEnrollmentDomainData.js b/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/useCommonEnrollmentDomainData/useCommonEnrollmentDomainData.js
index 5ce1534b56..16133e2f38 100644
--- a/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/useCommonEnrollmentDomainData/useCommonEnrollmentDomainData.js
+++ b/src/core_modules/capture-core/components/Pages/common/EnrollmentOverviewDomain/useCommonEnrollmentDomainData/useCommonEnrollmentDomainData.js
@@ -23,7 +23,7 @@ export const useCommonEnrollmentDomainData = (teiId: string, enrollmentId: strin
                     id: ({ variables: { teiId: updatedTeiId } }) => updatedTeiId,
                     params: ({ variables: { programId: updatedProgramId } }) => ({
                         program: updatedProgramId,
-                        fields: ['enrollments[*],attributes'],
+                        fields: ['enrollments[*,!attributes],attributes'],
                     }),
                 },
             }),
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useEnrollment.js b/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useEnrollment.js
index b37ae14a77..1513f6a2c0 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useEnrollment.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useEnrollment.js
@@ -27,7 +27,7 @@ export const useEnrollment = ({
                     resource: 'tracker/enrollments/',
                     id: ({ variables: { enrollmentId: updatedEnrollmentId } }) => updatedEnrollmentId,
                     params: {
-                        fields: 'enrollment,trackedEntity,program,status,orgUnit,enrolledAt,occurredAt,followUp,deleted,createdBy,updatedBy,attributes,geometry',
+                        fields: 'enrollment,trackedEntity,program,status,orgUnit,enrolledAt,occurredAt,followUp,deleted,createdBy,updatedBy,geometry',
                     },
                 },
             }),

From 10411079433999e6d366ab8768e51b636a5b0e0a Mon Sep 17 00:00:00 2001
From: "@dhis2-bot" <apps@dhis2.org>
Date: Mon, 29 Apr 2024 15:17:56 +0000
Subject: [PATCH 16/19] chore(release): cut 100.68.3 [skip release]

## [100.68.3](https://github.com/dhis2/capture-app/compare/v100.68.2...v100.68.3) (2024-04-29)

### Bug Fixes

* [DHIS2-16931] Working list hides delete button ([#3603](https://github.com/dhis2/capture-app/issues/3603)) ([21d9d6e](https://github.com/dhis2/capture-app/commit/21d9d6e985fb17548745c065f8415866fdb19394))
* [DHIS2-17044] missing singular translation ([#3598](https://github.com/dhis2/capture-app/issues/3598)) ([9a7261c](https://github.com/dhis2/capture-app/commit/9a7261c6d43f3667edb162882d841025fb08fff0))
* [DHIS2-17096] show/hide option groups in profile widget ([#3593](https://github.com/dhis2/capture-app/issues/3593)) ([8aa8695](https://github.com/dhis2/capture-app/commit/8aa86956d8df15518a536b0dc51fa908cb9cb6db))
* [DHIS2-17161] Do not update attribute values from enrollment Widget ([#3601](https://github.com/dhis2/capture-app/issues/3601)) ([7750761](https://github.com/dhis2/capture-app/commit/7750761b3e20a7ed36ff96831c5bbd3cb0e78263))
* [DHIS2-17177] Registration page stuck after failed save ([#3595](https://github.com/dhis2/capture-app/issues/3595)) ([83e0399](https://github.com/dhis2/capture-app/commit/83e039951ab7d3188f75cb059f79dd5292f346fd))
---
 CHANGELOG.md                       | 11 +++++++++++
 package.json                       |  4 ++--
 packages/rules-engine/package.json |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2496eeb314..00645f9d14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## [100.68.3](https://github.com/dhis2/capture-app/compare/v100.68.2...v100.68.3) (2024-04-29)
+
+
+### Bug Fixes
+
+* [DHIS2-16931] Working list hides delete button ([#3603](https://github.com/dhis2/capture-app/issues/3603)) ([21d9d6e](https://github.com/dhis2/capture-app/commit/21d9d6e985fb17548745c065f8415866fdb19394))
+* [DHIS2-17044] missing singular translation ([#3598](https://github.com/dhis2/capture-app/issues/3598)) ([9a7261c](https://github.com/dhis2/capture-app/commit/9a7261c6d43f3667edb162882d841025fb08fff0))
+* [DHIS2-17096] show/hide option groups in profile widget ([#3593](https://github.com/dhis2/capture-app/issues/3593)) ([8aa8695](https://github.com/dhis2/capture-app/commit/8aa86956d8df15518a536b0dc51fa908cb9cb6db))
+* [DHIS2-17161] Do not update attribute values from enrollment Widget ([#3601](https://github.com/dhis2/capture-app/issues/3601)) ([7750761](https://github.com/dhis2/capture-app/commit/7750761b3e20a7ed36ff96831c5bbd3cb0e78263))
+* [DHIS2-17177] Registration page stuck after failed save ([#3595](https://github.com/dhis2/capture-app/issues/3595)) ([83e0399](https://github.com/dhis2/capture-app/commit/83e039951ab7d3188f75cb059f79dd5292f346fd))
+
 ## [100.68.2](https://github.com/dhis2/capture-app/compare/v100.68.1...v100.68.2) (2024-04-29)
 
 
diff --git a/package.json b/package.json
index b8a096a50a..05d66c8d2f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "capture-app",
     "homepage": ".",
-    "version": "100.68.2",
+    "version": "100.68.3",
     "cacheVersion": "7",
     "serverVersion": "38",
     "license": "BSD-3-Clause",
@@ -10,7 +10,7 @@
         "packages/rules-engine"
     ],
     "dependencies": {
-        "@dhis2/rules-engine-javascript": "100.68.2",
+        "@dhis2/rules-engine-javascript": "100.68.3",
         "@dhis2/app-runtime": "^3.9.3",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-icons": "^1.0.1",
diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json
index 0225903449..52392d7986 100644
--- a/packages/rules-engine/package.json
+++ b/packages/rules-engine/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/rules-engine-javascript",
-    "version": "100.68.2",
+    "version": "100.68.3",
     "license": "BSD-3-Clause",
     "main": "./build/cjs/index.js",
     "scripts": {

From 794e9039ea86714802fbad9c9f1fd164e60a869f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joakim=20Storl=C3=B8kken=20Melseth?= <joakim@dhis2.org>
Date: Mon, 29 Apr 2024 17:22:17 +0200
Subject: [PATCH 17/19] chore: cypress login issue v42 (#3602)

---
 cypress/e2e/SmokeTests.feature |  3 ++-
 cypress/support/commands.js    | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/cypress/e2e/SmokeTests.feature b/cypress/e2e/SmokeTests.feature
index 6ce30ae163..bb2410d889 100644
--- a/cypress/e2e/SmokeTests.feature
+++ b/cypress/e2e/SmokeTests.feature
@@ -5,7 +5,8 @@ Feature: Smoke tests
         Given you open the App without auth cookie
         Then you should see the login prompt
 
-    @skip-login
+    # login form is not working for v42 currently
+    @skip-login @v<42
     Scenario: Show app main selections and header bar: without auth cookie
         Given you open the App without auth cookie
         When you fill in credentials
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 428216f958..dbd509e0d3 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -28,3 +28,36 @@ Cypress.Commands.add('forceVisit', (url) => {
     cy.visit(url);
     cy.window().then((win) => { win.location.href = url; });
 });
+
+// overrides loginByApi from @dhis2/cypress-commands
+// temporary solution: should use solution from @dhis2/cypres-commands when available
+Cypress.Commands.add('loginByApi', ({ username, password, baseUrl }) => {
+    const currentInstanceVersion = Number(/[.](\d+)/.exec(Cypress.env('dhis2InstanceVersion'))[1]);
+
+    if (currentInstanceVersion >= 42) {
+        cy.request({
+            url: `${baseUrl}/api/auth/login`,
+            method: 'POST',
+            followRedirect: true,
+            body: {
+                username,
+                password,
+            },
+        });
+    } else {
+        cy.request({
+            url: `${baseUrl}/dhis-web-commons-security/login.action`,
+            method: 'POST',
+            form: true,
+            followRedirect: true,
+            body: {
+                j_username: username,
+                j_password: password,
+                '2fa_code': '',
+            },
+        });
+    }
+
+    // Set base url for the app platform
+    window.localStorage.setItem('DHIS2_BASE_URL', baseUrl);
+});

From 6a0bb73b2c9cfba5361e5bbb9b1f4218b3200cd3 Mon Sep 17 00:00:00 2001
From: Simona Domnisoru <simona.domnisoru@gmail.com>
Date: Mon, 29 Apr 2024 17:26:20 +0200
Subject: [PATCH 18/19] fix: [DHIS2-17225] cannot add TET with polygon or
 coordiante (#3618)

---
 cypress/e2e/NewPage.feature                   | 12 +++++++++++
 cypress/e2e/NewPage/index.js                  | 21 +++++++++++++++++++
 ...rackedEntityInstanceDataEntry.component.js |  5 +++--
 .../CoordinateField.component.js              |  1 +
 4 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/cypress/e2e/NewPage.feature b/cypress/e2e/NewPage.feature
index fd0ad26b65..43f1a18395 100644
--- a/cypress/e2e/NewPage.feature
+++ b/cypress/e2e/NewPage.feature
@@ -224,3 +224,15 @@ Feature: User creates a new entries from the registration page
   Scenario: First stage appears on registration page
     Given you are in Child programme registration page
     Then the first stage appears on registration page
+
+  Scenario: New malaria entity without enrollment
+  Given you are in the registration page with Ngelehun CHC org unit selected
+  And you select Malaria Entity from the available tracked entity types
+  And you click the location button
+  Then the map opens
+
+  Scenario: New focus area without enrollment 
+  Given you are in the registration page with Ngelehun CHC org unit selected
+  And you select Focus area from the available tracked entity types
+  And the user clicks the element containing the text: Choose area on map
+  Then the map opens
diff --git a/cypress/e2e/NewPage/index.js b/cypress/e2e/NewPage/index.js
index 3c968d2b3f..d104f14c6d 100644
--- a/cypress/e2e/NewPage/index.js
+++ b/cypress/e2e/NewPage/index.js
@@ -7,6 +7,10 @@ And('you are on the default registration page', () => {
     cy.visit('/#/new');
 });
 
+Given('you are in the registration page with Ngelehun CHC org unit selected', () => {
+    cy.visit('/#/new?orgUnitId=DiszpKrYNg8');
+});
+
 And('there should be informative message explaining you need to select an organisation unit', () => {
     cy.get('[data-test="informative-paper"]')
         .contains('Choose a registering unit to start reporting')
@@ -638,3 +642,20 @@ And('you delete the recently added tracked entity', () => {
     });
     cy.url().should('include', 'selectedTemplateId=IpHINAT79UW');
 });
+
+And(/^you select (.*) from the available tracked entity types/, (selection) => {
+    cy.get('[data-test="dhis2-uicore-select-input"]')
+        .click();
+    cy.contains(selection)
+        .click();
+});
+
+And('you click the location button', () => {
+    cy.get('[data-test="mapIconButton"]')
+        .click();
+});
+
+Then('the map opens', () => {
+    cy.get('.leaflet-container').should('exist');
+});
+
diff --git a/src/core_modules/capture-core/components/DataEntries/TrackedEntityInstance/TrackedEntityInstanceDataEntry.component.js b/src/core_modules/capture-core/components/DataEntries/TrackedEntityInstance/TrackedEntityInstanceDataEntry.component.js
index fad0f62845..b98d36f10e 100644
--- a/src/core_modules/capture-core/components/DataEntries/TrackedEntityInstance/TrackedEntityInstanceDataEntry.component.js
+++ b/src/core_modules/capture-core/components/DataEntries/TrackedEntityInstance/TrackedEntityInstanceDataEntry.component.js
@@ -10,6 +10,7 @@ import {
 import type { TeiRegistration } from '../../../metaData';
 
 type FinalTeiDataEntryProps = {
+    orgUnitId: string,
     teiRegistrationMetadata: TeiRegistration,
 };
 // final step before the generic dataEntry is inserted
@@ -19,10 +20,11 @@ class FinalTeiDataEntry extends React.Component<FinalTeiDataEntryProps> {
     }
 
     render() {
-        const { teiRegistrationMetadata, ...passOnProps } = this.props;
+        const { teiRegistrationMetadata, orgUnitId, ...passOnProps } = this.props;
         return (
             <DataEntry
                 {...passOnProps}
+                orgUnit={{ id: orgUnitId }}
                 formFoundation={teiRegistrationMetadata.form}
             />
         );
@@ -62,7 +64,6 @@ export class PreTeiDataEntry extends React.Component<PreTeiDataEntryProps> {
 
     render() {
         const {
-            orgUnitId,
             trackedEntityTypeId,
             onUpdateField,
             onStartAsyncUpdateField,
diff --git a/src/core_modules/capture-ui/CoordinateField/CoordinateField.component.js b/src/core_modules/capture-ui/CoordinateField/CoordinateField.component.js
index 39bb978211..782b38b821 100644
--- a/src/core_modules/capture-ui/CoordinateField/CoordinateField.component.js
+++ b/src/core_modules/capture-ui/CoordinateField/CoordinateField.component.js
@@ -129,6 +129,7 @@ export class CoordinateField extends React.Component<Props, State> {
             <div className={mapIconContainerClass}>
                 <IconButton
                     disabled={!!disabled}
+                    dataTest="mapIconButton"
                     style={{ height: 42, width: 42, borderRadius: 0, padding: 0 }}
                     className={classNames(defaultClasses.mapIcon, mapIconCustomClass)}
                     onClick={this.openMap}

From a38748ae05e2fa1a58e2178d88db7ae724af6f14 Mon Sep 17 00:00:00 2001
From: "@dhis2-bot" <apps@dhis2.org>
Date: Mon, 29 Apr 2024 15:47:33 +0000
Subject: [PATCH 19/19] chore(release): cut 100.68.4 [skip release]

## [100.68.4](https://github.com/dhis2/capture-app/compare/v100.68.3...v100.68.4) (2024-04-29)

### Bug Fixes

* [DHIS2-17225] cannot add TET with polygon or coordiante ([#3618](https://github.com/dhis2/capture-app/issues/3618)) ([6a0bb73](https://github.com/dhis2/capture-app/commit/6a0bb73b2c9cfba5361e5bbb9b1f4218b3200cd3))
---
 CHANGELOG.md                       | 7 +++++++
 package.json                       | 4 ++--
 packages/rules-engine/package.json | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00645f9d14..1417fead6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [100.68.4](https://github.com/dhis2/capture-app/compare/v100.68.3...v100.68.4) (2024-04-29)
+
+
+### Bug Fixes
+
+* [DHIS2-17225] cannot add TET with polygon or coordiante ([#3618](https://github.com/dhis2/capture-app/issues/3618)) ([6a0bb73](https://github.com/dhis2/capture-app/commit/6a0bb73b2c9cfba5361e5bbb9b1f4218b3200cd3))
+
 ## [100.68.3](https://github.com/dhis2/capture-app/compare/v100.68.2...v100.68.3) (2024-04-29)
 
 
diff --git a/package.json b/package.json
index 05d66c8d2f..d05bffd8e9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "capture-app",
     "homepage": ".",
-    "version": "100.68.3",
+    "version": "100.68.4",
     "cacheVersion": "7",
     "serverVersion": "38",
     "license": "BSD-3-Clause",
@@ -10,7 +10,7 @@
         "packages/rules-engine"
     ],
     "dependencies": {
-        "@dhis2/rules-engine-javascript": "100.68.3",
+        "@dhis2/rules-engine-javascript": "100.68.4",
         "@dhis2/app-runtime": "^3.9.3",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-icons": "^1.0.1",
diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json
index 52392d7986..2a1a73d42d 100644
--- a/packages/rules-engine/package.json
+++ b/packages/rules-engine/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/rules-engine-javascript",
-    "version": "100.68.3",
+    "version": "100.68.4",
     "license": "BSD-3-Clause",
     "main": "./build/cjs/index.js",
     "scripts": {