@iapps/ng-dhis2-ui 1.2.7 → 1.2.62

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

@@ -3534,7 +3534,6 @@ const DataTableActions = (props) => {
 // license that can be found in the LICENSE file.
 
 const TableCell = ({ cell, getTextColorFromBackGround, }) => {
-    console.log('cel value', cell);
     if (cell?.style && cell?.style !== 'default-value') {
         return (React__default.createElement(DataTableCell, null,
             React__default.createElement("div", { style: { display: 'flex', justifyContent: 'center' } },
@@ -3791,12 +3790,21 @@ const getTrackedEntityTableData = (response, programId, pager, metaData) => {
         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.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,7 +3845,7 @@ const getTrackedEntityTableData = (response, programId, pager, metaData) => {
                     };
                 }
                 catch {
-                    return { ...attr }; // Leave value as is on parse failure
+                    return { ...attr };
                 }
             }
             return attr;
@@ -3856,11 +3864,11 @@ const getTrackedEntityTableData = (response, programId, pager, metaData) => {
             }
         });
         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,
@@ -3873,7 +3881,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) || '-',
@@ -3959,6 +3967,7 @@ class LineListTableComponent extends ReactWrapperModule {
         this.showFilters = false;
         this.isOptionSetNameVisible = false;
         this.allowRowsSelection = false;
+        this.triggerRefetch = false;
         this.actionSelected = new EventEmitter();
         this.rowsSelected = new EventEmitter();
         this.reactStateUpdaters = null;
@@ -3999,6 +4008,7 @@ class LineListTableComponent extends ReactWrapperModule {
             const [dateStates, setDateStates] = useState({});
             const [metaData, setMetaData] = useState(null);
             const [selectable, setSelectable] = useState(this.allowRowsSelection);
+            const [triggerRefetch, setTriggerRefetch] = useState(this.triggerRefetch);
             const d2 = window.d2Web;
             // Store updaters in refs for Angular to access
             const updateRefs = useRef({
@@ -4010,6 +4020,7 @@ class LineListTableComponent extends ReactWrapperModule {
                 setEndDateState,
                 setOptionSetNameVisible,
                 setSelectable,
+                setTriggerRefetch
             });
             useEffect(() => {
                 this.setReactStateUpdaters?.(updateRefs.current);
@@ -4128,6 +4139,7 @@ class LineListTableComponent extends ReactWrapperModule {
                 pager.pageSize,
                 isOptionSetNameVisibleState,
                 dataQueryFiltersState,
+                triggerRefetch
             ]);
             const handleInputChange = (key, value) => {
                 setInputValues((prevValues) => ({
@@ -4250,6 +4262,9 @@ class LineListTableComponent extends ReactWrapperModule {
             if (changes['allowRowsSelection']) {
                 this.reactStateUpdaters.setIsButtonLoading(this.allowRowsSelection);
             }
+            if (changes['triggerRefetch']) {
+                this.reactStateUpdaters.setTriggerRefetch(this.triggerRefetch);
+            }
         }
     }
     async ngAfterViewInit() {
@@ -4260,7 +4275,7 @@ class LineListTableComponent extends ReactWrapperModule {
         this.render();
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.1.8", ngImport: i0, type: LineListTableComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.1.8", type: LineListTableComponent, isStandalone: false, selector: "ng-dhis2-ui-line-list", inputs: { programId: "programId", orgUnit: "orgUnit", programStageId: "programStageId", actionOptions: "actionOptions", actionOptionOrientation: "actionOptionOrientation", attributeFilters: "attributeFilters", useOuModeWithOlderDHIS2Instance: "useOuModeWithOlderDHIS2Instance", startDate: "startDate", endDate: "endDate", dataQueryFilters: "dataQueryFilters", ouMode: "ouMode", isButtonLoading: "isButtonLoading", buttonFilter: "buttonFilter", filterRootOrgUnit: "filterRootOrgUnit", showFilters: "showFilters", isOptionSetNameVisible: "isOptionSetNameVisible", allowRowsSelection: "allowRowsSelection", enrollmentStatus: "enrollmentStatus", eventStatus: "eventStatus" }, 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: "19.1.8", type: LineListTableComponent, isStandalone: false, selector: "ng-dhis2-ui-line-list", inputs: { programId: "programId", orgUnit: "orgUnit", programStageId: "programStageId", actionOptions: "actionOptions", actionOptionOrientation: "actionOptionOrientation", attributeFilters: "attributeFilters", useOuModeWithOlderDHIS2Instance: "useOuModeWithOlderDHIS2Instance", startDate: "startDate", endDate: "endDate", dataQueryFilters: "dataQueryFilters", ouMode: "ouMode", isButtonLoading: "isButtonLoading", buttonFilter: "buttonFilter", filterRootOrgUnit: "filterRootOrgUnit", showFilters: "showFilters", isOptionSetNameVisible: "isOptionSetNameVisible", allowRowsSelection: "allowRowsSelection", enrollmentStatus: "enrollmentStatus", triggerRefetch: "triggerRefetch", eventStatus: "eventStatus" }, 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: "19.1.8", ngImport: i0, type: LineListTableComponent, decorators: [{
             type: Component,
@@ -4301,6 +4316,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.8", ngImpor
                 type: Input
             }], enrollmentStatus: [{
                 type: Input
+            }], triggerRefetch: [{
+                type: Input
             }], eventStatus: [{
                 type: Input
             }], actionSelected: [{