mmhglobal-dynamicform 2.41.4 → 2.42.0

package/fesm2020/mmhglobal-dynamicform.mjs

@@ -2357,37 +2357,27 @@ class ZComponentService {
         }
         return obsList;
     }
-    localizeDateTimeByIgnoringTimeZone(value, data) {
-        if (this.timePickerDateType.includes(data.Type)) {
-            const userTimeZoneOffSet = this.convertOffsetMinToHour((new Date(value).getTimezoneOffset()));
-            const datetimeWithoutTimeZone = this.removeTimeZoneAndConvertToISOString(value);
-            //return new Date(`${datetimeWithoutTimeZone.split('.000Z')[0]}${userTimeZoneOffSet}`);
-            return new Date(`${datetimeWithoutTimeZone.split('Z')[0]}${userTimeZoneOffSet}`);
-        }
-        else if (data.Type === 'zshortdate') {
-            const dateOnly = value.includes('T') ? value.split('T')[0] : value; // Extract date portion
-            const date = new Date(dateOnly); // Create a date object from the extracted date
-            date.setUTCDate(1); // Set day to the first of the month
-            // Convert to UTC, accounting for the timezone offset
-            const timezoneOffset = date.getTimezoneOffset(); // Get timezone offset in minutes
-            date.setMinutes(date.getMinutes() + timezoneOffset); // Adjust for timezone offset
-            // Return the final date object
-            return date;
-        }
-        else {
-            const dateOnly = value.includes('T') ? value.split('T')[0] : value;
-            return new Date(dateOnly + " " + new Date(dateOnly).toLocaleTimeString());
-        }
-    }
-    removeTimeZoneAndConvertToISOString(value) {
-        const result = value.split('+')[0];
-        return new Date(result.endsWith('Z') ? result : `${result}Z`).toISOString();
-    }
-    convertOffsetMinToHour(num) {
-        num = -num;
-        const prefix = num.toString().startsWith('-') ? '-' : '+';
-        const result = `${(Math.abs(num) / 60).toString().padStart(2, '0')}:00`;
-        return `${prefix}${result}`;
+    localizeDateTimeByIgnoringTimeZone(value, field) {
+        // Support both string and Date inputs
+        const originalDate = value instanceof Date ? new Date(value.getTime()) : new Date(value);
+        // Case 1: time / datetime fields → keep wall-clock time stable
+        if (this.timePickerDateType.includes(field.Type)) {
+            const adjusted = new Date(originalDate);
+            const offsetMinutes = originalDate.getTimezoneOffset();
+            adjusted.setMinutes(originalDate.getMinutes() - offsetMinutes);
+            return adjusted;
+        }
+        // Case 2: month-only (zshortdate) → year+month, day fixed to 1
+        if (field.Type === 'zshortdate') {
+            return new Date(originalDate.getFullYear(), originalDate.getMonth(), 1, // day
+            0, 0, 0, 0);
+        }
+        // Case 3: normal date-only → keep calendar date stable, ignore time
+        const dateOnly = new Date(originalDate.getFullYear(), originalDate.getMonth(), originalDate.getDate(), 0, 0, 0, 0);
+        const normalizedDate = new Date(dateOnly);
+        const localOffsetMinutes = dateOnly.getTimezoneOffset();
+        normalizedDate.setMinutes(dateOnly.getMinutes() - localOffsetMinutes);
+        return normalizedDate;
     }
     //#endregion
     decrementComponentCounterForField(field) {
@@ -3598,21 +3588,21 @@ class DateParserFilter {
     constructor(componentService) {
         this.componentService = componentService;
     }
-    transform(value, data) {
-        // debugger;
-        if (!value) {
-            return value;
+    transform(rawValue, field) {
+        if (!rawValue) {
+            return null;
         }
-        // filter items array, items which match and return true will be
-        // kept, false will be filtered out
         try {
-            if (data.IsIgnoreTimeZone) {
-                return this.componentService.localizeDateTimeByIgnoringTimeZone(value, data);
+            // For "ignore timezone" fields, normalize via service
+            if (field.IsIgnoreTimeZone) {
+                return this.componentService.localizeDateTimeByIgnoringTimeZone(rawValue, field);
             }
-            return new Date(value);
+            // Otherwise, just convert to Date
+            const inputDate = new Date(rawValue);
+            return inputDate;
         }
         catch (error) {
-            console.log("DateParserFilter error: ", error);
+            console.log('DateParserFilter error:', error);
             return null;
         }
     }
@@ -7214,12 +7204,13 @@ class ZdatetimeComponent extends InputFieldBase {
     }
     onChange(value) {
         const formControl = this.form.controls[this.data.Value];
-        const val = this.convertDateTimeValueToString(value);
+        const dateValue = this.convertDateTimeValueToString(value);
         if (formControl) {
-            formControl.setValue(val);
+            formControl.setValue(dateValue);
             formControl.markAsTouched();
         }
-        super.onChange(null, val);
+        // Important: pass Date to base, not ISO string
+        super.onChange(null, dateValue);
     }
     setMinAndMaxDateRange() {
         const minDateGroupValue = ZComponentHelper.getGroupValue(this.data.MinDate, this.group);
@@ -7239,24 +7230,39 @@ class ZdatetimeComponent extends InputFieldBase {
         }
     }
     convertDateTimeValueToString(value) {
-        if (value == undefined) {
+        if (value === undefined || value === null) {
             return undefined;
         }
-        const valueDate = value;
+        const inputDate = new Date(value);
+        // zshortdate → normalize to first day of month
         if (this.data.Type === 'zshortdate') {
-            valueDate.setDate(1);
+            const monthStart = new Date(inputDate);
+            monthStart.setDate(1);
+            return monthStart;
         }
+        // Ignore timezone: keep same local wall-clock time regardless of browser TZ
         if (this.data.IsIgnoreTimeZone) {
-            const timezoneOffSet = new Date(value).getTimezoneOffset();
-            valueDate.setMinutes(valueDate.getMinutes() + (-timezoneOffSet));
-            return valueDate.toISOString();
+            return this.adjustForIgnoreTimeZone(inputDate);
         }
+        // For non-time types -> date-only
         if (!['zuidatetime', 'ztime', 'zuitime'].includes(this.data.Type)) {
-            return this.parseAnyValueToDateOnly(value).toISOString();
-        }
-        else {
-            return this.parseAnyValueToDate(value).toISOString();
+            // Assuming these helpers already return Date
+            const dateOnly = this.parseAnyValueToDateOnly(inputDate);
+            return dateOnly;
         }
+        // For datetime/time types -> full datetime
+        const dateTime = this.parseAnyValueToDate(inputDate);
+        return dateTime;
+    }
+    /**
+     * Adjusts a Date so that its wall-clock time stays the same
+     * when ignoring the browser timezone.
+     */
+    adjustForIgnoreTimeZone(date) {
+        const adjustedDate = new Date(date);
+        const timezoneOffsetMinutes = adjustedDate.getTimezoneOffset();
+        adjustedDate.setMinutes(adjustedDate.getMinutes() - timezoneOffsetMinutes);
+        return adjustedDate;
     }
     parseAnyValueToDate(value) {
         return new Date(value instanceof Date ? value : new Date(value));
@@ -11809,7 +11815,7 @@ class ZreportComponent extends FieldBase {
         this.onPrintBegin = this.printBegin.bind(this);
         this.onPrintEnd = this.printEnd.bind(this);
         super.initComponent().subscribe(() => {
-            this.serviceUrl = this.resourceApiService.getURL(this.data.ResourceURL);
+            this.serviceUrl = this.zcoreService.normalizeUrl(this.resourceApiService.getURL(this.data.ResourceURL));
             if (!this.serviceUrl) {
                 console.log("resourceURL is empty.");
             }