diff --git a/src/app/modals/add-note/add-note.page.ts b/src/app/modals/add-note/add-note.page.ts index 9f7fd96db..eda5c0545 100644 --- a/src/app/modals/add-note/add-note.page.ts +++ b/src/app/modals/add-note/add-note.page.ts @@ -61,7 +61,7 @@ export class AddNotePage implements OnInit { this.documents = this.documents.filter( (e, i) => index != i); } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 5593aa57e..ca879bbf0 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -504,7 +504,7 @@ export class CreateProcessPage implements OnInit { - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/modals/dar-parecer/dar-parecer.page.ts b/src/app/modals/dar-parecer/dar-parecer.page.ts index 5569b346d..945ede90e 100644 --- a/src/app/modals/dar-parecer/dar-parecer.page.ts +++ b/src/app/modals/dar-parecer/dar-parecer.page.ts @@ -97,7 +97,7 @@ export class DarParecerPage implements OnInit { } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts index e3f584f27..122b9c6ff 100644 --- a/src/app/modals/delegar/delegar.page.ts +++ b/src/app/modals/delegar/delegar.page.ts @@ -171,7 +171,7 @@ export class DelegarPage implements OnInit { this.taskParticipants = taskParticipants; } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index 5b581a5f6..f35252c8c 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -234,7 +234,7 @@ export class EditEventPage implements OnInit { }); } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts index adcec863c..9549c9482 100644 --- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts @@ -92,7 +92,7 @@ export class EventActionsPopoverPage implements OnInit { } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index 767dce174..b54e8af7c 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -169,7 +169,7 @@ export class NewEventPage implements OnInit { } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index fad93138b..e0a66ff92 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -464,7 +464,7 @@ export class DespachoPrPage implements OnInit { return await popover.present(); } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index c7f5b9de5..57dbf26c0 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -424,7 +424,7 @@ export class DespachoPage implements OnInit { } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts index 117e202ff..bfdd64f4a 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.ts @@ -53,7 +53,7 @@ export class DiplomaAssinarPage implements OnInit { this.LoadTaskDetail(this.serialnumber); } - goBack(){ + goBack() { let navigationExtras: NavigationExtras = { queryParams: { "diplomas": true, @@ -150,18 +150,20 @@ export class DiplomaAssinarPage implements OnInit { } try { await this.processes.CompleteTask(body).toPromise() - this.goBack(); - this.successMessage() + + this.successMessage(false, ()=>{ + this.goBack(); + }) } catch (error) { this.badRequest() } } - close(){ + close() { this.modalController.dismiss(); } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts index d217e079f..fae1c1b00 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts @@ -154,7 +154,9 @@ export class DiplomaPage implements OnInit { try { await this.processes.CompleteTask(body).toPromise() this.close(); - this.successMessage() + this.successMessage(false, ()=>{ + + }) } catch (error) { this.badRequest() } @@ -272,7 +274,7 @@ export class DiplomaPage implements OnInit { this.modalController.dismiss(); } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts index e4f9d950b..805251e85 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts @@ -128,7 +128,7 @@ export class ApproveEventModalPage implements OnInit { try { await this.processes.PostTaskAction(body).toPromise() - + this.successMessage('Evento rejeitado', () =>{ this.router.navigate(['/home/gabinete-digital/event-list']); }) @@ -220,7 +220,7 @@ export class ApproveEventModalPage implements OnInit { } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index 32490c2b1..126b093e5 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -235,7 +235,7 @@ export class ApproveEventPage implements OnInit { - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index bd3388073..29dc86172 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -305,7 +305,7 @@ export class BookMeetingModalPage implements OnInit { - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index c943534cf..10021e2db 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -528,7 +528,7 @@ export class ExpedientTaskModalPage implements OnInit { } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 84014169c..c3aa7b388 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -364,7 +364,7 @@ export class ExpedienteDetailPage implements OnInit { - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts index 263de463b..94327f159 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts @@ -440,7 +440,7 @@ export class ExpedientePrPage implements OnInit { return await popover.present(); } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index 56bbdc153..d3b28cdd0 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -418,7 +418,7 @@ export class PedidoPage implements OnInit { } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 4b7b5fe1c..a807cb999 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -205,7 +205,7 @@ export class LoginPage implements OnInit { } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/pages/publications/new-action/new-action.page.ts b/src/app/pages/publications/new-action/new-action.page.ts index 1c33621dc..0def7afd9 100644 --- a/src/app/pages/publications/new-action/new-action.page.ts +++ b/src/app/pages/publications/new-action/new-action.page.ts @@ -56,7 +56,7 @@ export class NewActionPage implements OnInit { this.modalController.dismiss(); } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/pages/publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/publication-detail/publication-detail.page.ts index 50125f6f7..0d4a520af 100644 --- a/src/app/pages/publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/publication-detail/publication-detail.page.ts @@ -122,7 +122,7 @@ export class PublicationDetailPage implements OnInit { } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts index 12eb32156..cced89669 100644 --- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts @@ -124,7 +124,7 @@ export class PublicationDetailPage implements OnInit { } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/services/toast.service.ts b/src/app/services/toast.service.ts index afaf60547..04b4726e4 100644 --- a/src/app/services/toast.service.ts +++ b/src/app/services/toast.service.ts @@ -22,7 +22,7 @@ export class ToastService { toast.present(); } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts index cb4dcda46..432fd955d 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -235,7 +235,7 @@ export class ApproveEventPage implements OnInit { } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 6c992ee4e..df0c2ec93 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -315,7 +315,7 @@ export class NewEventPage implements OnInit { window['temp.path:/home/agenda/new-event.component.ts'] = {} } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/shared/fingerprint/fingerprint.page.ts b/src/app/shared/fingerprint/fingerprint.page.ts index e325fbec2..d1997b19e 100644 --- a/src/app/shared/fingerprint/fingerprint.page.ts +++ b/src/app/shared/fingerprint/fingerprint.page.ts @@ -69,7 +69,7 @@ export class FingerprintPage implements OnInit { } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts index ea3c95554..c55082221 100644 --- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts +++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts @@ -407,7 +407,7 @@ export class EditEventToApproveComponent implements OnInit { }); } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/shared/pin/pin.page.ts b/src/app/shared/pin/pin.page.ts index 46a03e619..0646d4796 100644 --- a/src/app/shared/pin/pin.page.ts +++ b/src/app/shared/pin/pin.page.ts @@ -54,7 +54,7 @@ export class PinPage implements OnInit { } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/shared/popover/deploma-options/deploma-options.page.ts b/src/app/shared/popover/deploma-options/deploma-options.page.ts index 1a513983c..827cdc242 100644 --- a/src/app/shared/popover/deploma-options/deploma-options.page.ts +++ b/src/app/shared/popover/deploma-options/deploma-options.page.ts @@ -145,7 +145,7 @@ export class DeplomaOptionsPage implements OnInit { } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts index 9fe7de0c3..fac026cb2 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.ts +++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts @@ -281,7 +281,7 @@ export class DespachosOptionsPage implements OnInit { - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts index 44d6ea705..fd4e0b524 100644 --- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts +++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts @@ -282,7 +282,7 @@ export class DespachosPrOptionsPage implements OnInit { - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts index 14156cec4..4608d15dd 100644 --- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts +++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts @@ -289,7 +289,7 @@ export class OptsExpedientePrPage implements OnInit { } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() 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 12e764cbf..65f5c9507 100644 --- a/src/app/shared/popover/request-options/request-options.page.ts +++ b/src/app/shared/popover/request-options/request-options.page.ts @@ -285,7 +285,7 @@ export class RequestOptionsPage implements OnInit { - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/shared/publication/new-action/new-action.page.ts b/src/app/shared/publication/new-action/new-action.page.ts index ab288eabc..3c982c133 100644 --- a/src/app/shared/publication/new-action/new-action.page.ts +++ b/src/app/shared/publication/new-action/new-action.page.ts @@ -59,7 +59,7 @@ export class NewActionPage implements OnInit { } - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts index c50779f70..b09b55bee 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -275,7 +275,7 @@ export class NewPublicationPage implements OnInit { } */ - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts index 513e1090d..e6dbee632 100644 --- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts +++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts @@ -141,7 +141,7 @@ export class PublicationDetailPage implements OnInit { - async successMessage(message?: string, callback?) { + async successMessage(message?: any, callback?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create()