@iapps/ng-dhis2-ui 1.1.66 → 1.1.68

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

@@ -3446,31 +3446,49 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.8", ngImpor
             type: Injectable
         }], ctorParameters: () => [{ type: i1.NgxDhis2HttpClientService }] });
 
-const getProgramStageData = (response, programStageId, pager) => {
-    const events = response.data.events;
-    const allDataElements = new Set();
-    events.forEach((event) => {
-        event.dataValues.forEach((dv) => allDataElements.add(dv.dataElement));
-    });
-    const stageFromMetaData = response.metadata.programStages.find((stage) => stage.id === programStageId);
-    if (!stageFromMetaData) {
-        throw new Error(`Program stage with ID ${programStageId} not found`);
-    }
-    const entityColumns = Array.from(allDataElements).map((dataElementId) => ({
-        label: stageFromMetaData.programStageDataElements.find((psde) => psde.dataElement.id === dataElementId)?.dataElement.name || dataElementId,
-        key: dataElementId,
-    }));
-    const dataElementsData = events.map((event, idx) => {
-        const row = {
-            event: event.event,
-            index: (pager.page - 1) * pager.pageSize + idx + 1,
-        };
-        allDataElements.forEach((dataElementId) => (row[dataElementId] = ''));
-        event.dataValues.forEach((dv) => (row[dv.dataElement] = dv.value));
-        return row;
-    });
-    return { columns: entityColumns, data: dataElementsData };
-};
+// export const getProgramStageData = (
+//   response: LineListResponse,
+//   programStageId: string,
+//   pager: any,
+//   isOptionSetNameVisible: boolean
+// ): { columns: ColumnDefinition[]; data: TableRow[] } => {
+//   const events = (response.data as EventsResponse).events;
+//   const allDataElements = new Set<string>();
+//   events.forEach((event: any) => {
+//     event.dataValues.forEach((dv: any) => allDataElements.add(dv.dataElement));
+//   });
+//   const stageFromMetaData = response.metadata.programStages.find(
+//     (stage: any) => stage.id === programStageId
+//   );
+//   if (!stageFromMetaData) {
+//     throw new Error(`Program stage with ID ${programStageId} not found`);
+//   }
+//   const entityColumns = Array.from(allDataElements).map(
+//     (dataElementId: string) => ({
+//       label:
+//         stageFromMetaData.programStageDataElements.find(
+//           (psde: any) => psde.dataElement.id === dataElementId
+//         )?.dataElement.name || dataElementId,
+//       key: dataElementId,
+//     })
+//   );
+//   const dataElementsData: TableRow[] = events.map((event: any, idx: number) => {
+//     const row: TableRow = {
+//       event: event.event,
+//       index: (pager.page - 1) * pager.pageSize + idx + 1,
+//     };
+//     allDataElements.forEach(
+//       (dataElementId: string) => (row[dataElementId] = '')
+//     );
+//     if (isOptionSetNameVisible) {
+//       event.dataValues.forEach((dv: any) => (row[dv.dataElement] = dv.value));
+//     } else {
+//       event.dataValues.forEach((dv: any) => (row[dv.dataElement] = dv.value));
+//     }
+//     return row;
+//   });
+//   return { columns: entityColumns, data: dataElementsData };
+// };
 // export const getTrackedEntityData = (
 //   response: LineListResponse,
 //   programId: string,
@@ -3603,6 +3621,44 @@ const getProgramStageData = (response, programStageId, pager) => {
 //     filteredEntityColumns: filteredEntityColumns,
 //   };
 // };
+const getProgramStageData = (response, programStageId, pager, isOptionSetNameVisible) => {
+    const events = response.data.events;
+    const allDataElements = new Set();
+    events.forEach((event) => {
+        event.dataValues.forEach((dv) => allDataElements.add(dv.dataElement));
+    });
+    const stageFromMetaData = response.metadata.programStages.find((stage) => stage.id === programStageId);
+    if (!stageFromMetaData) {
+        throw new Error(`Program stage with ID ${programStageId} not found`);
+    }
+    const entityColumns = Array.from(allDataElements).map((dataElementId) => {
+        const dataElementMeta = stageFromMetaData.programStageDataElements.find((psde) => psde.dataElement.id === dataElementId);
+        return {
+            label: dataElementMeta?.dataElement.name || dataElementId,
+            key: dataElementId,
+        };
+    });
+    const dataElementsData = events.map((event, idx) => {
+        const row = {
+            event: event.event,
+            index: (pager.page - 1) * pager.pageSize + idx + 1,
+        };
+        allDataElements.forEach((dataElementId) => (row[dataElementId] = ''));
+        event.dataValues.forEach((dv) => {
+            const dataElementMeta = stageFromMetaData.programStageDataElements.find((psde) => psde.dataElement.id === dv.dataElement);
+            if (isOptionSetNameVisible && dataElementMeta?.dataElement.optionSet) {
+                const optionSet = dataElementMeta.dataElement.optionSet;
+                const matchingOption = optionSet.options.find((option) => option.code === dv.value);
+                row[dv.dataElement] = matchingOption ? matchingOption.name : dv.value;
+            }
+            else {
+                row[dv.dataElement] = dv.value;
+            }
+        });
+        return row;
+    });
+    return { columns: entityColumns, data: dataElementsData };
+};
 const getTrackedEntityData = (response, programId, pager, isOptionSetNameVisible, filters) => {
     let teis = response.data?.trackedEntities ??
         response.data?.instances ??
@@ -3702,7 +3758,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 +3814,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 +4091,7 @@ class LineListTableComponent extends ReactWrapperModule {
                 setStartDateState,
                 setEndDateState,
                 setIsButtonLoading,
-                setOptionSetNameVisible
+                setOptionSetNameVisible,
             });
             useEffect(() => {
                 this.setReactStateUpdaters?.(updateRefs.current);
@@ -3990,7 +4107,7 @@ class LineListTableComponent extends ReactWrapperModule {
                     let filteredDataColumns = [];
                     if (this.programStageId) {
                         responsePager = response.data.pager;
-                        const { columns, data } = getProgramStageData(response, this.programStageId, pager);
+                        const { columns, data } = getProgramStageData(response, this.programStageId, pager, this.isOptionSetNameVisible);
                         entityColumns = columns;
                         entityData = data;
                     }
@@ -4028,7 +4145,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 +4164,7 @@ class LineListTableComponent extends ReactWrapperModule {
                 endDateState,
                 pager.page,
                 pager.pageSize,
-                isOptionSetNameVisibleState
+                isOptionSetNameVisibleState,
             ]);
             const getDropdownOptions = (row) => {
                 return (this.actionOptions || []).map((option) => ({