From 574aac6615dfbaa7fa448b7bf216ebf8fac94857 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 8 Jun 2021 16:56:48 +0100 Subject: [PATCH] Messages --- .../modals/create-process/create-process.page.ts | 4 ++-- src/app/modals/dar-parecer/dar-parecer.page.ts | 4 ++-- src/app/modals/delegar/delegar.page.ts | 2 +- .../event-actions-popover.page.ts | 4 ++-- .../despachos-pr/despacho-pr/despacho-pr.page.ts | 12 +++++++----- .../despachos/despacho/despacho.page.ts | 12 ++++++------ .../diplomas/diploma/diploma.page.ts | 2 +- .../approve-event-modal.page.ts | 8 ++++---- .../approve-event/approve-event.page.ts | 2 +- .../book-meeting-modal.page.ts | 2 +- .../expediente-detail/expediente-detail.page.ts | 10 +++++----- .../expediente-pr/expediente-pr.page.ts | 10 +++++----- .../pedidos/pedido/pedido.page.ts | 2 +- .../publications/new-action/new-action.page.ts | 10 +++++----- .../publication-detail.page.ts | 10 +++++----- .../publication-detail.page.ts | 8 ++++---- .../agenda/approve-event/approve-event.page.ts | 4 ++-- .../shared/agenda/new-event/new-event.page.ts | 12 ++++++------ .../edit-event-to-approve/edit-event.page.ts | 4 ++-- .../despachos-options/despachos-options.page.ts | 4 ++-- .../despachos-pr-options.page.ts | 4 ++-- .../opts-expediente-pr.page.ts | 2 +- .../request-options/request-options.page.ts | 4 ++-- .../publication/new-action/new-action.page.ts | 8 ++++---- .../new-publication/new-publication.page.ts | 16 ++++++++-------- .../publication-detail.page.ts | 10 +++++----- 26 files changed, 86 insertions(+), 84 deletions(-) diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 38ffde662..9b67e9240 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -177,7 +177,7 @@ export class CreateProcessPage implements OnInit { try { await this.processes.postDespatcho(this.postData).toPromise() - this.successMessage() + this.successMessage('') } catch (error) { this.badRequest() } @@ -578,7 +578,7 @@ export class CreateProcessPage implements OnInit { leaveAnimation, component: BadRequestPage, componentProps: { - message: message || 'Processo efetuado' , + message: message || 'Processo não efetuado' , }, cssClass: 'notification-modal' }); diff --git a/src/app/modals/dar-parecer/dar-parecer.page.ts b/src/app/modals/dar-parecer/dar-parecer.page.ts index a9a08305a..2ac655fd2 100644 --- a/src/app/modals/dar-parecer/dar-parecer.page.ts +++ b/src/app/modals/dar-parecer/dar-parecer.page.ts @@ -65,9 +65,9 @@ export class DarParecerPage implements OnInit { try { await this.processes.CompleteTask(body).toPromise(); this.modalController.dismiss(); - this.successMessage() + this.successMessage('Pedido de Parecer solicitado') } catch (error) { - this.badRequest() + this.badRequest("Pedido de Parecer não solicitado") } diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts index 1b532099a..5b97e5a0a 100644 --- a/src/app/modals/delegar/delegar.page.ts +++ b/src/app/modals/delegar/delegar.page.ts @@ -102,7 +102,7 @@ export class DelegarPage implements OnInit { this.successMessage('Processo delegado') }, (error)=>{ - this.badRequest() + this.badRequest("Processo não delegado") }); this.goBack(); } 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 d122be70b..53e11a19c 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 @@ -41,7 +41,7 @@ export class EventActionsPopoverPage implements OnInit { console.log(body); - try { + try { this.processes.PostTaskAction(body).toPromise() this.router.navigate(['/home/gabinete-digital/event-list']); this.modalController.dismiss(null); @@ -51,7 +51,7 @@ export class EventActionsPopoverPage implements OnInit { } } - emendarTask(){ + emendarTask() { let body = { "serialNumber": this.serialNumber, "action": "Rejeitar" } console.log(body); 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 bb2f46d55..cf7368de1 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 @@ -206,10 +206,10 @@ export class DespachoPrPage implements OnInit { } try { await this.processes.CompleteTask(body).toPromise() - this.successMessage() + this.successMessage('Processo arquivado') this.close(); } catch (error) { - this.badRequest() + this.badRequest('Processo não arquivado') } } @@ -227,10 +227,10 @@ export class DespachoPrPage implements OnInit { try { await this.processes.CompleteTask(body).toPromise() - this.successMessage() + this.successMessage('Processo criado') this.close(); } catch (error) { - this.badRequest() + this.badRequest('Processo não criado') } } @@ -247,7 +247,7 @@ export class DespachoPrPage implements OnInit { } try { await this.processes.CompleteTask(body).toPromise() - this.successMessage() + this.successMessage('') this.close(); } catch (error) { this.badRequest() @@ -280,6 +280,8 @@ export class DespachoPrPage implements OnInit { this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ console.log(res); this.close(); + + this.successMessage('Processo enviado para pendentes') }); } 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 74b48ad7c..9f325ca6d 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -183,9 +183,9 @@ export class DespachoPage implements OnInit { try { await this.processes.CompleteTask(body).toPromise() this.close(); - this.successMessage() + this.successMessage('Processo criado') } catch(error) { - this.badRequest() + this.badRequest("Processo não criado") } } @@ -201,10 +201,10 @@ export class DespachoPage implements OnInit { } try { await this.processes.CompleteTask(body).toPromise() - this.successMessage() + this.successMessage('Processo descartado') this.close(); } catch (error) { - this.badRequest() + this.badRequest("Processo não descartado") } } @@ -235,10 +235,10 @@ export class DespachoPage implements OnInit { this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ console.log(res); this.close(); - this.successMessage() + this.successMessage('Processo enviado para despacho') }, error => { - this.badRequest() + this.badRequest("Processo não enviado para despacho") }); } 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 acc56e9d8..f5aa91be5 100644 --- a/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts @@ -191,7 +191,7 @@ export class DiplomaPage implements OnInit { } try { await this.processes.CompleteTask(body).toPromise(); - this.successMessage() + this.successMessage('Processo concluído') } catch (error) { this.badRequest() } 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 b1860ecdc..9fd4654cc 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 @@ -102,9 +102,9 @@ export class ApproveEventModalPage implements OnInit { await this.processes.PostTaskAction(body).toPromise() this.router.navigate(['/home/gabinete-digital/event-list']); this.modalController.dismiss(null); - this.successMessage() + this.successMessage('Evento aprovado') } catch (error) { - this.badRequest() + this.badRequest('Evento não aprovado') } @@ -127,9 +127,9 @@ export class ApproveEventModalPage implements OnInit { await this.processes.PostTaskAction(body).toPromise() this.router.navigate(['/home/gabinete-digital/event-list']); - this.successMessage() + this.successMessage('Evento rejeitado') } catch (error) { - this.badRequest() + this.badRequest('Evento não rejeitado') } this.modalController.dismiss(null); 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 aa2eb515d..559075eae 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 @@ -122,7 +122,7 @@ export class ApproveEventPage implements OnInit { try { this.processes.PostTaskAction(body).toPromise(); - await this.successMessage(); + await this.successMessage('Processo rejeitado'); this.goBack(); } catch (error) { this.badRequest() 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 99ef3d3a1..c6d9f57fa 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 @@ -139,7 +139,7 @@ export class BookMeetingModalPage implements OnInit { this.distartExpedientModal(); this.successMessage('Reunião criada') } catch (error) { - this.badRequest() + this.badRequest('Reunião não criada') } 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 c4c4d6eeb..7a3b027ed 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 @@ -111,7 +111,7 @@ export class ExpedienteDetailPage implements OnInit { this.goBack(); }, (error)=>{ - this.badRequest() + this.badRequest('Processo não enviado para pendentes') }); } @@ -246,10 +246,10 @@ export class ExpedienteDetailPage implements OnInit { try { await this.processes.CompleteTask(otherbody).toPromise() - this.successMessage(); + this.successMessage('Processo descartado'); this.goBack(); } catch (error) { - this.badRequest() + this.badRequest('Processo não descartado') } } @@ -261,10 +261,10 @@ export class ExpedienteDetailPage implements OnInit { if(res['data']== 'Yes'){ try { await this.processes.CompleteTask(body).toPromise(); - this.successMessage(); + this.successMessage('Processo descartado'); this.goBack(); } catch (error) { - this.badRequest() + this.badRequest('Processo não descartado') } 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 dcd46821a..31e57a034 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 @@ -106,7 +106,7 @@ export class ExpedientePrPage implements OnInit { this.goBack(); }, (error)=>{ - this.badRequest() + this.badRequest('Processo não enviado para pendentes') }); } @@ -201,9 +201,9 @@ export class ExpedientePrPage implements OnInit { try { await this.processes.CompleteTask(body).toPromise() this.close(); - this.successMessage() + this.successMessage('Processo aprovado') } catch(error) { - this.badRequest() + this.badRequest('Processo não aprovado') } } @@ -329,9 +329,9 @@ export class ExpedientePrPage implements OnInit { try { await this.processes.CompleteTask(otherbody).toPromise(); - this.successMessage() + this.successMessage('Processo descartado') } catch (error) { - this.badRequest() + this.badRequest('Processo não descartado') } 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 289a1639a..113e45855 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -221,7 +221,7 @@ export class PedidoPage implements OnInit { try { await this.processes.CompleteTask(body).toPromise() - this.successMessage() + this.successMessage('Processo arquivado') this.close(); } catch (error) { this.badRequest() 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 66e91d50b..8108d746a 100644 --- a/src/app/pages/publications/new-action/new-action.page.ts +++ b/src/app/pages/publications/new-action/new-action.page.ts @@ -45,10 +45,10 @@ export class NewActionPage implements OnInit { try { await this.publication.CreatePublicationFolder(this.folder).toPromise() - this.successMessage() + this.successMessage("Ação presidencial criado") this.close(); } catch (error) { - this.badRequest() + this.badRequest("Ação presidencial não criado") } } @@ -100,7 +100,7 @@ export class NewActionPage implements OnInit { } - async badRequest() { + async badRequest(message?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() .addElement(baseEl.querySelector('ion-backdrop')!) @@ -130,9 +130,9 @@ export class NewActionPage implements OnInit { leaveAnimation, component: BadRequestPage, componentProps: { - message: 'Processo não realizado com sucesso', + message: message || 'Processo não realizado com sucesso', }, - cssClass: 'modal modal-desktop' + cssClass: 'notification-modal' }); modal.present() 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 d7331a992..f4adc3908 100644 --- a/src/app/pages/publications/publication-detail/publication-detail.page.ts +++ b/src/app/pages/publications/publication-detail/publication-detail.page.ts @@ -83,10 +83,10 @@ export class PublicationDetailPage implements OnInit { try { await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise(); - this.successMessage() + this.successMessage('Publicação eliminado') this.close(); } catch (error) { - this.badRequest() + this.badRequest('Publicação não eliminado') } } @@ -166,7 +166,7 @@ export class PublicationDetailPage implements OnInit { } - async badRequest() { + async badRequest(message?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() .addElement(baseEl.querySelector('ion-backdrop')!) @@ -196,9 +196,9 @@ export class PublicationDetailPage implements OnInit { leaveAnimation, component: BadRequestPage, componentProps: { - message: 'Processo não realizado com sucesso', + message: message || 'Processo não realizado com sucesso', }, - cssClass: 'modal modal-desktop' + cssClass: 'notification-modal' }); modal.present() 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 74b9c7378..b448c62aa 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 @@ -83,13 +83,13 @@ export class PublicationDetailPage implements OnInit { try { await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise(); - this.successMessage() + this.successMessage('Publicaçao eliminado') this.close(); //this.goBackToViewPublications.emit(); } catch (error) { - this.badRequest() + this.badRequest('Publicaçao não eliminado') } } @@ -168,7 +168,7 @@ export class PublicationDetailPage implements OnInit { } - async badRequest() { + async badRequest(message?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() .addElement(baseEl.querySelector('ion-backdrop')!) @@ -200,7 +200,7 @@ export class PublicationDetailPage implements OnInit { componentProps: { message: 'Processo não realizado com sucesso', }, - cssClass: 'modal modal-desktop' + cssClass: 'notification-modal' }); modal.present() 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 db7d30017..d75031bb3 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -125,9 +125,9 @@ export class ApproveEventPage implements OnInit { await this.processes.PostTaskAction(body).toPromise() this.router.navigate(['/home/gabinete-digital/event-list']); this.modalController.dismiss(null); - this.successMessage() + this.successMessage('Evento rejeitado') } catch (error) { - this.badRequest() + this.badRequest('Evento não rejeitado') } } 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 7c533dc9a..bae43e372 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -206,11 +206,11 @@ export class NewEventPage implements OnInit { this.afterSave(); } - this.successMessage() + this.successMessage('Evento criado') }, error => { - this.badRequest() + this.badRequest('Evento não criado') }); } else if(this.profile=='pr') { @@ -247,7 +247,7 @@ export class NewEventPage implements OnInit { this.afterSave(); } - this.successMessage() + this.successMessage('Evento criado') }); } } @@ -359,7 +359,7 @@ export class NewEventPage implements OnInit { } - async badRequest() { + async badRequest(message?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() .addElement(baseEl.querySelector('ion-backdrop')!) @@ -389,9 +389,9 @@ export class NewEventPage implements OnInit { leaveAnimation, component: BadRequestPage, componentProps: { - message: 'Processo não realizado com sucesso', + message: message || 'Processo não realizado com sucesso', }, - cssClass: 'modal modal-desktop' + cssClass: 'notification-modal' }); modal.present() 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 edb29e322..4bcd513d4 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 @@ -253,9 +253,9 @@ export class EditEventToApproveComponent implements OnInit { } this.eventsService.postEventToApproveEdit(event).subscribe(()=>{ - this.successMessage() + this.successMessage('Evento editado') }, error =>{ - this.badRequest() + this.badRequest('Evento não editado') }) 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 79877c012..c0f4ab31e 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.ts +++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts @@ -250,10 +250,10 @@ export class DespachosOptionsPage implements OnInit { } try { await this.processes.CompleteTask(body).toPromise() - this.successMessage() + this.successMessage('Processo arquivado') this.close(); } catch (error) { - this.badRequest() + this.badRequest('Processo não arquivado') } } 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 307d599c8..f942fdd37 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 @@ -251,10 +251,10 @@ export class DespachosPrOptionsPage implements OnInit { } try { await this.processes.CompleteTask(body).toPromise() - this.successMessage() + this.successMessage('Processo arquivado') this.close(); } catch (error) { - this.badRequest() + this.badRequest('Processo não arquivado') } } 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 00c53da0b..f5d683176 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 @@ -331,7 +331,7 @@ export class OptsExpedientePrPage implements OnInit { } - async badRequest() { + async badRequest(message?) { const modal = await this.modalController.create({ component: BadRequestPage, componentProps: { 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 566639ada..add10b2ba 100644 --- a/src/app/shared/popover/request-options/request-options.page.ts +++ b/src/app/shared/popover/request-options/request-options.page.ts @@ -232,9 +232,9 @@ export class RequestOptionsPage implements OnInit { try { await this.processes.CompleteTask(body).toPromise() this.close(); - this.successMessage() + this.successMessage('Processo arquivado') } catch (error) { - this.badRequest() + this.badRequest('Processo não arquivado') } 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 5edadbe90..c43558ea0 100644 --- a/src/app/shared/publication/new-action/new-action.page.ts +++ b/src/app/shared/publication/new-action/new-action.page.ts @@ -47,9 +47,9 @@ export class NewActionPage implements OnInit { try { await this.publication.CreatePublicationFolder(this.folder).toPromise() this.close(); - this.successMessage() + this.successMessage('Publicação criado') } catch (error) { - this.badRequest() + this.badRequest('Publicação não criado') } } @@ -103,7 +103,7 @@ export class NewActionPage implements OnInit { } - async badRequest() { + async badRequest(message?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() .addElement(baseEl.querySelector('ion-backdrop')!) @@ -135,7 +135,7 @@ export class NewActionPage implements OnInit { componentProps: { message: 'Processo não realizado com sucesso', }, - cssClass: 'modal modal-desktop' + cssClass: 'notification-modal' }); modal.present() 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 c1cbb4fc3..6dced0ef8 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -159,11 +159,11 @@ export class NewPublicationPage implements OnInit { console.log(this.publication); await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise() - this.successMessage() + this.successMessage("Publicação criado") this.goBack(); } catch (error) { - this.badRequest() + this.badRequest("Publicação não criado") } } @@ -183,11 +183,11 @@ export class NewPublicationPage implements OnInit { try { console.log(this.publication); await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise() - this.successMessage() + this.successMessage("Publicação criado") this.goBack(); } catch (error) { - this.badRequest() + this.badRequest("Publicação não criado") } } @@ -209,11 +209,11 @@ export class NewPublicationPage implements OnInit { try { console.log(this.publication); await this.publications.CreatePublication(this.folderId, this.publication).toPromise() - this.successMessage() + this.successMessage("Publicação criado") this.goBackToViewPublications.emit(); } catch (error) { - this.badRequest() + this.badRequest("Publicação não criado") } } @@ -319,7 +319,7 @@ export class NewPublicationPage implements OnInit { } - async badRequest() { + async badRequest(message?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() .addElement(baseEl.querySelector('ion-backdrop')!) @@ -351,7 +351,7 @@ export class NewPublicationPage implements OnInit { componentProps: { message: 'Processo não realizado com sucesso', }, - cssClass: 'modal modal-desktop' + cssClass: 'notification-modal' }); modal.present() 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 5396004ca..2703b1f85 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 @@ -80,7 +80,7 @@ export class PublicationDetailPage implements OnInit { }); } - close(){ + close() { this.modalController.dismiss(); } @@ -88,10 +88,10 @@ export class PublicationDetailPage implements OnInit { try { await this.publications.DeletePublication(this.folderId, this.publicationId).toPromise(); - this.successMessage() + this.successMessage("Publicação eliminado") this.goBackToViewPublications.emit(); } catch (error) { - this.badRequest() + this.badRequest("Publicação não eliminado") } } @@ -185,7 +185,7 @@ export class PublicationDetailPage implements OnInit { } - async badRequest() { + async badRequest(message?) { const enterAnimation = (baseEl: any) => { const backdropAnimation = this.animationController.create() .addElement(baseEl.querySelector('ion-backdrop')!) @@ -217,7 +217,7 @@ export class PublicationDetailPage implements OnInit { componentProps: { message: 'Processo não realizado com sucesso', }, - cssClass: 'modal modal-desktop' + cssClass: 'notification-modal' }); modal.present()