@iapps/ng-dhis2-ui 1.2.104 → 1.2.111

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

@@ -4095,10 +4095,10 @@ const getTrackedEntityTableData = (response, programId, pager, metaData, searche
     }))
         .filter((col) => searcheableDataElements.includes(col.key)));
     const dataElementColumns = metaData
-        .programStages.sort((a, b) => a.sortOrder - b.sortOrder) // Sorts stages by sortOrder
+        .programStages.sort((a, b) => a.sortOrder - b.sortOrder)
         .flatMap((stage) => stage
         .programStageDataElements.filter((psde) => psde.displayInReports)
-        .sort((a, b) => a.sortOrder - b.sortOrder) // Sorts data elements within stage
+        .sort((a, b) => a.sortOrder - b.sortOrder)
         .map((psde) => ({
         label: psde.dataElement.name || psde.dataElement.formName || 'default',
         key: psde.dataElement.id,
@@ -4127,94 +4127,204 @@ const getTrackedEntityTableData = (response, programId, pager, metaData, searche
         options: attr.optionSet ?? undefined,
         type: 'attribute',
     }));
-    const tableData = teis.map((tei, idx) => {
+    const getOptionColor = (option) => option?.color || option?.style?.color;
+    const formatDate = (value) => {
+        try {
+            return format(parse$1(value, 'yyyy-MM-dd', new Date()), 'dd/MM/yyyy');
+        }
+        catch {
+            return value;
+        }
+    };
+    const trackedEntityAttributeMap = new Map();
+    (metaData.programTrackedEntityAttributes || []).forEach(({ trackedEntityAttribute }) => {
+        if (trackedEntityAttribute?.id) {
+            trackedEntityAttributeMap.set(trackedEntityAttribute.id, trackedEntityAttribute);
+        }
+    });
+    const dataElementOptionMap = new Map();
+    dataElementOptions.forEach((deo) => {
+        if (deo.id) {
+            dataElementOptionMap.set(deo.id, deo);
+        }
+    });
+    const tableData = teis.map((tei, index) => {
         const row = {
             trackedEntityInstance: { value: tei.trackedEntity },
-            index: { value: (pager.page - 1) * pager.pageSize + idx + 1 },
+            index: { value: (pager.page - 1) * pager.pageSize + index + 1 },
         };
-        const matchingEnrollment = tei.latestEnrollment;
-        let attributesData = matchingEnrollment.attributes;
-        const dataElementsData = matchingEnrollment.events.flatMap((event) => event.dataValues);
-        attributesData = attributesData.map((attr) => {
-            if (attr?.valueType?.toLowerCase() === 'date') {
-                try {
-                    return {
-                        ...attr,
-                        value: format(parse$1(attr.value, 'yyyy-MM-dd', new Date()), 'dd/MM/yyyy'),
-                    };
-                }
-                catch {
-                    return { ...attr };
-                }
+        const enrollment = tei.latestEnrollment;
+        if (!enrollment)
+            return row;
+        const attributes = (enrollment.attributes || []).map((attr) => {
+            if (attr?.valueType?.toLowerCase() === 'date' &&
+                typeof attr.value === 'string') {
+                return { ...attr, value: formatDate(attr.value) };
             }
             return attr;
         });
-        // attributesData.forEach((attr: any) => {
-        //   const attributeMeta = metaData.programTrackedEntityAttributes?.find(
-        //     (metadata) => metadata.trackedEntityAttribute.id === attr.attribute
-        //   );
-        //   if (attributeMeta?.trackedEntityAttribute.optionSetValue) {
-        //     const optionSet = attributeMeta?.trackedEntityAttribute?.optionSet;
-        //     const option = optionSet?.options?.find(
-        //       (option) => option.code === attr.value
-        //     );
-        //     row[attr.attribute] = option
-        //       ? { value: option?.name }
-        //       : { value: attr.value };
-        //   } else {
-        //     row[attr.attribute] = { value: attr.value };
-        //   }
-        // });
-        attributesData.forEach((attr) => {
-            const attributeMeta = metaData.programTrackedEntityAttributes?.find((metadata) => metadata.trackedEntityAttribute.id === attr.attribute);
-            const valueType = attributeMeta?.trackedEntityAttribute?.valueType;
+        attributes.forEach((attr) => {
+            const attributeId = attr?.attribute;
+            const value = attr?.value;
+            if (!attributeId || value == null)
+                return;
+            const attributeMeta = trackedEntityAttributeMap.get(attributeId);
+            const valueType = attributeMeta?.valueType;
             if (valueType === 'ORGANISATION_UNIT') {
-                const orgUnitName = orgUnitMap?.get(attr.value);
-                row[attr.attribute] = { value: orgUnitName || attr.value };
-            }
-            else if (attributeMeta?.trackedEntityAttribute.optionSetValue) {
-                const optionSet = attributeMeta?.trackedEntityAttribute?.optionSet;
-                const option = optionSet?.options?.find((option) => option.code === attr.value);
-                row[attr.attribute] = option
-                    ? { value: option?.name }
-                    : { value: attr.value };
-            }
-            else {
-                row[attr.attribute] = { value: attr.value };
+                const name = orgUnitMap?.get(value);
+                row[attributeId] = { value: name || value };
             }
-        });
-        dataElementsData.forEach((element) => {
-            // Finds the matching data element in dataElementOptions by ID
-            const dataElementOption = dataElementOptions.find((deo) => deo.id === element.dataElement);
-            // finds a matching option within that data element's options
-            const matchingOption = dataElementOption?.options?.find((opt) => opt.name === element.value);
-            // Builds the row entry with value and optional style
-            if (matchingOption) {
-                row[element.dataElement] = {
-                    value: element.value,
-                    style: matchingOption.color,
+            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),
+                    }),
                 };
             }
             else {
-                row[element.dataElement] = {
-                    value: element.value,
-                };
+                row[attributeId] = { value };
             }
         });
-        // Includes orgUnit in the row for id access with style
-        row['orgUnitId'] = { value: matchingEnrollment.orgUnit };
-        row['orgUnit'] = {
-            value: orgUnitMap?.get(matchingEnrollment.orgUnit) || '-',
+        const dataValues = enrollment.events?.flatMap((event) => event.dataValues || []) || [];
+        dataValues.forEach((dataValue) => {
+            const dataElementId = dataValue.dataElement;
+            const value = dataValue.value;
+            if (!dataElementId || value == null)
+                return;
+            const dataElementOption = dataElementOptionMap.get(dataElementId);
+            const matchedOption = dataElementOption?.options?.find((opt) => opt.name === value);
+            row[dataElementId] = {
+                value,
+                ...(getOptionColor(matchedOption) && {
+                    style: getOptionColor(matchedOption),
+                }),
+            };
+        });
+        const orgUnitId = enrollment.orgUnit;
+        const orgUnitName = orgUnitMap?.get(orgUnitId) || '-';
+        row['orgUnitId'] = { value: orgUnitId || '-' };
+        row['orgUnit'] = { value: orgUnitName };
+        const teiObject = typeof tei.toObject === 'function' ? tei.toObject() : null;
+        row['responseData'] = {
+            value: teiObject || null,
         };
-        row['responseData'] = { value: tei.toObject() };
         return row;
     });
     return {
         columns: tableColumns,
         data: tableData,
         filteredEntityColumns: [...tableFilters, ...tableSearcheableDataElements],
-        orgUnitLabel: orgUnitLabel,
+        orgUnitLabel,
     };
+    // const tableData = teis.map((tei: TrackedEntityInstance, idx: number) => {
+    //   const row: TableRow = {
+    //     trackedEntityInstance: { value: tei.trackedEntity },
+    //     index: { value: (pager.page - 1) * pager.pageSize + idx + 1 },
+    //   };
+    //   const matchingEnrollment = tei.latestEnrollment;
+    //   let attributesData = matchingEnrollment.attributes;
+    //   const dataElementsData = matchingEnrollment!.events.flatMap(
+    //     (event) => event.dataValues
+    //   );
+    //   attributesData = attributesData!.map((attr: any) => {
+    //     if (attr?.valueType?.toLowerCase() === 'date') {
+    //       try {
+    //         return {
+    //           ...attr,
+    //           value: format(
+    //             parse(attr.value, 'yyyy-MM-dd', new Date()),
+    //             'dd/MM/yyyy'
+    //           ),
+    //         };
+    //       } catch {
+    //         return { ...attr };
+    //       }
+    //     }
+    //     return attr;
+    //   });
+    //   // Tracked Entity Instance Attributes
+    //   const trackedEntityAttributeMap = new Map<string, any>();
+    //   (metaData.programTrackedEntityAttributes || []).forEach(
+    //     (programAttribute) => {
+    //       const attributeId = programAttribute.trackedEntityAttribute?.id;
+    //       if (attributeId) {
+    //         trackedEntityAttributeMap.set(
+    //           attributeId,
+    //           programAttribute.trackedEntityAttribute
+    //         );
+    //       }
+    //     }
+    //   );
+    //   attributesData.forEach((attributeItem: any) => {
+    //     const attributeId = attributeItem?.attribute;
+    //     const attributeValue = attributeItem?.value;
+    //     if (!attributeId || attributeValue == null) return;
+    //     const trackedEntityAttribute = trackedEntityAttributeMap.get(attributeId);
+    //     const valueType = trackedEntityAttribute?.valueType;
+    //     if (valueType === 'ORGANISATION_UNIT') {
+    //       const organisationUnitName = orgUnitMap?.get(attributeValue);
+    //       row[attributeId] = {
+    //         value: organisationUnitName || attributeValue,
+    //       };
+    //     } else if (
+    //       trackedEntityAttribute?.optionSetValue &&
+    //       trackedEntityAttribute?.optionSet?.options
+    //     ) {
+    //       const matchedOption = trackedEntityAttribute.optionSet.options.find(
+    //         (option: any) => option.code === attributeValue
+    //       );
+    //       const optionColor = matchedOption?.color || matchedOption?.style?.color;
+    //       row[attributeId] = {
+    //         value: matchedOption?.name || attributeValue,
+    //         ...(optionColor && { style: optionColor }),
+    //       };
+    //     } else {
+    //       row[attributeId] = {
+    //         value: attributeValue,
+    //       };
+    //     }
+    //   });
+    //   // Program Stage Data Elements
+    //   const dataElementOptionMap = new Map(
+    //     dataElementOptions.map((deo) => [deo.id, deo])
+    //   );
+    //   dataElementsData.forEach((element: DataValue) => {
+    //     if (!element?.dataElement || element.value == null) return;
+    //     const dataElementOption = dataElementOptionMap.get(element.dataElement);
+    //     const matchingOption: any = dataElementOption?.options?.find(
+    //       (opt) => opt.name === element.value
+    //     );
+    //     const optionColor = matchingOption?.color || matchingOption?.style?.color;
+    //     row[element.dataElement] = {
+    //       value: element.value,
+    //       ...(optionColor && { style: optionColor }),
+    //     };
+    //   });
+    //   const orgUnitId = matchingEnrollment?.orgUnit;
+    //   if (orgUnitId) {
+    //     row['orgUnitId'] = { value: orgUnitId };
+    //     const orgUnitName = orgUnitMap?.get(orgUnitId) || '-';
+    //     row['orgUnit'] = { value: orgUnitName };
+    //   } else {
+    //     row['orgUnitId'] = { value: '-' };
+    //     row['orgUnit'] = { value: '-' };
+    //   }
+    //   const teiObject =
+    //     typeof tei?.toObject === 'function' ? tei.toObject() : null;
+    //   row['responseData'] = {
+    //     value: (teiObject as TrackedEntityInstance) || null,
+    //   };
+    //   return row;
+    // });
+    // return {
+    //   columns: tableColumns,
+    //   data: tableData,
+    //   filteredEntityColumns: [...tableFilters, ...tableSearcheableDataElements],
+    //   orgUnitLabel: orgUnitLabel,
+    // };
 };
 const addActionsColumn = (columns, actionOptions) => {
     return [
@@ -6224,6 +6334,17 @@ class FormValue {
     }
 }
 
+var OrgUnitLevel;
+(function (OrgUnitLevel) {
+    OrgUnitLevel["FACILITY"] = "FACILITY";
+    OrgUnitLevel["HAMLET"] = "HAMLET";
+    OrgUnitLevel["STREET"] = "STREET";
+    OrgUnitLevel["WARD"] = "WARD";
+    OrgUnitLevel["COUNCIL"] = "COUNCIL";
+    OrgUnitLevel["REGION"] = "REGION";
+    OrgUnitLevel["NATIONAL"] = "NATIONAL";
+})(OrgUnitLevel || (OrgUnitLevel = {}));
+
 // Copyright 2025 UDSM DHIS2 Lab. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
@@ -6331,6 +6452,58 @@ const orgUnitFieldStyles = {
         paddingInlineStart: '4px',
     },
 };
+const FACILITY_KEYWORDS = [
+    'Hospital',
+    'Dispensary',
+    'Health Center',
+    'Clinic',
+    'Health Post',
+    'Medical Center',
+    'Polyclinic',
+];
+const LOWERCASE_FACILITY_KEYWORDS = FACILITY_KEYWORDS.map((k) => k.toLowerCase());
+const getFacilityMatch = (name, config) => {
+    if (!name)
+        return null;
+    const cleanedName = name.trim().toLowerCase();
+    if (cleanedName.length < 3)
+        return null;
+    const matchesKeyword = LOWERCASE_FACILITY_KEYWORDS.some((keyword) => cleanedName.includes(keyword));
+    if (!matchesKeyword) {
+        return null;
+    }
+    return {
+        type: config?.level ?? 'UNKNOWN',
+        confidence: config?.confidence ?? 0,
+    };
+};
+const flattenChildren = (rootUnits) => {
+    const result = [];
+    const stack = [...rootUnits];
+    while (stack.length > 0) {
+        const current = stack.pop();
+        if (!current)
+            continue;
+        result.push(current);
+        if (Array.isArray(current.children) && current.children.length > 0) {
+            stack.push(...current.children);
+        }
+    }
+    return result;
+};
+const buildReadableFullName = (unit) => {
+    const ancestors = (unit.ancestors || [])
+        .map((a) => a.displayName?.trim())
+        .filter(Boolean);
+    const currentName = (unit.displayName || unit.name || '').trim();
+    const pathParts = [];
+    for (const name of [...ancestors, currentName]) {
+        if (name && name !== pathParts[pathParts.length - 1]) {
+            pathParts.push(name);
+        }
+    }
+    return pathParts.join(' / ');
+};
 const OrgUnitFormField = (props) => {
     // const { onSelectOrgUnit, label, required, selected, disabled, key, customOrgUnitRoots } = props;
     // const d2 = (window as unknown as D2Window)?.d2Web;
@@ -6398,24 +6571,45 @@ const OrgUnitFormField = (props) => {
         if (matchList.length > 0) {
             setUseCustomRoots(true);
             setConfiguredRootsLoading(true);
-            Promise.all(matchList.map((entry) => d2.httpInstance
-                .get(`organisationUnits/${entry.orgUnit}.json?fields=id,displayName,name,code,path,level`)
-                .then((res) => {
-                const orgUnitPayload = res.data;
-                return {
-                    id: orgUnitPayload?.id,
-                    name: orgUnitPayload?.displayName || orgUnitPayload?.name,
-                    code: orgUnitPayload?.code,
-                    path: orgUnitPayload?.path,
-                    level: orgUnitPayload.level,
-                };
-            })))
-                .then((result) => {
-                setConfiguredRootInfo(result);
+            Promise.allSettled(matchList.map(async (orgUnitConfig) => {
+                try {
+                    const orgUnitResponse = await d2.httpInstance.get(`organisationUnits/${orgUnitConfig.orgUnit}.json?fields=id,displayName,name,code,path,level,ancestors[displayName],children[id,displayName,name,code,path,level,ancestors[displayName],children[id,displayName,name,code,path,level,ancestors[displayName]]]&paging=false`);
+                    const rootOrgUnitData = orgUnitResponse.data;
+                    const allDescendantOrgUnits = flattenChildren([rootOrgUnitData]);
+                    const matchingConfig = customOrgUnitRoots?.find((config) => config.orgUnit === orgUnitConfig.orgUnit);
+                    const facilityResults = allDescendantOrgUnits
+                        .map((orgUnit) => {
+                        const orgUnitName = orgUnit.displayName || orgUnit.name || '';
+                        const facilityMatch = getFacilityMatch(orgUnitName, matchingConfig);
+                        if (!facilityMatch)
+                            return null;
+                        return {
+                            id: orgUnit.id,
+                            name: buildReadableFullName(orgUnit),
+                            code: orgUnit.code,
+                            path: orgUnit.path,
+                            level: orgUnit.level,
+                            type: facilityMatch.type,
+                            confidence: facilityMatch.confidence,
+                        };
+                    })
+                        .filter((facility) => facility !== null);
+                    return facilityResults;
+                }
+                catch (fetchError) {
+                    console.warn(`[OrgUnitFormField] Failed to fetch orgUnit ${orgUnitConfig.orgUnit}:`, fetchError);
+                    return [];
+                }
+            }))
+                .then((settledResults) => {
+                const allFacilities = settledResults
+                    .filter((result) => result.status === 'fulfilled')
+                    .flatMap((result) => result.value);
+                setConfiguredRootInfo(allFacilities);
                 setConfiguredRootsLoading(false);
             })
-                .catch((err) => {
-                console.warn(`[OrgUnitFormField] Failed to fetch customOrgUnitRoots:`, err);
+                .catch((unexpectedError) => {
+                console.warn(`[OrgUnitFormField] Unexpected error:`, unexpectedError);
                 setConfiguredRootsLoading(false);
             });
         }
@@ -8659,5 +8853,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { Boolean$1 as Boolean, BreadcrumbComponent, BreadcrumbModule, ButtonComponent, ButtonModule, CheckBox, D2FormModule, DataTableUIComponent, DataTableUIModule, DateField, DateRangeValue, Dropdown, EventFormComponent, EventFormModule, FieldConfig, FieldControlTypeUtil, FieldDropdown, FieldType, FieldUtil, FlatFormComponent, FormComponent, FormConfig, FormField, FormFieldComponent, FormFieldGroup, FormFieldTypeUtil, FormMetaData, FormMetadataSection, FormUtil, FormValue, FormValueUtil, HeaderBarComponent, HeaderBarModule, LineListModule, LineListTableComponent, MetadataRule, MetadataRuleAction, OrganisationUnitSelectionConfig, OrganisationUnitSelectorComponent, OrganisationUnitSelectorModalComponent, OrganisationUnitSelectorModule, PeriodSelectorComponent, PeriodSelectorModalComponent, PeriodSelectorModule, ProgramEntryFormConfig, ProgramEntryFormMetaData, ProgramEntryFormModule, ProgramEntryFormSection, ReactWrapperModule, RepeatableFormComponent, SectionFormComponent, SelectionFiltersComponent, SelectionFiltersUiModule, TrackerFormComponent, TrackerFormModule, TranslationUtil };
+export { Boolean$1 as Boolean, BreadcrumbComponent, BreadcrumbModule, ButtonComponent, ButtonModule, CheckBox, D2FormModule, DataTableUIComponent, DataTableUIModule, DateField, DateRangeValue, Dropdown, EventFormComponent, EventFormModule, FieldConfig, FieldControlTypeUtil, FieldDropdown, FieldType, FieldUtil, FlatFormComponent, FormComponent, FormConfig, FormField, FormFieldComponent, FormFieldGroup, FormFieldTypeUtil, FormMetaData, FormMetadataSection, FormUtil, FormValue, FormValueUtil, HeaderBarComponent, HeaderBarModule, LineListModule, LineListTableComponent, MetadataRule, MetadataRuleAction, OrgUnitLevel, OrganisationUnitSelectionConfig, OrganisationUnitSelectorComponent, OrganisationUnitSelectorModalComponent, OrganisationUnitSelectorModule, PeriodSelectorComponent, PeriodSelectorModalComponent, PeriodSelectorModule, ProgramEntryFormConfig, ProgramEntryFormMetaData, ProgramEntryFormModule, ProgramEntryFormSection, ReactWrapperModule, RepeatableFormComponent, SectionFormComponent, SelectionFiltersComponent, SelectionFiltersUiModule, TrackerFormComponent, TrackerFormModule, TranslationUtil };
 //# sourceMappingURL=iapps-ng-dhis2-ui.mjs.map