@iapps/ng-dhis2-ui 1.1.77 → 1.1.79

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

@@ -3564,6 +3564,78 @@ class LineListService {
     //     })
     //   );
     // }
+    //tracker/trackedEntities.json?program=${programId}&orgUnit=${orgUnit}${ouModeIdentifier}&page=${page}&pageSize=${pageSize}&fields=trackedEntity,orgUnit,attributes[*],enrollments[*]&totalPages=true&${filterParams}${dateFilter}&order=createdAt:desc&trackedEntities=uid1,uid2,uid3
+    // private getTrackedEntityInstances(
+    //   programId: string,
+    //   orgUnit: string,
+    //   page: number,
+    //   pageSize: number,
+    //   filters: AttributeFilter[] = [],
+    //   startDate?: string,
+    //   endDate?: string,
+    //   ouMode?: string,
+    //   filterRootOrgUnit?: boolean,
+    //   useOuModeWithOlderDHIS2Instance?: boolean,
+    //   filtersFromEvents: FilterConfig[] = []
+    // ): Observable<TrackedEntityResponse> {
+    //   const filterParams = buildFilters(filters);
+    //   const filterParamsFromEvents = buildFiltersFromEvents(filtersFromEvents);
+    //   const dateFilter = [
+    //     startDate ? `enrollmentEnrolledAfter=${startDate}` : '',
+    //     endDate ? `enrollmentEnrolledBefore=${endDate}` : '',
+    //   ]
+    //     .filter(Boolean)
+    //     .join('&');
+    //   const ouModeIdentifier =
+    //     ouMode && useOuModeWithOlderDHIS2Instance
+    //       ? `&ouMode=${ouMode}`
+    //       : `&orgUnitMode=${ouMode}`;
+    //   return this.httpClient
+    //     .get(
+    //       `tracker/trackedEntities.json?program=${programId}&orgUnit=${orgUnit}${ouModeIdentifier}&page=${page}&pageSize=${pageSize}&fields=trackedEntity,orgUnit,attributes[*],enrollments[*]&totalPages=true&${filterParams}${dateFilter}&order=createdAt:desc`
+    //     )
+    //     .pipe(
+    //       switchMap((response: any) => {
+    //         if (filterRootOrgUnit) {
+    //           response.trackedEntities = response.trackedEntities.filter(
+    //             (tei: any) => tei.orgUnit !== orgUnit
+    //           );
+    //         }
+    //         // **Step 1:** Extract unique orgUnits from enrollments
+    //         const uniqueOrgUnitIds = new Set<string>();
+    //         if (response && response.trackedEntities) {
+    //           response.trackedEntities.forEach((tei: any) => {
+    //             tei.enrollments?.forEach((enrollment: any) => {
+    //               if (enrollment.program === programId) {
+    //                 uniqueOrgUnitIds.add(enrollment.orgUnit);
+    //               }
+    //             });
+    //           });
+    //         } else {
+    //           if (response && response.instances) {
+    //             response?.instances?.forEach((tei: any) => {
+    //               tei.enrollments?.forEach((enrollment: any) => {
+    //                 if (enrollment.program === programId) {
+    //                   uniqueOrgUnitIds.add(enrollment?.orgUnit);
+    //                 }
+    //               });
+    //             });
+    //           }
+    //         }
+    //         // If no unique orgUnits found, return immediately
+    //         if (uniqueOrgUnitIds.size === 0) {
+    //           return of({ ...response, orgUnitsMap: new Map<string, string>() });
+    //         }
+    //         // **Step 2:** Fetch orgUnit names in a single request
+    //         return this.fetchOrgUnits(Array.from(uniqueOrgUnitIds)).pipe(
+    //           map((orgUnitsMap: Map<string, string>) => ({
+    //             ...response,
+    //             orgUnitsMap, // Attach orgUnitId → orgUnitName map
+    //           }))
+    //         );
+    //       })
+    //     );
+    // }
     getTrackedEntityInstances(programId, orgUnit, page, pageSize, filters = [], startDate, endDate, ouMode, filterRootOrgUnit, useOuModeWithOlderDHIS2Instance, filtersFromEvents = []) {
         const filterParams = buildFilters(filters);
         const filterParamsFromEvents = buildFiltersFromEvents(filtersFromEvents);
@@ -3576,13 +3648,17 @@ class LineListService {
         const ouModeIdentifier = ouMode && useOuModeWithOlderDHIS2Instance
             ? `&ouMode=${ouMode}`
             : `&orgUnitMode=${ouMode}`;
-        return this.httpClient
-            .get(`tracker/trackedEntities.json?program=${programId}&orgUnit=${orgUnit}${ouModeIdentifier}&page=${page}&pageSize=${pageSize}&fields=trackedEntity,orgUnit,attributes[*],enrollments[*]&totalPages=true&${filterParams}${dateFilter}&order=createdAt:desc`)
-            .pipe(switchMap((response) => {
+        let baseUrl = '';
+        if (filtersFromEvents.length === 0) {
+            baseUrl = `tracker/trackedEntities.json?program=${programId}&orgUnit=${orgUnit}${ouModeIdentifier}&page=${page}&pageSize=${pageSize}&fields=trackedEntity,orgUnit,attributes[*],enrollments[*]&totalPages=true&${filterParams}${dateFilter}&order=createdAt:desc`;
+        }
+        else {
+            baseUrl = `tracker/trackedEntities.json?program=${programId}&orgUnit=${orgUnit}${ouModeIdentifier}&fields=trackedEntity,orgUnit,attributes[*],enrollments[*]&${filterParams}${dateFilter}&order=createdAt:desc&paging=false`;
+        }
+        return this.httpClient.get(baseUrl).pipe(switchMap((response) => {
             if (filterRootOrgUnit) {
                 response.trackedEntities = response.trackedEntities.filter((tei) => tei.orgUnit !== orgUnit);
             }
-            // **Step 1:** Extract unique orgUnits from enrollments
             const uniqueOrgUnitIds = new Set();
             if (response && response.trackedEntities) {
                 response.trackedEntities.forEach((tei) => {
@@ -3594,28 +3670,51 @@ class LineListService {
                 });
             }
             else {
-                if (response && response.instances) {
-                    response?.instances?.forEach((tei) => {
-                        tei.enrollments?.forEach((enrollment) => {
-                            if (enrollment.program === programId) {
-                                uniqueOrgUnitIds.add(enrollment?.orgUnit);
-                            }
-                        });
+                response?.instances?.forEach((tei) => {
+                    tei.enrollments?.forEach((enrollment) => {
+                        if (enrollment.program === programId) {
+                            uniqueOrgUnitIds.add(enrollment.orgUnit);
+                        }
                     });
+                });
+            }
+            if (filtersFromEvents.length === 0) {
+                if (uniqueOrgUnitIds.size === 0) {
+                    return of({ ...response, orgUnitsMap: new Map() });
                 }
+                return this.fetchOrgUnits(Array.from(uniqueOrgUnitIds)).pipe(map$1((orgUnitsMap) => ({
+                    ...response,
+                    orgUnitsMap,
+                })));
             }
-            // If no unique orgUnits found, return immediately
-            if (uniqueOrgUnitIds.size === 0) {
-                return of({ ...response, orgUnitsMap: new Map() });
+            // NEW LOGIC STARTS HERE if filtersFromEvents is present
+            const filteredTrackedEntities = getFilteredTrackedEntites(response.trackedEntities, filtersFromEvents);
+            const trackedEntityIds = filteredTrackedEntities
+                .map((tei) => tei.trackedEntity)
+                .join(',');
+            if (!trackedEntityIds) {
+                return of({
+                    trackedEntities: [],
+                    orgUnitsMap: new Map(),
+                });
             }
-            // **Step 2:** Fetch orgUnit names in a single request
-            return this.fetchOrgUnits(Array.from(uniqueOrgUnitIds)).pipe(map$1((orgUnitsMap) => ({
-                ...response,
-                orgUnitsMap, // Attach orgUnitId → orgUnitName map
-            })));
+            const refetchUrl = `tracker/trackedEntities.json?program=${programId}&orgUnit=${orgUnit}${ouModeIdentifier}&page=${page}&pageSize=${pageSize}&fields=trackedEntity,orgUnit,attributes[*],enrollments[*]&totalPages=true&${filterParams}${dateFilter}&order=createdAt:desc&trackedEntities=${trackedEntityIds}`;
+            return this.httpClient.get(refetchUrl).pipe(switchMap((filteredResponse) => {
+                const orgUnitIds = new Set();
+                filteredResponse.trackedEntities?.forEach((tei) => {
+                    tei.enrollments?.forEach((enrollment) => {
+                        if (enrollment.program === programId) {
+                            orgUnitIds.add(enrollment.orgUnit);
+                        }
+                    });
+                });
+                return this.fetchOrgUnits(Array.from(orgUnitIds)).pipe(map$1((orgUnitsMap) => ({
+                    ...filteredResponse,
+                    orgUnitsMap,
+                })));
+            }));
         }));
     }
-    //filter=id:in:[id1,id2,id3]
     /**
      * Fetch orgUnit names for given orgUnit IDs
      */
@@ -3906,9 +4005,9 @@ const getTrackedEntityData = (response, programId, pager, isOptionSetNameVisible
             : null,
         sortOrder: attr.sortOrder,
     }));
-    if (filters) {
-        teis = getFilteredTrackedEntites(teis, filters);
-    }
+    // if (filters) {
+    //   teis = getFilteredTrackedEntites(teis, filters);
+    // }
     const allAttributes = new Set();
     teis.forEach((tei) => {
         const matchingEnrollment = tei.enrollments.find((enrollment) => enrollment.program === programId);
@@ -3971,7 +4070,7 @@ const getTrackedEntityData = (response, programId, pager, isOptionSetNameVisible
             label: foundAttribute?.displayName || attrId,
             key: attrId,
             valueType: foundAttribute?.valueType,
-            options: mappedAttr?.optionSet ?? undefined
+            options: mappedAttr?.optionSet ?? undefined,
         };
     })
         .filter((column) => {
@@ -3987,7 +4086,6 @@ const getTrackedEntityData = (response, programId, pager, isOptionSetNameVisible
         return sortOrderA - sortOrderB;
     })
         .filter((column) => searchableKeys.has(column.key));
-    console.log('filtered entity columns', filteredEntityColumns);
     const attributesData = teis.map((tei, idx) => {
         const row = {
             trackedEntityInstance: tei.trackedEntity,
@@ -4061,7 +4159,6 @@ const getTrackedEntityData = (response, programId, pager, isOptionSetNameVisible
             })),
         ];
     }
-    console.log('filtered entity columns', filteredEntityColumns);
     return {
         columns: entityColumns,
         data: attributesData,
@@ -4346,6 +4443,22 @@ class LineListTableComponent extends ReactWrapperModule {
                     return updatedFilters;
                 });
             };
+            //TODO: MERGE THIS WITH HANDLE INPUT CHANGE PUT A CHECK FOR IF ITS A SELECT FIELD TO USE EQ
+            const handleInputChangeForSelectField = (key, value) => {
+                setInputValues((prevValues) => ({
+                    ...prevValues,
+                    [key]: value ?? '',
+                }));
+                setAttributeFiltersState((prevFilters = []) => {
+                    // Remove old filter for this key
+                    const filteredFilters = prevFilters.filter((f) => f.attribute !== key);
+                    // Only add new filter if value is not empty
+                    const updatedFilters = value.trim()
+                        ? [...filteredFilters, { attribute: key, operator: 'eq', value }]
+                        : filteredFilters;
+                    return updatedFilters;
+                });
+            };
             const handleDateSelect = (key, selectedDate) => {
                 const selectedDateString = selectedDate?.calendarDateString ?? ''; // Default to empty string if null
                 // Update dateStates
@@ -4392,7 +4505,7 @@ class LineListTableComponent extends ReactWrapperModule {
                 // <div>
                 //   <div/>
                 React__default.createElement("div", null,
-                    React__default.createElement(Modal$1, { hide: hide },
+                    React__default.createElement(Modal$1, { hide: hide, position: "middle" },
                         React__default.createElement(ModalTitle$1, null, "Select organization unit"),
                         React__default.createElement(ModalContent$1, null,
                             React__default.createElement(OrgUnitFormField$1, { key: selectedOrgUnit, onSelectOrgUnit: (selectedOrgUnit) => {
@@ -4412,12 +4525,15 @@ class LineListTableComponent extends ReactWrapperModule {
                             } },
                             React__default.createElement(InputField$1, { key: "location", 
                                 //label={orgUnitLabel}
-                                label: orgUnitLabel ? orgUnitLabel : 'registering unit', value: selectedOrgUnit, clearable: true, onFocus: () => setHide(false), className: "custom-input", onChange: (event) => {
+                                label: orgUnitLabel ? orgUnitLabel : 'registering unit', value: selectedOrgUnit, onFocus: () => setHide(false), className: "custom-input", onChange: (event) => {
                                     setSelectedOrgUnit(event.value);
                                     setOrgUnitState(defaultOrgUnit);
                                 } }),
                             React__default.createElement(CalendarInput, { label: "Start date:", calendar: "gregory", locale: "en-GB", timeZone: "Africa/Dar_es_Salaam", className: "custom-input", date: startDateState, onDateSelect: (selectedDate) => {
-                                    setStartDateState(selectedDate.calendarDateString);
+                                    if (selectedDate?.calendarDateString) {
+                                        setStartDateState(selectedDate.calendarDateString);
+                                    }
+                                    //  setStartDateState(selectedDate.calendarDateString);
                                 } }),
                             React__default.createElement(CalendarInput, { label: "End date:", calendar: "gregory", locale: "en-GB", timeZone: "Africa/Dar_es_Salaam", className: "custom-input", date: endDateState, onDateSelect: (selectedDate) => {
                                     setEndDateState(selectedDate.calendarDateString);
@@ -4434,7 +4550,7 @@ class LineListTableComponent extends ReactWrapperModule {
                                                 ...prevValues,
                                                 [key]: selected ?? '',
                                             }));
-                                            handleInputChange(key, selected ?? '');
+                                            handleInputChangeForSelectField(key, selected ?? '');
                                         } }, (options.options ?? []).map((opt) => (React__default.createElement(SingleSelectOption, { key: opt.id, label: opt.name, value: opt.code })))));
                                 }
                                 // Fallback: default InputField
@@ -4474,6 +4590,9 @@ class LineListTableComponent extends ReactWrapperModule {
                             React__default.createElement(DataTableRow, null, columns.map((col) => (React__default.createElement(DataTableColumnHeader, { key: col.key }, col.label))))),
                         React__default.createElement(TableBody, null, data.length > 0 ? (data.map((row) => (React__default.createElement(DataTableRow, { key: row.index }, columns.map((col) => (React__default.createElement(DataTableCell, { key: col.key }, col.key === 'actions'
                             ? this.actionOptions && (React__default.createElement(DataTableActions, { actionOptions: this.actionOptions, actionOptionOrientation: this.actionOptionOrientation, onClick: (option) => {
+                                    if (option.onClick) {
+                                        option.onClick(row);
+                                    }
                                     this.actionSelected.emit({
                                         action: option.label,
                                         row,
@@ -4537,11 +4656,11 @@ 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", filters: "filters", ouMode: "ouMode", dispatchTeis: "dispatchTeis", isButtonLoading: "isButtonLoading", buttonLabel: "buttonLabel", buttonFilter: "buttonFilter", filterRootOrgUnit: "filterRootOrgUnit", showFilters: "showFilters", isOptionSetNameVisible: "isOptionSetNameVisible" }, outputs: { actionSelected: "actionSelected", approvalSelected: "approvalSelected", firstValue: "firstValue" }, usesInheritance: true, usesOnChanges: true, ngImport: i0, template: '<ng-content></ng-content>', isInline: true, styles: ["::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 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", filters: "filters", ouMode: "ouMode", dispatchTeis: "dispatchTeis", isButtonLoading: "isButtonLoading", buttonLabel: "buttonLabel", buttonFilter: "buttonFilter", filterRootOrgUnit: "filterRootOrgUnit", showFilters: "showFilters", isOptionSetNameVisible: "isOptionSetNameVisible" }, outputs: { actionSelected: "actionSelected", approvalSelected: "approvalSelected", firstValue: "firstValue" }, usesInheritance: true, usesOnChanges: true, ngImport: i0, template: '<ng-content></ng-content>', isInline: true, styles: ["::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:14px!important}::ng-deep .custom-input [data-test=calendar-clear-button]:hover{background-color:#ddd}::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,
-            args: [{ selector: 'ng-dhis2-ui-line-list', template: '<ng-content></ng-content>', standalone: false, styles: ["::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 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"] }]
+            args: [{ selector: 'ng-dhis2-ui-line-list', template: '<ng-content></ng-content>', standalone: false, styles: ["::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:14px!important}::ng-deep .custom-input [data-test=calendar-clear-button]:hover{background-color:#ddd}::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"] }]
         }], propDecorators: { programId: [{
                 type: Input
             }], orgUnit: [{
@@ -4605,6 +4724,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.1.8", ngImpor
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// Copyright 2025 UDSM DHIS2 Lab. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
 const dropdownStyles = {
     layer: {
         zIndex: '1 !important',
@@ -5482,9 +5605,20 @@ class MetadataRule {
 class FormMetadataSection {
     constructor(params) {
         this.params = params;
+        this.inheritedAttributes = [];
+        this.inheritedAttributes =
+            (this.params.program['trackedEntityType'] || {})['trackedEntityTypeAttributes'] || [];
     }
     get attributes() {
-        return (this.params.program['programTrackedEntityAttributes'] || []).map((programTrackedEntityAttribute) => {
+        let programTrackedEntityAttributes = this.params.program['programTrackedEntityAttributes'] || [];
+        if (this.params.excludeInheritedAttributes) {
+            programTrackedEntityAttributes = programTrackedEntityAttributes.filter((programTrackedEntityAttribute) => {
+                return !this.inheritedAttributes.find((inheritedAttribute) => inheritedAttribute['trackedEntityAttribute']?.id ===
+                    programTrackedEntityAttribute['trackedEntityAttribute']
+                        ?.id);
+            });
+        }
+        return programTrackedEntityAttributes.map((programTrackedEntityAttribute) => {
             return {
                 ...programTrackedEntityAttribute['trackedEntityAttribute'],
                 formName: (programTrackedEntityAttribute['trackedEntityAttribute'] || {})['name'],
@@ -5524,7 +5658,7 @@ class FormMetadataSection {
         return {
             id: this.params.section?.id,
             name: this.params.section?.name,
-            fieldGroups: this.fieldGroups,
+            fieldGroups: this.fieldGroups.filter((fieldGroup) => fieldGroup.fields?.length > 0),
         };
     }
 }
@@ -5632,6 +5766,7 @@ class FormMetaData {
                 },
                 program,
                 locale: this.params.locale,
+                excludeInheritedAttributes: this.params.excludeInheritedAttributes,
             }).toJson();
         });
     }
@@ -5660,6 +5795,7 @@ class FormMetaData {
             },
             program,
             locale: this.params.locale,
+            excludeInheritedAttributes: this.params.excludeInheritedAttributes,
         }).toJson();
     }
     #getReportingDateSection(program) {
@@ -5696,6 +5832,7 @@ class FormMetaData {
             },
             program,
             locale: this.params.locale,
+            excludeInheritedAttributes: this.params.excludeInheritedAttributes,
         }).toJson();
     }
     #getRegistrationSection(program) {
@@ -5728,6 +5865,7 @@ class FormMetaData {
             },
             program,
             locale: this.params.locale,
+            excludeInheritedAttributes: this.params.excludeInheritedAttributes,
         }).toJson();
     }
     #getMergedRegistrationSection(program) {
@@ -5803,6 +5941,7 @@ class FormMetaData {
             },
             program,
             locale: this.params.locale,
+            excludeInheritedAttributes: this.params.excludeInheritedAttributes,
         }).toJson();
     }
     toJson() {
@@ -5893,18 +6032,6 @@ const FileUploadField = (props) => {
             else {
                 onChange(file);
             }
-            // this.ngZone.run(() => {
-            //   this.form().get(this.field().id) ||
-            //     this.form()
-            //       .get(this.field().key)
-            //       ?.setValue((event?.files || [])[0]);
-            //   this.update.emit({
-            //     form: this.form(),
-            //     value: (event?.files || [])[0],
-            //   });
-            // });
-            // setValue((event?.files || [])[0]);
-            // setTouched(true);
         } }, file && (React__default.createElement(FileListItem, { cancelText: "Cancel", label: file.name, loading: uploading, onRemove: () => {
             setFile(null);
         }, removeText: "Remove" }))));
@@ -7415,6 +7542,7 @@ class TrackerFormComponent {
                 programs: [program],
                 programStage: this.programStage(),
                 disableEnrollmentDate: true,
+                excludeInheritedAttributes: true,
             }).toJson();
         }
     }
@@ -7530,7 +7658,14 @@ class ProgramEntryFormFieldUtil {
         this.config = config;
     }
     get attributes() {
-        return (this.program.programTrackedEntityAttributes || []).map((programTrackedEntityAttribute) => {
+        let programTrackedEntityAttributes = this.program.programTrackedEntityAttributes || [];
+        if (this.config.excludeInheritedAttributes) {
+            programTrackedEntityAttributes = programTrackedEntityAttributes.filter((programTrackedEntityAttribute) => {
+                return !(this.program.trackedEntityType?.trackedEntityTypeAttributes || []).find((inheritedAttribute) => inheritedAttribute.trackedEntityAttribute?.id ===
+                    programTrackedEntityAttribute?.trackedEntityAttribute?.id);
+            });
+        }
+        return programTrackedEntityAttributes.map((programTrackedEntityAttribute) => {
             return {
                 ...programTrackedEntityAttribute.trackedEntityAttribute,
                 sortOrder: programTrackedEntityAttribute.sortOrder,
@@ -7692,6 +7827,11 @@ class ProgramEntryFormMetaData {
             'useFirstStageDuringRegistration',
             'trackedEntityType',
         ])
+            .with(this.d2.programModule.trackedEntityType
+            .select(['id', 'name'])
+            .with(this.d2.programModule.trackedEntityTypeAttribute.select([
+            'trackedEntityAttribute',
+        ])), 'ToOne')
             .with(this.d2.programModule.programTrackedEntityAttribute.with(this.d2.programModule.trackedEntityAttribute.with(this.d2.optionSetModule.optionSet.with(this.d2.optionSetModule.option), 'ToOne'), 'ToOne'))
             .with(this.d2.programModule.programRuleVariable
             .with(this.d2.dataElementModule.dataElement.select([