@iapps/ng-dhis2-ui 1.2.119 → 1.2.122

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

@@ -28,7 +28,7 @@ import { isObject, isString, debounce, sortBy, isArray, find, camelCase, flatten
 import cx from 'classnames';
 import { getNowInCalendar, generateFixedPeriods } from '@dhis2/multi-calendar-dates';
 import { Pager, DataOrderCriteria, DataQueryFilter, DataFilterCondition, ProgramRuleEngine } from '@iapps/d2-web-sdk';
-import { parseISO, isValid, format, parse as parse$1, addDays } from 'date-fns';
+import { parseISO, isValid, format, addDays } from 'date-fns';
 import { map as map$1 } from 'rxjs/operators';
 import * as XLSX from 'xlsx';
 import * as i2 from '@angular/forms';
@@ -4104,6 +4104,7 @@ const getTrackedEntityTableData = (response, programId, pager, metaData, searche
         id: element.id,
         options: element.optionSet?.options.map((opt) => ({
             name: opt.name,
+            code: opt.code,
             color: opt.style?.color,
         })),
     }));
@@ -4125,13 +4126,19 @@ const getTrackedEntityTableData = (response, programId, pager, metaData, searche
         type: 'attribute',
     }));
     const getOptionColor = (option) => option?.color || option?.style?.color;
+    //   const formatDate = (value: string): string => {
+    //     try {
+    //       return format(parse(value, 'yyyy-MM-dd', new Date()), 'dd/MM/yyyy');
+    //     } catch {
+    //       return value;
+    //     }
+    //   };
     const formatDate = (value) => {
-        try {
-            return format(parse$1(value, 'yyyy-MM-dd', new Date()), 'dd/MM/yyyy');
-        }
-        catch {
-            return value;
+        const date = new Date(value);
+        if (isValid(date)) {
+            return format(date, 'dd/MM/yyyy');
         }
+        return value;
     };
     const trackedEntityAttributeMap = new Map();
     (metaData.programTrackedEntityAttributes || []).forEach(({ trackedEntityAttribute }) => {
@@ -4192,9 +4199,9 @@ const getTrackedEntityTableData = (response, programId, pager, metaData, searche
             if (!dataElementId || value == null)
                 return;
             const dataElementOption = dataElementOptionMap.get(dataElementId);
-            const matchedOption = dataElementOption?.options?.find((opt) => opt.name === value);
+            const matchedOption = dataElementOption?.options?.find((opt) => opt.code === value);
             row[dataElementId] = {
-                value,
+                value: matchedOption?.name || value,
                 ...(getOptionColor(matchedOption) && {
                     style: getOptionColor(matchedOption),
                 }),
@@ -8630,6 +8637,7 @@ class ProgramEntryFormModule {
         this.isFormValid = signal(true, ...(ngDevMode ? [{ debugName: "isFormValid" }] : []));
         this.isFormValid$ = toObservable(this.isFormValid);
         this.instance = signal(null, ...(ngDevMode ? [{ debugName: "instance" }] : []));
+        this.preprocess = input(...(ngDevMode ? [undefined, { debugName: "preprocess" }] : []));
         this.instanceSave = new EventEmitter();
         this.instanceSaveCompleted = new EventEmitter();
         this.instanceUpdate = new EventEmitter();
@@ -8729,6 +8737,11 @@ class ProgramEntryFormModule {
         });
     }
     async #saveInstance() {
+        if (this.preprocess() && this.instance()) {
+            this.preprocess()({
+                instance: this.instance(),
+            });
+        }
         switch (this.config().formType) {
             case 'TRACKER': {
                 if (this.config().autoComplete) {
@@ -8801,7 +8814,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 } }, 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    [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" }, { 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 }, customOrgUnitRoots: { classPropertyName: "customOrgUnitRoots", publicName: "customOrgUnitRoots", 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\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" }, { 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,