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
@@ -17,6 +17,7 @@ import { SuccessMessagePage } from 'src/app/shared/popover/success-message/succe
import { User } from 'src/app/models/user.model';
import { AuthService } from 'src/app/services/auth.service';
import { AttendeesPage } from 'src/app/pages/events/attendees/attendees.page';
import { ToastService } from 'src/app/services/toast.service';
@Component({
selector: 'app-book-meeting-modal',
@@ -53,7 +54,8 @@ export class BookMeetingModalPage implements OnInit {
private attachmentsService: AttachmentsService,
private calendarService: EventsService,
authService: AuthService,
private animationController: AnimationController
private animationController: AnimationController,
private toastService: ToastService,
) {
this.loggeduser = authService.ValidatedUser;
this.task = this.navParams.get('task');
@@ -138,9 +140,9 @@ export class BookMeetingModalPage implements OnInit {
}
this.distartExpedientModal();
this.successMessage('Reunião criada')
this.toastService.successMessage('Reunião criada')
} catch (error) {
this.badRequest('Reunião não criada')
this.toastService.badRequest('Reunião não criada')
}
@@ -157,12 +159,12 @@ export class BookMeetingModalPage implements OnInit {
break;
}
this.successMessage('Reunião criada', ()=>{
this.toastService.successMessage('Reunião criada', ()=>{
this.close();
})
} catch (error) {
this.badRequest()
this.toastService.badRequest()
}
}
@@ -56,7 +56,7 @@ export class ExpedienteDetailPage implements OnInit {
public popoverController: PopoverController,
private activatedRoute: ActivatedRoute,
private toastService: ToastService,
private animationController: AnimationController
private animationController: AnimationController,
) {
this.activateRoute.paramMap.subscribe(params => {
@@ -120,14 +120,14 @@ export class ExpedienteDetailPage implements OnInit {
});
}
sendExpedienteToPending(){
sendExpedienteToPending() {
this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
console.log(res);
this.successMessage('Processo enviado para pendentes')
this.toastService.successMessage('Processo enviado para pendentes')
this.goBack();
},
(error)=>{
this.badRequest('Processo não enviado para pendentes')
this.toastService.badRequest('Processo não enviado para pendentes')
});
}
@@ -266,10 +266,10 @@ export class ExpedienteDetailPage implements OnInit {
try {
await this.processes.CompleteTask(otherbody).toPromise()
this.successMessage('Processo descartado');
this.toastService.successMessage('Processo descartado');
this.goBack();
} catch (error) {
this.badRequest('Processo não descartado')
this.toastService.badRequest('Processo não descartado')
}
}
@@ -281,10 +281,10 @@ export class ExpedienteDetailPage implements OnInit {
if(res['data']== 'Yes'){
try {
await this.processes.CompleteTask(body).toPromise();
this.successMessage('Processo descartado');
this.toastService.successMessage('Processo descartado');
this.goBack();
} catch (error) {
this.badRequest('Processo não descartado')
this.toastService.badRequest('Processo não descartado')
}
this.goBack();
}
@@ -292,10 +292,10 @@ export class ExpedienteDetailPage implements OnInit {
console.log('Update');
try {
await this.processes.UpdateTaskStatus(this.task.FolderId).toPromise();
this.successMessage();
this.toastService.successMessage();
this.goBack();
} catch (error) {
this.badRequest()
this.toastService.badRequest()
}
}
}
@@ -361,52 +361,7 @@ export class ExpedienteDetailPage implements OnInit {
async successMessage(message?: any, callback?) {
const enterAnimation = (baseEl: any) => {
const backdropAnimation = this.animationController.create()
.addElement(baseEl.querySelector('ion-backdrop')!)
.fromTo('opacity', '0.01', 'var(--backdrop-opacity)');
const wrapperAnimation = this.animationController.create()
.addElement(baseEl.querySelector('.modal-wrapper')!)
.keyframes([
{ offset: 0, opacity: '1', right: '-100%' },
{ offset: 1, opacity: '1', right: '0px' }
]);
return this.animationController.create()
.addElement(baseEl)
.easing('ease-out')
.duration(500)
.addAnimation([backdropAnimation, wrapperAnimation]);
}
const leaveAnimation = (baseEl: any) => {
return enterAnimation(baseEl).direction('reverse');
}
const modal = await this.modalController.create({
enterAnimation,
leaveAnimation,
component: SuccessMessagePage,
componentProps: {
message: message || 'Processo efetuado' ,
},
cssClass: 'notification-modal'
});
modal.present()
setTimeout(()=>{
if (callback) {
callback()
}
modal.dismiss()
},7000)
}
async badRequest(message?: string, callback?) {
const enterAnimation = (baseEl: any) => {