From 479ebb8ee6a3bcfdf9e8acb461fb3e5ddda49e2a Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 20 Aug 2021 14:39:06 +0100 Subject: [PATCH] Fix --- src/app/services/modal.service.ts | 19 ++++++++++++++++++- .../request-options/request-options.page.ts | 3 ++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/app/services/modal.service.ts b/src/app/services/modal.service.ts index 7590a2ad3..21aaa4329 100644 --- a/src/app/services/modal.service.ts +++ b/src/app/services/modal.service.ts @@ -1,9 +1,26 @@ import { Injectable } from '@angular/core'; +import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; +import { AnimationController, ModalController, NavParams, PopoverController } from '@ionic/angular'; @Injectable({ providedIn: 'root' }) export class ModalService { - constructor() { } + constructor( + private modalController: ModalController, + ) { } + + + BookMeetingModalPage(task, { classs, backdropDismiss = false }) { + return this.modalController.create({ + component: BookMeetingModalPage, + componentProps: { + task: task, + }, + cssClass: classs, + backdropDismiss + }); + } + } diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts index ee9ee3343..126421194 100644 --- a/src/app/shared/popover/request-options/request-options.page.ts +++ b/src/app/shared/popover/request-options/request-options.page.ts @@ -237,6 +237,8 @@ export class RequestOptionsPage implements OnInit { else if(actionName == 'Arquivar') { await this.arquivar(res.data.note, docs); this.popoverController.dismiss('close') + this.modalController.dismiss('close'); + alert('close') } } }); @@ -255,7 +257,6 @@ export class RequestOptionsPage implements OnInit { try { await this.processes.CompleteTask(body).toPromise() - this.close(); this.toastService.successMessage('Processo arquivado') } catch (error) { this.toastService.badRequest('Processo não arquivado')