@iapps/ng-dhis2-ui 1.1.77 → 1.1.78

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

@@ -3971,7 +3971,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 +3987,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 +4060,6 @@ const getTrackedEntityData = (response, programId, pager, isOptionSetNameVisible
             })),
         ];
     }
-    console.log('filtered entity columns', filteredEntityColumns);
     return {
         columns: entityColumns,
         data: attributesData,
@@ -4392,7 +4390,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) => {
@@ -4474,6 +4472,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,
@@ -4605,6 +4606,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 +5487,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 +5540,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 +5648,7 @@ class FormMetaData {
                 },
                 program,
                 locale: this.params.locale,
+                excludeInheritedAttributes: this.params.excludeInheritedAttributes,
             }).toJson();
         });
     }
@@ -5660,6 +5677,7 @@ class FormMetaData {
             },
             program,
             locale: this.params.locale,
+            excludeInheritedAttributes: this.params.excludeInheritedAttributes,
         }).toJson();
     }
     #getReportingDateSection(program) {
@@ -5696,6 +5714,7 @@ class FormMetaData {
             },
             program,
             locale: this.params.locale,
+            excludeInheritedAttributes: this.params.excludeInheritedAttributes,
         }).toJson();
     }
     #getRegistrationSection(program) {
@@ -5728,6 +5747,7 @@ class FormMetaData {
             },
             program,
             locale: this.params.locale,
+            excludeInheritedAttributes: this.params.excludeInheritedAttributes,
         }).toJson();
     }
     #getMergedRegistrationSection(program) {
@@ -5803,6 +5823,7 @@ class FormMetaData {
             },
             program,
             locale: this.params.locale,
+            excludeInheritedAttributes: this.params.excludeInheritedAttributes,
         }).toJson();
     }
     toJson() {
@@ -5893,18 +5914,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 +7424,7 @@ class TrackerFormComponent {
                 programs: [program],
                 programStage: this.programStage(),
                 disableEnrollmentDate: true,
+                excludeInheritedAttributes: true,
             }).toJson();
         }
     }
@@ -7530,7 +7540,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 +7709,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([