@iapps/ng-dhis2-ui 1.2.166 → 1.2.167

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

@@ -4300,6 +4300,29 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImpor
             type: Injectable
         }] });
 
+const getOptionCode = (option) => option.code ?? option.value ?? option.id;
+const getMultiOptionCodes = (value) => {
+    if (Array.isArray(value)) {
+        return value
+            .map((item) => String(item).trim())
+            .filter((item) => item.length > 0);
+    }
+    if (typeof value !== 'string') {
+        return value == null ? [] : [String(value)];
+    }
+    return value
+        .split(/[;,]/)
+        .map((item) => item.trim())
+        .filter((item) => item.length > 0);
+};
+const formatMultiTextOptionValue = (value, options = []) => {
+    const optionByCode = new Map(options
+        .map((option) => [getOptionCode(option), option])
+        .filter(([code]) => !!code));
+    const codes = getMultiOptionCodes(value);
+    return codes.map((code) => optionByCode.get(code)?.name || code).join(', ');
+};
+
 const getTrackedEntityTableData = (response, programId, pager, metaData, searcheableDataElements, customDisplayInReportsIds, columnNameSource = 'NAME') => {
     const getColumnLabel = (item) => columnNameSource === 'FORM_NAME'
         ? item?.formName || item?.name || 'Default'
@@ -4359,6 +4382,7 @@ const getTrackedEntityTableData = (response, programId, pager, metaData, searche
         .filter((psde) => psde.dataElement && shouldIncludeDataElement(psde))
         .map(({ dataElement }) => ({
         id: dataElement.id,
+        valueType: dataElement.valueType,
         options: dataElement.optionSet?.options?.map((option) => ({
             name: option.name,
             code: option.code,
@@ -4446,13 +4470,20 @@ const getTrackedEntityTableData = (response, programId, pager, metaData, searche
             }
             else if (attributeMeta?.optionSetValue &&
                 attributeMeta?.optionSet?.options) {
-                const matchedOption = attributeMeta.optionSet.options.find((opt) => opt.code === value);
-                row[attributeId] = {
-                    value: matchedOption?.name || value,
-                    ...(getOptionColor(matchedOption) && {
-                        style: getOptionColor(matchedOption),
-                    }),
-                };
+                if (valueType === 'MULTI_TEXT') {
+                    row[attributeId] = {
+                        value: formatMultiTextOptionValue(value, attributeMeta.optionSet.options),
+                    };
+                }
+                else {
+                    const matchedOption = attributeMeta.optionSet.options.find((opt) => opt.code === value);
+                    row[attributeId] = {
+                        value: matchedOption?.name || value,
+                        ...(getOptionColor(matchedOption) && {
+                            style: getOptionColor(matchedOption),
+                        }),
+                    };
+                }
             }
             else {
                 row[attributeId] = { value };
@@ -4465,13 +4496,20 @@ const getTrackedEntityTableData = (response, programId, pager, metaData, searche
             if (!dataElementId || value == null)
                 return;
             const dataElementOption = dataElementOptionMap.get(dataElementId);
-            const matchedOption = dataElementOption?.options?.find((opt) => opt.code === value);
-            row[dataElementId] = {
-                value: matchedOption?.name || value,
-                ...(getOptionColor(matchedOption) && {
-                    style: getOptionColor(matchedOption),
-                }),
-            };
+            if (dataElementOption?.valueType === 'MULTI_TEXT') {
+                row[dataElementId] = {
+                    value: formatMultiTextOptionValue(value, dataElementOption.options),
+                };
+            }
+            else {
+                const matchedOption = dataElementOption?.options?.find((opt) => opt.code === value);
+                row[dataElementId] = {
+                    value: matchedOption?.name || value,
+                    ...(getOptionColor(matchedOption) && {
+                        style: getOptionColor(matchedOption),
+                    }),
+                };
+            }
         });
         const orgUnitId = enrollment.orgUnit;
         const orgUnitName = orgUnitMap?.get(orgUnitId) || '-';
@@ -4615,7 +4653,6 @@ const getEvents = (response, programStageId, pager, metaData, columnNameSource =
         ? item?.formName || item?.name || 'Default'
         : item?.name || item?.formName || 'Default';
     const events = response.data.events;
-    const eventsiiii = response.data;
     const allDataElements = new Set();
     events.forEach((event) => {
         event.dataValues.forEach((dv) => allDataElements.add(dv.dataElement));
@@ -4656,10 +4693,17 @@ const getEvents = (response, programStageId, pager, metaData, columnNameSource =
             const dataElementMeta = stageFromMetaData.programStageDataElements.find((psde) => psde.dataElement.id === dv.dataElement);
             if (dataElementMeta?.dataElement.optionSet) {
                 const optionSet = dataElementMeta.dataElement.optionSet;
-                const matchingOption = optionSet.options.find((option) => option.code === dv.value);
-                row[dv.dataElement] = matchingOption
-                    ? { value: matchingOption.name }
-                    : { value: dv.value };
+                if (dataElementMeta.dataElement.valueType === 'MULTI_TEXT') {
+                    row[dv.dataElement] = {
+                        value: formatMultiTextOptionValue(dv.value, optionSet.options),
+                    };
+                }
+                else {
+                    const matchingOption = optionSet.options.find((option) => option.code === dv.value);
+                    row[dv.dataElement] = matchingOption
+                        ? { value: matchingOption.name }
+                        : { value: dv.value };
+                }
             }
             else {
                 row[dv.dataElement] = { value: dv.value };
@@ -10381,6 +10425,9 @@ class FieldUtil {
     }
     static getFieldControlType(valueType, hasOptions) {
         if (hasOptions) {
+            if (valueType === FieldType.MULTI_TEXT) {
+                return 'multi-dropdown';
+            }
             return 'dropdown';
         }
         switch (valueType) {