From f0bb57692065a63042f013833880c0c665364c4b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 7 Mar 2024 16:10:06 +0100
Subject: [PATCH] MOBILE-3947 ui: Display Cancel/Done buttons in datetime

---
 src/addons/calendar/pages/edit-event/edit-event.html         | 5 +++--
 .../fields/date/component/addon-mod-data-field-date.html     | 2 +-
 .../component/addon-user-profile-field-datetime.html         | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/addons/calendar/pages/edit-event/edit-event.html b/src/addons/calendar/pages/edit-event/edit-event.html
index fde3faec0..75f3667c6 100644
--- a/src/addons/calendar/pages/edit-event/edit-event.html
+++ b/src/addons/calendar/pages/edit-event/edit-event.html
@@ -32,7 +32,8 @@
                 <ion-datetime-button datetime="timestart" />
                 <ion-modal [keepContentsMounted]="true">
                     <ng-template>
-                        <ion-datetime id="timestart" formControlName="timestart" presentation="date-time" [max]="maxDate" [min]="minDate">
+                        <ion-datetime id="timestart" formControlName="timestart" presentation="date-time" [max]="maxDate" [min]="minDate"
+                            [showDefaultButtons]="true">
                             <span slot="title">{{'core.date' | translate}}</span>
                         </ion-datetime>
                     </ng-template>
@@ -155,7 +156,7 @@
                         <ion-modal [keepContentsMounted]="true">
                             <ng-template>
                                 <ion-datetime id="timedurationuntil" formControlName="timedurationuntil" [max]="maxDate" [min]="minDate"
-                                    presentation="date-time">
+                                    presentation="date-time" [showDefaultButtons]="true">
                                     <span slot="title">{{'addon.calendar.durationuntil' | translate}}</span>
                                 </ion-datetime>
                             </ng-template>
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 9e9378121..b5ac0ad6e 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
@@ -5,7 +5,7 @@
     <ion-modal [keepContentsMounted]="true">
         <ng-template>
             <ion-datetime id="datetime" [formControlName]="'f_'+field.id" [max]="maxDate" [min]="minDate"
-                [disabled]="searchMode && !searchFields['f_'+field.id+'_z']" presentation="date" />
+                [disabled]="searchMode && !searchFields['f_'+field.id+'_z']" presentation="date" [showDefaultButtons]="true" />
         </ng-template>
     </ion-modal>
     <core-input-errors *ngIf="error && editMode" [control]="form.controls['f_'+field.id]" [errorText]="error" />
diff --git a/src/addons/userprofilefield/datetime/component/addon-user-profile-field-datetime.html b/src/addons/userprofilefield/datetime/component/addon-user-profile-field-datetime.html
index 43341f2e6..563e186cf 100644
--- a/src/addons/userprofilefield/datetime/component/addon-user-profile-field-datetime.html
+++ b/src/addons/userprofilefield/datetime/component/addon-user-profile-field-datetime.html
@@ -22,7 +22,8 @@
     <ion-datetime-button datetime="datetime" />
     <ion-modal [keepContentsMounted]="true">
         <ng-template>
-            <ion-datetime id="datetime" [formControlName]="modelName" [presentation]="ionDateTimePresentation" [max]="max" [min]="min">
+            <ion-datetime id="datetime" [formControlName]="modelName" [presentation]="ionDateTimePresentation" [max]="max" [min]="min"
+                [showDefaultButtons]="true">
                 <span slot="title">
                     <core-format-text [text]="field.name" [contextLevel]="contextLevel" [contextInstanceId]="contextInstanceId"
                         [courseId]="courseId" [wsNotFiltered]="true" />