From 1aa03370367b99f6b1ac8d9b316ee2599d903e27 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 17 Jun 2021 09:55:19 +0100 Subject: [PATCH 1/5] save --- .../pedidos/pedido/pedido.page.html | 1 + .../pedidos/pedido/pedido.page.ts | 22 ++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index 4802585c9..46b799352 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -107,6 +107,7 @@
+
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 e947f2181..49c44697b 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -228,9 +228,26 @@ export class PedidoPage implements OnInit { } catch (error) { this.toastService.badRequest() } + } + async assignar(note:string, documents:any) { + let body = { + "serialNumber": this.serialnumber, + "action": "Reencaminhar", + "ActionTypeId": 98, + "dataFields": { + "ReviewUserComment": note, + }, + "AttachmentList" :documents, + } - + try { + await this.processes.CompleteTask(body).toPromise() + this.toastService.successMessage('Processo arquivado') + this.close(); + } catch (error) { + this.toastService.badRequest() + } } sendExpedienteToPending(){ @@ -404,6 +421,9 @@ export class PedidoPage implements OnInit { else if(actionName == 'Arquivar'){ this.arquivar(res.data.note, docs); } + else if(actionName == 'Assignar'){ + this.assignar(res.data.note, docs); + } } }); } From ba8abd077ef9541223e8fd29ff2db87d2c0502d9 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 17 Jun 2021 10:09:30 +0100 Subject: [PATCH 2/5] save --- src/global.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/global.scss b/src/global.scss index 4220f3260..13b007773 100644 --- a/src/global.scss +++ b/src/global.scss @@ -872,4 +872,8 @@ background: rgb(92, 92, 92); tr:nth-child(n+6) { display: none; } +} + +.modal { + display: flex !important; } \ No newline at end of file From e0e6c35678cba0abc097b20831f02959de338f04 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 17 Jun 2021 12:24:31 +0100 Subject: [PATCH 3/5] save --- src/app/app-routing.module.ts | 293 +++++++++--------- src/app/modals/delegar/delegar.page.ts | 4 +- .../modals/forward/forward-routing.module.ts | 17 + src/app/modals/forward/forward.module.ts | 22 ++ src/app/modals/forward/forward.page.html | 91 ++++++ src/app/modals/forward/forward.page.scss | 150 +++++++++ src/app/modals/forward/forward.page.spec.ts | 24 ++ src/app/modals/forward/forward.page.ts | 204 ++++++++++++ .../agenda/new-event/new-event.page.html | 2 +- .../pedidos/pedido/pedido.page.html | 2 +- .../pedidos/pedido/pedido.page.ts | 28 +- .../pages/publications/publications.page.scss | 8 +- .../agenda/new-event/new-event.page.html | 6 +- .../attendee-modal/attendee-modal.page.html | 1 - .../edit-event-to-approve/edit-event.page.ts | 2 +- 15 files changed, 693 insertions(+), 161 deletions(-) create mode 100644 src/app/modals/forward/forward-routing.module.ts create mode 100644 src/app/modals/forward/forward.module.ts create mode 100644 src/app/modals/forward/forward.page.html create mode 100644 src/app/modals/forward/forward.page.scss create mode 100644 src/app/modals/forward/forward.page.spec.ts create mode 100644 src/app/modals/forward/forward.page.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 4ba03b687..bf502bfda 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,133 +1,134 @@ -import { NgModule } from '@angular/core'; -import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; -import { ChatPage } from './pages/chat/chat.page'; -import { MessagesPage } from './pages/chat/messages/messages.page'; - -const routes: Routes = [ - { - path: '', - loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule) - }, - { - path: '', - loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) - }, - { - path: 'empty-chat', - loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule) - }, - { - path: 'empty-container', - loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule) - }, - { - path: 'events-to-approve', - loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule) - }, - { - path: 'expedients', - loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule) - }, - { - path: 'document-detail', - loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule) - }, - { - path: 'edit-group', - loadChildren: () => import('./shared/chat/edit-group/edit-group.module').then( m => m.EditGroupPageModule) - }, - { - path: 'pedidos', - loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule) - }, - { - path: 'event-list', - loadChildren: () => import('./pages/gabinete-digital/event-list/event-list.module').then(m =>m.EventListPageModule) - }, - { - path: 'despachos', - loadChildren: () => import('./shared/gabinete-digital/despachos/despachos.module').then( m => m.DespachosPageModule) - }, - { - path: 'create-process', - loadChildren: () => import('./modals/create-process/create-process.module').then( m => m.CreateProcessPageModule) - }, - { - path: 'pendentes', - loadChildren: () => import('./shared/gabinete-digital/pendentes/pendentes.module').then( m => m.PendentesPageModule) - }, - { - path: 'delegar', - loadChildren: () => import('./modals/delegar/delegar.module').then( m => m.DelegarPageModule) - }, - { - path: 'add-note', - loadChildren: () => import('./modals/add-note/add-note.module').then( m => m.AddNotePageModule) - }, - { - path: 'dar-parecer', - loadChildren: () => import('./modals/dar-parecer/dar-parecer.module').then( m => m.DarParecerPageModule) - }, - { - path: 'opts-expediente', - loadChildren: () => import('./shared/popover/opts-expediente/opts-expediente.module').then( m => m.OptsExpedientePageModule) - }, - { - path: 'despachos-pr', - loadChildren: () => import('./shared/gabinete-digital/despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule) - }, - { - path: 'diplomas', - loadChildren: () => import('./shared/gabinete-digital/diplomas/diplomas.module').then( m => m.DiplomasPageModule) - }, - { - path: 'expedientes-pr', - loadChildren: () => import('./shared/gabinete-digital/expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule) - }, - { - path: 'diplomas-assinar', - loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule) - }, - { - path: 'opts-expediente-pr', - loadChildren: () => import('./shared/popover/opts-expediente-pr/opts-expediente-pr.module').then( m => m.OptsExpedientePrPageModule) - }, - { - path: 'despachos-options', - loadChildren: () => import('./shared/popover/despachos-options/despachos-options.module').then( m => m.DespachosOptionsPageModule) - }, - { - path: 'despachos-pr-options', - loadChildren: () => import('./shared/popover/despachos-pr-options/despachos-pr-options.module').then( m => m.DespachosPrOptionsPageModule) - }, - { - path: 'deploma-options', - loadChildren: () => import('./shared/popover/deploma-options/deploma-options.module').then( m => m.DeplomaOptionsPageModule) - }, - { - path: 'pin', - loadChildren: () => import('./shared/pin/pin.module').then( m => m.PinPageModule) - }, - { - path: 'fingerprint', - loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule) - }, - { - path: 'new-event', - loadChildren: () => import('./shared/agenda/new-event/new-event.module').then( m => m.NewEventPageModule) - }, - { - path: 'edit-event', - loadChildren: () => import('./shared/agenda/edit-event/edit-event.module').then( m => m.EditEventPageModule) - }, - { - path: 'event-list', - loadChildren: () => import('./shared/agenda/event-list/event-list.module').then( m => m.EventListPageModule) - }, - { - path: 'approve-event', - loadChildren: () => import('./shared/agenda/approve-event/approve-event.module').then( m => m.ApproveEventPageModule) - }, { +import { NgModule } from '@angular/core'; +import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; +import { ChatPage } from './pages/chat/chat.page'; +import { MessagesPage } from './pages/chat/messages/messages.page'; + +const routes: Routes = [ + { + path: '', + loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule) + }, + { + path: '', + loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) + }, + { + path: 'empty-chat', + loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule) + }, + { + path: 'empty-container', + loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule) + }, + { + path: 'events-to-approve', + loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule) + }, + { + path: 'expedients', + loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule) + }, + { + path: 'document-detail', + loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule) + }, + { + path: 'edit-group', + loadChildren: () => import('./shared/chat/edit-group/edit-group.module').then( m => m.EditGroupPageModule) + }, + { + path: 'pedidos', + loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule) + }, + { + path: 'event-list', + loadChildren: () => import('./pages/gabinete-digital/event-list/event-list.module').then(m =>m.EventListPageModule) + }, + { + path: 'despachos', + loadChildren: () => import('./shared/gabinete-digital/despachos/despachos.module').then( m => m.DespachosPageModule) + }, + { + path: 'create-process', + loadChildren: () => import('./modals/create-process/create-process.module').then( m => m.CreateProcessPageModule) + }, + { + path: 'pendentes', + loadChildren: () => import('./shared/gabinete-digital/pendentes/pendentes.module').then( m => m.PendentesPageModule) + }, + { + path: 'delegar', + loadChildren: () => import('./modals/delegar/delegar.module').then( m => m.DelegarPageModule) + }, + { + path: 'add-note', + loadChildren: () => import('./modals/add-note/add-note.module').then( m => m.AddNotePageModule) + }, + { + path: 'dar-parecer', + loadChildren: () => import('./modals/dar-parecer/dar-parecer.module').then( m => m.DarParecerPageModule) + }, + { + path: 'opts-expediente', + loadChildren: () => import('./shared/popover/opts-expediente/opts-expediente.module').then( m => m.OptsExpedientePageModule) + }, + { + path: 'despachos-pr', + loadChildren: () => import('./shared/gabinete-digital/despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule) + }, + { + path: 'diplomas', + loadChildren: () => import('./shared/gabinete-digital/diplomas/diplomas.module').then( m => m.DiplomasPageModule) + }, + { + path: 'expedientes-pr', + loadChildren: () => import('./shared/gabinete-digital/expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule) + }, + { + path: 'diplomas-assinar', + loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule) + }, + { + path: 'opts-expediente-pr', + loadChildren: () => import('./shared/popover/opts-expediente-pr/opts-expediente-pr.module').then( m => m.OptsExpedientePrPageModule) + }, + { + path: 'despachos-options', + loadChildren: () => import('./shared/popover/despachos-options/despachos-options.module').then( m => m.DespachosOptionsPageModule) + }, + { + path: 'despachos-pr-options', + loadChildren: () => import('./shared/popover/despachos-pr-options/despachos-pr-options.module').then( m => m.DespachosPrOptionsPageModule) + }, + { + path: 'deploma-options', + loadChildren: () => import('./shared/popover/deploma-options/deploma-options.module').then( m => m.DeplomaOptionsPageModule) + }, + { + path: 'pin', + loadChildren: () => import('./shared/pin/pin.module').then( m => m.PinPageModule) + }, + { + path: 'fingerprint', + loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule) + }, + { + path: 'new-event', + loadChildren: () => import('./shared/agenda/new-event/new-event.module').then( m => m.NewEventPageModule) + }, + { + path: 'edit-event', + loadChildren: () => import('./shared/agenda/edit-event/edit-event.module').then( m => m.EditEventPageModule) + }, + { + path: 'event-list', + loadChildren: () => import('./shared/agenda/event-list/event-list.module').then( m => m.EventListPageModule) + }, + { + path: 'approve-event', + loadChildren: () => import('./shared/agenda/approve-event/approve-event.module').then( m => m.ApproveEventPageModule) + }, + { path: 'bad-request', loadChildren: () => import('./shared/popover/bad-request/bad-request.module').then( m => m.BadRequestPageModule) }, @@ -135,18 +136,22 @@ const routes: Routes = [ path: 'success-message', loadChildren: () => import('./shared/popover/success-message/success-message.module').then( m => m.SuccessMessagePageModule) }, + { + path: 'forward', + loadChildren: () => import('./modals/forward/forward.module').then( m => m.ForwardPageModule) + }, - - /* { - path: 'chat', - component: ChatPage - } */ - -]; -@NgModule({ - imports: [ - RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules }) - ], - exports: [RouterModule] -}) -export class AppRoutingModule {} + + /* { + path: 'chat', + component: ChatPage + } */ + +]; +@NgModule({ + imports: [ + RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules }) + ], + exports: [RouterModule] +}) +export class AppRoutingModule {} diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts index 5b6a388d2..e18ed8185 100644 --- a/src/app/modals/delegar/delegar.page.ts +++ b/src/app/modals/delegar/delegar.page.ts @@ -63,8 +63,6 @@ export class DelegarPage implements OnInit { /* Set + 30minutes to seleted datetime */ let selectedEndDate = new Date(); /* this.postData.EndDate = new Date(selectedEndDate.setMinutes(new Date().getMinutes() + 30)); */ - - } @@ -85,7 +83,7 @@ export class DelegarPage implements OnInit { async saveTask() { if(this.taskParticipants.length > 1){ - this.alertService.presentErrorMessage("Selecione apenas um destinatário"); + this.toastService.badRequest("Selecione apenas um destinatário"); } else { let body = { diff --git a/src/app/modals/forward/forward-routing.module.ts b/src/app/modals/forward/forward-routing.module.ts new file mode 100644 index 000000000..9f5d429bb --- /dev/null +++ b/src/app/modals/forward/forward-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { ForwardPage } from './forward.page'; + +const routes: Routes = [ + { + path: '', + component: ForwardPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class ForwardPageRoutingModule {} diff --git a/src/app/modals/forward/forward.module.ts b/src/app/modals/forward/forward.module.ts new file mode 100644 index 000000000..086c344f3 --- /dev/null +++ b/src/app/modals/forward/forward.module.ts @@ -0,0 +1,22 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { ForwardPageRoutingModule } from './forward-routing.module'; + +import { ForwardPage } from './forward.page'; +import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + ForwardPageRoutingModule, + AttendeeModalPageModule + ], + declarations: [ForwardPage] +}) +export class ForwardPageModule {} diff --git a/src/app/modals/forward/forward.page.html b/src/app/modals/forward/forward.page.html new file mode 100644 index 000000000..cbc8b67c3 --- /dev/null +++ b/src/app/modals/forward/forward.page.html @@ -0,0 +1,91 @@ + +
+ +
+
+
+ +
+
+
+ +
+
+
+ +
+
+
+ + + Adicionar intervenientes + {{participant.Name}} + + +
+
+ +
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+ + + +
+ + Documentos Anexados + + + + +

{{attachment.Description}}

+

{{attachment.Stakeholders}} {{ attachment.CreateDate | date: 'dd/MM/yyyy' }}

+ + + +
+
+ +
+ +
+ + +
+
+ + +
+ + +
+ + diff --git a/src/app/modals/forward/forward.page.scss b/src/app/modals/forward/forward.page.scss new file mode 100644 index 000000000..c6fc0f6da --- /dev/null +++ b/src/app/modals/forward/forward.page.scss @@ -0,0 +1,150 @@ +.content{ + padding: 30px 20px 0 20px !important; + margin: 0; + float: left; + + .header-content{ + margin-bottom: 20px !important; + } + + .header-title{ + font-family: Roboto; + font-size: 25px; + padding: 0; + color:#000; + float: left; + } + + .ion-item-container{ + margin: 15px auto; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 10px; + + } + .ion-item-container-no-border{ + margin: 0px auto; + padding: 0 !important; + overflow: auto; + } + .container-div{ + margin-bottom: 15px; + overflow: hidden; + } + .ion-item-class-2{ + margin: 0px auto; + } + .ion-icon-class{ + width: 45px; + height: 45px; + float: left; + padding: 10px; + font-size: 25px; + } + ion-select{ + padding-left: 5px; + margin-left: 0; + } + .ion-input-class{ + width: calc(100% - 45px); + height: 45px; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 5px; + padding-right: 10px; + float: left; + } + .ion-input-class-no-height{ + border: 1px solid #ebebeb; + border-radius: 5px; + overflow: auto; + } + .list-people{ + width: 256px; + float: left; + + } + .add-people{ + width: 45px; + float: right; + overflow: auto; + font-size: 25px; + padding: 10px; + } + .list-people-title{ + /* font-size: 13px; */ + color: #797979; + } + .attach-document{ + font-size: 15px; + color: #0d89d1; + margin: 5px 5px 5px 10px; + padding: 5px; + float: left; + } + .attach-icon{ + width: 37px; + font-size: 35px; + float: left; + } + .attach-title-item{ + width: 100%; + font-size: 15px; + color:#0d89d1; + } + /* SPAN */ + .span-left{ + float: left; + font-size: 15x; + } + .span-right{ + text-align: right; + float: right; + font-size: 13px; + } + } + .container-footer{ + margin:0 auto; + overflow: auto; + } + .button-cancel { + width: 170px; + height: 44px; + border-radius: 22.5px; + --background: #e0e9ee; + --color: #061b52; + margin:10px; + } + .button-save { + width: 170px; + height: 44px; + border-radius: 22.5px; + --background: #42b9fe; + --color:#ffffff; + margin:10px; + } + + .text-input{ + width: 100%; + border: 1px solid #ebebeb; + margin: 0px 15px 15px 0px; + padding: 0 !important; + border-radius: 5px; + } + + /* Error Messages */ + .error{ + color:red; + font-size: 12px; + font-weight: bold; + padding-bottom: 20px; + } + .span-color{ + color:red; + } + .buttons{ + display: flex; + justify-content: space-between; + padding: 20px; + overflow: auto; + } \ No newline at end of file diff --git a/src/app/modals/forward/forward.page.spec.ts b/src/app/modals/forward/forward.page.spec.ts new file mode 100644 index 000000000..3992e03cb --- /dev/null +++ b/src/app/modals/forward/forward.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { ForwardPage } from './forward.page'; + +describe('ForwardPage', () => { + let component: ForwardPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ ForwardPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(ForwardPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/modals/forward/forward.page.ts b/src/app/modals/forward/forward.page.ts new file mode 100644 index 000000000..e2f5f482f --- /dev/null +++ b/src/app/modals/forward/forward.page.ts @@ -0,0 +1,204 @@ +import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import { AlertController, AnimationController, ModalController, NavParams } from '@ionic/angular'; +import { Event } from 'src/app/models/event.model' +import { EventBody } from 'src/app/models/eventbody.model'; +import { ProcessesService } from 'src/app/services/processes.service'; +import { EventPerson } from 'src/app/models/eventperson.model'; +import { EventsService } from 'src/app/services/events.service'; +import { AttachmentsService } from 'src/app/services/attachments.service'; +import { AddParticipantsModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page'; +import { AddParticipantsCcModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page'; +import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; +import { AlertService } from 'src/app/services/alert.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 { ToastService } from 'src/app/services/toast.service'; +import { SearchDocument } from 'src/app/models/search-document'; +import { SearchPage } from 'src/app/pages/search/search.page'; + +@Component({ + selector: 'app-forward', + templateUrl: './forward.page.html', + styleUrls: ['./forward.page.scss'], +}) +export class ForwardPage implements OnInit { + task: any; + note:string; + + taskParticipants: EventPerson[] = []; + taskParticipantsCc: EventPerson[] = []; + + taskDocId:string; + loadedAttachments:any; + + adding: "intervenient" | "CC" = "intervenient"; + + postData: Event; + eventBody: EventBody; + eventAttendees: EventPerson; + + formLocationSatus: boolean = false; + showAttendees= false; + + documents:SearchDocument[] = []; + + constructor( + private modalController: ModalController, + private router:Router, + private navParams: NavParams, + private processes:ProcessesService, + private attachmentsService: AttachmentsService, + private calendarService: EventsService, + public alertController: AlertController, + private alertService: AlertService, + private animationController: AnimationController, + private toastService: ToastService, + ) { + this.task = this.navParams.get('task'); + this.postData = new Event(); + this.eventBody = { BodyType : "1", Text : ""}; + this.postData.Body = this.eventBody; + this.postData.Subject = this.task.Folio; + this.postData.CalendarName = "Oficial"; + let selectedEndDate = new Date(); + } + + ngOnInit() { + this.adding = "intervenient"; + console.log(this.task); + + } + + close() { + this.router.navigate(['/home/gabinete-digital/expediente']); + this.modalController.dismiss(null); + } + + cancelTask() { + this.modalController.dismiss(null); + } + + async assignar(note:string, documents:any) { + let body = { + "serialNumber": this.task.SerialNumber, + "action": "Reencaminhar", + "ActionTypeId": 98, + "dataFields": { + "ReviewUserComment": note, + }, + "AttachmentList" :documents, + } + } + + notImplemented(){ + this.alertService.presentAlert('Funcionalidade em desenvolvimento'); + } + + async saveTask() { + + const DocumentToSave = this.documents.map((e) => { + return { + ApplicationId: e.ApplicationType, + SourceId: e.Id, + } + }); + let docs = { + ProcessInstanceID: "", + Attachments: DocumentToSave, + } + + if(this.taskParticipants.length > 1){ + this.toastService.badRequest("Selecione apenas um destinatário"); + } + else { + let body = { + "usersSelected": this.taskParticipants, + "distributionType": "paralelo", + "priority": 0, + "countryCode": "string", + "serialNumber": this.task.SerialNumber, + "action": "Reencaminhar", + "actionTypeId": 98, + "dataFields": { + "ReviewUserComment": this.note, + }, + "FolderId": this.task.FolderId, + "AttachmentList" :docs, + } + console.log(body); + this.processes.DelegateTask(body).subscribe(res=>{ + console.log(res); + this.toastService.successMessage('Processo delegado') + }, + (error)=>{ + this.toastService.badRequest("Processo não delegado") + }); + } + } + + async addParticipants(){ + console.log('HERE'); + + this.adding = "intervenient"; + if(window.innerWidth <= 800){ + const modal = await this.modalController.create({ + component: AddParticipantsModalPage, + componentProps: { + eventPersons: this.eventAttendees + }, + cssClass: 'book-meeting-modal', + backdropDismiss: false + }); + + await modal.present(); + + modal.onDidDismiss().then((res) => { + }); + } else { + this.showAttendees = true; + } + } + + validateFormInputs(){ + let formLocation = this.postData.Location.trim(); + if(!this.postData.Location && formLocation.length <= 0){ + this.formLocationSatus=true; + } + } + + dynamicSetIntervenient({taskParticipants}){ + this.taskParticipants = taskParticipants; + } + + + async getDoc() { + + const modal = await this.modalController.create({ + component: SearchPage, + cssClass: 'modal-width-100-width-background modal', + componentProps: { + type: 'AccoesPresidenciais & ArquivoDespachoElect', + showSearchInput: true, + select: true + } + }); + await modal.present(); + modal.onDidDismiss().then((res)=>{ + if(res){ + const data = res.data; + this.documents.push(data.selected); + } + }); + + } + + removeAttachment(index: number){ + + this.documents = this.documents.filter( (e, i) => index != i); + } + + + + +} \ No newline at end of file diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index e50e3e8b3..6de527c28 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -12,7 +12,7 @@
- +
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index 46b799352..1874b81ce 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -107,7 +107,7 @@
- +
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 49c44697b..9ec4fe614 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -3,7 +3,6 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { EventsService } from 'src/app/services/events.service'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; -import { DailyWorkTask } from '../../../../models/dailyworktask.model'; import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { formatDate } from '@angular/common'; import { Event } from '../../../../models/event.model'; @@ -12,19 +11,17 @@ import { AlertService } from 'src/app/services/alert.service'; import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { momentG } from 'src/plugin/momentG' import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page'; -import { ExpedientTaskModalPage } from '../../expediente/expedient-task-modal/expedient-task-modal.page'; import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page'; import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page'; import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; import { DarParecerPage } from 'src/app/modals/dar-parecer/dar-parecer.page'; import { AddNotePage } from 'src/app/modals/add-note/add-note.page'; -import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page'; import { RequestOptionsPage } from 'src/app/shared/popover/request-options/request-options.page'; import { AuthService } from 'src/app/services/auth.service'; import { User } from 'src/app/models/user.model'; 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 { ToastService } from 'src/app/services/toast.service'; +import { ForwardPage } from 'src/app/modals/forward/forward.page'; @Component({ selector: 'app-pedido', @@ -206,8 +203,6 @@ export class PedidoPage implements OnInit { } catch (error) { this.toastService.badRequest() } - - } async arquivar(note:string, documents:any) { @@ -361,6 +356,27 @@ export class PedidoPage implements OnInit { modal.onDidDismiss(); } + async openForwardModal(task: any) { + console.log(task); + + let classs; + if( window.innerWidth <= 800){ + classs = 'book-meeting-modal modal modal-desktop' + } else { + classs = 'modal modal-desktop showAsideOptions' + } + const modal = await this.modalController.create({ + component: ForwardPage, + componentProps: { + task: this.task, + }, + cssClass: classs, + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + } + async openDarParecer(task: any) { console.log(task); diff --git a/src/app/pages/publications/publications.page.scss b/src/app/pages/publications/publications.page.scss index 288b9aaaf..a446b55cb 100644 --- a/src/app/pages/publications/publications.page.scss +++ b/src/app/pages/publications/publications.page.scss @@ -90,7 +90,7 @@ ion-toolbar{ } } .item{ - padding: 0 0px 0 0px; + padding: 0 0px 0 0px !important; margin: 0px auto; border-bottom: 1px solid #ebebeb; } @@ -116,14 +116,20 @@ ion-toolbar{ .item-content-date{ color: #797979; font-size: 13px; + margin: 0 !important; + padding: 0 !important; } .item-content-title{ color: #0d89d1; font-size: 15px; + margin: 0 !important; + padding: 0 !important; } .item-content-detail{ color: #000000; font-size: 13px; + margin: 0 !important; + padding: 0 !important; } diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html index 0bfdb186d..0ea38e87f 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -13,7 +13,7 @@
-
+ - +
diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.html b/src/app/shared/event/attendee-modal/attendee-modal.page.html index 97b1d4b7b..d0f026983 100644 --- a/src/app/shared/event/attendee-modal/attendee-modal.page.html +++ b/src/app/shared/event/attendee-modal/attendee-modal.page.html @@ -1,7 +1,6 @@ Adicionar intervenientes - Agenda Desktop 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 0ea46630d..c2f99bdbf 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 @@ -251,7 +251,7 @@ export class EditEventToApproveComponent implements OnInit { Message: this.eventProcess.workflowInstanceDataFields.Message, ParticipantsList: this.eventProcess.workflowInstanceDataFields.ParticipantsList, Private: false, - ReviewerComments: '' + ReviewUserComments: '' } this.eventsService.postEventToApproveEdit(event).subscribe(()=>{ From 4b067e25175bcada0c783729ce61b08b8cdc1fa1 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 17 Jun 2021 12:29:37 +0100 Subject: [PATCH 4/5] save --- src/app/home/home.page.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index cbba18d51..fdffad8de 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -22,10 +22,10 @@ Ações - + \ No newline at end of file From 0c3259289420ed8d1c730df098f6fe97065fa9d3 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Thu, 17 Jun 2021 16:12:56 +0100 Subject: [PATCH 5/5] save --- src/app/home/home.page.html | 4 +- src/app/modals/forward/forward.page.html | 2 +- src/app/modals/forward/forward.page.ts | 34 +++++++++++---- .../event-actions-popover.page.html | 2 +- .../event-actions-popover.page.ts | 41 +++++++++++-------- .../approve-event/approve-event.page.ts | 14 ++----- .../event-list/event-list.page.ts | 2 +- .../expediente-detail.page.html | 4 +- .../expediente/expediente.page.ts | 14 +------ .../gabinete-digital.page.html | 5 ++- .../gabinete-digital/gabinete-digital.page.ts | 5 +-- .../pedidos/pedido/pedido.page.ts | 14 ++++--- .../pages/publications/publications.page.html | 4 +- .../pages/publications/publications.page.ts | 11 +++-- src/app/services/processes.service.ts | 10 +++++ .../approve-event/approve-event.page.ts | 3 +- 16 files changed, 94 insertions(+), 75 deletions(-) diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index fdffad8de..cbba18d51 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -22,10 +22,10 @@ Ações - + \ No newline at end of file diff --git a/src/app/modals/forward/forward.page.html b/src/app/modals/forward/forward.page.html index cbc8b67c3..00f97ee0b 100644 --- a/src/app/modals/forward/forward.page.html +++ b/src/app/modals/forward/forward.page.html @@ -85,7 +85,7 @@
- +
diff --git a/src/app/modals/forward/forward.page.ts b/src/app/modals/forward/forward.page.ts index e2f5f482f..06f9eac42 100644 --- a/src/app/modals/forward/forward.page.ts +++ b/src/app/modals/forward/forward.page.ts @@ -1,5 +1,5 @@ import { Component, OnInit } from '@angular/core'; -import { Router } from '@angular/router'; +import { NavigationExtras, Router } from '@angular/router'; import { AlertController, AnimationController, ModalController, NavParams } from '@ionic/angular'; import { Event } from 'src/app/models/event.model' import { EventBody } from 'src/app/models/eventbody.model'; @@ -78,6 +78,19 @@ export class ForwardPage implements OnInit { cancelTask() { this.modalController.dismiss(null); } + goBack() { + this.modalController.dismiss(null); + if (window.innerWidth <= 800) { + this.router.navigate(['/home/gabinete-digital/pedidos']); + } else { + let navigationExtras: NavigationExtras = { + queryParams: { + "pedidos": true, + } + } + this.router.navigate(['/home/gabinete-digital'], navigationExtras); + } + } async assignar(note:string, documents:any) { let body = { @@ -112,11 +125,17 @@ export class ForwardPage implements OnInit { this.toastService.badRequest("Selecione apenas um destinatário"); } else { + + let attendees: any = this.taskParticipants.concat(this.taskParticipantsCc); + attendees = attendees.map(function(val) { + return { + UserEmail: val.EmailAddress, + UserType: val.IsRequired?"I": "CC" + }; + }); + let body = { - "usersSelected": this.taskParticipants, - "distributionType": "paralelo", - "priority": 0, - "countryCode": "string", + "usersSelected": attendees, "serialNumber": this.task.SerialNumber, "action": "Reencaminhar", "actionTypeId": 98, @@ -127,9 +146,10 @@ export class ForwardPage implements OnInit { "AttachmentList" :docs, } console.log(body); - this.processes.DelegateTask(body).subscribe(res=>{ + this.processes.CompleteParecerPrTask(body).subscribe(res=>{ console.log(res); - this.toastService.successMessage('Processo delegado') + this.toastService.successMessage('Processo delegado'); + this.goBack(); }, (error)=>{ this.toastService.badRequest("Processo não delegado") diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html index 929cb675c..2be952653 100644 --- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html @@ -9,6 +9,6 @@
- +
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 2f2ae7020..367609ec7 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 @@ -35,44 +35,53 @@ export class EventActionsPopoverPage implements OnInit { } }; } + + goBack(){ + this.closePopover(); + this.router.navigate(['/home/gabinete-digital/event-list']); + } + closePopover(){ this.popoverController.dismiss(); } + approveTask() { let body = { "serialNumber": this.serialNumber, "action": "Aprovar" } console.log(body); - - + try { this.processes.PostTaskAction(body).toPromise() - this.router.navigate(['/home/gabinete-digital/event-list']); - this.modalController.dismiss(null); - this.toastService.successMessage() + this.toastService.successMessage(); + this.goBack(); } catch (error) { this.toastService.badRequest() } - } + emendarTask() { - let body = { "serialNumber": this.serialNumber, "action": "Rejeitar" } console.log(body); - - try { - this.processes.PostTaskAction(body).toPromise() - this.router.navigate(['/home/gabinete-digital/event-list']); - this.modalController.dismiss(null); - this.toastService.successMessage() + this.processes.PostTaskAction(body).toPromise(); + this.toastService.successMessage(); + this.goBack(); } catch (error) { this.toastService.badRequest() } - - } - deleteTask(){ + async rejeitar(){ + let body = { "serialNumber": this.serialNumber, "action": "Rejeitar" } + console.log(body); + try { + this.processes.PostTaskAction(body).toPromise(); + await this.toastService.successMessage('Processo rejeitado'); + this.goBack(); + } catch (error) { + this.toastService.badRequest() + } } + async editTask() { console.log(this.serialNumber); console.log(this.instanceId); 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 31c8ede5d..95bce892b 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 @@ -76,7 +76,6 @@ export class ApproveEventPage implements OnInit { this.router.navigate(['/home/gabinete-digital'], navigationExtras); } - } async getTask() { @@ -97,10 +96,8 @@ export class ApproveEventPage implements OnInit { try { await this.processes.PostTaskAction(body).toPromise() - this.toastService.successMessage() - this.toastService.successMessage('Evento aprovado', ()=>{ - this.goBack(); - }); + this.toastService.successMessage(); + this.goBack(); } catch (error) { this.toastService.badRequest() @@ -126,18 +123,13 @@ export class ApproveEventPage implements OnInit { async rejeitar(serialNumber:string){ let body = { "serialNumber": serialNumber, "action": "Rejeitar" } console.log(body); - this.toastService.successMessage('Process'); try { this.processes.PostTaskAction(body).toPromise(); await this.toastService.successMessage('Processo rejeitado'); - await this.toastService.successMessage('Processo rejeitado', ()=>{ - this.goBack(); - }); - + this.goBack(); } catch (error) { this.toastService.badRequest() } - } async getAttachments(instanceId:string){ diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index 0ef45e5b3..ca7207ad9 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -37,7 +37,7 @@ export class EventListPage implements OnInit { this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == this.router.url) { - this.doRefresh(); + this.LoadToApproveEvents(); } }); diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index a8193c345..52d71b82a 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -35,14 +35,14 @@
-
Intervenientes
+
Com conhecimento
diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 54375f618..6a677e6d0 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -82,28 +82,16 @@ export class ExpedientePage implements OnInit { doRefresh() { this.LoadList(); - setTimeout(() => { }, 2000); } goBack() { - this.router.navigate(['/home/gabinete-digital']); - } - goToExpediente(serialNumber:any) { - - let navigationExtras: NavigationExtras = { - queryParams: { - "serialNumber": serialNumber, - "caller": "gabinete" - } - } - + goToExpediente(serialNumber:any){ this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']); - } } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index f1cc06c77..522bfcfb4 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -3,18 +3,19 @@ - + +
Gabinete Digital -
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index d3001864e..d0fc37eea 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -260,7 +260,7 @@ export class GabineteDigitalPage implements OnInit { } - doRefresh() { + doRefresh(event) { this.closeAllDesktopComponents(); switch(this.loggeduser.Profile){ case 'MDGPR': @@ -276,8 +276,7 @@ export class GabineteDigitalPage implements OnInit { this.LoadCounts(); //this.refreshExpedientes(); - setTimeout(() => { - }, 2000); + event.target.complete(); } notImplemented(){ 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 9ec4fe614..0f0325345 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -445,14 +445,16 @@ export class PedidoPage implements OnInit { } goBack() { - - let navigationExtras: NavigationExtras = { - queryParams: { - "pedidos": true, + if (window.innerWidth <= 800) { + this.router.navigate(['/home/gabinete-digital/pedidos']); + } else { + let navigationExtras: NavigationExtras = { + queryParams: { + "pedidos": true, + } } + this.router.navigate(['/home/gabinete-digital'], navigationExtras); } - - this.router.navigate(['/home/gabinete-digital'], navigationExtras); } diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 9f39fd6a8..c071b0d24 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -3,7 +3,7 @@ - + @@ -24,7 +24,7 @@ -
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts index 60b18bd50..4e9224928 100644 --- a/src/app/pages/publications/publications.page.ts +++ b/src/app/pages/publications/publications.page.ts @@ -68,13 +68,12 @@ export class PublicationsPage implements OnInit { } }); } - doRefresh() { - /* this.getActions(); */ + doRefresh(event) { + this.getActions(); setTimeout(() => { - this.getActions(); - /* event.target.complete(); */ - }, 2000); + event.target.complete(); + }, 250); } get windowInnerWidth(): number { @@ -125,7 +124,7 @@ export class PublicationsPage implements OnInit { }); await modal.present(); modal.onDidDismiss().then(()=>{ - this.doRefresh(); + this.getActions(); }); } else { this.desktopComponent.showAddActions = true; diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 6b4b28eaf..6a382fb71 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -139,6 +139,7 @@ export class ProcessesService { }; return this.http.post(`${geturl}`, body, options) } + CompleteTask(body:any){ const geturl = environment.apiURL + 'Tasks/CompleteTask'; @@ -148,6 +149,15 @@ export class ProcessesService { return this.http.post(`${geturl}`, body, options) } + CompleteParecerPrTask(body:any){ + const geturl = environment.apiURL + 'Tasks/CompleteTaskParecerPr'; + + let options = { + headers: this.headers, + }; + return this.http.post(`${geturl}`, body, options) + } + UpdateTaskStatus(FolderId:string): Observable{ const geturl = environment.apiURL + 'Tasks/UpdateTaskStatus'; let params = new HttpParams(); 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 5d9909a2d..9742c71e6 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -127,10 +127,9 @@ export class ApproveEventPage implements OnInit { try { await this.processes.PostTaskAction(body).toPromise() this.router.navigate(['/home/gabinete-digital/event-list']); - this.modalController.dismiss(null); this.toastService.successMessage('Evento rejeitado') } catch (error) { - this.toastService.badRequest('Evento não rejeitado') + this.toastService.badRequest('Processo não efectuado') } }