@iapps/ng-dhis2-ui 1.2.158 → 1.2.160

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

@@ -4628,6 +4628,9 @@ const getEvents = (response, programStageId, pager, metaData, columnNameSource =
     const dataElementsData = events.map((event, idx) => {
         const row = {
             event: { value: event.event },
+            responseData: {
+                value: event,
+            },
             index: {
                 value: (pager.page - 1) * pager.pageSize + idx + 1,
             },
@@ -12828,6 +12831,7 @@ class ProgramEntryFormModule {
         this.event = input(...(ngDevMode ? [undefined, { debugName: "event" }] : []));
         this.enrollment = input(...(ngDevMode ? [undefined, { debugName: "enrollment" }] : []));
         this.orgUnit = input(...(ngDevMode ? [undefined, { debugName: "orgUnit" }] : []));
+        this.codeGeneratorOrgUnit = input(...(ngDevMode ? [undefined, { debugName: "codeGeneratorOrgUnit" }] : []));
         this.customOrgUnitRoots = input(...(ngDevMode ? [undefined, { debugName: "customOrgUnitRoots" }] : []));
         this.formMetaData = input(...(ngDevMode ? [undefined, { debugName: "formMetaData" }] : []));
         this.collapsibleSections = input(false, ...(ngDevMode ? [{ debugName: "collapsibleSections" }] : []));
@@ -13099,22 +13103,36 @@ class ProgramEntryFormModule {
                 return firstValueFrom(of(null));
         }
     }
+    async #setReservedValuesForCodeGeneration(instance) {
+        const orgUnitForCodeGeneration = this.codeGeneratorOrgUnit() || this.orgUnit();
+        const reservedValueQuery = this.d2.trackerModule.trackedEntity.setProgram(this.config().program);
+        if (orgUnitForCodeGeneration) {
+            reservedValueQuery.setOrgUnit(orgUnitForCodeGeneration);
+        }
+        const reservedValues = await reservedValueQuery.generateReservedValues(instance);
+        reservedValues.forEach((reserved) => {
+            instance.setAttributeValue(reserved.ownerUid, reserved.value);
+        });
+        return instance;
+    }
     async #getTrackerInstance() {
         this.instanceQuery = this.d2.trackerModule.trackedEntity
             .setProgram(this.config().program)
             .setOrgUnit(this.orgUnit());
         if (!this.trackedEntity()) {
-            return await this.instanceQuery.create();
+            const instance = await this.instanceQuery.create();
+            return await this.#setReservedValuesForCodeGeneration(instance);
         }
         const instanceResult = (await this.instanceQuery
             .setTrackedEntity(this.trackedEntity())
             .get()).data;
         if (!instanceResult) {
-            return await this.instanceQuery.create();
+            const instance = await this.instanceQuery.create();
+            return await this.#setReservedValuesForCodeGeneration(instance);
         }
-        const instance = await this.instanceQuery
-            .setInstanceFields(this.metaData()?.program)
-            .setReservedValues();
+        this.instanceQuery
+            .setInstanceFields(this.metaData()?.program);
+        const instance = await this.#setReservedValuesForCodeGeneration(this.instanceQuery.instance);
         if (this.orgUnit()) {
             instance.setOrgUnit(this.orgUnit());
         }
@@ -13150,7 +13168,7 @@ class ProgramEntryFormModule {
         }
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: ProgramEntryFormModule, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.1.3", 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 }, 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: CommonModule }, { 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"] }] }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.1.3", 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: CommonModule }, { 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"] }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: ProgramEntryFormModule, decorators: [{
             type: Component,