@iapps/ng-dhis2-ui 1.2.80 → 1.2.82

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

@@ -4102,7 +4102,7 @@ class LineListTableComponent extends ReactWrapperModule {
                     try {
                         const trackerResponse = (await d2.trackerModule.trackedEntity
                             .setProgram(this.programId)
-                            .getMetaData());
+                            .getMetaData({ skipProgramRules: true }));
                         const data = trackerResponse;
                         setMetaData(data);
                     }
@@ -4353,7 +4353,11 @@ class LineListTableComponent extends ReactWrapperModule {
                 React__default.createElement("div", { style: {
                         fontSize: 14,
                     } }, "Loading"))) : (React__default.createElement("div", null,
-                this.showDownloadButton && (React__default.createElement("div", { style: { paddingBottom: '1rem', display: 'flex', justifyContent: 'flex-end' } },
+                this.showDownloadButton && (React__default.createElement("div", { style: {
+                        paddingBottom: '1rem',
+                        display: 'flex',
+                        justifyContent: 'flex-end',
+                    } },
                     React__default.createElement(DropdownButton, { name: "Download", component: React__default.createElement("span", null,
                             ' ',
                             React__default.createElement(MenuItem$1, { label: "Download Csv", onClick: handleCsvDownload }),
@@ -6079,6 +6083,13 @@ class BaseFormFieldComponent extends ReactWrapperModule {
                 }
                 return [];
             }, [value]);
+            const inputWidth = useMemo(() => {
+                if (this.field().controlType === 'date' ||
+                    this.field().controlType === 'date-time') {
+                    return '360px';
+                }
+                return this.fieldConfig()?.inputWidth;
+            }, []);
             const { validationError, hasError } = useFieldValidation({
                 field: this.field(),
                 form: this.form(),
@@ -6229,7 +6240,7 @@ class BaseFormFieldComponent extends ReactWrapperModule {
                                     setTouched(true);
                                 }, extension: this.field()?.extension })));
                     default:
-                        return (React__default.createElement(InputField$1, { error: hasError, validationText: validationError, type: this.field().type, inputWidth: this.fieldConfig()?.inputWidth, required: this.field().required, name: this.field().id, label: this.label(), min: this.field().min?.toString(), max: this.field().max?.toString(), placeholder: this.placeholder(), value: value, readOnly: disabled, onChange: (event) => {
+                        return (React__default.createElement(InputField$1, { error: hasError, validationText: validationError, type: this.field().type, inputWidth: inputWidth, required: this.field().required, name: this.field().id, label: this.label(), min: this.field().min?.toString(), max: this.field().max?.toString(), placeholder: this.placeholder(), value: value, readOnly: disabled, onChange: (event) => {
                                 this.ngZone.run(() => {
                                     (this.form().get(this.field().id) ||
                                         this.form().get(this.field().key))?.setValue(event.value);
@@ -6551,10 +6562,6 @@ class FormComponent {
             this.#processRules(this.programRuleActions());
         });
     }
-    ngOnInit() {
-        this.values = this.form.getRawValue();
-        this.formUpdate.emit(new FormValue(this.form, this.fields));
-    }
     ngOnChanges(changes) {
         this.values = this.form.getRawValue();
     }
@@ -6888,6 +6895,7 @@ class FlatFormComponent extends BaseFormWrapperComponent {
         this.onFormUpdate();
     }
     onFormUpdate() {
+        console.log('WE ARE UPDATING HERE');
         this.updateDataValues(this.formGroup.getRawValue());
         this.updateFormValidity(this.formGroup.valid);
     }
@@ -7541,6 +7549,11 @@ class ProgramEntryFormFieldUtil {
             const options = FieldDropdown.getDropdownOptions(field);
             const hasOptions = options?.length > 0;
             const extension = this.config.formFieldExtensions?.find((fieldExtension) => fieldExtension?.id === field.id);
+            const autoAssignedValue = this.#getAutoAssignedValue(field);
+            if (!isUndefined(autoAssignedValue) &&
+                this.config.hideCustomAssignedFields) {
+                return null;
+            }
             return new FormField({
                 ...field,
                 id: field.id,
@@ -7559,6 +7572,7 @@ class ProgramEntryFormFieldUtil {
                 extension,
             });
         })
+            .filter((field) => field != null)
             .sort((a, b) => a.order ?? 0 - (b.order ?? 0));
         return [...this.reportFields, ...fields];
     }
@@ -7568,12 +7582,16 @@ class ProgramEntryFormFieldUtil {
         }
         if (this.config.autoAssignedValues &&
             this.config.autoAssignedValues.length > 0) {
-            const key = field.code ? camelCase(field.code) : field.id;
-            const assignedValue = (this.config.autoAssignedValues || []).find((assignedValue) => assignedValue.field === key)?.value;
+            const assignedValue = this.#getAutoAssignedValue(field);
             return !isUndefined(assignedValue);
         }
         return false;
     }
+    #getAutoAssignedValue(field) {
+        const key = field.code ? camelCase(field.code) : field.id;
+        const assignedValue = (this.config.autoAssignedValues || []).find((assignedValue) => assignedValue.field === key)?.value;
+        return assignedValue;
+    }
 }
 
 // Copyright 2025 UDSM DHIS2 Lab. All rights reserved.
@@ -7894,14 +7912,17 @@ class ProgramEntryFormModule {
         if (!this.trackedEntity()) {
             return await this.instanceQuery.create();
         }
-        const instance = (await this.instanceQuery
+        const instanceResult = (await this.instanceQuery
             .setTrackedEntity(this.trackedEntity())
             .get()).data;
-        if (!instance) {
+        if (!instanceResult) {
             return await this.instanceQuery.create();
         }
-        if (this.metaData()?.program) {
-            instance.setFields(this.metaData().program);
+        const instance = await this.instanceQuery
+            .setInstanceFields(this.metaData()?.program)
+            .setReservedValues();
+        if (this.orgUnit()) {
+            instance.setOrgUnit(this.orgUnit());
         }
         return instance;
     }
@@ -7935,11 +7956,11 @@ class ProgramEntryFormModule {
         }
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.8", ngImport: i0, type: ProgramEntryFormModule, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.1.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 } }, 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\n  <ng-dhis2-ui-flat-form\n    [name]=\"metaData()!.name\"\n    [dataValues]=\"instance()!\"\n    [rules]=\"metaData()!.rules\"\n    [fields]=\"metaData()!.formFields\"\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" }, { kind: "directive", type: ReactWrapperModule, selector: "ng-dhis2-ui-wrapper", inputs: ["props", "component"] }] }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "19.1.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 } }, 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\n  <ng-dhis2-ui-flat-form\n    [name]=\"metaData()!.name\"\n    [dataValues]=\"instance() || {}\"\n    [rules]=\"metaData()!.rules\"\n    [fields]=\"metaData()!.formFields\"\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" }, { kind: "directive", type: ReactWrapperModule, selector: "ng-dhis2-ui-wrapper", inputs: ["props", "component"] }] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.8", ngImport: i0, type: ProgramEntryFormModule, decorators: [{
             type: Component,
-            args: [{ selector: 'ng-dhis2-ui-program-entry-form', imports: [CommonModule, 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\n  <ng-dhis2-ui-flat-form\n    [name]=\"metaData()!.name\"\n    [dataValues]=\"instance()!\"\n    [rules]=\"metaData()!.rules\"\n    [fields]=\"metaData()!.formFields\"\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', imports: [CommonModule, 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\n  <ng-dhis2-ui-flat-form\n    [name]=\"metaData()!.name\"\n    [dataValues]=\"instance() || {}\"\n    [rules]=\"metaData()!.rules\"\n    [fields]=\"metaData()!.formFields\"\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: { instanceSave: [{
                 type: Output
             }], instanceSaveCompleted: [{