confit

src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts

@@ -1,12 +1,13 @@
 import { Component, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { Event } from 'src/app/models/event.model';
-import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/emend-message-modal.page';
-import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page';
 import { AlertService } from 'src/app/services/alert.service';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { ProcessesService } from 'src/app/services/processes.service';
+import { EmendMessageModalPage } from '../../../agenda/emend-message-modal/emend-message-modal.page';
+import { EventActionsPopoverPage } from '../../../agenda/event-actions-popover/event-actions-popover.page';
+
 
 @Component({
   selector: 'app-approve-event-modal',
@@ -15,36 +16,45 @@ import { ProcessesService } from 'src/app/services/processes.service';
 })
 export class ApproveEventModalPage implements OnInit {
   event: Event;
-  loadedEvent:any;
-  loadedAttachments:any;
-  serialNumber:string;
-  customDate:any;
-  today:any;
-  
+  loadedEvent: any;
+  loadedAttachments: any;
+  serialNumber: string;
+  customDate: any;
+  today: any;
+
   months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
   days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"];
 
-  
+
   constructor(
-    private router:Router,
+    private router: Router,
     private modalController: ModalController,
     private navParams: NavParams,
-    private processes:ProcessesService,
+    private processes: ProcessesService,
     private attachmentsService: AttachmentsService,
     private popoverController: PopoverController,
     private menu: MenuController,
     private alertService: AlertService,
-    )
-    {
-      this.serialNumber = this.navParams.get('serialNumber');
-     }
+    private activatedRoute: ActivatedRoute,
+  ) {
+    this.activatedRoute.paramMap.subscribe(paramMap =>
+      {
+        if (!paramMap.has("serialNumber")){
+          return;
+        }
+        else{
+          this.serialNumber = paramMap.get('serialNumber'); 
+        }
+      });
+  }
 
   ngOnInit() {
     this.getTask();
     this.getAttachments();
   }
 
-  notImplemented(){
+
+  notImplemented() {
     this.alertService.presentAlert('Funcionalidade em desenvolvimento');
   }
 
@@ -55,7 +65,7 @@ export class ApproveEventModalPage implements OnInit {
 
   getTask(){
     this.processes.GetTask(this.serialNumber).subscribe(res => {
-      console.log(res);
+      console.log('GET TASK SERIALNUMBER: ', this.serialNumber,'Approve event',res);
       this.loadedEvent = res;
       this.today = new Date(res.workflowInstanceDataFields.StartDate);
       console.log(new Date(this.today));
@@ -64,6 +74,7 @@ export class ApproveEventModalPage implements OnInit {
     })
   }
   approveTask(serialNumber:string){
+    console.log('approveTask SERIALNUMBER: ', serialNumber)
     let body = { "serialNumber": serialNumber, "action": "Aprovar" }
     console.log(body);
     this.processes.PostTaskAction(body);
@@ -73,6 +84,7 @@ export class ApproveEventModalPage implements OnInit {
   }
 
   emendTask(serialNumber:string){
+    console.log('emendTask: ',serialNumber)
     /* console.log('Emendar'); */
     this.menu.close();
     this.openEmendMessageModal(serialNumber);
@@ -80,7 +92,7 @@ export class ApproveEventModalPage implements OnInit {
   }
 
   rejectTask(serialNumber:string){
-  
+    console.log('rejectTask: ',serialNumber)
     let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
     console.log(body);
     this.processes.PostTaskAction(body);
@@ -90,6 +102,7 @@ export class ApproveEventModalPage implements OnInit {
   }
   getAttachments(){
     this.attachmentsService.getAttachmentsBySerial(this.serialNumber).subscribe(res=>{
+      console.log('getAttachments: ',this.serialNumber)
       this.loadedAttachments = res;
       console.log(res);
     });

src/app/pages/gabinete-digital/event-list/event-list.page.html

@@ -40,6 +40,7 @@
           <ion-item-sliding>
             <ion-item class="Rectangle" lines="none" 
               *ngFor="let event of eventsMDGPRList" (click)="openApproveModal(event.serialNumber)">
+              
               <div class="content-mdgpr-{{event.workflowInstanceDataFields.Agenda}}">
                 <div class="approve-event-time">
                   <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>

src/app/pages/gabinete-digital/event-list/event-list.page.ts

@@ -4,7 +4,7 @@ import { EventPerson } from 'src/app/models/eventperson.model';
 import { Event } from 'src/app/models/event.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController, NavParams } from '@ionic/angular';
-import { ApproveEventModalPage } from '../../agenda/approve-event-modal/approve-event-modal.page';
+import { ApproveEventModalPage } from './approve-event-modal/approve-event-modal.page';
 import { NavigationEnd, Router } from '@angular/router';
 
 @Component({