@iapps/ng-dhis2-ui 1.2.7 → 1.2.61

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

@@ -3534,7 +3534,6 @@ const DataTableActions = (props) => {
 // license that can be found in the LICENSE file.
 
 const TableCell = ({ cell, getTextColorFromBackGround, }) => {
-    console.log('cel value', cell);
     if (cell?.style && cell?.style !== 'default-value') {
         return (React__default.createElement(DataTableCell, null,
             React__default.createElement("div", { style: { display: 'flex', justifyContent: 'center' } },
@@ -3785,18 +3784,28 @@ const getTrackedEntityTableData = (response, programId, pager, metaData) => {
     const orgUnitLabel = metaData.orgUnitLabel;
     const orgUnitMap = response.data
         .orgUnitsMap;
+    console.log('thhis is the metadata', metaData);
     const attributeColumns = metaData.displayInListTrackedEntityAttributes
         .sort((a, b) => a.sortOrder - b.sortOrder)
         .map((trackedEntityAttribute) => ({
         label: trackedEntityAttribute.formName ?? trackedEntityAttribute.name,
         key: trackedEntityAttribute.id,
     }));
-    const dataElementColumns = metaData.displayInListDataElements
-        .sort((a, b) => a.sortOrder - b.sortOrder)
-        .map((dataElement) => ({
-        label: dataElement.formName || dataElement.name,
-        key: dataElement.id,
-    }));
+    // const dataElementColumns = metaData.displayInListDataElements
+    //   .sort((a, b) => a.sortOrder! - b.sortOrder!)
+    //   .map((dataElement) => ({
+    //     label: dataElement.formName || dataElement.name,
+    //     key: dataElement.id,
+    //   }));
+    const dataElementColumns = metaData
+        .programStages.sort((a, b) => a.sortOrder - b.sortOrder) // Sorts stages by sortOrder
+        .flatMap((stage) => stage
+        .programStageDataElements.filter((psde) => psde.displayInReports)
+        .sort((a, b) => a.sortOrder - b.sortOrder) // Sorts data elements within stage
+        .map((psde) => ({
+        label: psde.dataElement.formName || psde.dataElement.name,
+        key: psde.dataElement.id,
+    })));
     const dataElementOptions = metaData.displayInListDataElements.map((element) => ({
         id: element.id,
         options: element.optionSet?.options.map((opt) => ({
@@ -3837,7 +3846,7 @@ const getTrackedEntityTableData = (response, programId, pager, metaData) => {
                     };
                 }
                 catch {
-                    return { ...attr }; // Leave value as is on parse failure
+                    return { ...attr };
                 }
             }
             return attr;
@@ -3856,11 +3865,11 @@ const getTrackedEntityTableData = (response, programId, pager, metaData) => {
             }
         });
         dataElementsData.forEach((element) => {
-            // Find the matching data element in dataElementOptions by ID
+            // Finds the matching data element in dataElementOptions by ID
             const dataElementOption = dataElementOptions.find((deo) => deo.id === element.dataElement);
-            // find a matching option within that data element's options
+            // finds a matching option within that data element's options
             const matchingOption = dataElementOption?.options?.find((opt) => opt.name === element.value);
-            // Build the row entry with value and optionally style
+            // Builds the row entry with value and optional style
             if (matchingOption) {
                 row[element.dataElement] = {
                     value: element.value,
@@ -3873,7 +3882,7 @@ const getTrackedEntityTableData = (response, programId, pager, metaData) => {
                 };
             }
         });
-        // Include orgUnit in the row for id access with style
+        // Includes orgUnit in the row for id access with style
         row['orgUnitId'] = { value: matchingEnrollment.orgUnit };
         row['orgUnit'] = {
             value: orgUnitMap?.get(matchingEnrollment.orgUnit) || '-',