@iapps/ng-dhis2-ui 1.2.119 → 1.2.121

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),
                 }),