From e0a6c421fff893acaf1108c0b775b04f298a9a53 Mon Sep 17 00:00:00 2001
From: Noel De Martin <noel@moodle.com>
Date: Tue, 22 Jun 2021 16:45:59 +0200
Subject: [PATCH] MOBILE-3320 calendar: Fix timezone in ion-datetime

This is a temporary fix, it should be considered further in MOBILE-3784
---
 src/addons/calendar/pages/edit-event/edit-event.html         | 5 +++--
 .../fields/date/component/addon-mod-data-field-date.html     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html
index d858edae4..eabb1be4e 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.html
+++ b/src/addons/calendar/pages/edit-event/edit-event.html
@@ -29,7 +29,7 @@
                     <p class="item-heading" [core-mark-required]="true">{{ 'core.date' | translate }}</p>
                 </ion-label>
                 <ion-datetime formControlName="timestart" [placeholder]="'core.date' | translate" [displayFormat]="dateFormat"
-                    [max]="maxDate" [min]="minDate">
+                    [max]="maxDate" [min]="minDate" display-timezone="utc">
                 </ion-datetime>
                 <core-input-errors [control]="form.controls.timestart" [errorMessages]="errors"></core-input-errors>
             </ion-item>
@@ -166,7 +166,8 @@
                         <ion-item>
                             <ion-datetime formControlName="timedurationuntil" [max]="maxDate" [min]="minDate"
                                 [placeholder]="'addon.calendar.durationuntil' | translate" slot="end"
-                                [displayFormat]="dateFormat" [disabled]="form.controls.duration.value != 1">
+                                [displayFormat]="dateFormat" [disabled]="form.controls.duration.value != 1"
+                                display-timezone="utc">
                             </ion-datetime>
                         </ion-item>
                         <ion-item lines="none">
diff --git a/src/addons/mod/data/fields/date/component/addon-mod-data-field-date.html b/src/addons/mod/data/fields/date/component/addon-mod-data-field-date.html
index f6bcd38db..d0acc0ca8 100644
--- a/src/addons/mod/data/fields/date/component/addon-mod-data-field-date.html
+++ b/src/addons/mod/data/fields/date/component/addon-mod-data-field-date.html
@@ -1,7 +1,7 @@
 <span *ngIf="inputMode && form" [formGroup]="form">
     <span *ngIf="editMode" [core-mark-required]="field.required" class="core-mark-required"></span>
     <ion-datetime [formControlName]="'f_'+field.id" [placeholder]="'core.date' | translate" [max]="maxDate" [min]="minDate"
-        [disabled]="searchMode && !searchFields!['f_'+field.id+'_z']" [displayFormat]="format">
+        [disabled]="searchMode && !searchFields!['f_'+field.id+'_z']" [displayFormat]="format" display-timezone="utc">
     </ion-datetime>
     <core-input-errors *ngIf="error && editMode" [control]="form.controls['f_'+field.id]" [errorText]="error"></core-input-errors>