@iapps/ng-dhis2-ui 1.3.2 → 1.3.4

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

@@ -11317,7 +11317,6 @@ class BaseFormWrapperComponent {
         this.formValidityUpdate.emit(isFormValid);
     }
     executeRules() {
-        console.log(this.#updatedDataValues());
         this.ruleActions.set(new ProgramRuleEngine()
             .setRules(this.rules())
             .setDataValues(this.#updatedDataValues())
@@ -11353,10 +11352,10 @@ class FlatFormComponent extends BaseFormWrapperComponent {
     }
     ngOnInit() {
         this.formGroup = FormUtil.getFormGroup(this.fields(), this.dataValues());
-        this.onFormUpdate();
+        this.onFormUpdate(this.dataValues());
     }
-    onFormUpdate() {
-        this.updateDataValues(this.formGroup.getRawValue());
+    onFormUpdate(dataValues) {
+        this.updateDataValues(dataValues ?? this.formGroup.getRawValue());
         this.updateFormValidity(this.formGroup.valid);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: FlatFormComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
@@ -12208,7 +12207,7 @@ class ProgramEntryFormFieldUtil {
         return [...this.reportFields, ...fields];
     }
     #getDisabledStatus(field) {
-        if (field?.generated) {
+        if (field?.generated || this.config.disableForm) {
             return true;
         }
         if (this.config.autoAssignedValues &&
@@ -12225,192 +12224,6 @@ class ProgramEntryFormFieldUtil {
     }
 }
 
-// Copyright 2025 UDSM DHIS2 Lab. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-class ProgramStageEntryFormSection {
-    constructor(props) {
-        this.formFields = [];
-        this.orientation = 'HORIZONTAL';
-        Object.assign(this, props);
-    }
-}
-
-class ProgramStageEntryFormSectionUtil {
-    #sortedCanonicalStageFieldsCache = null;
-    constructor(program, config) {
-        this.program = program;
-        this.config = config;
-        this.fieldUtil = new ProgramEntryFormFieldUtil(program, config);
-    }
-    get programStageEntryFormSections() {
-        const programStageId = this.#getStageIdFromConfig();
-        if (!programStageId)
-            return [];
-        const programStage = this.#findStageById(programStageId);
-        if (!programStage)
-            return [];
-        const sections = [];
-        const basicDetailsFields = this.fieldUtil.eventReportFields;
-        if (basicDetailsFields?.length) {
-            sections.push(new ProgramStageEntryFormSection({
-                id: `${programStage.id}_basic_information`,
-                name: 'Basic Information',
-                description: programStage.description ?? '',
-                formFields: basicDetailsFields,
-                orientation: 'VERTICAL',
-            }));
-        }
-        const canonicalFieldsByDataElementId = this.#buildCanonicalStageFieldsByDataElementId(programStage);
-        const programStageSections = programStage.programStageSections ?? [];
-        for (const programStageSection of programStageSections) {
-            const sectionFields = this.#mapStageSectionToFields(programStageSection, canonicalFieldsByDataElementId);
-            if (!sectionFields.length)
-                continue;
-            sections.push(new ProgramStageEntryFormSection({
-                id: programStageSection.id,
-                name: programStageSection.displayName ?? programStageSection.name ?? '',
-                description: programStageSection.description ?? '',
-                formFields: sectionFields,
-                orientation: 'HORIZONTAL',
-            }));
-        }
-        return sections;
-    }
-    // ---------------------------
-    // Canonical stage fields
-    // ---------------------------
-    #buildCanonicalStageFieldsByDataElementId(programStage) {
-        const programStageDataElements = programStage.programStageDataElements ?? [];
-        const fieldsByDataElementId = new Map();
-        for (let i = 0; i < programStageDataElements.length; i++) {
-            const programStageDataElement = programStageDataElements[i];
-            const canonicalField = this.#mapProgramStageDataElementToField(programStageDataElement, programStage.id);
-            if (!canonicalField?.id)
-                continue;
-            fieldsByDataElementId.set(canonicalField.id, canonicalField);
-        }
-        this.#sortedCanonicalStageFieldsCache = null;
-        return fieldsByDataElementId;
-    }
-    // ---------------------------
-    // Map a stage section using canonical fields (like program sections)
-    // ---------------------------
-    #mapStageSectionToFields(programStageSection, canonicalFieldsByDataElementId) {
-        const sectionDataElements = programStageSection.dataElements;
-        const sectionDataElementIdsFromAlt = programStageSection?.dataElementsIds ??
-            undefined;
-        const sectionDataElementIds = (sectionDataElements?.length
-            ? sectionDataElements.map((d) => d?.id).filter(Boolean)
-            : sectionDataElementIdsFromAlt?.filter(Boolean)) ?? [];
-        if (sectionDataElementIds.length > 0) {
-            const sectionFields = [];
-            for (let index = 0; index < sectionDataElementIds.length; index++) {
-                const dataElementId = sectionDataElementIds[index];
-                const canonicalField = canonicalFieldsByDataElementId.get(dataElementId);
-                if (!canonicalField)
-                    continue;
-                sectionFields.push({
-                    ...canonicalField,
-                    order: index + 1,
-                });
-            }
-            return sectionFields;
-        }
-        return this.#getSortedCanonicalStageFields(canonicalFieldsByDataElementId);
-    }
-    #getSortedCanonicalStageFields(canonicalFieldsByDataElementId) {
-        const cache = this.#sortedCanonicalStageFieldsCache;
-        if (cache?.sourceMap === canonicalFieldsByDataElementId) {
-            return cache.sortedFields;
-        }
-        const sortedFields = Array.from(canonicalFieldsByDataElementId.values());
-        sortedFields.sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
-        this.#sortedCanonicalStageFieldsCache = {
-            sourceMap: canonicalFieldsByDataElementId,
-            sortedFields,
-        };
-        return sortedFields;
-    }
-    // ---------------------------
-    // Map a programStageDataElement => canonical form field
-    // ---------------------------
-    #mapProgramStageDataElementToField(programStageDataElement, programStageId) {
-        const dataElementDefinition = programStageDataElement?.dataElement;
-        if (!dataElementDefinition?.id)
-            return null;
-        const fieldBaseConfig = {
-            id: dataElementDefinition.id,
-            code: dataElementDefinition.code,
-            formName: dataElementDefinition.formName,
-            name: dataElementDefinition.displayName ?? dataElementDefinition.name ?? '',
-            description: dataElementDefinition.description,
-            mandatory: !!programStageDataElement.compulsory,
-            valueType: dataElementDefinition.valueType,
-            sortOrder: programStageDataElement.sortOrder,
-            stepId: programStageId,
-            allowFutureDate: programStageDataElement.allowFutureDate,
-            optionSet: dataElementDefinition.optionSet,
-        };
-        const dropdownOptions = FieldDropdown.getDropdownOptions(fieldBaseConfig);
-        const hasSelectableOptions = (dropdownOptions?.length ?? 0) > 0;
-        const fieldExtension = this.config.formFieldExtensions?.find((extension) => extension?.id === fieldBaseConfig.id);
-        const autoAssignedValue = this.#getAutoAssignedValue(fieldBaseConfig);
-        if (!isUndefined(autoAssignedValue) &&
-            this.config.hideCustomAssignedFields) {
-            return null;
-        }
-        return new FormField({
-            ...fieldBaseConfig,
-            label: fieldBaseConfig.formName || fieldBaseConfig.name,
-            key: fieldBaseConfig.code
-                ? camelCase(fieldBaseConfig.code)
-                : fieldBaseConfig.id,
-            required: fieldBaseConfig.mandatory,
-            type: FieldUtil.getFieldType(fieldBaseConfig.valueType),
-            options: dropdownOptions,
-            disabled: this.#getDisabledStatus(fieldBaseConfig),
-            order: fieldBaseConfig.sortOrder,
-            hasOptions: hasSelectableOptions,
-            controlType: FieldUtil.getFieldControlType(fieldBaseConfig.valueType, hasSelectableOptions),
-            extension: fieldExtension,
-        });
-    }
-    // ---------------------------
-    // Stage selection helpers
-    // ---------------------------
-    #getStageIdFromConfig() {
-        const programStageRef = this.config?.programStage;
-        if (!programStageRef)
-            return null;
-        if (typeof programStageRef === 'string' && programStageRef.trim()) {
-            return programStageRef.trim();
-        }
-        const candidateId = programStageRef.id ??
-            programStageRef.stageId ??
-            programStageRef.programStageId ??
-            programStageRef.value?.id ??
-            null;
-        return typeof candidateId === 'string' && candidateId.trim()
-            ? candidateId.trim()
-            : null;
-    }
-    #findStageById(programStageId) {
-        return ((this.program.programStages ?? []).find((stage) => stage?.id === programStageId) ?? null);
-    }
-    // ---------------------------
-    // Extension hooks
-    // ---------------------------
-    #getAutoAssignedValue(field) {
-        const impl = this?.['#getAutoAssignedValue'];
-        return typeof impl === 'function' ? impl.call(this, field) : undefined;
-    }
-    #getDisabledStatus(field) {
-        const impl = this?.['#getDisabledStatus'];
-        return typeof impl === 'function' ? impl.call(this, field) : false;
-    }
-}
-
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 // Copyright 2025 UDSM DHIS2 Lab. All rights reserved.
@@ -12725,6 +12538,195 @@ class ProgramEntryFormSectionUtil {
     }
 }
 
+// Copyright 2025 UDSM DHIS2 Lab. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+class ProgramStageEntryFormSection {
+    constructor(props) {
+        this.formFields = [];
+        this.orientation = 'HORIZONTAL';
+        Object.assign(this, props);
+    }
+}
+
+class ProgramStageEntryFormSectionUtil {
+    #sortedCanonicalStageFieldsCache = null;
+    constructor(program, config) {
+        this.program = program;
+        this.config = config;
+        this.fieldUtil = new ProgramEntryFormFieldUtil(program, config);
+    }
+    get programStageEntryFormSections() {
+        const programStageId = this.#getStageIdFromConfig();
+        if (!programStageId)
+            return [];
+        const programStage = this.#findStageById(programStageId);
+        if (!programStage)
+            return [];
+        const sections = [];
+        const basicDetailsFields = this.fieldUtil.eventReportFields;
+        if (basicDetailsFields?.length) {
+            sections.push(new ProgramStageEntryFormSection({
+                id: `${programStage.id}_basic_information`,
+                name: 'Basic Information',
+                description: programStage.description ?? '',
+                formFields: basicDetailsFields,
+                orientation: 'VERTICAL',
+            }));
+        }
+        const canonicalFieldsByDataElementId = this.#buildCanonicalStageFieldsByDataElementId(programStage);
+        const programStageSections = programStage.programStageSections ?? [];
+        for (const programStageSection of programStageSections) {
+            const sectionFields = this.#mapStageSectionToFields(programStageSection, canonicalFieldsByDataElementId);
+            if (!sectionFields.length)
+                continue;
+            sections.push(new ProgramStageEntryFormSection({
+                id: programStageSection.id,
+                name: programStageSection.displayName ?? programStageSection.name ?? '',
+                description: programStageSection.description ?? '',
+                formFields: sectionFields,
+                orientation: 'HORIZONTAL',
+            }));
+        }
+        return sections;
+    }
+    // ---------------------------
+    // Canonical stage fields
+    // ---------------------------
+    #buildCanonicalStageFieldsByDataElementId(programStage) {
+        const programStageDataElements = programStage.programStageDataElements ?? [];
+        const fieldsByDataElementId = new Map();
+        for (let i = 0; i < programStageDataElements.length; i++) {
+            const programStageDataElement = programStageDataElements[i];
+            const canonicalField = this.#mapProgramStageDataElementToField(programStageDataElement, programStage.id);
+            if (!canonicalField?.id)
+                continue;
+            fieldsByDataElementId.set(canonicalField.id, canonicalField);
+        }
+        this.#sortedCanonicalStageFieldsCache = null;
+        return fieldsByDataElementId;
+    }
+    // ---------------------------
+    // Map a stage section using canonical fields (like program sections)
+    // ---------------------------
+    #mapStageSectionToFields(programStageSection, canonicalFieldsByDataElementId) {
+        const sectionDataElements = programStageSection.dataElements;
+        const sectionDataElementIdsFromAlt = programStageSection?.dataElementsIds ??
+            undefined;
+        const sectionDataElementIds = (sectionDataElements?.length
+            ? sectionDataElements.map((d) => d?.id).filter(Boolean)
+            : sectionDataElementIdsFromAlt?.filter(Boolean)) ?? [];
+        if (sectionDataElementIds.length > 0) {
+            const sectionFields = [];
+            for (let index = 0; index < sectionDataElementIds.length; index++) {
+                const dataElementId = sectionDataElementIds[index];
+                const canonicalField = canonicalFieldsByDataElementId.get(dataElementId);
+                if (!canonicalField)
+                    continue;
+                sectionFields.push({
+                    ...canonicalField,
+                    order: index + 1,
+                });
+            }
+            return sectionFields;
+        }
+        return this.#getSortedCanonicalStageFields(canonicalFieldsByDataElementId);
+    }
+    #getSortedCanonicalStageFields(canonicalFieldsByDataElementId) {
+        const cache = this.#sortedCanonicalStageFieldsCache;
+        if (cache?.sourceMap === canonicalFieldsByDataElementId) {
+            return cache.sortedFields;
+        }
+        const sortedFields = Array.from(canonicalFieldsByDataElementId.values());
+        sortedFields.sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
+        this.#sortedCanonicalStageFieldsCache = {
+            sourceMap: canonicalFieldsByDataElementId,
+            sortedFields,
+        };
+        return sortedFields;
+    }
+    // ---------------------------
+    // Map a programStageDataElement => canonical form field
+    // ---------------------------
+    #mapProgramStageDataElementToField(programStageDataElement, programStageId) {
+        const dataElementDefinition = programStageDataElement?.dataElement;
+        if (!dataElementDefinition?.id)
+            return null;
+        const fieldBaseConfig = {
+            id: dataElementDefinition.id,
+            code: dataElementDefinition.code,
+            formName: dataElementDefinition.formName,
+            name: dataElementDefinition.displayName ?? dataElementDefinition.name ?? '',
+            description: dataElementDefinition.description,
+            mandatory: !!programStageDataElement.compulsory,
+            valueType: dataElementDefinition.valueType,
+            sortOrder: programStageDataElement.sortOrder,
+            stepId: programStageId,
+            allowFutureDate: programStageDataElement.allowFutureDate,
+            optionSet: dataElementDefinition.optionSet,
+        };
+        const dropdownOptions = FieldDropdown.getDropdownOptions(fieldBaseConfig);
+        const hasSelectableOptions = (dropdownOptions?.length ?? 0) > 0;
+        const fieldExtension = this.config.formFieldExtensions?.find((extension) => extension?.id === fieldBaseConfig.id);
+        const autoAssignedValue = this.#getAutoAssignedValue(fieldBaseConfig);
+        if (!isUndefined(autoAssignedValue) &&
+            this.config.hideCustomAssignedFields) {
+            return null;
+        }
+        return new FormField({
+            ...fieldBaseConfig,
+            label: fieldBaseConfig.formName || fieldBaseConfig.name,
+            key: fieldBaseConfig.code
+                ? camelCase(fieldBaseConfig.code)
+                : fieldBaseConfig.id,
+            required: fieldBaseConfig.mandatory,
+            type: FieldUtil.getFieldType(fieldBaseConfig.valueType),
+            options: dropdownOptions,
+            disabled: this.#getDisabledStatus(fieldBaseConfig),
+            order: fieldBaseConfig.sortOrder,
+            hasOptions: hasSelectableOptions,
+            controlType: FieldUtil.getFieldControlType(fieldBaseConfig.valueType, hasSelectableOptions),
+            extension: fieldExtension,
+        });
+    }
+    // ---------------------------
+    // Stage selection helpers
+    // ---------------------------
+    #getStageIdFromConfig() {
+        const programStageRef = this.config?.programStage;
+        if (!programStageRef)
+            return null;
+        if (typeof programStageRef === 'string' && programStageRef.trim()) {
+            return programStageRef.trim();
+        }
+        const candidateId = programStageRef.id ??
+            programStageRef.stageId ??
+            programStageRef.programStageId ??
+            programStageRef.value?.id ??
+            null;
+        return typeof candidateId === 'string' && candidateId.trim()
+            ? candidateId.trim()
+            : null;
+    }
+    #findStageById(programStageId) {
+        return ((this.program.programStages ?? []).find((stage) => stage?.id === programStageId) ?? null);
+    }
+    // ---------------------------
+    // Extension hooks
+    // ---------------------------
+    #getAutoAssignedValue(field) {
+        const impl = this?.['#getAutoAssignedValue'];
+        return typeof impl === 'function' ? impl.call(this, field) : undefined;
+    }
+    #getDisabledStatus(field) {
+        if (this.config?.disableForm) {
+            return true;
+        }
+        const impl = this?.['#getDisabledStatus'];
+        return typeof impl === 'function' ? impl.call(this, field) : false;
+    }
+}
+
 // Copyright 2025 UDSM DHIS2 Lab. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
@@ -12762,6 +12764,9 @@ class ProgramEntryFormMetaData {
         return this.autoAssignedFieldIdSet;
     }
     shouldDisableField(field) {
+        if (this.config?.disableForm) {
+            return true;
+        }
         const fieldIdentifiers = this.getFieldIdentifiers(field);
         if (!fieldIdentifiers.length) {
             return false;
@@ -12802,96 +12807,36 @@ class ProgramEntryFormMetaData {
             .with(this.d2.programModule.trackedEntityTypeAttribute.select([
             'trackedEntityAttribute',
         ])), 'ToOne')
-            .with(this.d2.programModule.programRuleVariable
-            .with(this.d2.dataElementModule.dataElement.select([
-            'id',
-            'code',
-            'name',
-        ]), 'ToOne')
+            .with(this.#getProgramRuleVariableQuery())
+            .byId(program);
+        // if (!this.config.programStage) {
+        programQuery.with(this.#getProgramTrackedEntityAttributeQuery());
+        // }
+        // if (this.config.displayType === 'FLAT') {
+        programQuery.with(this.#getProgramSectionQuery());
+        // }
+        programQuery.with(this.#getProgramStageQuery());
+        return programQuery.get({ useIndexDb: true });
+    }
+    #getProgramRuleVariableQuery() {
+        return this.d2.programModule.programRuleVariable
+            .with(this.d2.dataElementModule.dataElement.select(['id', 'code', 'name']), 'ToOne')
             .with(this.d2.programModule.trackedEntityAttribute.select([
             'id',
             'code',
             '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 || 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'));
-            programQuery.with(programStageQuery);
-        }
-        return programQuery.get();
+        ]), 'ToOne');
     }
-    async #getProgramMetaData() {
-        const program = this.config.program;
-        if (!this.d2) {
-            return null;
-        }
-        const metaDataResponse = await Promise.all([
-            this.getProgramPromise(),
-            this.d2.programModule.programRule
-                .where({
-                attribute: 'program.id',
-                value: program,
-            })
-                .with(this.d2.programModule.programRuleAction
-                .select([
-                'id',
-                'programRuleActionType',
-                'data',
-                'programRule',
-                'displayContent',
-                'content',
-            ])
-                .with(this.d2.dataElementModule.dataElement.select([
-                'id',
-                'code',
-                'name',
-                'description',
-            ]), 'ToOne')
-                .with(this.d2.programModule.trackedEntityAttribute.select([
-                'id',
-                'code',
-                'name',
-                'description',
-            ]), 'ToOne')
-                .with(this.d2.programModule.programSection.select([
-                'id',
-                'code',
-                'name',
-                'description',
-            ]), 'ToOne')
-                .with(this.d2.programModule.programStageSection.select([
-                'id',
-                'code',
-                'name',
-                'description',
-            ]), 'ToOne')
-                .with(this.d2.optionSetModule.optionGroup
-                .select(['id'])
-                .with(this.d2.optionSetModule.option.select([
-                'id',
-                'code',
-                'displayName',
-            ]), 'ToMany'), 'ToOne')
-                .with(this.d2.optionSetModule.option.select([
-                'id',
-                'code',
-                'displayName',
-            ]), 'ToOne'))
-                .paginate(new Pager({ paging: false }))
-                .get(),
-        ]);
-        const [programResponse, programRuleResponse] = metaDataResponse;
-        const metaData = programResponse.data;
-        metaData.programRules = programRuleResponse.data;
-        return metaData;
+    #getProgramSectionQuery() {
+        return this.d2.programModule.programSection.with(this.d2.programModule.trackedEntityAttribute.select(['id']));
+    }
+    #getProgramTrackedEntityAttributeQuery() {
+        return this.d2.programModule.programTrackedEntityAttribute.with(this.d2.programModule.trackedEntityAttribute.with(this.d2.optionSetModule.optionSet.with(this.d2.optionSetModule.option), 'ToOne'), 'ToOne');
+    }
+    #getProgramStageQuery() {
+        return 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'));
     }
     get formFields() {
         if (!this.program) {
@@ -12903,7 +12848,11 @@ class ProgramEntryFormMetaData {
         if (!autoAssigned?.length) {
             return fields;
         }
-        return fields.map((field) => this.shouldDisableField(field) ? this.withDisabledFlags(field) : field);
+        return fields.map((field) => {
+            return this.shouldDisableField(field)
+                ? this.withDisabledFlags(field)
+                : field;
+        });
     }
     // get sections(): IProgramEntryFormSection[] {
     //   if (!this.program) {
@@ -13030,7 +12979,7 @@ class ProgramEntryFormMetaData {
     }
     async #getCustomFieldConfigurations() {
         try {
-            const response = await this.d2.httpInstance.get('dataStore/field-extensions?fields=id,fieldOptionsDependsOn,optionSet&paging=false');
+            const response = await this.d2.httpInstance.get('dataStore/field-extensions?fields=id,fieldOptionsDependsOn,optionSet&paging=false', { useIndexDb: true });
             const responseData = response?.data;
             const entries = Array.isArray(responseData)
                 ? responseData
@@ -13054,11 +13003,14 @@ class ProgramEntryFormMetaData {
     }
     async get() {
         try {
-            const program = await this.#getProgramMetaData();
+            const program = await window?.d2Web?.trackerModule?.trackedEntity
+                ?.setProgram(this.config?.program)
+                ?.getMetaData();
             if (program) {
                 this.program = program;
-                this.customFieldConfigurations =
-                    await this.#getCustomFieldConfigurations();
+                // TODO FIND ANOTHER WAY TO PASS IN CUSTOM FIELD CONFIGURATIONS, AVOID TIGHT COUPLING HERE
+                // this.customFieldConfigurations =
+                //   await this.#getCustomFieldConfigurations();
                 if (this.config?.formFieldExtensions &&
                     this.config.formFieldExtensions.length > 0 &&
                     this.config.formFieldExtensions[0]?.optionsSourceCode) {
@@ -13116,6 +13068,8 @@ class ProgramEntryFormModule {
         this.isFormValid$ = toObservable(this.isFormValid);
         this.instance = signal(null, /* @ts-ignore */
         ...(ngDevMode ? [{ debugName: "instance" }] : /* istanbul ignore next */ []));
+        this.trackedEntityInstance = signal(null, /* @ts-ignore */
+        ...(ngDevMode ? [{ debugName: "trackedEntityInstance" }] : /* istanbul ignore next */ []));
         this.preprocess = input(/* @ts-ignore */
         ...(ngDevMode ? [undefined, { debugName: "preprocess" }] : /* istanbul ignore next */ []));
         this.instanceSave = new EventEmitter();
@@ -13136,6 +13090,22 @@ class ProgramEntryFormModule {
             return undefined;
         }, /* @ts-ignore */
         ...(ngDevMode ? [{ debugName: "dataId" }] : /* istanbul ignore next */ []));
+        this.dataEntities = computed(() => {
+            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 {
+                ...attributeValues,
+                ...(trackedEntity?.reportEntities ?? {}),
+                ...(this.instance() || {}),
+            };
+        }, /* @ts-ignore */
+        ...(ngDevMode ? [{ debugName: "dataEntities" }] : /* istanbul ignore next */ []));
         this.FormActionButtons = computed(() => {
             if (this.config().hideActionButtons) {
                 return React__default.createElement(React__default.Fragment, null);
@@ -13160,7 +13130,7 @@ class ProgramEntryFormModule {
                     });
                 };
                 return (React__default.createElement(ButtonStrip$1, null,
-                    !this.config().hideSubmitButton && (React__default.createElement(Button$1, { primary: true, disabled: !isValid, loading: submitting, onClick: onSave }, this.config().submitButtonLabel)),
+                    !(this.config().hideSubmitButton || this.config().disableForm) && (React__default.createElement(Button$1, { primary: true, disabled: !isValid, loading: submitting, onClick: onSave }, this.config().submitButtonLabel)),
                     !this.config().hideCancelButton && (React__default.createElement(Button$1, { onClick: () => {
                             this.ngZone.run(() => {
                                 this.onCancel();
@@ -13233,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' &&
@@ -13298,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;
@@ -13343,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();
             }
@@ -13351,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));
@@ -13371,65 +13288,78 @@ 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);
         }
         return instance;
     }
-    #getInstance() {
+    async #getInstance() {
         switch (this.config().formType) {
             case 'TRACKER':
                 return this.#getTrackerInstance();
-            case 'EVENT':
+            case 'EVENT': {
+                if (this.trackedEntity()) {
+                    const trackedEntityInstance = await this.#getTrackerInstance();
+                    this.trackedEntityInstance.set(trackedEntityInstance);
+                }
                 return this.#getEventInstance();
+            }
             default:
                 return firstValueFrom(of(null));
         }
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: ProgramEntryFormModule, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "22.0.8", type: ProgramEntryFormModule, isStandalone: true, selector: "ng-dhis2-ui-program-entry-form", inputs: { config: { classPropertyName: "config", publicName: "config", isSignal: true, isRequired: true, transformFunction: null }, trackedEntity: { classPropertyName: "trackedEntity", publicName: "trackedEntity", isSignal: true, isRequired: false, transformFunction: null }, event: { classPropertyName: "event", publicName: "event", isSignal: true, isRequired: false, transformFunction: null }, enrollment: { classPropertyName: "enrollment", publicName: "enrollment", isSignal: true, isRequired: false, transformFunction: null }, orgUnit: { classPropertyName: "orgUnit", publicName: "orgUnit", isSignal: true, isRequired: false, transformFunction: null }, codeGeneratorOrgUnit: { classPropertyName: "codeGeneratorOrgUnit", publicName: "codeGeneratorOrgUnit", isSignal: true, isRequired: false, transformFunction: null }, customOrgUnitRoots: { classPropertyName: "customOrgUnitRoots", publicName: "customOrgUnitRoots", isSignal: true, isRequired: false, transformFunction: null }, formMetaData: { classPropertyName: "formMetaData", publicName: "formMetaData", isSignal: true, isRequired: false, transformFunction: null }, collapsibleSections: { classPropertyName: "collapsibleSections", publicName: "collapsibleSections", isSignal: true, isRequired: false, transformFunction: null }, preprocess: { classPropertyName: "preprocess", publicName: "preprocess", isSignal: true, isRequired: false, transformFunction: null } }, outputs: { instanceSave: "instanceSave", instanceSaveCompleted: "instanceSaveCompleted", instanceUpdate: "instanceUpdate", formValidityUpdate: "formValidityUpdate", formCancel: "formCancel" }, ngImport: i0, template: "@if (loading()) {\n<div className=\"program-entry__form-loader\">\n  <ng-dhis2-ui-wrapper [component]=\"FormLoader\" />\n</div>\n} @else if(metaData()) {\n\n<div>\n  <!-- Form content -->\n  @switch (config().displayType) {\n\n  <!-- Flat display -->\n  @case ('FLAT') {\n    <ng-dhis2-ui-flat-form\n      [programEntryFormConfig]=\"config()\"\n      [optionCascadeConfigs]=\"config().optionCascadeConfigs || []\"\n      [collapsibleSections]=\"collapsibleSections()\"\n      [programEntryFormMetaData]=\"metaData()!\"\n      [name]=\"metaData()!.name\"\n      [dataValues]=\"instance() || {}\"\n      [dataId]=\"dataId()\"\n      [rules]=\"metaData()!.rules\"\n      [fields]=\"metaData()!.formFields\"\n      [customOrgUnitRoots]=\"customOrgUnitRoots()\"\n      [coordinatePickerGeoConfig]=\"config().coordinatePickerGeoConfig\"\n      (formUpdate)=\"onFormUpdate($event)\"\n      (formValidityUpdate)=\"onValidityUpdate($event)\"\n    />\n\n  <!-- <ng-dhis2-ui-flat-form\n    [name]=\"metaData()!.name\"\n    [dataValues]=\"instance() || {}\"\n    [dataId]=\"dataId()\"\n    [rules]=\"metaData()!.rules\"\n    [fields]=\"metaData()!.formFields\"\n    [customOrgUnitRoots]=\"customOrgUnitRoots()\"\n    [program]=\"config().program\"\n    (formUpdate)=\"onFormUpdate($event)\"\n    (formValidityUpdate)=\"onValidityUpdate($event)\"\n  /> -->\n  }\n\n  <!-- SECTION display -->\n  @case ('SECTION') { Section form }\n\n  <!-- CUSTOM FORM -->\n  @case ('CUSTOM') { } }\n\n  <!-- Action buttons -->\n\n  @if(!config().hideActionButtons) {\n  <ng-dhis2-ui-wrapper [component]=\"FormActionButtons()\" />\n  }\n</div>\n}\n", styles: ["::ng-deep .program-entry__form-loader{padding:8px}\n"], dependencies: [{ kind: "ngmodule", type: D2FormModule }, { kind: "component", type: FlatFormComponent, selector: "ng-dhis2-ui-flat-form", inputs: ["collapsibleSections", "programEntryFormConfig", "optionCascadeConfigs"] }, { kind: "directive", type: ReactWrapperModule, selector: "ng-dhis2-ui-wrapper", inputs: ["props", "component"] }], changeDetection: i0.ChangeDetectionStrategy.Eager }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "22.0.8", type: ProgramEntryFormModule, isStandalone: true, selector: "ng-dhis2-ui-program-entry-form", inputs: { config: { classPropertyName: "config", publicName: "config", isSignal: true, isRequired: true, transformFunction: null }, trackedEntity: { classPropertyName: "trackedEntity", publicName: "trackedEntity", isSignal: true, isRequired: false, transformFunction: null }, event: { classPropertyName: "event", publicName: "event", isSignal: true, isRequired: false, transformFunction: null }, enrollment: { classPropertyName: "enrollment", publicName: "enrollment", isSignal: true, isRequired: false, transformFunction: null }, orgUnit: { classPropertyName: "orgUnit", publicName: "orgUnit", isSignal: true, isRequired: false, transformFunction: null }, codeGeneratorOrgUnit: { classPropertyName: "codeGeneratorOrgUnit", publicName: "codeGeneratorOrgUnit", isSignal: true, isRequired: false, transformFunction: null }, customOrgUnitRoots: { classPropertyName: "customOrgUnitRoots", publicName: "customOrgUnitRoots", isSignal: true, isRequired: false, transformFunction: null }, formMetaData: { classPropertyName: "formMetaData", publicName: "formMetaData", isSignal: true, isRequired: false, transformFunction: null }, collapsibleSections: { classPropertyName: "collapsibleSections", publicName: "collapsibleSections", isSignal: true, isRequired: false, transformFunction: null }, preprocess: { classPropertyName: "preprocess", publicName: "preprocess", isSignal: true, isRequired: false, transformFunction: null } }, outputs: { instanceSave: "instanceSave", instanceSaveCompleted: "instanceSaveCompleted", instanceUpdate: "instanceUpdate", formValidityUpdate: "formValidityUpdate", formCancel: "formCancel" }, ngImport: i0, template: "@if (loading()) {\n<div className=\"program-entry__form-loader\">\n  <ng-dhis2-ui-wrapper [component]=\"FormLoader\" />\n</div>\n} @else if(metaData()) {\n\n<div>\n  <!-- Form content -->\n  @switch (config().displayType) {\n\n  <!-- Flat display -->\n  @case ('FLAT') {\n  <ng-dhis2-ui-flat-form\n    [programEntryFormConfig]=\"config()\"\n    [optionCascadeConfigs]=\"config().optionCascadeConfigs || []\"\n    [collapsibleSections]=\"collapsibleSections()\"\n    [programEntryFormMetaData]=\"metaData()!\"\n    [name]=\"metaData()!.name\"\n    [dataValues]=\"dataEntities()\"\n    [dataId]=\"dataId()\"\n    [rules]=\"metaData()!.rules\"\n    [fields]=\"metaData()!.formFields\"\n    [customOrgUnitRoots]=\"customOrgUnitRoots()\"\n    [coordinatePickerGeoConfig]=\"config().coordinatePickerGeoConfig\"\n    (formUpdate)=\"onFormUpdate($event)\"\n    (formValidityUpdate)=\"onValidityUpdate($event)\"\n  />\n\n  <!-- <ng-dhis2-ui-flat-form\n    [name]=\"metaData()!.name\"\n    [dataValues]=\"instance() || {}\"\n    [dataId]=\"dataId()\"\n    [rules]=\"metaData()!.rules\"\n    [fields]=\"metaData()!.formFields\"\n    [customOrgUnitRoots]=\"customOrgUnitRoots()\"\n    [program]=\"config().program\"\n    (formUpdate)=\"onFormUpdate($event)\"\n    (formValidityUpdate)=\"onValidityUpdate($event)\"\n  /> -->\n  }\n\n  <!-- SECTION display -->\n  @case ('SECTION') { Section form }\n\n  <!-- CUSTOM FORM -->\n  @case ('CUSTOM') { } }\n\n  <!-- Action buttons -->\n\n  @if(!config().hideActionButtons) {\n  <ng-dhis2-ui-wrapper [component]=\"FormActionButtons()\" />\n  }\n</div>\n}\n", styles: ["::ng-deep .program-entry__form-loader{padding:8px}\n"], dependencies: [{ kind: "ngmodule", type: D2FormModule }, { kind: "component", type: FlatFormComponent, selector: "ng-dhis2-ui-flat-form", inputs: ["collapsibleSections", "programEntryFormConfig", "optionCascadeConfigs"] }, { kind: "directive", type: ReactWrapperModule, selector: "ng-dhis2-ui-wrapper", inputs: ["props", "component"] }], changeDetection: i0.ChangeDetectionStrategy.Eager }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: ProgramEntryFormModule, decorators: [{
             type: Component,
-            args: [{ selector: 'ng-dhis2-ui-program-entry-form', changeDetection: ChangeDetectionStrategy.Eager, imports: [D2FormModule, ReactWrapperModule], template: "@if (loading()) {\n<div className=\"program-entry__form-loader\">\n  <ng-dhis2-ui-wrapper [component]=\"FormLoader\" />\n</div>\n} @else if(metaData()) {\n\n<div>\n  <!-- Form content -->\n  @switch (config().displayType) {\n\n  <!-- Flat display -->\n  @case ('FLAT') {\n    <ng-dhis2-ui-flat-form\n      [programEntryFormConfig]=\"config()\"\n      [optionCascadeConfigs]=\"config().optionCascadeConfigs || []\"\n      [collapsibleSections]=\"collapsibleSections()\"\n      [programEntryFormMetaData]=\"metaData()!\"\n      [name]=\"metaData()!.name\"\n      [dataValues]=\"instance() || {}\"\n      [dataId]=\"dataId()\"\n      [rules]=\"metaData()!.rules\"\n      [fields]=\"metaData()!.formFields\"\n      [customOrgUnitRoots]=\"customOrgUnitRoots()\"\n      [coordinatePickerGeoConfig]=\"config().coordinatePickerGeoConfig\"\n      (formUpdate)=\"onFormUpdate($event)\"\n      (formValidityUpdate)=\"onValidityUpdate($event)\"\n    />\n\n  <!-- <ng-dhis2-ui-flat-form\n    [name]=\"metaData()!.name\"\n    [dataValues]=\"instance() || {}\"\n    [dataId]=\"dataId()\"\n    [rules]=\"metaData()!.rules\"\n    [fields]=\"metaData()!.formFields\"\n    [customOrgUnitRoots]=\"customOrgUnitRoots()\"\n    [program]=\"config().program\"\n    (formUpdate)=\"onFormUpdate($event)\"\n    (formValidityUpdate)=\"onValidityUpdate($event)\"\n  /> -->\n  }\n\n  <!-- SECTION display -->\n  @case ('SECTION') { Section form }\n\n  <!-- CUSTOM FORM -->\n  @case ('CUSTOM') { } }\n\n  <!-- Action buttons -->\n\n  @if(!config().hideActionButtons) {\n  <ng-dhis2-ui-wrapper [component]=\"FormActionButtons()\" />\n  }\n</div>\n}\n", styles: ["::ng-deep .program-entry__form-loader{padding:8px}\n"] }]
+            args: [{ selector: 'ng-dhis2-ui-program-entry-form', changeDetection: ChangeDetectionStrategy.Eager, imports: [D2FormModule, ReactWrapperModule], template: "@if (loading()) {\n<div className=\"program-entry__form-loader\">\n  <ng-dhis2-ui-wrapper [component]=\"FormLoader\" />\n</div>\n} @else if(metaData()) {\n\n<div>\n  <!-- Form content -->\n  @switch (config().displayType) {\n\n  <!-- Flat display -->\n  @case ('FLAT') {\n  <ng-dhis2-ui-flat-form\n    [programEntryFormConfig]=\"config()\"\n    [optionCascadeConfigs]=\"config().optionCascadeConfigs || []\"\n    [collapsibleSections]=\"collapsibleSections()\"\n    [programEntryFormMetaData]=\"metaData()!\"\n    [name]=\"metaData()!.name\"\n    [dataValues]=\"dataEntities()\"\n    [dataId]=\"dataId()\"\n    [rules]=\"metaData()!.rules\"\n    [fields]=\"metaData()!.formFields\"\n    [customOrgUnitRoots]=\"customOrgUnitRoots()\"\n    [coordinatePickerGeoConfig]=\"config().coordinatePickerGeoConfig\"\n    (formUpdate)=\"onFormUpdate($event)\"\n    (formValidityUpdate)=\"onValidityUpdate($event)\"\n  />\n\n  <!-- <ng-dhis2-ui-flat-form\n    [name]=\"metaData()!.name\"\n    [dataValues]=\"instance() || {}\"\n    [dataId]=\"dataId()\"\n    [rules]=\"metaData()!.rules\"\n    [fields]=\"metaData()!.formFields\"\n    [customOrgUnitRoots]=\"customOrgUnitRoots()\"\n    [program]=\"config().program\"\n    (formUpdate)=\"onFormUpdate($event)\"\n    (formValidityUpdate)=\"onValidityUpdate($event)\"\n  /> -->\n  }\n\n  <!-- SECTION display -->\n  @case ('SECTION') { Section form }\n\n  <!-- CUSTOM FORM -->\n  @case ('CUSTOM') { } }\n\n  <!-- Action buttons -->\n\n  @if(!config().hideActionButtons) {\n  <ng-dhis2-ui-wrapper [component]=\"FormActionButtons()\" />\n  }\n</div>\n}\n", styles: ["::ng-deep .program-entry__form-loader{padding:8px}\n"] }]
         }], propDecorators: { config: [{ type: i0.Input, args: [{ isSignal: true, alias: "config", required: true }] }], trackedEntity: [{ type: i0.Input, args: [{ isSignal: true, alias: "trackedEntity", required: false }] }], event: [{ type: i0.Input, args: [{ isSignal: true, alias: "event", required: false }] }], enrollment: [{ type: i0.Input, args: [{ isSignal: true, alias: "enrollment", required: false }] }], orgUnit: [{ type: i0.Input, args: [{ isSignal: true, alias: "orgUnit", required: false }] }], codeGeneratorOrgUnit: [{ type: i0.Input, args: [{ isSignal: true, alias: "codeGeneratorOrgUnit", required: false }] }], customOrgUnitRoots: [{ type: i0.Input, args: [{ isSignal: true, alias: "customOrgUnitRoots", required: false }] }], formMetaData: [{ type: i0.Input, args: [{ isSignal: true, alias: "formMetaData", required: false }] }], collapsibleSections: [{ type: i0.Input, args: [{ isSignal: true, alias: "collapsibleSections", required: false }] }], preprocess: [{ type: i0.Input, args: [{ isSignal: true, alias: "preprocess", required: false }] }], instanceSave: [{
                 type: Output
             }], instanceSaveCompleted: [{