@iapps/ng-dhis2-ui 1.2.163 → 1.2.165

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

@@ -4310,6 +4310,7 @@ const getTrackedEntityTableData = (response, programId, pager, metaData, searche
         ? teisRaw
         : [teisRaw];
     const orgUnitLabel = metaData.orgUnitLabel;
+    const incidentDateLabel = metaData.incidentDateLabel;
     const orgUnitMap = response.data
         .orgUnitsMap;
     const attributeColumns = metaData.displayInListTrackedEntityAttributes
@@ -4369,6 +4370,14 @@ const getTrackedEntityTableData = (response, programId, pager, metaData, searche
             label: orgUnitLabel || 'Registering unit',
             key: 'orgUnit',
         },
+        ...(metaData.displayIncidentDate
+            ? [
+                {
+                    label: incidentDateLabel || 'Incident date',
+                    key: 'incidentDate',
+                },
+            ]
+            : []),
         ...attributeColumns,
         ...dataElementColumns,
     ];
@@ -4468,6 +4477,11 @@ const getTrackedEntityTableData = (response, programId, pager, metaData, searche
         const orgUnitName = orgUnitMap?.get(orgUnitId) || '-';
         row['orgUnitId'] = { value: orgUnitId || '-' };
         row['orgUnit'] = { value: orgUnitName };
+        row['incidentDate'] = {
+            value: enrollment.incidentDate
+                ? formatDate(enrollment.incidentDate)
+                : '-',
+        };
         const teiObject = typeof tei.toObject === 'function' ? tei.toObject() : null;
         row['responseData'] = {
             value: teiObject || null,
@@ -7403,7 +7417,7 @@ function getNumericLevelForSemanticLevel(level, keywordToLevel = DEFAULT_KEYWORD
     return keyword ? keywordToLevel[keyword] : undefined;
 }
 const OrgUnitFormField = (props) => {
-    const { onSelectOrgUnit, label, required, selected, disabled, key, field, customOrgUnitRoots, } = props;
+    const { onSelectOrgUnit, label, required, selected, disabled, key, field, customOrgUnitRoots, orgUnitRoots, } = props;
     const d2 = window?.d2Web;
     const classes = useDynamicStyles$2(orgUnitFieldStyles);
     const config = useMemo(() => d2.systemInfo?.toInitObject(), []);
@@ -7673,11 +7687,15 @@ const OrgUnitFormField = (props) => {
             }
             return configuredRootInfo;
         }
+        if (orgUnitRoots?.length) {
+            return orgUnitRoots.map((id) => ({ id }));
+        }
         return d2.currentUser?.organisationUnits || [];
     }, [
         useCustomRoots,
         configuredRootsLoading,
         configuredRootInfo,
+        orgUnitRoots,
         d2.currentUser,
     ]);
     const getExpandedItems = () => {
@@ -9157,7 +9175,7 @@ class BaseFormFieldComponent extends ReactWrapperModule {
                     case 'textarea':
                         return (React__default.createElement(TextAreaField, { error: hasError, validationText: validationError, inputWidth: this.fieldConfig()?.inputWidth, required: f.required, name: f.id, disabled: disabled, label: this.label(), rows: 5, placeholder: this.placeholder(), value: value, onChange: (event) => onValueChange(event.value), onBlur: () => checkValueUniqueness() }));
                     case 'org-unit':
-                        return (React__default.createElement(OrgUnitFormField, { label: this.label(), key: f.id, field: f.id, required: f.required, disabled: disabled, customOrgUnitRoots: this.customOrgUnitRoots(), onSelectOrgUnit: (selectedOrgUnit) => onValueChange(selectedOrgUnit), selected: value }));
+                        return (React__default.createElement(OrgUnitFormField, { label: this.label(), key: f.id, field: f.id, required: f.required, disabled: disabled, customOrgUnitRoots: this.customOrgUnitRoots(), orgUnitRoots: f.extension?.orgUnitRoots, onSelectOrgUnit: (selectedOrgUnit) => onValueChange(selectedOrgUnit), selected: value }));
                     case 'transfer':
                         return (React__default.createElement(Transfer, { filterable: true, filterPlaceholder: "Search", selected: selected, leftHeader: React__default.createElement("div", { style: { fontSize: 14, padding: '8px 4px' } }, f.availableOptionsLabel), rightHeader: React__default.createElement("div", { style: { fontSize: 14, padding: '8px 4px' } }, f.selectedOptionsLabel), options: f.options, onChange: (event) => onValueChange(event.selected) }));
                     case 'checkbox':