From 02c57342306fcb8255a83f4f177a657c376e2f19 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 16 Mar 2022 10:20:08 +0100
Subject: [PATCH] MOBILE-3909 calendar: Save reminder when Enter clicked

---
 .../reminder-time-modal.html                  | 86 ++++++++++---------
 1 file changed, 44 insertions(+), 42 deletions(-)

diff --git a/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html b/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html
index 21c7fecd9..052241aa9 100644
--- a/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html
+++ b/src/addons/calendar/components/reminder-time-modal/reminder-time-modal.html
@@ -11,50 +11,52 @@
     </ion-toolbar>
 </ion-header>
 <ion-content>
-    <ion-radio-group [(ngModel)]="radioValue" class="ion-text-wrap">
-        <!-- Preset options. -->
-        <ion-item *ngIf="allowDisable">
-            <ion-label>
-                <p>{{ 'core.settings.disabled' | translate }}</p>
-            </ion-label>
-            <ion-radio slot="end" value="disabled"></ion-radio>
-        </ion-item>
-        <ion-item *ngFor="let option of presetOptions">
-            <ion-label>
-                <p>{{ option.label }}</p>
-            </ion-label>
-            <ion-radio slot="end" [value]="option.radioValue"></ion-radio>
-        </ion-item>
+    <form (ngSubmit)="saveReminder()">
+        <ion-radio-group name="radiovalue" [(ngModel)]="radioValue" class="ion-text-wrap">
+            <!-- Preset options. -->
+            <ion-item *ngIf="allowDisable">
+                <ion-label>
+                    <p>{{ 'core.settings.disabled' | translate }}</p>
+                </ion-label>
+                <ion-radio slot="end" value="disabled"></ion-radio>
+            </ion-item>
+            <ion-item *ngFor="let option of presetOptions">
+                <ion-label>
+                    <p>{{ option.label }}</p>
+                </ion-label>
+                <ion-radio slot="end" [value]="option.radioValue"></ion-radio>
+            </ion-item>
 
-        <!-- Custom value. -->
-        <ion-item class="ion-text-wrap">
-            <ion-label>
-                <p>{{ 'core.custom' | translate }}</p>
-            </ion-label>
-            <ion-radio slot="end" value="custom"></ion-radio>
-        </ion-item>
-        <ion-item class="ion-text-wrap">
-            <ion-label></ion-label>
+            <!-- Custom value. -->
+            <ion-item class="ion-text-wrap">
+                <ion-label>
+                    <p>{{ 'core.custom' | translate }}</p>
+                </ion-label>
+                <ion-radio slot="end" value="custom"></ion-radio>
+            </ion-item>
+            <ion-item class="ion-text-wrap">
+                <ion-label></ion-label>
 
-            <div class="flex-row">
-                <!-- Input to enter the value. -->
-                <ion-input type="number" name="customvalue" [(ngModel)]="customValue" [disabled]="radioValue != 'custom'" placeholder="10"
-                    (click)="customInputClicked($event)">
-                </ion-input>
+                <div class="flex-row">
+                    <!-- Input to enter the value. -->
+                    <ion-input type="number" name="customvalue" [(ngModel)]="customValue" [disabled]="radioValue != 'custom'"
+                        placeholder="10" (click)="customInputClicked($event)">
+                    </ion-input>
 
-                <!-- Units. -->
-                <label class="accesshide" for="reminderUnits">{{ 'addon.calendar.units' | translate }}</label>
-                <ion-select id="reminderUnits" name="customunits" [(ngModel)]="customUnits" interface="action-sheet"
-                    [disabled]="radioValue != 'custom'" slot="end" [interfaceOptions]="{header: 'addon.calendar.units' | translate}">
-                    <ion-select-option *ngFor="let option of customUnitsOptions" [value]="option.value">
-                        {{ option.label | translate }}
-                    </ion-select-option>
-                </ion-select>
-            </div>
-        </ion-item>
-    </ion-radio-group>
+                    <!-- Units. -->
+                    <label class="accesshide" for="reminderUnits">{{ 'addon.calendar.units' | translate }}</label>
+                    <ion-select id="reminderUnits" name="customunits" [(ngModel)]="customUnits" interface="action-sheet"
+                        [disabled]="radioValue != 'custom'" slot="end" [interfaceOptions]="{header: 'addon.calendar.units' | translate}">
+                        <ion-select-option *ngFor="let option of customUnitsOptions" [value]="option.value">
+                            {{ option.label | translate }}
+                        </ion-select-option>
+                    </ion-select>
+                </div>
+            </ion-item>
+        </ion-radio-group>
 
-    <ion-button class="ion-margin" expand="block" (click)="saveReminder()" [disabled]="radioValue == 'custom' && !customValue">
-        {{ 'core.done' | translate }}
-    </ion-button>
+        <ion-button type="submit" class="ion-margin" expand="block" [disabled]="radioValue == 'custom' && !customValue">
+            {{ 'core.done' | translate }}
+        </ion-button>
+    </form>
 </ion-content>