@iapps/ng-dhis2-ui 1.2.102 → 1.2.103

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

@@ -3470,6 +3470,9 @@ const FilterToolbar = ({ orgUnitLabel, selectedOrgUnit, setSelectedOrgUnit, setO
                             }, style: { display: 'inline-flex', alignItems: 'center' } },
                             React__default.createElement(ClearIcon, { className: "my-icon-class" })))));
                 }
+                {
+                    /* TODO: I HAVE DUPLICATED DROPDOWN AND CLEAR ICON IN MULTIPLE PLACES REQUIRED TO CREATE A REUSABLE DROPDOWN COMPONENT WITH THE CLEAR ICON TO AVOID DUPLICATION */
+                }
                 if (options && options.options.length > 0) {
                     return (React__default.createElement(DropdownButton, { name: "customDropdown", open: openDropdownKey === key, onClick: () => {
                             setOpenDropdownKey(openDropdownKey === key ? null : key);
@@ -3621,6 +3624,49 @@ function formatDateForDisplay(dateString) {
         return 'dd-mm-yyyy';
     }
 }
+// case 'date':
+//           case 'date-time':
+//             return (
+//               // <InputField
+//               //   error={hasError}
+//               //   validationText={validationError}
+//               //   type={this.field().type as any}
+//               //   inputWidth={inputWidth}
+//               //   required={this.field().required}
+//               //   name={this.field().id}
+//               //   label={this.label()}
+//               //   min={this.field().min?.toString()}
+//               //   max={this.field().max?.toString()}
+//               //   placeholder={this.placeholder()}
+//               //   value={value}
+//               //   readOnly={disabled}
+//               //   onChange={(event: any) => {
+//               //     onValueChange(event.value);
+//               //   }}
+//               //   onBlur={() => {
+//               //     checkValueUniqueness();
+//               //   }}
+//               // />
+//               <CalendarInput
+//                 label={this.label()}
+//                 error={hasError}
+//                 validationText={validationError}
+//                 date={value}
+//                 readOnly={disabled}
+//                 min={this.field().min?.toString()}
+//                 max={this.field().max?.toString()}
+//                 placeholder={this.placeholder()}
+//                 onDateSelect={(selectedDate: any) => {
+//                   onValueChange(selectedDate.calendarDateString);
+//                 }}
+//                 disabled={disabled}
+//                 inputWidth={inputWidth}
+//                 required={this.field().required}
+//                 calendar="gregory"
+//                 locale="en-GB"
+//                 timeZone="Africa/Dar_es_Salaam"
+//               />
+//             );
 
 const TableHeader = ({ columns, allSelected, onSelectAll, selectable, showActionButtons, }) => {
     const handleCheckboxChange = () => {
@@ -3976,7 +4022,7 @@ const getTrackedEntityTableData = (response, programId, pager, metaData, searche
     const attributeColumns = metaData.displayInListTrackedEntityAttributes
         .sort((a, b) => a.sortOrder - b.sortOrder)
         .map((trackedEntityAttribute) => ({
-        label: trackedEntityAttribute.formName ?? trackedEntityAttribute.name,
+        label: trackedEntityAttribute.name ?? trackedEntityAttribute.formName,
         key: trackedEntityAttribute.id,
     }));
     const tableSearcheableDataElements = metaData
@@ -3985,7 +4031,7 @@ const getTrackedEntityTableData = (response, programId, pager, metaData, searche
         .programStageDataElements.filter((psde) => psde.displayInReports)
         .sort((a, b) => a.sortOrder - b.sortOrder)
         .map((psde) => ({
-        label: psde.dataElement.formName || psde.dataElement.name,
+        label: psde.dataElement.name || psde.dataElement.formName || 'default',
         key: psde.dataElement.id,
         valueType: psde.dataElement.valueType,
         options: psde.dataElement.optionSet,
@@ -3998,7 +4044,7 @@ const getTrackedEntityTableData = (response, programId, pager, metaData, searche
         .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,
+        label: psde.dataElement.name || psde.dataElement.formName || 'default',
         key: psde.dataElement.id,
     })));
     const dataElementOptions = metaData.displayInListDataElements.map((element) => ({
@@ -8195,8 +8241,17 @@ class ProgramEntryFormModule {
         this.FormLoader = () => {
             return React__default.createElement(CircularLoader$1, { small: true });
         };
+        // dataId = computed(() => {
+        //   return this.instance()?.trackedEntity || this.instance()?.event;
+        // });
         this.dataId = computed(() => {
-            return this.instance()?.trackedEntity || this.instance()?.event;
+            if (this.config().formType === 'EVENT') {
+                return this.instance()?.event;
+            }
+            if (this.config().formType === 'TRACKER') {
+                return this.instance()?.trackedEntity;
+            }
+            return undefined;
         });
         this.FormActionButtons = computed(() => {
             if (this.config().hideActionButtons) {