@iapps/ng-dhis2-ui 1.2.4 → 1.2.6

package/fesm2022/iapps-ng-dhis2-ui.mjs

@@ -3986,7 +3986,7 @@ class LineListTableComponent extends ReactWrapperModule {
                         .setOrgUnit(orgUnitState)
                         .setOuMode(this.ouMode)
                         .setStatus(this.enrollmentStatus)
-                        .setEventStatus(this.eventStatus?.status, this.eventStatus.programStage)
+                        .setEventStatus(this.eventStatus?.status, this.eventStatus?.programStage)
                         .setFilters(dataQueryFiltersState)
                         .setPagination(new Pager({
                         pageSize: pager.pageSize,
@@ -6625,6 +6625,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.8", ngImpor
 class FlatFormComponent extends BaseFormWrapperComponent {
     ngOnInit() {
         this.formGroup = FormUtil.getFormGroup(this.fields(), this.dataValues());
+        this.onFormUpdate();
     }
     onFormUpdate() {
         this.updateDataValues(this.formGroup.getRawValue());
@@ -7185,8 +7186,11 @@ class ProgramEntryFormFieldUtil {
         });
     }
     get dataElements() {
-        return flatten((this.program.programStages || []).map((programStage) => {
-            return (programStage.programStageDataElements || []).map((stageDataElement) => {
+        const programStages = this.config.programStage
+            ? this.program.programStages?.filter((programStage) => programStage.id === this.config.programStage)
+            : this.program.programStages;
+        return flatten((programStages || []).map((programStage) => {
+            const dataElements = (programStage.programStageDataElements || []).map((stageDataElement) => {
                 return {
                     ...stageDataElement.dataElement,
                     sortOrder: stageDataElement.sortOrder,
@@ -7196,6 +7200,28 @@ class ProgramEntryFormFieldUtil {
                     metaType: 'DATA_ELEMENT',
                 };
             });
+            const eventDateName = programStage.executionDateLabel ||
+                `Reporting date - ${programStage.name}`;
+            return [
+                {
+                    id: 'occurredAt',
+                    code: 'OCCURRED_AT',
+                    formName: eventDateName,
+                    name: eventDateName,
+                    shortName: eventDateName,
+                    displayName: eventDateName,
+                    sortOrder: 1,
+                    mandatory: true,
+                    stepId: programStage.id,
+                    valueType: 'DATE',
+                    metaType: 'EVENT_DATE',
+                    domainType: 'TRACKER',
+                    aggregationType: 'NONE',
+                    lastUpdated: '',
+                    created: '',
+                },
+                ...dataElements,
+            ];
         }));
     }
     #getOrgUniField() {
@@ -7214,7 +7240,7 @@ class ProgramEntryFormFieldUtil {
         });
     }
     #getEnrollmentDateField() {
-        if (this.config.hideEnrollmentDate) {
+        if (this.config.hideEnrollmentDate || this.config.programStage) {
             return null;
         }
         return new FormField({
@@ -7229,7 +7255,7 @@ class ProgramEntryFormFieldUtil {
         });
     }
     #getIncidentDateField() {
-        if (!this.program.displayIncidentDate) {
+        if (!this.program.displayIncidentDate || this.config.programStage) {
             return null;
         }
         return new DateField({
@@ -7340,7 +7366,6 @@ class ProgramEntryFormMetaData {
             .with(this.d2.programModule.trackedEntityTypeAttribute.select([
             'trackedEntityAttribute',
         ])), 'ToOne')
-            .with(this.d2.programModule.programTrackedEntityAttribute.with(this.d2.programModule.trackedEntityAttribute.with(this.d2.optionSetModule.optionSet.with(this.d2.optionSetModule.option), 'ToOne'), 'ToOne'))
             .with(this.d2.programModule.programRuleVariable
             .with(this.d2.dataElementModule.dataElement.select([
             'id',
@@ -7353,13 +7378,17 @@ class ProgramEntryFormMetaData {
             'name',
         ]), 'ToOne'))
             .byId(program);
+        if (!this.config.programStage) {
+            programQuery.with(this.d2.programModule.programTrackedEntityAttribute.with(this.d2.programModule.trackedEntityAttribute.with(this.d2.optionSetModule.optionSet.with(this.d2.optionSetModule.option), 'ToOne'), 'ToOne'));
+        }
         if (this.config.displayType === 'FLAT') {
             programQuery.with(this.d2.programModule.programSection.with(this.d2.programModule.trackedEntityAttribute.select(['id'])));
         }
-        if (!this.config.excludeProgramStages) {
-            programQuery.with(this.d2.programModule.programStage
+        if (!this.config.excludeProgramStages || this.config.programStage) {
+            const programStageQuery = this.d2.programModule.programStage
                 .with(this.d2.programModule.programStageSection)
-                .with(this.d2.programModule.programStageDataElement.with(this.d2.dataElementModule.dataElement.with(this.d2.optionSetModule.optionSet.with(this.d2.optionSetModule.option), 'ToOne'), 'ToOne')));
+                .with(this.d2.programModule.programStageDataElement.with(this.d2.dataElementModule.dataElement.with(this.d2.optionSetModule.optionSet.with(this.d2.optionSetModule.option), 'ToOne'), 'ToOne'));
+            programQuery.with(programStageQuery);
         }
         return programQuery.get();
     }
@@ -7577,14 +7606,22 @@ class ProgramEntryFormModule {
     }
     async #saveInstance() {
         switch (this.config().formType) {
-            case 'TRACKER':
+            case 'TRACKER': {
+                if (this.config().autoComplete) {
+                    this.instance().complete();
+                }
                 return this.instanceQuery
                     .setData(this.instance())
                     .save();
-            case 'EVENT':
+            }
+            case 'EVENT': {
+                if (this.config().autoComplete) {
+                    this.instance().complete();
+                }
                 return this.instanceQuery
                     .setData(this.instance())
                     .save();
+            }
             default:
                 return firstValueFrom(of(null));
         }
@@ -7614,10 +7651,17 @@ class ProgramEntryFormModule {
             .setEnrollment(this.enrollment())
             .setTrackedEntity(this.trackedEntity())
             .setOrgUnit(this.orgUnit());
-        return this.event()
-            ? (await this.instanceQuery.setEvent(this.event()).get())
-                .data || (await this.instanceQuery.create())
-            : await this.instanceQuery.create();
+        if (!this.event()) {
+            return await this.instanceQuery.create();
+        }
+        const instance = (await this.instanceQuery.setEvent(this.event()).get()).data;
+        if (!instance) {
+            return await this.instanceQuery.create();
+        }
+        if (this.metaData()?.program) {
+            instance.setFields(this.metaData().program);
+        }
+        return instance;
     }
     #getInstance() {
         switch (this.config().formType) {