@iapps/ng-dhis2-ui 1.3.3 → 1.3.4

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

@@ -13094,8 +13094,14 @@ class ProgramEntryFormModule {
             if (!this.instance()) {
                 return {};
             }
+            const trackedEntity = this.trackedEntityInstance();
+            const attributeValues = Object.keys(trackedEntity?.attributeEntities ?? {}).reduce((acc, key) => {
+                acc[key] = trackedEntity?.attributeEntities?.[key]?.value;
+                return acc;
+            }, {});
             return {
-                ...(this.trackedEntityInstance() || {}),
+                ...attributeValues,
+                ...(trackedEntity?.reportEntities ?? {}),
                 ...(this.instance() || {}),
             };
         }, /* @ts-ignore */
@@ -13197,44 +13203,6 @@ class ProgramEntryFormModule {
         }
         return configuredKey;
     }
-    // #updateInstanceWithAutoAssignedValues(
-    //   autoAssignedValues: AutoAssignedValues[]
-    // ) {
-    //   const assignedDataValues = autoAssignedValues.reduce(
-    //     (entities, assignedValue) => {
-    //       return {
-    //         ...entities,
-    //         [assignedValue.field]: assignedValue.value,
-    //       };
-    //     },
-    //     {}
-    //   );
-    //   this.#updateInstance(assignedDataValues);
-    // }
-    // #updateInstanceWithAutoAssignedValues(
-    //   autoAssignedValues: AutoAssignedValues[]
-    // ) {
-    //   const valueCount = autoAssignedValues?.length ?? 0;
-    //   if (valueCount === 0) {
-    //     return;
-    //   }
-    //   const metaData = this.metaData();
-    //   const aggregatedValues: Record<string, unknown> = {};
-    //   for (let index = 0; index < valueCount; index++) {
-    //     const { field: configuredKey, value } = autoAssignedValues[index];
-    //     const semanticKey = metaData
-    //       ? this.#resolveFieldRuntimeId(configuredKey, metaData)
-    //       : configuredKey;
-    //     aggregatedValues[semanticKey] = value;
-    //     if (configuredKey !== semanticKey) {
-    //       aggregatedValues[configuredKey] = value;
-    //     }
-    //   }
-    //   if (Object.keys(aggregatedValues).length === 0) {
-    //     return;
-    //   }
-    //   this.#updateInstance(aggregatedValues);
-    // }
     #updateInstanceWithAutoAssignedValues(autoAssignedValues) {
         const trackedEntityId = this.trackedEntity?.();
         if (typeof trackedEntityId === 'string' &&
@@ -13262,21 +13230,6 @@ class ProgramEntryFormModule {
         }
         this.#updateInstance(aggregatedValues);
     }
-    // #updateInstance(dataValues: Record<string, unknown>) {
-    //   this.instance.update((instance) => {
-    //     instance?.updateDataValues(dataValues, this.config().updateTeiOrgUnit);
-    //     return instance;
-    //   });
-    // }
-    // #updateInstance(dataValues: Record<string, unknown>) {
-    //   this.instance.update((instance) => {
-    //     if (!instance) {
-    //       return instance;
-    //     }
-    //     instance.updateDataValues(dataValues, this.config().updateTeiOrgUnit);
-    //     return instance;
-    //   });
-    // }
     #updateInstance(dataValues) {
         if (!dataValues || Object.keys(dataValues).length === 0) {
             return;
@@ -13307,7 +13260,8 @@ class ProgramEntryFormModule {
                 if (this.config().autoComplete) {
                     this.instance().complete();
                 }
-                return this.instanceQuery
+                const instanceQuery = this.#getQuery('TRACKER');
+                return instanceQuery
                     .setData(this.instance())
                     .save();
             }
@@ -13315,9 +13269,8 @@ class ProgramEntryFormModule {
                 if (this.config().autoComplete) {
                     this.instance().complete();
                 }
-                return this.instanceQuery
-                    .setData(this.instance())
-                    .save();
+                const instanceQuery = this.#getQuery('EVENT');
+                return instanceQuery.setData(this.instance()).save();
             }
             default:
                 return firstValueFrom(of(null));
@@ -13335,43 +13288,51 @@ class ProgramEntryFormModule {
         });
         return instance;
     }
-    async #getTrackerInstance() {
+    #getQuery(instanceType) {
         const d2 = window.d2Web;
-        this.instanceQuery = d2?.trackerModule?.trackedEntity
-            ?.setProgram(this.config().program)
-            ?.setOrgUnit(this.orgUnit());
-        if (!this.instanceQuery) {
+        switch (instanceType) {
+            case 'TRACKER':
+                return d2.trackerModule.trackedEntity
+                    .setProgram(this.config().program)
+                    .setOrgUnit(this.orgUnit());
+            case 'EVENT':
+                return d2.eventModule.event
+                    .setProgram(this.config().program)
+                    .setProgramStage(this.config().programStage)
+                    .setEnrollment(this.enrollment())
+                    .setTrackedEntity(this.trackedEntity())
+                    .setOrgUnit(this.orgUnit());
+            default:
+                throw new Error('Invalid form type');
+        }
+    }
+    async #getTrackerInstance() {
+        const instanceQuery = this.#getQuery('TRACKER');
+        if (!instanceQuery) {
             throw new Error('Could not initialize tracker query');
         }
         if (!this.trackedEntity()) {
-            return await this.instanceQuery.create();
+            return await instanceQuery.create();
         }
-        const instanceResult = (await this.instanceQuery
-            .setTrackedEntity(this.trackedEntity())
-            .get()).data;
+        const instanceResult = (await instanceQuery.setTrackedEntity(this.trackedEntity()).get()).data;
         if (!instanceResult) {
-            return await this.instanceQuery.create();
+            return await instanceQuery.create();
         }
-        this.instanceQuery.setInstanceFields(this.metaData()?.program);
-        const instance = await this.instanceQuery.setReservedValues();
+        instanceQuery.setInstanceFields(this.metaData()?.program);
+        const instance = await instanceQuery.setReservedValues();
         if (this.orgUnit()) {
             instance.setOrgUnit(this.orgUnit());
         }
         return instance;
     }
     async #getEventInstance() {
-        this.instanceQuery = this.d2.eventModule.event
-            .setProgram(this.config().program)
-            .setProgramStage(this.config().programStage)
-            .setEnrollment(this.enrollment())
-            .setTrackedEntity(this.trackedEntity())
-            .setOrgUnit(this.orgUnit());
+        const instanceQuery = this.#getQuery('EVENT');
         if (!this.event()) {
-            return await this.instanceQuery.create();
+            return await instanceQuery.create();
         }
-        const instance = (await this.instanceQuery.setEvent(this.event()).get()).data;
+        const instance = (await instanceQuery.setEvent(this.event()).get()).data;
         if (!instance) {
-            return await this.instanceQuery.create();
+            return await instanceQuery.create();
         }
         if (this.metaData()?.program) {
             instance.setFields(this.metaData().program);