@iapps/ng-dhis2-ui 1.1.66 → 1.1.67

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

@@ -3702,7 +3702,47 @@ const getTrackedEntityData = (response, programId, pager, isOptionSetNameVisible
         filteredEntityColumns: filteredEntityColumns,
     };
 };
-const getEventData = (response, pager) => {
+// export const getEventData = (
+//   response: LineListResponse,
+//   pager: any,
+//   isOptionSetNameVisible: boolean
+// ): { columns: ColumnDefinition[]; data: TableRow[] } => {
+//   const events = (response.data as EventsResponse).events;
+//   const uniqueDataElements = new Set<string>();
+//   events?.forEach((event: any) => {
+//     event?.dataValues.forEach((dv: any) =>
+//       uniqueDataElements.add(dv.dataElement)
+//     );
+//   });
+//   const entityColumns = Array.from(uniqueDataElements).map(
+//     (dataElement: string) => ({
+//       label:
+//         response.metadata.programStages[0].programStageDataElements.find(
+//           (psde: any) => psde.dataElement.id === dataElement
+//         )?.dataElement.name || dataElement,
+//       key: dataElement,
+//     })
+//   );
+//   const dataElementsData = events.map((event: any, idx: number) => {
+//     const row: TableRow = {
+//       event: event.event,
+//       index: (pager.page - 1) * pager.pageSize + idx + 1,
+//     };
+//     uniqueDataElements.forEach(
+//       (dataElement: string) => (row[dataElement] = '')
+//     );
+//     event.dataValues.forEach((dv: any) => {
+//       if (isOptionSetNameVisible) {
+//         return (row[dv.dataElement] = dv.value)
+//       } else {
+//         return (row[dv.dataElement] = dv.value)
+//       }
+//     });
+//     return row;
+//   });
+//   return { columns: entityColumns, data: dataElementsData };
+// };
+const getEventData = (response, pager, isOptionSetNameVisible) => {
     const events = response.data.events;
     const uniqueDataElements = new Set();
     events?.forEach((event) => {
@@ -3718,7 +3758,28 @@ const getEventData = (response, pager) => {
             index: (pager.page - 1) * pager.pageSize + idx + 1,
         };
         uniqueDataElements.forEach((dataElement) => (row[dataElement] = ''));
-        event.dataValues.forEach((dv) => (row[dv.dataElement] = dv.value));
+        event.dataValues.forEach((dv) => {
+            if (isOptionSetNameVisible && dv.optionSetValue) {
+                const dataElementMetadata = response.metadata.programStages
+                    .flatMap((programStage) => programStage.programStageDataElements)
+                    .find((psde) => psde.dataElement.id === dv.dataElement)?.dataElement.optionSet;
+                if (dataElementMetadata && dataElementMetadata.options) {
+                    const matchingOption = dataElementMetadata.options.find((option) => option.code === dv.value);
+                    if (matchingOption) {
+                        row[dv.dataElement] = matchingOption.name;
+                    }
+                    else {
+                        row[dv.dataElement] = dv.value;
+                    }
+                }
+                else {
+                    row[dv.dataElement] = dv.value;
+                }
+            }
+            else {
+                row[dv.dataElement] = dv.value;
+            }
+        });
         return row;
     });
     return { columns: entityColumns, data: dataElementsData };
@@ -3974,7 +4035,7 @@ class LineListTableComponent extends ReactWrapperModule {
                 setStartDateState,
                 setEndDateState,
                 setIsButtonLoading,
-                setOptionSetNameVisible
+                setOptionSetNameVisible,
             });
             useEffect(() => {
                 this.setReactStateUpdaters?.(updateRefs.current);
@@ -4028,7 +4089,7 @@ class LineListTableComponent extends ReactWrapperModule {
                     }
                     else {
                         responsePager = response.data.pager;
-                        const { columns, data } = getEventData(response, pager);
+                        const { columns, data } = getEventData(response, pager, this.isOptionSetNameVisible);
                         entityColumns = columns;
                         entityData = data;
                     }
@@ -4047,7 +4108,7 @@ class LineListTableComponent extends ReactWrapperModule {
                 endDateState,
                 pager.page,
                 pager.pageSize,
-                isOptionSetNameVisibleState
+                isOptionSetNameVisibleState,
             ]);
             const getDropdownOptions = (row) => {
                 return (this.actionOptions || []).map((option) => ({