save

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

@@ -1,13 +1,8 @@
-import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
-import { CalendarComponent } from 'ionic2-calendar';
-
+import { Component, Input, OnInit } from '@angular/core';
+import { NavigationEnd, Router } from '@angular/router';
 import { DailyWorkTask } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
-import { formatDate } from '@angular/common';
-import { LoadingService } from 'src/app/services/loading.service';
 import { ModalController } from '@ionic/angular';
-import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page';
 import { AlertService } from 'src/app/services/alert.service';
 
 @Component({
@@ -21,21 +16,15 @@ export class ExpedientePage implements OnInit {
   showLoader: boolean;
   //profile:string;
 
-  @ViewChild(CalendarComponent) myCal: CalendarComponent;
-
   taskslist:DailyWorkTask[];
   serialNumber:string;
 
-  @Input() profile:string;
-  @Output() openExpedientDetail:EventEmitter<any> = new EventEmitter<any>();
-
   constructor(
     private processes:ProcessesService,
     private modalController: ModalController,
     private alertService: AlertService,
     private router: Router,
     ) {
-      this.profile = 'mdgpr';
     }
 
   ngOnInit() {
@@ -47,11 +36,6 @@ export class ExpedientePage implements OnInit {
     });
   }
 
-  openExpedientDetailPage(data){
-    console.log(data);
-    this.openExpedientDetail.emit(data);
-  }
-
   LoadList(){
     this.showLoader = true;
     this.processes.GetTasksList("Expediente", false).subscribe(result => {

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

@@ -20,17 +20,17 @@ import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-a
 })
 
 export class GabineteDigitalPage implements OnInit {
-  
+
   segment:string;
   showLoader: boolean;
   public profile:string;
 
-  count_exp_dailywork=0; 
+  count_exp_dailywork=0;
   count_exp_pr =0
   count_desp_dailywork=0;
-  count_desp_pending=0;  
+  count_desp_pending=0;
   count_par_dailywork=0;
-  count_par_pending=0; 
+  count_par_pending=0;
   count_def_dailywork=0;
   count_def_pending=0;
   count_exp_pp : string;
@@ -49,7 +49,7 @@ export class GabineteDigitalPage implements OnInit {
 
   desktopComponent: any = {
     showEventList: false,
-    showExpediente : false
+    showExpediente : false,
   }
 
   showEventsToApprove = false;
@@ -63,7 +63,7 @@ export class GabineteDigitalPage implements OnInit {
   showDiplomas = false;
   showDiplomasAssinar = false;
   showExpedientDetail = false;
-  showSignedDiploma = false
+  showSignedDiploma = false;
   emptyTextDescription = 'Sem opção selecionada';
 
   serialNumber:string;
@@ -96,7 +96,7 @@ export class GabineteDigitalPage implements OnInit {
         }
       };
       this.checkRoutes();
-      
+
   }
 
   closeAllDesktopComponent(){
@@ -111,7 +111,7 @@ export class GabineteDigitalPage implements OnInit {
   ngOnInit() {
     const pathname = window.location.pathname
 
-    this.router.events.forEach((event) => {  
+    this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == pathname) {
         this.checkRoutes();
         this.LoadCounts();
@@ -120,11 +120,12 @@ export class GabineteDigitalPage implements OnInit {
         // console.log('not')
       }
     });
-    
-    this.hideRefreshButton(); 
+
+    this.hideRefreshButton();
   }
 
   checkUser(){
+    this.selectedElement='Correspondence';
     switch(this.loggeduser.Profile){
       case 'MDGPR':
         this.showExpedients = true;
@@ -150,6 +151,7 @@ export class GabineteDigitalPage implements OnInit {
   }
 
   checkRoutes(){
+    this.closeAllDesktopComponents();
     if(this.router.url == '/home/gabinete-digital?eventos=true'){
       this.openEventsToApprovePage();
       this.selectedElement='approval';
@@ -252,7 +254,7 @@ export class GabineteDigitalPage implements OnInit {
         this.count_de_pr = Object.keys(despachosPr).length;
         break;
     }
-    
+
     let diplomasValidar = despachospr.filter(data => data.activityInstanceName == "Revisar Diploma");
     this.count_dip_pv = Object.keys(diplomasValidar).length;
 
@@ -263,14 +265,14 @@ export class GabineteDigitalPage implements OnInit {
     this.count_dip_as_pr = Object.keys(diplomasAssinados).length;
 
     this.processesbackend.GetToApprovedEvents('PR','true').subscribe(res=>{
-      this.count_ev_pr = res; 
+      this.count_ev_pr = res;
     });
     this.processesbackend.GetToApprovedEvents('MDGPR','true').subscribe(res=>{
       this.count_ev_md = res;
     });
 
     this.showLoader = false;
-    
+
     this.count_exp_pp = "-";
     this.count_exp_pd = "-";
     this.count_dip_apr = "-";
@@ -279,7 +281,7 @@ export class GabineteDigitalPage implements OnInit {
 
   doRefresh(event) {
     console.log(event);
-    
+
     this.closeAllDesktopComponents();
    /*  switch(this.loggeduser.Profile){
       case 'MDGPR':
@@ -302,7 +304,7 @@ export class GabineteDigitalPage implements OnInit {
     }
     else{
       console.log('null');
-      
+
     }
   }
 
@@ -358,7 +360,7 @@ export class GabineteDigitalPage implements OnInit {
         }
         break;
     }
-    
+
   }
 
   openPedidosPage(segment:string) {
@@ -394,7 +396,7 @@ export class GabineteDigitalPage implements OnInit {
       this.showDespachos = true;
     }
   }
-  
+
   openDespachosPrPage(segment?:string) {
     this.closeAllDesktopComponents();
     if( window.innerWidth <= 801){