Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: [DHIS2-15967] allow enrolling TEIs with mandatory TET attributes #3455

Merged
merged 8 commits into from
Nov 16, 2023
+11 −5
Merged

fix: [DHIS2-15967] allow enrolling TEIs with mandatory TET attributes #3455

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5457c90
fix: add tracked entity attributes in TEI registration payload
superskip Oct 30, 2023
53b088a
fix: make program attribute mandatory if TET attribute is mandatory
superskip Oct 31, 2023
601d0a2
refactor: modify `compulsory` in `formFoundation`
superskip Nov 2, 2023
9c7ea0d
fix: compulsory tet attributes in profile widget
superskip Nov 2, 2023
4a124f6
Revert "fix: compulsory tet attributes in profile widget"
superskip Nov 7, 2023
aea74a3
Revert "refactor: modify `compulsory` in `formFoundation`"
superskip Nov 7, 2023
7ab03fb
Revert "fix: make program attribute mandatory if TET attribute is man…
superskip Nov 7, 2023
da07e36
Merge branch 'master' into DHIS2-15967
superskip Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions ...e/components/DataEntries/EnrollmentRegistrationEntry/EnrollmentRegistrationEntry.types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,17 @@ import type { ExistingUniqueValueDialogActionsComponent } from '../withErrorMess
import type { InputAttribute } from './hooks/useFormValues';
import { RenderFoundation, ProgramStage } from '../../../metaData';

type TrackedEntityAttributes = Array<{
attribute: string,
value: any,
}>;

export type EnrollmentPayload = {|
trackedEntity: string,
trackedEntityType: string,
orgUnit: string,
geometry: any,
attributes: TrackedEntityAttributes,
enrollments: [
{|
occurredAt: string,
Expand All @@ -23,10 +29,7 @@ export type EnrollmentPayload = {|
events: Array<{
orgUnit: string,
}>,
attributes: Array<{
attribute: string,
value: any,
}>,
attributes: TrackedEntityAttributes,
|}
]
|}
Expand Down
5 changes: 4 additions & 1 deletion ...ore/components/DataEntries/EnrollmentRegistrationEntry/hooks/useBuildEnrollmentPayload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,15 @@ export const useBuildEnrollmentPayload = ({
? [firstStageDuringRegistrationEvent, ...autoGenerateEvents]
: autoGenerateEvents;

const attributes = deriveAttributesFromFormValues(formServerValues);

const enrollment = {
program: programId,
status: 'ACTIVE',
orgUnit: orgUnitId,
occurredAt,
enrolledAt,
attributes: deriveAttributesFromFormValues(formServerValues),
attributes,
events: allEventsToBeCreated,
};

Expand All @@ -177,6 +179,7 @@ export const useBuildEnrollmentPayload = ({
trackedEntity: teiId || generateUID(),
orgUnit: orgUnitId,
trackedEntityType: trackedEntityTypeId,
attributes,
geometry,
enrollments: [enrollment],
};
Expand Down
16 changes: 15 additions & 1 deletion .../common/TEIAndEnrollment/useMetadataForRegistrationForm/useMetadataForRegistrationForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// @flow
import { useMemo } from 'react';
import { useOptionSetsForAttributes } from './hooks/useOptionSetsForAttributes';
import { scopeTypes } from '../../../../../metaData';
import { scopeTypes, Section } from '../../../../../metaData';
import { useProgramFromIndexedDB } from '../../../../../utils/cachedDataHooks/useProgramFromIndexedDB';
import { useScopeInfo } from '../../../../../hooks/useScopeInfo';
import { useTrackedEntityTypeCollection } from './hooks/useTrackedEntityTypeCollection';
Expand Down Expand Up @@ -72,6 +72,20 @@ export const useMetadataForRegistrationForm = ({ selectedScopeId }: Props) => {
locale,
});

if (trackedEntityType && enrollment) {
for (const tetAttribute of trackedEntityType.trackedEntityTypeAttributes) {
if (tetAttribute.mandatory) {
const section = enrollment.enrollmentForm.getSection(Section.MAIN_SECTION_ID);
if (section) {
const enrollmentAttribute = section.elements && section.elements.get(tetAttribute.trackedEntityAttributeId);
if (enrollmentAttribute) {
enrollmentAttribute.compulsory = true;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suggest adding the compulsory logic when the DataElement is built rather than when the metadata is retrieved from IndexedDB.
To achieve this, you can pass trackedEntityTypeCollection to DataElementFactory inside EnrollmentFactory. Then it can be used inside _setBaseProperties method to calculate the dataElement.compulsory.
WDYT?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're right - I did miss a spot with the profile widget! I'll try your suggestion : )

}
}
}
}
}

if (scopeType === scopeTypes.TRACKED_ENTITY_TYPE && trackedEntityTypeCollection && tetId) {
return {
name: trackedEntityTypeCollection.name,
Expand Down
Loading