@iapps/ng-dhis2-ui 1.2.134 → 1.2.136

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

@@ -6670,7 +6670,7 @@ const InternationalPhoneField = ({ name, label, placeholder, value, required, di
                     flex: '0 0 auto',
                     width: 260,
                 } },
-                React__default.createElement(FilterableSingleSelectField, { selected: selectedIsoCode, onChange: handleCountryChange, disabled: disabled, dense: true, filterable: true, onFilterChange: ({ value }) => setFilterText(value), noMatchText: "No matching country" }, filteredCountries.map((country) => (React__default.createElement(SingleSelectOption, { key: country.isoCode, value: country.isoCode, label: `${country.flag} ${country.name} (${country.dialCode})` }))))),
+                React__default.createElement(FilterableSingleSelectField, { selected: selectedIsoCode, onChange: handleCountryChange, disabled: disabled, dense: true, filterable: true, onFilterChange: ({ value }) => setFilterText(value), noMatchText: "No matching country" }, filteredCountries.map((country) => (React__default.createElement(SingleSelectOption, { disabled: disabled, key: country.isoCode, value: country.isoCode, label: `${country.flag} ${country.name} (${country.dialCode})` }))))),
             React__default.createElement("div", { style: { flex: '1 1 0', minWidth: 0 } },
                 React__default.createElement(InputField$1, { type: "tel", name: name, placeholder: placeholder ?? '767000000', value: localNumber, required: required, disabled: disabled, error: hasError, validationText: effectiveValidationText, autoComplete: "tel", max: selectedCountry.isoCode === 'TZ' ? '9' : '15', onChange: handleLocalChange, onBlur: () => {
                         if (selectedCountry.isoCode === 'TZ') {
@@ -10268,6 +10268,47 @@ class ProgramEntryFormMetaData {
         this.config = config;
         return this;
     }
+    getFieldIdentifiers(field) {
+        const f = field;
+        const candidateIds = [
+            f.key,
+            field.id,
+            f.code,
+            f.attribute,
+            f.trackedEntityAttribute,
+            f.dataElement,
+        ];
+        return candidateIds.filter((value) => typeof value === 'string' && value.length > 0);
+    }
+    getAutoAssignedFieldIdSet() {
+        const autoAssigned = this.config?.autoAssignedValues;
+        if (!autoAssigned?.length) {
+            return null;
+        }
+        if (!this.autoAssignedFieldIdSet) {
+            this.autoAssignedFieldIdSet = new Set(autoAssigned
+                .map(({ field }) => field)
+                .filter((value) => typeof value === 'string' && value.length > 0));
+        }
+        return this.autoAssignedFieldIdSet;
+    }
+    shouldDisableField(field) {
+        const fieldIdentifiers = this.getFieldIdentifiers(field);
+        if (!fieldIdentifiers.length) {
+            return false;
+        }
+        const autoAssignedIdSet = this.getAutoAssignedFieldIdSet();
+        if (!autoAssignedIdSet) {
+            return false;
+        }
+        return fieldIdentifiers.some((id) => autoAssignedIdSet.has(id));
+    }
+    withDisabledFlags(field) {
+        return {
+            ...field,
+            disabled: true,
+        };
+    }
     getProgramPromise() {
         const program = this.config.program;
         const programQuery = this.d2.programModule.program
@@ -10370,37 +10411,115 @@ class ProgramEntryFormMetaData {
         if (!this.program) {
             return [];
         }
-        return new ProgramEntryFormFieldUtil(this.program, this.config).fields;
+        const fields = new ProgramEntryFormFieldUtil(this.program, this.config)
+            .fields;
+        const autoAssigned = this.config?.autoAssignedValues;
+        if (!autoAssigned?.length) {
+            return fields;
+        }
+        return fields.map((field) => this.shouldDisableField(field) ? this.withDisabledFlags(field) : field);
     }
+    // get sections(): IProgramEntryFormSection[] {
+    //   if (!this.program) {
+    //     return [];
+    //   }
+    //   const { displayType, formType } = this.config;
+    //   if (!this.program || this.config.displayType !== 'FLAT') {
+    //     return [];
+    //   }
+    //   if (displayType === 'FLAT' && formType === 'TRACKER') {
+    //     return new ProgramEntryFormSectionUtil(this.program, this.config)
+    //       .programEntryFormSections;
+    //   }
+    //   return new ProgramEntryFormSectionUtil(this.program, this.config)
+    //     .programEntryFormSections;
+    // }
+    // get programStageSections(): IProgramEntryFormSection[] {
+    //   if (!this.program) {
+    //     return [];
+    //   }
+    //   const { displayType, formType } = this.config;
+    //   if (displayType === 'FLAT' && formType === 'EVENT') {
+    //     return new ProgramStageEntryFormSectionUtil(this.program, this.config)
+    //       .programStageEntryFormSections;
+    //   }
+    //   if (displayType === 'SECTION') {
+    //     return new ProgramStageEntryFormSectionUtil(this.program, this.config)
+    //       .programStageEntryFormSections;
+    //   }
+    //   return [];
+    // }
     get sections() {
         if (!this.program) {
             return [];
         }
-        const { displayType, formType } = this.config;
-        if (!this.program || this.config.displayType !== 'FLAT') {
+        const { displayType } = this.config;
+        if (displayType !== 'FLAT') {
             return [];
         }
-        if (displayType === 'FLAT' && formType === 'TRACKER') {
-            return new ProgramEntryFormSectionUtil(this.program, this.config)
-                .programEntryFormSections;
+        const baseSections = new ProgramEntryFormSectionUtil(this.program, this.config).programEntryFormSections;
+        const autoAssigned = this.config?.autoAssignedValues;
+        if (!autoAssigned?.length) {
+            return baseSections;
         }
-        return new ProgramEntryFormSectionUtil(this.program, this.config)
-            .programEntryFormSections;
+        return baseSections.map((section) => {
+            const formFields = section.formFields ?? [];
+            if (!formFields.length) {
+                return section;
+            }
+            let hasDisabledField = false;
+            const updatedFields = formFields.map((field) => {
+                if (this.shouldDisableField(field)) {
+                    hasDisabledField = true;
+                    return this.withDisabledFlags(field);
+                }
+                return field;
+            });
+            if (!hasDisabledField) {
+                return section;
+            }
+            return {
+                ...section,
+                formFields: updatedFields,
+            };
+        });
     }
     get programStageSections() {
         if (!this.program) {
             return [];
         }
         const { displayType, formType } = this.config;
-        if (displayType === 'FLAT' && formType === 'EVENT') {
-            return new ProgramStageEntryFormSectionUtil(this.program, this.config)
-                .programStageEntryFormSections;
+        const isFlatEvent = displayType === 'FLAT' && formType === 'EVENT';
+        const isSectionDisplay = displayType === 'SECTION';
+        if (!isFlatEvent && !isSectionDisplay) {
+            return [];
         }
-        if (displayType === 'SECTION') {
-            return new ProgramStageEntryFormSectionUtil(this.program, this.config)
-                .programStageEntryFormSections;
+        const baseSections = new ProgramStageEntryFormSectionUtil(this.program, this.config).programStageEntryFormSections;
+        const autoAssigned = this.config?.autoAssignedValues;
+        if (!autoAssigned?.length) {
+            return baseSections;
         }
-        return [];
+        return baseSections.map((section) => {
+            const formFields = section.formFields ?? [];
+            if (!formFields.length) {
+                return section;
+            }
+            let hasDisabledField = false;
+            const updatedFields = formFields.map((field) => {
+                if (this.shouldDisableField(field)) {
+                    hasDisabledField = true;
+                    return this.withDisabledFlags(field);
+                }
+                return field;
+            });
+            if (!hasDisabledField) {
+                return section;
+            }
+            return {
+                ...section,
+                formFields: updatedFields,
+            };
+        });
     }
     get rules() {
         if (!this.program || !this.program.programRules) {
@@ -10519,23 +10638,54 @@ class ProgramEntryFormModule {
             };
         }, ...(ngDevMode ? [{ debugName: "FormActionButtons" }] : []));
     }
+    // async ngOnInit() {
+    //   this.loading.set(true);
+    //   try {
+    //     // Loading metadata
+    //     const metaData = await new ProgramEntryFormMetaData()
+    //       .setConfig(this.config())
+    //       .get();
+    //     this.metaData.set(metaData);
+    //     // Load initial instance information
+    //     const instance = await this.#getInstance();
+    //     this.instance.set(instance);
+    //     if (this.config().autoAssignedValues) {
+    //       this.#updateInstanceWithAutoAssignedValues(
+    //         this.config().autoAssignedValues || []
+    //       );
+    //     }
+    //     this.loading.set(false);
+    //   } catch (err) {
+    //     this.loading.set(false);
+    //   }
+    // }
     async ngOnInit() {
         this.loading.set(true);
         try {
-            // Loading metadata
+            const config = this.config();
             const metaData = await new ProgramEntryFormMetaData()
-                .setConfig(this.config())
+                .setConfig(config)
                 .get();
+            if (!metaData) {
+                console.error('ProgramEntryFormMetaData.get() returned null');
+                return;
+            }
             this.metaData.set(metaData);
-            // Load initial instance information
             const instance = await this.#getInstance();
+            if (!instance) {
+                console.error('Failed to create or load instance for program entry form');
+                return;
+            }
             this.instance.set(instance);
-            if (this.config().autoAssignedValues) {
-                this.#updateInstanceWithAutoAssignedValues(this.config().autoAssignedValues || []);
+            const autoAssigned = config.autoAssignedValues;
+            if (autoAssigned?.length) {
+                this.#updateInstanceWithAutoAssignedValues(autoAssigned);
             }
-            this.loading.set(false);
         }
-        catch (err) {
+        catch (error) {
+            console.error('Error during ProgramEntryForm initialization', error);
+        }
+        finally {
             this.loading.set(false);
         }
     }
@@ -10552,18 +10702,122 @@ class ProgramEntryFormModule {
     onCancel() {
         this.formCancel.emit();
     }
+    #resolveFieldRuntimeId(configuredKey, metaData) {
+        const formFields = metaData?.formFields;
+        if (!formFields || formFields.length === 0) {
+            return configuredKey;
+        }
+        for (let index = 0; index < formFields.length; index++) {
+            const currentField = formFields[index];
+            if (currentField.id === configuredKey) {
+                return currentField.id;
+            }
+            if (currentField.attribute === configuredKey ||
+                currentField.trackedEntityAttribute === configuredKey) {
+                return currentField.id;
+            }
+            if (currentField.dataElement === configuredKey) {
+                return currentField.id;
+            }
+        }
+        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 assignedDataValues = autoAssignedValues.reduce((entities, assignedValue) => {
-            return {
-                ...entities,
-                [assignedValue.field]: assignedValue.value,
-            };
-        }, {});
-        this.#updateInstance(assignedDataValues);
+        const trackedEntityId = this.trackedEntity?.();
+        if (typeof trackedEntityId === 'string' &&
+            trackedEntityId.trim().length > 0) {
+            return;
+        }
+        const valueCount = autoAssignedValues?.length ?? 0;
+        if (valueCount === 0) {
+            return;
+        }
+        const metaData = this.metaData();
+        const aggregatedValues = {};
+        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);
     }
+    // #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;
+        }
+        const shouldUpdateOrgUnit = this.config().updateTeiOrgUnit;
         this.instance.update((instance) => {
-            instance?.updateDataValues(dataValues, this.config().updateTeiOrgUnit);
+            if (!instance) {
+                return instance;
+            }
+            for (const key in dataValues) {
+                if (Object.prototype.hasOwnProperty.call(dataValues, key)) {
+                    instance[key] =
+                        dataValues[key];
+                }
+            }
+            instance.updateDataValues(dataValues, shouldUpdateOrgUnit);
             return instance;
         });
     }