@iapps/ng-dhis2-ui 1.1.13 → 1.1.15

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

@@ -3097,9 +3097,36 @@ const matchesCondition = (eventValue, operator, filterValue) => {
             return false;
     }
 };
-const getFilteredTrackedEntityInstances = (trackedEntityInstance, filters) => {
-    return trackedEntityInstance.filter((trackedEntityInstance) => trackedEntityInstance.enrollments.some((enrollment) => enrollment.events.some((event) => filters.every((filter) => event.programStage === filter.programStage &&
-        event.dataValues.some((dataValue) => dataValue.dataElement === filter.dataElement &&
+// export const getFilteredTrackedEntityInstances = (
+//   trackedEntityInstance: TrackedEntityInstance[],
+//   filters: FilterConfig[]
+// ): TrackedEntityInstance[] => {
+//   return trackedEntityInstance.filter(
+//       (trackedEntityInstance: TrackedEntityInstance) =>
+//           trackedEntityInstance.enrollments.some((enrollment) =>
+//               enrollment.events.some((event) =>
+//                   filters.every(
+//                       (filter) =>
+//                           event.programStage === filter.programStage &&
+//                           event.dataValues.some(
+//                               (dataValue) =>
+//                                   dataValue.dataElement === filter.dataElement &&
+//                                   matchesCondition(
+//                                       dataValue.value,
+//                                       filter.operator,
+//                                       filter.value
+//                                   )
+//                           )
+//                   )
+//               )
+//           )
+//   );
+// };
+const getFilteredTrackedEntityInstances = (trackedEntityInstances, filters) => {
+    if (!filters.length)
+        return trackedEntityInstances;
+    return trackedEntityInstances.filter((tei) => filters.every((filter) => tei.enrollments?.some((enrollment) => enrollment.events?.some((event) => event.programStage === filter.programStage &&
+        event.dataValues?.some((dataValue) => dataValue.dataElement === filter.dataElement &&
             matchesCondition(dataValue.value, filter.operator, filter.value))))));
 };
 
@@ -3387,24 +3414,28 @@ class LineListTableComponent extends ReactWrapperModule {
                     },
                 }));
             };
-            // // Add this handler for the Approval button
-            // const handleApprovalClick = () => {
-            //   console.log('Approval button clicked');
-            //   // Optionally emit an event to Angular parent component
-            //   // this.actionSelected.emit({ action: 'Approval', row: null });
-            // };
-            // Updated handler using the new approvalSelected emitter
             const handleApprovalClick = () => {
                 this.lineListService
                     .getLineListData(this.programId, this.orgUnit, this.programStageId, pager.page, pager.pageSize, this.attributeFilters, this.startDate, this.endDate, this.ouMode)
                     .subscribe((response) => {
                     if ('trackedEntityInstances' in response.data) {
-                        const trackedEntityInstances = response.data
-                            .trackedEntityInstances;
-                        const teiIds = trackedEntityInstances.map((tei) => tei.trackedEntityInstance);
-                        // Emit TEI IDs using the new emitter
-                        console.log('teis emitted', teiIds);
-                        this.approvalSelected.emit(teiIds);
+                        const trackedEntityInstances = response.data.trackedEntityInstances;
+                        // Map TEIs to objects with teiId and enrollmentId
+                        const teiEnrollmentList = trackedEntityInstances
+                            .map((tei) => {
+                            // Find the enrollment where program matches this.programId
+                            const matchingEnrollment = tei.enrollments?.find((enrollment) => enrollment.program === this.programId);
+                            // Return object with teiId and enrollmentId (if found)
+                            return matchingEnrollment
+                                ? {
+                                    teiId: tei.trackedEntityInstance,
+                                    enrollmentId: matchingEnrollment.enrollment,
+                                }
+                                : null;
+                        })
+                            .filter((item) => item !== null); // Remove null entries (no matching enrollment)
+                        console.log('TEI and Enrollment IDs emitted:', teiEnrollmentList);
+                        this.approvalSelected.emit(teiEnrollmentList);
                     }
                     else {
                         console.log('No tracked entity instances found in the response');