{i18n.t('Enrollment widget could not be loaded. Please try again later')}
)}
{loading &&
{enrollment.followUp && (
@@ -89,28 +93,28 @@ export const WidgetEnrollmentPlain = ({
-
-
-
-
- {getEnrollmentDateLabel(program)}{' '}
- {convertValueClientToView(
- convertValueServerToClient(enrollment.enrolledAt, dataElementTypes.DATE),
- dataElementTypes.DATE,
- )}
-
+
+
+
{program.displayIncidentDate && (
-
-
-
-
- {getIncidentDateLabel(program)}{' '}
- {convertValueClientToView(
- convertValueServerToClient(enrollment.occurredAt, dataElementTypes.DATE),
- dataElementTypes.DATE,
- )}
-
+
+
+
)}
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/WidgetEnrollment.container.js b/src/core_modules/capture-core/components/WidgetEnrollment/WidgetEnrollment.container.js
index 8660f704f4..38296cfa32 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/WidgetEnrollment.container.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/WidgetEnrollment.container.js
@@ -10,8 +10,30 @@ import { useProgram } from './hooks/useProgram';
import type { Props } from './enrollment.types';
import { plainStatus } from './constants/status.const';
-export const WidgetEnrollment = ({ teiId, enrollmentId, programId, onDelete, onAddNew, onError, onSuccess }: Props) => {
- const { error: errorEnrollment, enrollment, refetch: refetchEnrollment } = useEnrollment(enrollmentId);
+export const WidgetEnrollment = ({
+ teiId,
+ enrollmentId,
+ programId,
+ readOnlyMode = false,
+ onDelete,
+ onAddNew,
+ onUpdateEnrollmentDate,
+ onUpdateIncidentDate,
+ onError,
+ onSuccess,
+}: Props) => {
+ const {
+ enrollment,
+ updateEnrollmentDate,
+ updateIncidentDate,
+ error: errorEnrollment,
+ refetch: refetchEnrollment,
+ } = useEnrollment({
+ enrollmentId,
+ onUpdateEnrollmentDate,
+ onUpdateIncidentDate,
+ onError,
+ });
const { error: errorProgram, program } = useProgram(programId);
const {
error: errorOwnerOrgUnit,
@@ -23,6 +45,7 @@ export const WidgetEnrollment = ({ teiId, enrollmentId, programId, onDelete, onA
const canAddNew = enrollments
.filter(item => item.program === programId)
.every(item => item.status !== plainStatus.ACTIVE);
+ const containsAutoGeneratedEvent = program && program.programStages.some(({ autoGenerateEvent }) => autoGenerateEvent);
const error = errorEnrollment || errorProgram || errorOwnerOrgUnit || errorOrgUnit;
if (error) {
@@ -33,6 +56,8 @@ export const WidgetEnrollment = ({ teiId, enrollmentId, programId, onDelete, onA
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 a3eacd0fdb..d4e14794b8 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/enrollment.types.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/enrollment.types.js
@@ -5,8 +5,11 @@ export type Props = {|
teiId: string,
enrollmentId: string,
programId: string,
+ readOnlyMode?: boolean,
onDelete: () => void,
onAddNew: () => void,
+ onUpdateEnrollmentDate?: (enrollmentDate: string) => void,
+ onUpdateIncidentDate?: (enrollmentDate: string) => void,
onError?: (message: string) => void,
onSuccess?: () => void,
|};
@@ -17,9 +20,13 @@ export type PlainProps = {|
ownerOrgUnit: Object,
refetchEnrollment: QueryRefetchFunction,
refetchTEI: QueryRefetchFunction,
- error?: FetchError,
+ initError?: FetchError,
loading: boolean,
canAddNew: boolean,
+ editDateEnabled: boolean,
+ displayAutoGeneratedEventWarning: boolean,
+ updateEnrollmentDate: (enrollmentDate: string) => void,
+ updateIncidentDate: (incidentDate: string) => void,
onDelete: () => void,
onAddNew: () => void,
onError?: (message: string) => void,
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 87ae5120c4..e9b2d305fd 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useEnrollment.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useEnrollment.js
@@ -1,8 +1,23 @@
// @flow
-import { useMemo, useEffect } from 'react';
+import { useMemo, useEffect, useState } from 'react';
import { useDataQuery } from '@dhis2/app-runtime';
+import { useUpdateEnrollment } from './useUpdateEnrollment';
+
+type Props = {
+ enrollmentId: string,
+ onUpdateEnrollmentDate?: (date: string) => void,
+ onUpdateIncidentDate?: (date: string) => void,
+ onError?: (error: any) => void,
+}
+
+export const useEnrollment = ({
+ enrollmentId,
+ onUpdateEnrollmentDate,
+ onUpdateIncidentDate,
+ onError,
+}: Props) => {
+ const [enrollment, setEnrollment] = useState();
-export const useEnrollment = (enrollmentId: string) => {
const { error, loading, data, refetch } = useDataQuery(
useMemo(
() => ({
@@ -20,5 +35,33 @@ export const useEnrollment = (enrollmentId: string) => {
enrollmentId && refetch({ variables: { enrollmentId } });
}, [refetch, enrollmentId]);
- return { error, refetch, enrollment: !loading && data?.enrollment };
+ useEffect(() => {
+ if (data) {
+ setEnrollment(data.enrollment);
+ }
+ }, [setEnrollment, data]);
+
+ const updateEnrollmentDate = useUpdateEnrollment({
+ enrollment,
+ setEnrollment,
+ propertyName: 'enrolledAt',
+ updateHandler: onUpdateEnrollmentDate,
+ onError,
+ });
+
+ const updateIncidentDate = useUpdateEnrollment({
+ enrollment,
+ setEnrollment,
+ propertyName: 'occurredAt',
+ updateHandler: onUpdateIncidentDate,
+ onError,
+ });
+
+ return {
+ error,
+ refetch,
+ enrollment: !loading && enrollment,
+ updateEnrollmentDate,
+ updateIncidentDate,
+ };
};
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useProgram.js b/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useProgram.js
index 937f5644c6..fec7939f6d 100644
--- a/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useProgram.js
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useProgram.js
@@ -10,7 +10,7 @@ export const useProgram = (programId: string) => {
resource: `programs/${programId}`,
params: {
fields: [
- 'displayIncidentDate,incidentDateLabel,enrollmentDateLabel,onlyEnrollOnce,trackedEntityType[displayName]',
+ 'displayIncidentDate,incidentDateLabel,enrollmentDateLabel,onlyEnrollOnce,trackedEntityType[displayName],programStages[autoGenerateEvent],access',
],
},
},
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useUpdateEnrollment.js b/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useUpdateEnrollment.js
new file mode 100644
index 0000000000..fd7c96f827
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/hooks/useUpdateEnrollment.js
@@ -0,0 +1,42 @@
+// @flow
+import { useCallback } from 'react';
+import { useDataMutation } from '@dhis2/app-runtime';
+import { processErrorReports } from '../processErrorReports';
+
+const enrollmentUpdate = {
+ resource: 'tracker?async=false&importStrategy=UPDATE',
+ type: 'create',
+ data: enrollment => ({
+ enrollments: [enrollment],
+ }),
+};
+
+export const useUpdateEnrollment = ({
+ enrollment,
+ setEnrollment,
+ propertyName,
+ updateHandler,
+ onError,
+}: {
+ enrollment: any,
+ setEnrollment: (enrollment: any) => void,
+ propertyName: string,
+ updateHandler?: (value: any) => void,
+ onError?: (error: any) => void,
+}) => {
+ const [updateEnrollmentMutation] = useDataMutation(enrollmentUpdate, {
+ onError: (e) => {
+ setEnrollment(enrollment);
+ updateHandler && updateHandler(enrollment[propertyName]);
+ onError && onError(processErrorReports(e));
+ },
+ });
+
+ return useCallback((value: string) => {
+ const updatedEnrollment = { ...enrollment };
+ updatedEnrollment[propertyName] = value;
+ setEnrollment(updatedEnrollment);
+ updateEnrollmentMutation(updatedEnrollment);
+ updateHandler && updateHandler(value);
+ }, [enrollment, setEnrollment, propertyName, updateHandler, updateEnrollmentMutation]);
+};
diff --git a/src/core_modules/capture-core/components/WidgetEnrollment/processErrorReports.js b/src/core_modules/capture-core/components/WidgetEnrollment/processErrorReports.js
new file mode 100644
index 0000000000..d60fa40b31
--- /dev/null
+++ b/src/core_modules/capture-core/components/WidgetEnrollment/processErrorReports.js
@@ -0,0 +1,8 @@
+// @flow
+export const processErrorReports = (error: any) => {
+ // $FlowFixMe[prop-missing]
+ const errorReports = error?.details?.validationReport?.errorReports;
+ return errorReports?.length > 0
+ ? errorReports.reduce((acc, errorReport) => `${acc} ${errorReport.message}`, '')
+ : error.message;
+};
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 b3470cbe24..9e0745fa5b 100644
--- a/src/core_modules/capture-core/reducers/descriptions/enrollmentDomain.reducerDescription.js
+++ b/src/core_modules/capture-core/reducers/descriptions/enrollmentDomain.reducerDescription.js
@@ -8,6 +8,8 @@ import { actionTypes as editEventActionTypes } from '../../components/WidgetEven
const initialReducerValue = {};
const {
COMMON_ENROLLMENT_SITE_DATA_SET,
+ UPDATE_ENROLLMENT_DATE,
+ UPDATE_INCIDENT_DATE,
UPDATE_ENROLLMENT_EVENTS,
UPDATE_ENROLLMENT_EVENTS_WITHOUT_ID,
UPDATE_ENROLLMENT_ATTRIBUTE_VALUES,
@@ -25,6 +27,20 @@ export const enrollmentDomainDesc = createReducerDescription(
attributeValues,
enrollmentId: enrollment?.enrollment,
}),
+ [UPDATE_ENROLLMENT_DATE]: (state, { payload: { enrollmentDate } }) => ({
+ ...state,
+ enrollment: {
+ ...state.enrollment,
+ enrolledAt: enrollmentDate,
+ },
+ }),
+ [UPDATE_INCIDENT_DATE]: (state, { payload: { incidentDate } }) => ({
+ ...state,
+ enrollment: {
+ ...state.enrollment,
+ occurredAt: incidentDate,
+ },
+ }),
[UPDATE_ENROLLMENT_EVENTS]: (
state,
{ payload: { eventId, eventData } },
diff --git a/src/core_modules/capture-core/reducers/descriptions/enrollmentPage.reducerDescription.js b/src/core_modules/capture-core/reducers/descriptions/enrollmentPage.reducerDescription.js
index bfff16fabb..87827640b1 100644
--- a/src/core_modules/capture-core/reducers/descriptions/enrollmentPage.reducerDescription.js
+++ b/src/core_modules/capture-core/reducers/descriptions/enrollmentPage.reducerDescription.js
@@ -20,6 +20,7 @@ const {
MISSING_MESSAGE_VIEW,
DELETE_ENROLLMENT,
UPDATE_TEI_DISPLAY_NAME,
+ UPDATE_ENROLLMENT_DATE,
} = enrollmentPageActionTypes;
export const enrollmentPageDesc = createReducerDescription({
@@ -73,6 +74,16 @@ export const enrollmentPageDesc = createReducerDescription({
...state,
teiDisplayName,
}),
+ [UPDATE_ENROLLMENT_DATE]:
+ (state, { payload: { enrollmentId, enrollmentDate } }) => ({
+ ...state,
+ enrollments: state.enrollments.map((enrollment) => {
+ if (enrollment.enrollment === enrollmentId) {
+ enrollment.enrolledAt = enrollmentDate;
+ }
+ return enrollment;
+ }),
+ }),
[PAGE_CLEAN]: () => initialReducerValue,
[DELETE_ENROLLMENT]: (state, { payload: { enrollmentId } }) => ({
...state,
diff --git a/yarn.lock b/yarn.lock
index 0c0d33e902..983b457b91 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2948,7 +2948,7 @@
"@jridgewell/resolve-uri" "3.1.0"
"@jridgewell/sourcemap-codec" "1.4.14"
-"@js-temporal/polyfill@^0.4.2":
+"@js-temporal/polyfill@0.4.3", "@js-temporal/polyfill@^0.4.2":
version "0.4.3"
resolved "https://registry.yarnpkg.com/@js-temporal/polyfill/-/polyfill-0.4.3.tgz#e8f8cf86745eb5050679c46a5ebedb9a9cc1f09b"
integrity sha512-6Fmjo/HlkyVCmJzAPnvtEWlcbQUSRhi8qlN9EtJA/wP7FqXsevLLrlojR44kzNzrRkpf7eDJ+z7b4xQD/Ycypw==