@iapps/ng-dhis2-ui 1.2.154 → 1.2.155

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

@@ -9169,18 +9169,18 @@ class BaseFormFieldComponent extends ReactWrapperModule {
             `${pad(date.getMinutes())}`);
     }
     /**
-   * Normalizes value from the HTML input into DHIS storage format.
-   *
-   * For date:
-   *   - Input: "YYYY-MM-DD"
-   *   - Output: "YYYY-MM-DD"
-   *
-   * For datetime:
-   *   - Input: "YYYY-MM-DDTHH:mm" (local)
-   *   - Output: ISO string in UTC: "YYYY-MM-DDTHH:mm:ss.sssZ"
-   *
-   * If allowFutureDate = false, any value beyond "now" is clamped to now.
-   */
+     * Normalizes value from the HTML input into DHIS storage format.
+     *
+     * For date:
+     *   - Input: "YYYY-MM-DD"
+     *   - Output: "YYYY-MM-DD"
+     *
+     * For datetime:
+     *   - Input: "YYYY-MM-DDTHH:mm" (local)
+     *   - Output: ISO string in UTC: "YYYY-MM-DDTHH:mm:ss.sssZ"
+     *
+     * If allowFutureDate = false, any value beyond "now" is clamped to now.
+     */
     normalizeDateValueFromHtmlInput(inputValue, isDateTimeField, allowFutureDate) {
         const trimmed = (inputValue ?? '').trim();
         if (!trimmed)
@@ -9202,19 +9202,38 @@ class BaseFormFieldComponent extends ReactWrapperModule {
         if (!/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}$/.test(trimmed)) {
             return null;
         }
-        // Interpret as LOCAL time
-        const localDate = new Date(trimmed);
-        if (Number.isNaN(localDate.getTime())) {
+        // Interpret selected datetime as EAT, not UTC/GMT
+        const eatDateTimeValue = `${trimmed}:00.000+03:00`;
+        const eatDate = new Date(eatDateTimeValue);
+        if (Number.isNaN(eatDate.getTime())) {
             return null;
         }
         if (!allowFutureDate) {
             const now = new Date();
-            if (localDate.getTime() > now.getTime()) {
-                return now.toISOString();
+            if (eatDate.getTime() > now.getTime()) {
+                return this.getNowInEatIsoString();
             }
         }
-        // Store as UTC ISO string with millis, e.g. "2025-11-26T21:01:00.000Z"
-        return localDate.toISOString();
+        return eatDateTimeValue;
+    }
+    getNowInEatIsoString() {
+        const formatter = new Intl.DateTimeFormat('en-GB', {
+            timeZone: 'Africa/Dar_es_Salaam',
+            year: 'numeric',
+            month: '2-digit',
+            day: '2-digit',
+            hour: '2-digit',
+            minute: '2-digit',
+            second: '2-digit',
+            hourCycle: 'h23',
+        });
+        const parts = formatter.formatToParts(new Date()).reduce((acc, part) => {
+            if (part.type !== 'literal') {
+                acc[part.type] = part.value;
+            }
+            return acc;
+        }, {});
+        return `${parts['year']}-${parts['month']}-${parts['day']}T${parts['hour']}:${parts['minute']}:${parts['second']}.000+03:00`;
     }
     async searchForDuplicates(value) {
         const d2 = window.d2Web;