@iapps/ng-dhis2-ui 1.2.6 → 1.2.61

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

@@ -3314,15 +3314,14 @@ const FilterToolbar = ({ orgUnitLabel, selectedOrgUnit, setSelectedOrgUnit, setO
                 setOrgUnitState(defaultOrgUnit);
             } }),
         React__default.createElement(CalendarInput, { label: "Start date:", calendar: "gregory", locale: "en-GB", timeZone: "Africa/Dar_es_Salaam", className: "custom-input", clearable: !!startDateState, date: startDateState, onDateSelect: (selectedDate) => {
-                if (!(selectedDate.calendarDateString === null)) {
-                    setStartDateState(selectedDate.calendarDateString);
-                }
-                console.log(selectedDate.calendarDateString);
+                // if (!(selectedDate.calendarDateString === null)) {
+                setStartDateState(selectedDate.calendarDateString);
+                //}
             } }),
         React__default.createElement(CalendarInput, { label: "End date:", calendar: "gregory", locale: "en-GB", timeZone: "Africa/Dar_es_Salaam", className: "custom-input", clearable: !!endDateState, date: endDateState, onDateSelect: (selectedDate) => {
-                if (!(selectedDate.calendarDateString === null)) {
-                    setEndDateState(selectedDate.calendarDateString);
-                }
+                // if (!(selectedDate.calendarDateString === null)) {
+                setEndDateState(selectedDate.calendarDateString);
+                //}
             } }),
         (visibleFilters ?? []).map(({ label, key, valueType, options }) => {
             if (valueType === 'DATE') {
@@ -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((attr) => ({
-        label: attr.name,
-        key: attr.id,
-    }));
-    const dataElementColumns = metaData.displayInListDataElements
-        .sort((a, b) => a.sortOrder - b.sortOrder)
-        .map((element) => ({
-        label: element.name,
-        key: element.id,
+        .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
+        .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,20 +3846,30 @@ const getTrackedEntityTableData = (response, programId, pager, metaData) => {
                     };
                 }
                 catch {
-                    return { ...attr }; // Leave value as is on parse failure
+                    return { ...attr };
                 }
             }
             return attr;
         });
         attributesData.forEach((attr) => {
-            row[attr.attribute] = { value: attr.value };
+            const attributeMeta = metaData.programTrackedEntityAttributes?.find((metadata) => metadata.trackedEntityAttribute.id === attr.attribute);
+            if (attributeMeta?.trackedEntityAttribute.optionSetValue) {
+                const optionSet = attributeMeta?.trackedEntityAttribute?.optionSet;
+                const option = optionSet?.options?.find((option) => option.code === attr.value);
+                row[attr.attribute] = option
+                    ? { value: option?.name }
+                    : { value: attr.value };
+            }
+            else {
+                row[attr.attribute] = { value: attr.value };
+            }
         });
         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,
@@ -3863,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) || '-',
@@ -3887,6 +3906,58 @@ const addActionsColumn = (columns, actionOptions) => {
     ];
 };
 
+const getEvents = (response, programStageId, pager, metaData) => {
+    const events = response.data.events;
+    const eventsiiii = response.data;
+    const allDataElements = new Set();
+    events.forEach((event) => {
+        event.dataValues.forEach((dv) => allDataElements.add(dv.dataElement));
+    });
+    let stageFromMetaData;
+    if (programStageId) {
+        stageFromMetaData = metaData.programStages.find((stage) => stage.id === programStageId);
+    }
+    else if (metaData.programType === 'WITHOUT_REGISTRATION') {
+        stageFromMetaData = metaData.programStages[0];
+    }
+    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: { value: event.event },
+            index: {
+                value: (pager.page - 1) * pager.pageSize + idx + 1,
+            },
+        };
+        allDataElements.forEach((dataElementId) => {
+            row[dataElementId] = { value: '' };
+        });
+        event.dataValues.forEach((dv) => {
+            const dataElementMeta = stageFromMetaData.programStageDataElements.find((psde) => psde.dataElement.id === dv.dataElement);
+            if (dataElementMeta?.dataElement.optionSet) {
+                const optionSet = dataElementMeta.dataElement.optionSet;
+                const matchingOption = optionSet.options.find((option) => option.code === dv.value);
+                row[dv.dataElement] = matchingOption
+                    ? { value: matchingOption.name }
+                    : { value: dv.value };
+            }
+            else {
+                row[dv.dataElement] = { value: dv.value };
+            }
+        });
+        return row;
+    });
+    return { columns: entityColumns, data: dataElementsData };
+};
+
 // src/app/line-list-table.component.ts
 class LineListTableComponent extends ReactWrapperModule {
     constructor() {
@@ -3974,10 +4045,36 @@ class LineListTableComponent extends ReactWrapperModule {
                 if (!metaData) {
                     return undefined;
                 }
-                setLoading(true);
                 const isTracker = metaData.programType === 'WITH_REGISTRATION';
+                const isEvent = metaData.programType === 'WITHOUT_REGISTRATION';
                 const endDate = endDateState ?? new Date().toISOString().split('T')[0];
-                if (isTracker) {
+                if (this.programStageId || isEvent) {
+                    setLoading(true);
+                    d2.eventModule.event
+                        .setProgram(this.programId)
+                        .setProgramStage(this.programStageId)
+                        .setPagination(new Pager({
+                        pageSize: pager.pageSize,
+                        page: pager.page,
+                    }))
+                        .get()
+                        .then((response) => {
+                        const eventsResponse = {
+                            events: response.data,
+                            pager: pager,
+                            // orgUnitsMap: fetchedOrgUnits,
+                        };
+                        const { columns, data } = getEvents({ data: eventsResponse }, this.programStageId, pager, metaData);
+                        const finalColumns = addActionsColumn([{ label: '#', key: 'index' }, ...columns], this.actionOptions);
+                        const pagerResponse = response.pagination;
+                        setLoading(false);
+                        setColumns(finalColumns);
+                        setData(data);
+                        setPager(new Pager(pagerResponse || {}));
+                    });
+                }
+                else if (isTracker) {
+                    setLoading(true);
                     d2.trackerModule.trackedEntity
                         .setEndDate(endDate)
                         .setStartDate(startDateState)
@@ -4028,9 +4125,6 @@ class LineListTableComponent extends ReactWrapperModule {
                         });
                     });
                 }
-                else {
-                    //TODO: TO IMPLEMEMNT EVENT QUERY FOR FILTERING EVENTS WHEN PROGRAM STAGE IS PASSED OR DEALING WITH EVENT PROGRAM USING TRACKER SDK QUERY
-                }
             }, [
                 metaData,
                 programIdState,
@@ -5009,7 +5103,9 @@ class FormFieldGroup {
                 ...field,
                 id: field.id,
                 code: fieldMetaData['code'],
-                label: (fieldMetaData['formName'] ?? field['label']),
+                label: (fieldMetaData['formName'] ??
+                    fieldMetaData['name'] ??
+                    field['label']),
                 key: camelCase(fieldMetaData['code']) || field.id,
                 required: (fieldMetaData['mandatory'] ??
                     fieldMetaData['required']),
@@ -5140,7 +5236,6 @@ class FormMetadataSection {
         return programTrackedEntityAttributes.map((programTrackedEntityAttribute) => {
             return {
                 ...programTrackedEntityAttribute['trackedEntityAttribute'],
-                formName: (programTrackedEntityAttribute['trackedEntityAttribute'] || {})['name'],
                 sortOrder: programTrackedEntityAttribute['sortOrder'],
                 mandatory: programTrackedEntityAttribute['mandatory'],
                 allowFutureDate: programTrackedEntityAttribute['allowFutureDate'],
@@ -7049,7 +7144,7 @@ class TrackerFormComponent {
                 programs: [program],
                 programStage: this.programStage(),
                 disableEnrollmentDate: true,
-                excludeInheritedAttributes: true,
+                excludeInheritedAttributes: false,
             }).toJson();
         }
     }