Improve

src/app/pages/gabinete-digital/diplomas/diplomas.page.ts

@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
+import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
 import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { formatDate } from '@angular/common';
@@ -29,10 +29,6 @@ constructor(
   private router: Router,
   private activatedRoute: ActivatedRoute,
   ) {
-  }
-
-  ngOnInit() {
-
     this.activatedRoute.queryParams.subscribe(params => {
 
       if(params['segment'] == 'validar') {
@@ -43,8 +39,15 @@ constructor(
       
       this.LoadList();
     });
-    
+  }
+
+  ngOnInit() {
     this.LoadList();
+    this.router.events.forEach((event) => {
+      if(event instanceof NavigationEnd && event.url == this.router.url) {
+        this.LoadList();
+      }
+    });
   }
   
   segmentChanged(ev: any) {

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

@@ -91,10 +91,10 @@ export class ApproveEventPage implements OnInit {
     console.log(body);
 
     try {  
-      //await this.processes.PostTaskAction(body).toPromise()
+      await this.processes.PostTaskAction(body).toPromise()
       //this.successMessage()
-      this.toastService.successMessage('Evento rejeitado!');
-      //this.goBack();
+      this.toastService.successMessage('Evento aprovado');
+      this.goBack();
     } catch (error) {
       this.badRequest()
     }
@@ -119,7 +119,6 @@ export class ApproveEventPage implements OnInit {
   async rejectTask(serialNumber:string){
     let body = { "serialNumber": serialNumber, "action": "Rejeitar" }
     console.log(body);
-
     try {    
       this.processes.PostTaskAction(body).toPromise();
       //await this.successMessage('Processo rejeitado');

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html

@@ -109,7 +109,7 @@
         <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <button (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
         <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
-        <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
+        <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" *ngIf="hideSendToPendentes" >Enviar para Pendentes</button>
         <div hidden class="solid"></div>
         <button hidden class="btn-cancel" shape="round" >Delegar</button>
         <button hidden (click)="showToast()" class="btn-cancel" shape="round" >ShowToast</button>

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -39,6 +39,8 @@ export class ExpedienteDetailPage implements OnInit {
   intervenientes: any;
   cc: any = [];
 
+  hideSendToPendentes = true
+
 
   constructor(private activateRoute: ActivatedRoute,
     private processes: ProcessesService,
@@ -54,19 +56,23 @@ export class ExpedienteDetailPage implements OnInit {
     private toastService: ToastService,
     private animationController: AnimationController
     ) {
+      
       this.activatedRoute.queryParams.subscribe(params => {
+
         if(params["serialNumber"]) {
           this.serialnumber = params["serialNumber"];
-          console.log(params["serialNumber"]);
         }
+        
+        if(params["type"] == "pendentes") {
+          this.hideSendToPendentes = false
+        }
+
       });
+
     }
 
   ngOnInit() {
     this.profile = "mdgpr";
-    console.log('HERE');
-    
-    console.log(this.serialnumber);
     
     this.activateRoute.paramMap.subscribe(paramMap => {
       if (!paramMap.has('SerialNumber')) {
@@ -88,50 +94,39 @@ export class ExpedienteDetailPage implements OnInit {
     this.toastService.presentToast('Não foi possível fazer login"');
   }
 
+
   goBack() {
 
 
     this.activatedRoute.queryParams.subscribe(params => {
       if(params["from"] == "inicio") {
 
+        
         this.router.navigate(['/home/events']);
 
       } else {
 
         let navigationExtras: NavigationExtras = {
           queryParams: {
-            "expedientes": true
+            "expedientes": true,
           }
-        };
+        }
 
-        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+        if( window.innerWidth < 801) {
+          this.router.navigate(['/home/gabinete-digital/expediente']);
+        } else {
+          this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+        }
       
       }
 
-      if (params["type"] == 'pendentes') {
 
-      }
+
 
     });
     
-
-    
-
   }
 
-  /* goBack(){
-    let navigationExtras: NavigationExtras = {
-      queryParams: {
-          "expedientes": true,
-      }
-    };
-    if( window.innerWidth < 801){
-      this.router.navigate(['/home/gabinete-digital/expediente']);
-    } else {
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-    }
-  } */
-
   sendExpedienteToPending(){
     this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
       console.log(res);

src/app/pages/gabinete-digital/expediente/expediente.page.ts

@@ -47,10 +47,6 @@ export class ExpedientePage implements OnInit {
     });
   }
 
-  notImplemented(){
-    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
-  }
-
   openExpedientDetailPage(data){
     console.log(data);
     this.openExpedientDetail.emit(data);
@@ -111,23 +107,5 @@ export class ExpedientePage implements OnInit {
   
   }
 
-  async viewExpedientDetail(serialNumber:any) {
-    console.log(this.profile);
-    const modal = await this.modalController.create({
-      component: ExpedienteDetailPage,
-      componentProps:{
-        enterAnimation: "",
-        serialNumber: serialNumber,
-        profile: this.profile,
-      },
-      cssClass: 'modal modal-desktop',
-    });
-    await modal.present();
-    modal.onDidDismiss().then((res)=>{
-      console.log('refresh list');
-      this.LoadList();
-    });
-  }
-
 }
   

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

@@ -303,6 +303,7 @@ export class GabineteDigitalPage implements OnInit {
     else {
       this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       this.showEventsToApprove = true;
+      this.eventsToApprove.doRefresh();
     }
   }
   

src/app/pages/gabinete-digital/pendentes/pendentes.page.ts

@@ -60,7 +60,7 @@ export class PendentesPage implements OnInit {
         "pedidos": true,
       }
     }
-    
+
     this.router.navigate(['/home/gabinete-digital'], navigationExtras);
 
     // window.history.back();
@@ -176,7 +176,8 @@ export class PendentesPage implements OnInit {
     let navigationExtras: NavigationExtras = {
       queryParams: {
         "serialNumber": serialNumber,
-        "from": "pendentes"
+        "from": "pendentes",
+        "type": "pendentes"
       }
     };
     this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);