@iapps/ng-dhis2-ui 1.2.155 → 1.2.157

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

@@ -4300,7 +4300,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImpor
             type: Injectable
         }] });
 
-const getTrackedEntityTableData = (response, programId, pager, metaData, searcheableDataElements) => {
+const getTrackedEntityTableData = (response, programId, pager, metaData, searcheableDataElements, customDisplayInReportsIds, columnNameSource = 'NAME') => {
+    const getColumnLabel = (item) => columnNameSource === 'FORM_NAME'
+        ? item?.formName || item?.name || 'Default'
+        : item?.name || item?.formName || 'Default';
     const teisRaw = response.data
         .trackedEntityInstances;
     const teis = Array.isArray(teisRaw)
@@ -4312,16 +4315,19 @@ const getTrackedEntityTableData = (response, programId, pager, metaData, searche
     const attributeColumns = metaData.displayInListTrackedEntityAttributes
         .sort((a, b) => a.sortOrder - b.sortOrder)
         .map((trackedEntityAttribute) => ({
-        label: trackedEntityAttribute.name ?? trackedEntityAttribute.formName,
+        label: getColumnLabel(trackedEntityAttribute),
         key: trackedEntityAttribute.id,
     }));
+    const shouldIncludeDataElement = (psde) => customDisplayInReportsIds !== undefined
+        ? customDisplayInReportsIds.includes(psde.dataElement?.id)
+        : psde.displayInReports === true;
     const tableSearcheableDataElements = metaData
         .programStages.sort((a, b) => a.sortOrder - b.sortOrder)
         .flatMap((stage) => stage
-        .programStageDataElements.filter((psde) => psde.displayInReports)
+        .programStageDataElements.filter(shouldIncludeDataElement)
         .sort((a, b) => a.sortOrder - b.sortOrder)
         .map((psde) => ({
-        label: psde.dataElement.name || psde.dataElement.formName || 'default',
+        label: getColumnLabel(psde.dataElement),
         key: psde.dataElement.id,
         valueType: psde.dataElement.valueType,
         options: psde.dataElement.optionSet,
@@ -4331,19 +4337,32 @@ const getTrackedEntityTableData = (response, programId, pager, metaData, searche
     const dataElementColumns = metaData
         .programStages.sort((a, b) => a.sortOrder - b.sortOrder)
         .flatMap((stage) => stage
-        .programStageDataElements.filter((psde) => psde.displayInReports)
+        .programStageDataElements.filter(shouldIncludeDataElement)
         .sort((a, b) => a.sortOrder - b.sortOrder)
         .map((psde) => ({
-        label: psde.dataElement.name || psde.dataElement.formName || 'default',
+        label: getColumnLabel(psde.dataElement),
         key: psde.dataElement.id,
     })));
-    const dataElementOptions = metaData.displayInListDataElements.map((element) => ({
-        id: element.id,
-        options: element.optionSet?.options.map((opt) => ({
-            name: opt.name,
-            code: opt.code,
-            color: opt.style?.color,
-        })),
+    // const dataElementOptions = metaData.displayInListDataElements.map(
+    //   (element) => ({
+    //     id: element.id,
+    //     options: element.optionSet?.options.map((opt) => ({
+    //       name: opt.name,
+    //       code: opt.code,
+    //       color: opt.style?.color,
+    //     })),
+    //   })
+    // );
+    const dataElementOptions = (metaData.programStages ?? [])
+        .flatMap((stage) => stage.programStageDataElements ?? [])
+        .filter((psde) => psde.dataElement && shouldIncludeDataElement(psde))
+        .map(({ dataElement }) => ({
+        id: dataElement.id,
+        options: dataElement.optionSet?.options?.map((option) => ({
+            name: option.name,
+            code: option.code,
+            color: option.style?.color,
+        })) ?? [],
     }));
     const tableColumns = [
         {
@@ -4356,7 +4375,8 @@ const getTrackedEntityTableData = (response, programId, pager, metaData, searche
     const tableFilters = metaData.searchableTrackedEntityAttributes
         .sort((a, b) => a.sortOrder - b.sortOrder)
         .map((attr) => ({
-        label: attr.name,
+        // label: attr.name,
+        label: getColumnLabel(attr),
         key: attr.id,
         valueType: attr.valueType,
         options: attr.optionSet ?? undefined,
@@ -4576,7 +4596,10 @@ const addActionsColumn = (columns, actionOptions) => {
     ];
 };
 
-const getEvents = (response, programStageId, pager, metaData) => {
+const getEvents = (response, programStageId, pager, metaData, columnNameSource = 'NAME') => {
+    const getColumnLabel = (item) => columnNameSource === 'FORM_NAME'
+        ? item?.formName || item?.name || 'Default'
+        : item?.name || item?.formName || 'Default';
     const events = response.data.events;
     const eventsiiii = response.data;
     const allDataElements = new Set();
@@ -4596,7 +4619,9 @@ const getEvents = (response, programStageId, pager, metaData) => {
     const entityColumns = Array.from(allDataElements).map((dataElementId) => {
         const dataElementMeta = stageFromMetaData.programStageDataElements.find((psde) => psde.dataElement.id === dataElementId);
         return {
-            label: dataElementMeta?.dataElement.name || dataElementId,
+            label: dataElementMeta
+                ? getColumnLabel(dataElementMeta.dataElement)
+                : dataElementId,
             key: dataElementId,
         };
     });
@@ -4646,6 +4671,7 @@ class LineListTableComponent extends ReactWrapperModule {
         this.showEnrollmentDates = true;
         this.showDownloadButton = false;
         this.searcheableDataElements = [];
+        this.columnNameSource = 'NAME';
         this.reactStateUpdaters = null;
         this.setReactStateUpdaters = (updaters) => {
             this.reactStateUpdaters = updaters;
@@ -4771,7 +4797,7 @@ class LineListTableComponent extends ReactWrapperModule {
                                 pager: pager,
                                 // orgUnitsMap: fetchedOrgUnits,
                             };
-                            const { columns, data } = getEvents({ data: eventsResponse }, this.programStageId, pager, metaData);
+                            const { columns, data } = getEvents({ data: eventsResponse }, this.programStageId, pager, metaData, this.columnNameSource);
                             // const filterableColumnIdsSet = new Set(
                             //   this.filterableColumnIds
                             // );
@@ -4851,7 +4877,7 @@ class LineListTableComponent extends ReactWrapperModule {
                                 pager: pager,
                                 orgUnitsMap: fetchedOrgUnits,
                             };
-                            const { columns, data, filteredEntityColumns, orgUnitLabel } = getTrackedEntityTableData({ data: trackedEntityResponse }, this.programId, pager, metaData, this.searcheableDataElements);
+                            const { columns, data, filteredEntityColumns, orgUnitLabel } = getTrackedEntityTableData({ data: trackedEntityResponse }, this.programId, pager, metaData, this.searcheableDataElements, this.customDisplayInReportsIds, this.columnNameSource);
                             setFilteredColumns((prev) => filteredEntityColumns.length > 0 ? filteredEntityColumns : prev);
                             let updatedFilterableColumnIds;
                             if (Array.isArray(this.filterableColumnIds) &&
@@ -5220,7 +5246,7 @@ class LineListTableComponent extends ReactWrapperModule {
         this.render();
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: LineListTableComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.1.3", type: LineListTableComponent, isStandalone: false, selector: "ng-dhis2-ui-line-list", inputs: { triggerToken: "triggerToken", programId: "programId", orgUnit: "orgUnit", programStageId: "programStageId", actionOptions: "actionOptions", actionOptionOrientation: "actionOptionOrientation", attributeFilters: "attributeFilters", useOuModeWithOlderDHIS2Instance: "useOuModeWithOlderDHIS2Instance", startDate: "startDate", endDate: "endDate", dataQueryFilters: "dataQueryFilters", lineListRowActionFilterConfig: "lineListRowActionFilterConfig", hydrateForActionFiltering: "hydrateForActionFiltering", ouMode: "ouMode", isButtonLoading: "isButtonLoading", buttonFilter: "buttonFilter", filterRootOrgUnit: "filterRootOrgUnit", showFilters: "showFilters", isOptionSetNameVisible: "isOptionSetNameVisible", allowRowsSelection: "allowRowsSelection", enrollmentStatus: "enrollmentStatus", filterableColumnIds: "filterableColumnIds", triggerRefetch: "triggerRefetch", eventStatus: "eventStatus", showActionButtons: "showActionButtons", showEnrollmentDates: "showEnrollmentDates", showDownloadButton: "showDownloadButton", searcheableDataElements: "searcheableDataElements" }, outputs: { actionSelected: "actionSelected", rowsSelected: "rowsSelected" }, usesInheritance: true, usesOnChanges: true, ngImport: i0, template: '<ng-content></ng-content>', isInline: true, styles: ["@charset \"UTF-8\";::ng-deep .custom-input{display:flex!important;gap:4px!important;align-items:center!important;border:1px solid #9fadba!important;border-radius:4px!important;margin:0;padding:0 0 0 8px;background-color:#fff!important}::ng-deep .custom-input div{margin:0!important}::ng-deep .custom-input label{font-size:12px;padding-right:0}::ng-deep .custom-input input{border:none!important;font-size:12px!important;display:flex;align-items:center;padding-left:4px;height:40px;outline:none!important;box-shadow:none!important}::ng-deep .custom-input input:focus{border:none!important;box-shadow:none!important}::ng-deep .custom-input [data-test=calendar-clear-button]{background-color:#f2f2f2!important;color:#870808!important;border-radius:6px!important;padding:4px 10px!important;font-size:0!important}::ng-deep .custom-input [data-test=calendar-clear-button]:before{content:\"\\2715\";font-size:14px;color:#870808}::ng-deep .custom-input [data-test=calendar-clear-button]:hover{background-color:#ddd}::ng-deep .calendar-input-wrapper{position:relative}::ng-deep .calendar-input-wrapper .custom-input{position:relative;width:100%;display:flex;align-items:center}::ng-deep .calendar-input-wrapper [data-test=calendar-clear-button]{right:8px;bottom:14px;margin:auto;display:flex;align-items:center;justify-content:center;width:16px;height:16px;font-size:0!important;background-color:#a0adba!important;border-radius:50%;padding:2px;cursor:pointer}::ng-deep .calendar-input-wrapper [data-test=calendar-clear-button]:before{content:\"\\2715\";font-size:10px;color:#f0f0f0}::ng-deep .calendar-input-wrapper input{padding-right:40px!important;height:40px;line-height:40px;box-sizing:border-box}::ng-deep .custom-input label{color:gray!important;opacity:1}::ng-deep .table-top-toolbar{background-color:var(--colors-grey100)!important;color:var(--colors-grey900)!important}::ng-deep .custom-select-input{display:flex!important;gap:4px!important;align-items:center!important;border:1px solid #9fadba!important;border-radius:4px!important;margin:0;padding:0 0 0 8px;background-color:#fff!important}::ng-deep .custom-select-input div{margin:0!important}::ng-deep .custom-select-input [data-test=dhis2-uiwidgets-singleselectfield-label]{font-size:12px;color:gray!important}::ng-deep .custom-select-input [data-test=dhis2-uicore-select-input]{border:none!important;font-size:12px!important;display:flex;align-items:center;padding-left:4px;height:40px;outline:none!important;box-shadow:none!important}::ng-deep .custom-select-input [data-test=dhis2-uicore-select-input]:focus-within{box-shadow:none!important}::ng-deep .custom-select-input input:focus{border:none!important;box-shadow:none!important}\n"] }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.1.3", type: LineListTableComponent, isStandalone: false, selector: "ng-dhis2-ui-line-list", inputs: { triggerToken: "triggerToken", programId: "programId", orgUnit: "orgUnit", programStageId: "programStageId", actionOptions: "actionOptions", actionOptionOrientation: "actionOptionOrientation", attributeFilters: "attributeFilters", useOuModeWithOlderDHIS2Instance: "useOuModeWithOlderDHIS2Instance", startDate: "startDate", endDate: "endDate", dataQueryFilters: "dataQueryFilters", lineListRowActionFilterConfig: "lineListRowActionFilterConfig", hydrateForActionFiltering: "hydrateForActionFiltering", ouMode: "ouMode", isButtonLoading: "isButtonLoading", buttonFilter: "buttonFilter", filterRootOrgUnit: "filterRootOrgUnit", showFilters: "showFilters", isOptionSetNameVisible: "isOptionSetNameVisible", allowRowsSelection: "allowRowsSelection", enrollmentStatus: "enrollmentStatus", filterableColumnIds: "filterableColumnIds", triggerRefetch: "triggerRefetch", eventStatus: "eventStatus", showActionButtons: "showActionButtons", showEnrollmentDates: "showEnrollmentDates", showDownloadButton: "showDownloadButton", searcheableDataElements: "searcheableDataElements", columnNameSource: "columnNameSource", customDisplayInReportsIds: "customDisplayInReportsIds" }, outputs: { actionSelected: "actionSelected", rowsSelected: "rowsSelected" }, usesInheritance: true, usesOnChanges: true, ngImport: i0, template: '<ng-content></ng-content>', isInline: true, styles: ["@charset \"UTF-8\";::ng-deep .custom-input{display:flex!important;gap:4px!important;align-items:center!important;border:1px solid #9fadba!important;border-radius:4px!important;margin:0;padding:0 0 0 8px;background-color:#fff!important}::ng-deep .custom-input div{margin:0!important}::ng-deep .custom-input label{font-size:12px;padding-right:0}::ng-deep .custom-input input{border:none!important;font-size:12px!important;display:flex;align-items:center;padding-left:4px;height:40px;outline:none!important;box-shadow:none!important}::ng-deep .custom-input input:focus{border:none!important;box-shadow:none!important}::ng-deep .custom-input [data-test=calendar-clear-button]{background-color:#f2f2f2!important;color:#870808!important;border-radius:6px!important;padding:4px 10px!important;font-size:0!important}::ng-deep .custom-input [data-test=calendar-clear-button]:before{content:\"\\2715\";font-size:14px;color:#870808}::ng-deep .custom-input [data-test=calendar-clear-button]:hover{background-color:#ddd}::ng-deep .calendar-input-wrapper{position:relative}::ng-deep .calendar-input-wrapper .custom-input{position:relative;width:100%;display:flex;align-items:center}::ng-deep .calendar-input-wrapper [data-test=calendar-clear-button]{right:8px;bottom:14px;margin:auto;display:flex;align-items:center;justify-content:center;width:16px;height:16px;font-size:0!important;background-color:#a0adba!important;border-radius:50%;padding:2px;cursor:pointer}::ng-deep .calendar-input-wrapper [data-test=calendar-clear-button]:before{content:\"\\2715\";font-size:10px;color:#f0f0f0}::ng-deep .calendar-input-wrapper input{padding-right:40px!important;height:40px;line-height:40px;box-sizing:border-box}::ng-deep .custom-input label{color:gray!important;opacity:1}::ng-deep .table-top-toolbar{background-color:var(--colors-grey100)!important;color:var(--colors-grey900)!important}::ng-deep .custom-select-input{display:flex!important;gap:4px!important;align-items:center!important;border:1px solid #9fadba!important;border-radius:4px!important;margin:0;padding:0 0 0 8px;background-color:#fff!important}::ng-deep .custom-select-input div{margin:0!important}::ng-deep .custom-select-input [data-test=dhis2-uiwidgets-singleselectfield-label]{font-size:12px;color:gray!important}::ng-deep .custom-select-input [data-test=dhis2-uicore-select-input]{border:none!important;font-size:12px!important;display:flex;align-items:center;padding-left:4px;height:40px;outline:none!important;box-shadow:none!important}::ng-deep .custom-select-input [data-test=dhis2-uicore-select-input]:focus-within{box-shadow:none!important}::ng-deep .custom-select-input input:focus{border:none!important;box-shadow:none!important}\n"] }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImport: i0, type: LineListTableComponent, decorators: [{
             type: Component,
@@ -5285,6 +5311,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.3", ngImpor
                 type: Input
             }], searcheableDataElements: [{
                 type: Input
+            }], columnNameSource: [{
+                type: Input
+            }], customDisplayInReportsIds: [{
+                type: Input
             }] } });
 
 class LineListModule {