Improve notification

This commit is contained in:
Peter Maquiran
2021-06-15 15:09:20 +01:00
parent bfb81fd84f
commit c856cc2927
32 changed files with 218 additions and 1447 deletions
@@ -6,6 +6,7 @@ import { EventPerson } from 'src/app/models/eventperson.model';
import { AlertService } from 'src/app/services/alert.service';
import { AttachmentsService } from 'src/app/services/attachments.service';
import { EventsService } from 'src/app/services/events.service';
import { ToastService } from 'src/app/services/toast.service';
import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { Event } from '../../../models/event.model';
@@ -47,6 +48,7 @@ export class EditEventPage implements OnInit {
public alertController: AlertController,
private attachmentsService: AttachmentsService,
private animationController: AnimationController,
private toastService: ToastService,
) {
this.isEventEdited = false;
this.postEvent = this.navParams.get('event');
@@ -116,16 +118,16 @@ export class EditEventPage implements OnInit {
});
await alert.present(); */
this.successMessage()
this.toastService.successMessage()
}, error => {
this.badRequest()
this.toastService.badRequest()
});
this.isEventEdited = true;
this.modalController.dismiss(this.isEventEdited);
} catch (error) {
this.badRequest()
this.toastService.badRequest()
}
}
@@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
import { Router } from '@angular/router';
import { AnimationController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { ProcessesService } from 'src/app/services/processes.service';
import { ToastService } from 'src/app/services/toast.service';
import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page';
import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
@@ -21,7 +22,8 @@ export class EventActionsPopoverPage implements OnInit {
private router:Router,
private modalController: ModalController,
private popoverController: PopoverController,
private animationController: AnimationController,) {
private animationController: AnimationController,
private toastService: ToastService,) {
this.serialNumber = this.navParams.get('serialNumber');
this.instanceId = this.navParams.get('InstanceId');
}
@@ -45,9 +47,9 @@ export class EventActionsPopoverPage implements OnInit {
this.processes.PostTaskAction(body).toPromise()
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
this.successMessage()
this.toastService.successMessage()
} catch (error) {
this.badRequest()
this.toastService.badRequest()
}
}
@@ -61,9 +63,9 @@ export class EventActionsPopoverPage implements OnInit {
this.processes.PostTaskAction(body).toPromise()
this.router.navigate(['/home/gabinete-digital/event-list']);
this.modalController.dismiss(null);
this.successMessage()
this.toastService.successMessage()
} catch (error) {
this.badRequest()
this.toastService.badRequest()
}
@@ -6,6 +6,7 @@ import { EventPerson } from 'src/app/models/eventperson.model';
import { SearchDocument } from 'src/app/models/search-document';
import { AttachmentsService } from 'src/app/services/attachments.service';
import { EventsService } from 'src/app/services/events.service';
import { ToastService } from 'src/app/services/toast.service';
import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page';
import { SuccessMessagePage } from 'src/app/shared/popover/success-message/success-message.page';
import { Event } from '../../../models/event.model';
@@ -41,6 +42,7 @@ export class NewEventPage implements OnInit {
private eventService: EventsService,
private attachmentsService: AttachmentsService,
private animationController: AnimationController,
private toastService: ToastService,
) {
this.postEvent = new Event();
this.eventBody = { BodyType : "1", Text : ""};
@@ -158,12 +160,12 @@ export class NewEventPage implements OnInit {
});
this.successMessage()
this.toastService.successMessage()
this.modalController.dismiss(this.postEvent);
} catch (error) {
this.badRequest()
this.toastService.badRequest()
}
}