@iapps/ng-dhis2-ui 1.2.85 → 1.2.87

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

@@ -30,8 +30,8 @@ import { isObject, isString, debounce, sortBy, isArray, find, camelCase, flatten
 import cx from 'classnames';
 import { getNowInCalendar, generateFixedPeriods } from '@dhis2/multi-calendar-dates';
 import { Pager, DataOrderCriteria, DataQueryFilter, DataFilterCondition, ProgramRuleEngine } from '@iapps/d2-web-sdk';
+import { parseISO, isValid, format, parse as parse$1, addDays } from 'date-fns';
 import { map as map$1 } from 'rxjs/operators';
-import { format, parse as parse$1, addDays } from 'date-fns';
 import * as XLSX from 'xlsx';
 import * as i2 from '@angular/forms';
 import { Validators, UntypedFormControl, UntypedFormGroup, FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
@@ -3328,13 +3328,17 @@ const FilterToolbar = ({ orgUnitLabel, selectedOrgUnit, setSelectedOrgUnit, setO
                     //clearable={!!tempStartDateState}
                     //date={tempStartDateState || undefined}
                     //date={tempStartDateState || "yyyy-mm-dd"}
-                    clearable: !!tempStartDateState && tempStartDateState !== 'yyyy-mm-dd', date: tempStartDateState || 'yyyy-mm-dd', onDateSelect: (selectedDate) => {
+                    clearable: !!tempStartDateState && tempStartDateState !== 'dd-mm-yyyy', 
+                    // date={tempStartDateState || 'dd-mm-yyyy'}
+                    date: formatDateForDisplay(tempStartDateState), onDateSelect: (selectedDate) => {
                         setTempStartDateState(selectedDate.calendarDateString);
                         if (selectedDate.calendarDateString === null) {
                             setStartDateState(selectedDate.calendarDateString);
                         }
                     } }),
-                React__default.createElement(CalendarInput, { label: "End date:", calendar: "gregory", locale: "en-GB", timeZone: "Africa/Dar_es_Salaam", className: "custom-input", clearable: !!tempEndDateState && tempEndDateState !== 'yyyy-mm-dd', date: tempEndDateState || 'yyyy-mm-dd', onDateSelect: (selectedDate) => {
+                React__default.createElement(CalendarInput, { label: "End date:", calendar: "gregory", locale: "en-GB", timeZone: "Africa/Dar_es_Salaam", className: "custom-input", clearable: !!tempEndDateState && tempEndDateState !== 'dd-mm-yyyy', 
+                    // date={tempEndDateState || 'dd-mm-yyyy'}
+                    date: formatDateForDisplay(tempEndDateState), onDateSelect: (selectedDate) => {
                         setTempEndDateState(selectedDate.calendarDateString);
                         if (selectedDate.calendarDateString === null) {
                             setEndDateState(selectedDate.calendarDateString);
@@ -3389,6 +3393,19 @@ const FilterToolbar = ({ orgUnitLabel, selectedOrgUnit, setSelectedOrgUnit, setO
             } },
             React__default.createElement(Button$1, { onClick: handleSearch }, "Search"),
             React__default.createElement(Button$1, { onClick: () => setShowAllFilters(!showAllFilters) }, showAllFilters ? 'Less Filters' : 'More Filters')))));
+function formatDateForDisplay(dateString) {
+    if (!dateString || dateString === 'dd-mm-yyyy')
+        return 'dd-mm-yyyy';
+    try {
+        const parsedDate = parseISO(dateString);
+        if (!isValid(parsedDate))
+            return 'dd-mm-yyyy';
+        return format(parsedDate, 'dd-MM-yyyy');
+    }
+    catch {
+        return 'dd-mm-yyyy';
+    }
+}
 
 const TableHeader = ({ columns, allSelected, onSelectAll, selectable, showActionButtons, }) => {
     const handleCheckboxChange = () => {
@@ -6440,6 +6457,13 @@ class FormComponent {
             this.#processRules(this.programRuleActions());
         });
     }
+    ngOnInit() {
+        this.values = this.form().getRawValue();
+        this.formUpdate.emit(new FormValue(this.form(), this.fields()));
+    }
+    // ngOnChanges(changes: SimpleChanges): void {
+    //   this.values = this.form.getRawValue();
+    // }
     ngOnChanges(changes) {
         this.values = this.form().getRawValue();
     }