EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2123 from albertgasset/MOBILE-2890 

Mobile 2890
main
Juan Leyva 2019-10-02 14:54:39 +02:00 committed by GitHub
parent b721589c46 922429e0d1
commit c1cececefb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/addon/calendar/pages/event/event.html
View File

@ -98,12 +98,11 @@
<ng-container *ngIf="event.timestart + event.timeduration > currentTime">
<ion-item>
<ion-label stacked><h2>{{ 'addon.calendar.setnewreminder' | translate }}</h2></ion-label>
<ion-datetime [(ngModel)]="notificationTimeText" [placeholder]="'core.choosedots' | translate" [displayFormat]="notificationFormat" [min]="notificationMin" [max]="notificationMax"></ion-datetime>
</ion-item>
<ion-item>
<button ion-button block color="primary" (click)="addNotificationTime($event)" [disabled]="!notificationTimeText">{{ 'core.save' | translate }}</button>
<button ion-button block color="primary" (click)="notificationPicker.open()">
{{ 'addon.calendar.setnewreminder' | translate }}
</button>
</ion-item>
<ion-datetime #notificationPicker hidden [(ngModel)]="notificationTimeText" [displayFormat]="notificationFormat" [min]="notificationMin" [max]="notificationMax" [doneText]="'core.add' | translate"(ionChange)="addNotificationTime()"></ion-datetime>
</ng-container>
</ion-card>
</core-loading>

25
src/addon/calendar/pages/event/event.ts
View File

@ -311,13 +311,8 @@ export class AddonCalendarEventPage implements OnDestroy {
/**
* Add a reminder for this event.
*
* @param e Click event.
*/
addNotificationTime(e: Event): void {
e.preventDefault();
e.stopPropagation();
addNotificationTime(): void {
if (this.notificationTimeText && this.event && this.event.id) {
let notificationTime = this.timeUtils.convertToTimestamp(this.notificationTimeText);
@ -349,10 +344,22 @@ export class AddonCalendarEventPage implements OnDestroy {
e.preventDefault();
e.stopPropagation();
this.calendarProvider.deleteEventReminder(id).then(() => {
this.calendarProvider.getEventReminders(this.eventId).then((reminders) => {
this.reminders = reminders;
const message = this.translate.instant('core.areyousure');
const okText = this.translate.instant('core.delete');
this.domUtils.showConfirm(message, undefined, okText).then(() => {
const modal = this.domUtils.showModalLoading('core.deleting', true);
this.calendarProvider.deleteEventReminder(id).then(() => {
this.calendarProvider.getEventReminders(this.eventId).then((reminders) => {
this.reminders = reminders;
});
}).catch((error) => {
this.domUtils.showErrorModalDefault(error, 'Error deleting reminder');
}).finally(() => {
modal.dismiss();
});
}).catch(() => {
// Cancelled.
});
}