@iapps/ng-dhis2-ui 1.1.46 → 1.1.47

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

@@ -3141,7 +3141,7 @@ class LineListService {
         const filterParams = buildFilters(filters);
         const dateFilter = startDate && endDate ? `&programStartDate=${startDate}&programEndDate=${endDate}` : '';
         const ouModeIdentifier = ouMode ? `&ouMode=${ouMode}` : ``;
-        return this.httpClient.get(`trackedEntityInstances.json?program=${programId}&ou=${orgUnit}${ouModeIdentifier}&page=${page}&pageSize=${pageSize}&fields=trackedEntityInstance,attributes[*,displayInList],enrollments[*]&totalPages=true&${filterParams}${dateFilter}&order=created:desc`).pipe(map$1((response) => {
+        return this.httpClient.get(`trackedEntityInstances.json?program=${programId}&ou=${orgUnit}${ouModeIdentifier}&page=${page}&pageSize=${pageSize}&fields=trackedEntityInstance,orgUnit,attributes[*,displayInList],enrollments[*]&totalPages=true&${filterParams}${dateFilter}&order=created:desc`).pipe(map$1((response) => {
             //TODO: use the api to to order by desc
             // response.trackedEntityInstances.reverse();
             return response;
@@ -3217,20 +3217,21 @@ const getTrackedEntityData = (response, programId, pager, filters) => {
     let teis = response.data
         .trackedEntityInstances;
     let programMetaData = response.metadata.programTrackedEntityAttributes;
-    //let progrmaMetaDataAttributesMap = programMetaData.reduce
+    //organisation units from metadata
+    let orgUnitsFromMetaData = response.metadata.organisationUnits;
+    //a Map to efficiently look up orgUnit names by ID
+    const orgUnitMap = new Map(orgUnitsFromMetaData.map((ou) => [ou.id, ou.name]));
     const mappedProgramMetadataAttributes = programMetaData.map((attr) => ({
         displayInList: attr.displayInList,
         searchable: attr.searchable,
         id: attr.trackedEntityAttribute.id,
     }));
-    console.log('the mapped attributes', mappedProgramMetadataAttributes);
     const programAttributesMap = programMetaData.reduce((acc, attribute) => {
         if (attribute.displayInList) {
             acc[attribute.id] = attribute.displayName;
         }
         return acc;
     }, {});
-    console.log('metadat attributes', programMetaData);
     if (filters) {
         teis = getFilteredTrackedEntityInstances(teis, filters);
     }
@@ -3242,11 +3243,6 @@ const getTrackedEntityData = (response, programId, pager, filters) => {
             : tei.attributes;
         attributes.forEach((attr) => allAttributes.add(attr.attribute));
     });
-    console.log('all of the attributes', allAttributes);
-    // const filteredAttributes = new Set(
-    //   [...allAttributes].filter((attributeId) => programAttributesMap[attributeId])
-    // );
-    // console.log('Filtered All Attributes:', filteredAttributes);
     let entityColumns = Array.from(allAttributes).map((attrId) => {
         const foundAttribute = teis
             .flatMap((tei) => {
@@ -3265,6 +3261,15 @@ const getTrackedEntityData = (response, programId, pager, filters) => {
         // Check if the column label is part of any value in programAttributesMap
         return Object.values(programAttributesMap).some((value) => value.includes(column.label));
     });
+    // entityColumns.push({
+    //   label: 'Location',
+    //   key: 'orgUnit',
+    // });
+    // Add orgUnit as the first column
+    entityColumns.unshift({
+        label: 'Location',
+        key: 'orgUnit',
+    });
     const searchableAttributes = mappedProgramMetadataAttributes
         .filter((attr) => attr.searchable && attr.displayInList)
         .map((attr) => ({
@@ -3275,8 +3280,6 @@ const getTrackedEntityData = (response, programId, pager, filters) => {
     const searchableKeys = new Set(searchableAttributes.map((attr) => attr.key));
     // Filter entityColumns to keep only those whose key exists in searchableAttributes
     const filteredEntityColumns = entityColumns.filter((column) => searchableKeys.has(column.key));
-    console.log('show the filtered values', filteredEntityColumns);
-    console.log('the answer is ', searchableAttributes);
     const attributesData = teis.map((tei, idx) => {
         let row = {
             trackedEntityInstance: tei.trackedEntityInstance,
@@ -3288,9 +3291,10 @@ const getTrackedEntityData = (response, programId, pager, filters) => {
             ? matchingEnrollment.attributes
             : tei.attributes;
         attributesToUse.forEach((attr) => (row[attr.attribute] = attr.value));
+        // Access the name of the orgUnit using the Map
+        row['orgUnit'] = orgUnitMap.get(tei.orgUnit) || tei.orgUnit || 'N/A';
         return row;
     });
-    console.log('attributes to use', entityColumns);
     return { columns: entityColumns, data: attributesData, filteredEntityColumns: filteredEntityColumns };
 };
 const getEventData = (response, pager) => {