Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

src/app/modals/create-process/create-process.page.html

@@ -13,7 +13,7 @@
           <div class="ion-icon-class">
             <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
           </div>
-          <div class="ion-input-class">
+          <div class="ion-input-class flex-grow-1">
             <ion-textarea class="add-border" placeholder="Descrição" [(ngModel)]="postData.DispatchFolder.Message"></ion-textarea>
           </div>
         </div>

src/app/modals/create-process/create-process.page.scss

@@ -46,12 +46,12 @@
     }
     .ion-input-class{
       width: calc(100% - 45px);
-      height: 45px;
       border: 1px solid #ebebeb;
       border-radius: 5px;
       padding-left: 5px;
       padding-right: 10px;
       float: left;
+      flex: 1;
     }
     .ion-input-class-no-height{
       border: 1px solid #ebebeb;

src/app/models/dailyworktask.model.ts

@@ -2,7 +2,7 @@ export class DailyWorkTask{
     SerialNumber: string;
     Folio: string;
     Senders: string;
-    CreateDate: string;
+    CreateDate: any;
     DocumentURL: string;
     Remetente:string;
     DocumentsQty:any;

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

@@ -1,33 +1,6 @@
 <ion-header class="ion-no-border">
   <app-header></app-header>
 </ion-header>
-<ion-menu autoHide="false" side="end" content-id="main-content">
-  <ion-header>
-    <ion-toolbar translucent>
-      <ion-title>Ações</ion-title>
-    </ion-toolbar>
-  </ion-header>
-  <ion-content>
-    <ion-list>
-      <ion-item (click)="approveTask(loadedEvent.serialNumber)">
-        <ion-icon name="checkmark-sharp"></ion-icon>
-        <ion-label>Aprovar</ion-label>
-      </ion-item>
-      <ion-item (click)="emendTask(loadedEvent.serialNumber)">
-        <ion-icon name="create-outline"></ion-icon>
-        <ion-label>Adicionar Nota</ion-label>
-      </ion-item>
-      <ion-item (click)="rejectTask(loadedEvent.serialNumber)">
-        <ion-icon name="close-sharp"></ion-icon>
-        <ion-label>Rejeitar</ion-label>
-      </ion-item>
-      <ion-item (click)="editar(loadedEvent.serialNumber)">
-        <ion-icon name="close-sharp"></ion-icon>
-        <ion-label>Editar</ion-label>
-      </ion-item>
-    </ion-list>
-  </ion-content>
-</ion-menu>
 
 <ion-content id="main-content">
   <div class="main-content d-flex height-100">

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

@@ -60,16 +60,6 @@ export class ApproveEventPage implements OnInit {
     this.getTask();
   }
 
-  notImplemented() {
-    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
-  }
-
-  close() {
-    /* this.router.navigate(['/home/gabinete-digital/event-list']); */
-    this.closeEventToApprove.emit();
-    this.modalController.dismiss();
-  }
-
   goBack() {
     let navigationExtras: NavigationExtras = {
       queryParams: {
@@ -78,7 +68,8 @@ export class ApproveEventPage implements OnInit {
     };
     if( window.innerWidth < 801) {
       this.router.navigate(['/home/gabinete-digital/event-list']);
-    } else {
+    } 
+    else {
       this.router.navigate(['/home/gabinete-digital'], navigationExtras);
     }
   }
@@ -86,9 +77,11 @@ export class ApproveEventPage implements OnInit {
   async getTask(){
     this.loadedEvent = await this.processes.GetTask(this.serialNumber).toPromise();
     console.log(this.loadedEvent);
+
     this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate);
-    console.log(new Date(this.today));
+
     this.customDate = this.days[this.today.getDay()]+ ", "  + this.today.getDate() +" de "  + ( this.months[this.today.getMonth()]);
+    
     let instanceId = this.loadedEvent.workflowInstanceDataFields.InstanceId;
     this.getAttachments(instanceId);
   }
@@ -118,8 +111,6 @@ export class ApproveEventPage implements OnInit {
   }
 
   emendTask(serialNumber:string){
-    /* console.log('Emendar'); */
-    this.menu.close();
     this.openEmendMessageModal(serialNumber);
     this.goBack();
   }
@@ -130,9 +121,9 @@ export class ApproveEventPage implements OnInit {
     console.log(body);
 
     try {    
-      this.processes.PostTaskAction(body).toPromise()
+      this.processes.PostTaskAction(body).toPromise();
+      await this.successMessage();
       this.goBack();
-      await this.successMessage()
     } catch (error) {
       this.badRequest()
     }
@@ -191,18 +182,15 @@ export class ApproveEventPage implements OnInit {
             "ReviewerUseComment": res.data,
           }
         }
-      console.log(body);
+        console.log(body);
-
-      try { 
-        await this.processes.PostTaskAction(body).toPromise()
-        //this.router.navigate(['/home/gabinete-digital/event-list']);
-        this.goToEventsToApprove();
-        this.successMessage()
-      } catch (error) {
-        this.badRequest()
-      }
-  
 
+        try { 
+          await this.processes.PostTaskAction(body).toPromise();
+          this.successMessage();
+          this.goBack();
+        } catch (error) {
+          this.badRequest();
+        }
       }
       else{
         //this.alertService.presentAlert('Operação cancelada!');
@@ -210,14 +198,14 @@ export class ApproveEventPage implements OnInit {
     });
   }
 
-  goToEventsToApprove(){
+  /* goToEventsToApprove(){
     let navigationExtras: NavigationExtras = {
       queryParams: {
-        "events": true,
+        "eventos": true,
       }
     };
     this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-  }
+  } */
 
 
   async editar(serialNumber: string) {

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html

@@ -16,7 +16,7 @@
             <div class="ion-icon-class">
               <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
             </div>
-            <div class="ion-input-class">
+            <div class="ion-input-class flex-grow-1">
               <ion-textarea class="add-border" placeholder="Descrição" [(ngModel)]="postData.DispatchFolder.Message"></ion-textarea>
             </div>
           </div>

src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss

@@ -46,13 +46,13 @@
   }
   .ion-input-class{
     width: calc(100% - 45px);
-    height: 51px;
     border: 1px solid #ebebeb;
     border-radius: 5px;
     padding-left: 5px;
     padding-right: 10px;
     float: left;
     overflow: hidden;
+    flex: 1;
   }
   .ion-input-class-no-height{
     border: 1px solid #ebebeb;

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

@@ -87,7 +87,11 @@ export class ExpedienteDetailPage implements OnInit {
     this.toastService.presentToast('Não foi possível fazer login"');
   }
 
-  goBack(){
+  goBack() {
+    window.history.back()
+  }
+
+  /* goBack(){
     let navigationExtras: NavigationExtras = {
       queryParams: {
           "expedientes": true,
@@ -98,7 +102,7 @@ export class ExpedienteDetailPage implements OnInit {
     } else {
       this.router.navigate(['/home/gabinete-digital'], navigationExtras);
     }
-  }
+  } */
 
   sendExpedienteToPending(){
     this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
@@ -242,7 +246,8 @@ export class ExpedienteDetailPage implements OnInit {
 
           try {     
             await this.processes.CompleteTask(otherbody).toPromise()
-            this.successMessage()
+            this.successMessage();
+            this.goBack();
           } catch (error) {
             this.badRequest()
           }
@@ -255,8 +260,9 @@ export class ExpedienteDetailPage implements OnInit {
       else{
         if(res['data']== 'Yes'){
           try {          
-            //await this.processes.CompleteTask(body).toPromise()
+            await this.processes.CompleteTask(body).toPromise();
-            this.successMessage()
+            this.successMessage();
+            this.goBack();
           } catch (error) {
             this.badRequest()
           }
@@ -270,7 +276,8 @@ export class ExpedienteDetailPage implements OnInit {
           
           try {
             await this.processes.UpdateTaskStatus(this.task.FolderId);
-            this.successMessage()
+            this.successMessage();
+            this.goBack();
           } catch (error) {
             this.badRequest()
           }

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

@@ -77,7 +77,7 @@
             </div>
             <p class="exp-card-title " *ngIf="loggeduser.Profile == 'MDGPR'">Expediente Presidente</p>
             <p class="exp-card-title " *ngIf="loggeduser.Profile == 'PR'">Expediente</p>
-            <p class="text-center exp-card-content"><span class="number">{{count_exp_pr}}</span> <span class="title1">Documentos</span></p>
+            <p class="text-center exp-card-content"><span class="number">{{count_exp_pr}} </span> <span class="title1">Documentos</span></p>
           </div>
 
           <div *ngIf="loggeduser.Profile == 'PR'" (click)="openDespachosPrPage(); selectedElement='DispatchesPr'" [class.active]="selectedElement == 'DispatchesPr'" class="exp-card d-md-flex flex-column justify-center" >
@@ -97,7 +97,7 @@
               <div class="exp-card-text">
                 <p class="exp-card-title " *ngIf="loggeduser.Profile == mdgpr">Expediente Presidente</p>
                 <p class="exp-card-title " *ngIf="loggeduser.Profile == pr">Expediente</p>
-                <p class="exp-card-content"><span class="number">{{count_exp_pr}}</span> <span class="title1">Documentos</span> </p>
+                <p class="exp-card-content"><span class="number">{{count_exp_pr}} </span> <span class="title1">Documentos</span> </p>
               </div>
             </div>
           </div>

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

@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { AfterViewInit, Component, OnInit, ViewChild } from '@angular/core';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { AlertService } from 'src/app/services/alert.service';
 import { ModalController } from '@ionic/angular';
@@ -7,11 +7,14 @@ import { ExpedientePage } from './expediente/expediente.page';
 import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
 import { DespachosPage } from './despachos/despachos.page';
 import { PedidosPage } from './pedidos/pedidos.page';
-import { PendentesPage } from './pendentes/pendentes.page';
+/* import { PendentesPage } from './pendentes/pendentes.page'; */
 import { AuthService } from 'src/app/services/auth.service';
 import { User } from 'src/app/models/user.model';
 import { DespachosPrPage } from 'src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page'
 import { DiplomasPage } from 'src/app/shared/gabinete-digital/diplomas/diplomas.page';
+import { ExpedientsPage } from 'src/app/shared/gabinete-digital/expedients/expedients.page';
+import { PendentesPage } from 'src/app/shared/gabinete-digital/pendentes/pendentes.page';
+import { EventsToApprovePage } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page';
 @Component({
   selector: 'app-gabinete-digital',
   templateUrl: './gabinete-digital.page.html',
@@ -69,7 +72,11 @@ export class GabineteDigitalPage implements OnInit {
 
   loggeduser: User;
   mdgpr = "MDGPR";
-  pr = "PR"
+  pr = "PR";
+
+  @ViewChild(ExpedientsPage) expedientesPage: ExpedientsPage;
+  @ViewChild(PendentesPage) pendentesListPage: PendentesPage;
+  @ViewChild(EventsToApprovePage) eventsToApprove: EventsToApprovePage;
 
   constructor(
     private processesbackend:ProcessesService,
@@ -88,61 +95,7 @@ export class GabineteDigitalPage implements OnInit {
           this.modalController.dismiss();
         }
       };
-
+      this.checkRoutes();
-      this.activatedRoute.queryParams.subscribe(params => {
-        switch (params)
-        {
-          case params["eventos"]:
-            this.openEventsToApprovePage("MDGPR");
-            this.selectedElement='approval'
-            break;
-
-          case params["expedientes"]:
-            this.openExpedientListPage();
-            this.selectedElement='Correspondence';
-            break;
-
-          case params["pendentes"]:
-            this.openPendentesPage('');
-            this.selectedElement='Pending'
-            break;
-    
-          case params["despachos"]:
-            this.openDespachosPage('');
-            this.selectedElement='Dispatches';
-            break;
-
-          case params["pedidos"]:
-            this.openPedidosPage('parecer');
-            this.selectedElement='RequestsForOpinion';
-            break;
-
-          case params["expedientespr"]:
-            this.openEventsToApprovePage("MDGPR");
-            this.selectedElement='Expediente Presidente'
-            break;
-
-          case params["despachospr"]:
-            this.openDespachosPrPage('');
-            this.selectedElement='DispatchesPr'
-            break;
-
-          case params["diplomas"]:
-            this.openDiplomasPage('');
-            this.selectedElement='DiplomasPorAssinar'
-            break;
-
-          case params["diplomasassinar"]:
-            this.openDiplomasPage('');
-            this.selectedElement='DiplomasAssinar'
-            break;
-        }
-      });
-
-      /* if (window.innerWidth >= 800 && this.loggeduser.Profile == 'MDGPR') {
-        this.openEventsToApprovePage('MDGPR');
-        this.selectedElement='approval'
-      } */
       
   }
 
@@ -153,6 +106,8 @@ export class GabineteDigitalPage implements OnInit {
     }
   }
 
+
+
   ngOnInit() {
     switch(this.loggeduser.Profile){
       case 'MDGPR':
@@ -164,9 +119,70 @@ export class GabineteDigitalPage implements OnInit {
     }
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == this.router.url) {
+        this.checkRoutes();
         this.LoadCounts();
       }
     });
+    
+  }
+
+  checkRoutes(){
+    this.activatedRoute.queryParams.subscribe(params => {
+      switch (params)
+      {
+        case params["eventos"]:
+          this.openEventsToApprovePage("MDGPR");
+          this.selectedElement='approval';
+          break;
+
+        case params["expedientes"]:
+          this.openExpedientListPage();
+          this.selectedElement='Correspondence';
+          this.expedientesPage.doRefresh();
+          break;
+
+        case params["pendentes"]:
+          this.openPendentesPage('');
+          this.selectedElement='Pending';
+          break;
+  
+        case params["despachos"]:
+          this.openDespachosPage('');
+          this.selectedElement='Dispatches';
+          break;
+
+        case params["pedidos"]:
+          this.openPedidosPage('parecer');
+          this.selectedElement='RequestsForOpinion';
+          break;
+
+        case params["expedientespr"]:
+          this.openEventsToApprovePage("MDGPR");
+          this.selectedElement='Expediente Presidente'
+          break;
+
+        case params["despachospr"]:
+          this.openDespachosPrPage('');
+          this.selectedElement='DispatchesPr'
+          break;
+
+        case params["diplomas"]:
+          this.openDiplomasPage('');
+          this.selectedElement='DiplomasPorAssinar'
+          break;
+
+        case params["diplomasassinar"]:
+          this.openDiplomasPage('');
+          this.selectedElement='DiplomasAssinar'
+          break;
+      }
+    });
+  }
+
+  refreshExpedientes(){
+    this.expedientesPage.doRefresh();
+    //this.pendentesListPage.doRefresh();
+    //this.eventsToApprove.doRefresh();
   }
 
   closeAllDesktopComponents() {
@@ -250,6 +266,7 @@ export class GabineteDigitalPage implements OnInit {
       case 'MDGPR':
         this.selectedElement='Correspondence';
         this.showExpedients = true;
+        this.expedientesPage.doRefresh();
         break;
       case 'PR':
         this.selectedElement='ExpedientesPr';
@@ -257,9 +274,9 @@ export class GabineteDigitalPage implements OnInit {
         break;
     }
     this.LoadCounts();
+    //this.refreshExpedientes();
 
     setTimeout(() => {
-      //event.target.complete();
     }, 2000);
   }
 
@@ -519,7 +536,7 @@ export class GabineteDigitalPage implements OnInit {
     //}
   }
 
-  async openPendenteList(){
+  /* async openPendenteList(){
     this.closeAllDesktopComponent();
       const modal = await this.modalController.create({
         component: PendentesPage,
@@ -531,7 +548,7 @@ export class GabineteDigitalPage implements OnInit {
       await modal.present();
       modal.onDidDismiss();
       console.log('show desktop modal')
-  }
+  } */
 
   async openDespachoList(){
     this.closeAllDesktopComponent();

src/app/shared/agenda/approve-event/approve-event.page.html

@@ -47,7 +47,7 @@
           <ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
         </div>
         <div class="header-title flex-grow-1 cursor-pointer">
-          <label>{{loadedEvent.workflowInstanceDataFields.Subject}}</label>
+          <label>{{loadedEvent.workflowInstanceDataFields.Subject}} 11 </label>
         </div>
         <div  (click)="editar(loadedEvent.serialNumber)" class="header-icon-right display-none-{{showAside}}">
           <ion-icon src="assets/images/icons-edit.svg"></ion-icon>

src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts

@@ -16,7 +16,7 @@ import { AuthService } from 'src/app/services/auth.service';
 import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
 import { DespachoPrPage } from 'src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page';
 import { User } from 'src/app/models/user.model';
-import { NavigationExtras, Router } from '@angular/router';
+import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
 
 @Component({
   selector: 'app-despachos-pr',
@@ -65,9 +65,11 @@ ngOnInit() {
   //Inicializar segment
   this.segment = "despachos";
   this.LoadList();
-  this.authService.userData$.subscribe((res:any)=>{
+  this.router.events.forEach((event) => {
-   console.log(res); 
+    if(event instanceof NavigationEnd && event.url == this.router.url) {
- });
+      this.doRefresh();
+    }
+  });
 }
 segmentChanged(ev: any) {
   this.LoadList();

src/app/shared/gabinete-digital/despachos/despachos.page.ts

@@ -14,7 +14,7 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar
 
 import { AuthService } from 'src/app/services/auth.service';
 import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
-import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
+import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
 
 @Component({
   selector: 'app-despachos',
@@ -65,6 +65,11 @@ export class DespachosPage implements OnInit {
    //Inicializar segment
    this.segment = "despachos";
    this.LoadList();
+   this.router.events.forEach((event) => {
+    if(event instanceof NavigationEnd && event.url == this.router.url) {
+      this.doRefresh();
+    }
+  });
   
  }
 

src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts

@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { NavigationExtras, Router } from '@angular/router';
+import { 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';
@@ -32,6 +32,11 @@ serialNumber:string;
 
   ngOnInit() {
     this.LoadList();
+    this.router.events.forEach((event) => {
+      if(event instanceof NavigationEnd && event.url == this.router.url) {
+        this.doRefresh();
+      }
+    });
   }
 
   goToDiploma(serialNumber:any){

src/app/shared/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';
@@ -32,6 +32,11 @@ constructor(
 
   ngOnInit() {
     this.LoadList();
+    this.router.events.forEach((event) => {
+      if(event instanceof NavigationEnd && event.url == this.router.url) {
+        this.doRefresh();
+      }
+    });
   }
 
   segmentChanged(ev: any) {

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html

@@ -7,7 +7,7 @@
       </button>
     </div>
     <ion-toolbar>
-      <ion-segment [(ngModel)]="profile">
+      <ion-segment [(ngModel)]="segment">
         <ion-segment-button value="MDGPR">
           Seu calendário
         </ion-segment-button>
@@ -22,7 +22,7 @@
      <ion-refresher-content>
     </ion-refresher-content>
   </ion-refresher>
-  <div class="main-content" [ngSwitch]="profile" *ngIf="eventsMDGPRList">
+  <div class="main-content" [ngSwitch]="segment" *ngIf="eventsMDGPRList">
    <!--  <div class="header-content width-100"> -->
      
   <!-- </div> --> 
@@ -51,7 +51,8 @@
           <ion-item
             class=" ion-no-padding width-100 cursor-pointer"
             *ngFor="let event of eventsPRList"
-            (click)="openApproveModal(event)">
+            (click)="goToEventDetail(event)"
+            >
             <div class="item event-pr-{{event.workflowInstanceDataFields.Agenda}} width-100">
                 <div class="approve-event-time">
                   <p>{{event.workflowInstanceDataFields.StartDate | date: 'hh:mm'}}</p>

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts

@@ -1,11 +1,11 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { EventBody } from 'src/app/models/eventbody.model';
 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 { ModalController } from '@ionic/angular';
 import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
-import { ApproveEventPage } from '../../agenda/approve-event/approve-event.page';
+import { User } from 'src/app/models/user.model';
+import { AuthService } from 'src/app/services/auth.service';
 
 @Component({
   selector: 'app-events-to-approve',
@@ -14,7 +14,6 @@ import { ApproveEventPage } from '../../agenda/approve-event/approve-event.page'
 })
 export class EventsToApprovePage implements OnInit {
 
-  //segment:string;
   showLoader: boolean;
   eventsPRList: any;
   eventsMDGPRList: any;
@@ -22,25 +21,25 @@ export class EventsToApprovePage implements OnInit {
   eventBody: EventBody;
   categories: string[];
   serialnumber:string;
-
+  loggeduser: User;
-  @Input() profile:string;
+  segment:string;
 
   constructor(
     private processes:ProcessesService,
     private modalController: ModalController,
     private router: Router,
-    //private navParams: NavParams,
+    private userAuth: AuthService,
-    ) { }
+    ) 
+    {
+      this.loggeduser = userAuth.ValidatedUser;
+     }
 
   ngOnInit() {
-    //this.segment = this.navParams.get('segment');
+    this.segment = this.loggeduser.Profile;
-    /* console.log(this.navParams.get('md')); */
-    console.log(this.profile);
     this.LoadToApproveEvents();
-
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == this.router.url) {
-        this.LoadToApproveEvents();
+        this.doRefresh();
       }
     });
 
@@ -87,7 +86,7 @@ export class EventsToApprovePage implements OnInit {
     this.router.navigate(['/home/gabinete-digital/event-list/approve-event'], navigationExtras)
   }
 
-  async openApproveModal(eventToAprove) {
+  /* async openApproveModal(eventToAprove) {
     let classs;
     if( window.innerWidth <= 800){
       classs = 'modal modal-desktop'
@@ -118,13 +117,19 @@ export class EventsToApprovePage implements OnInit {
       
       this.LoadToApproveEvents();
     });
+  } */
+
+  lis(){
+    console.log('Teste');
+    
   }
 
-  doRefresh(event) {
+  doRefresh() {
+    console.log('Refresh Events');
+    
     this.LoadToApproveEvents();
     console.log('refresh');
     setTimeout(() => {
-       event.target.complete();
      }, 2000);
   }
   close(){

src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts

@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { NavigationExtras, Router } from '@angular/router';
+import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
 
 import { DailyWorkTask } from '../../../models/dailyworktask.model';
@@ -39,6 +39,11 @@ export class ExpedientesPrPage implements OnInit {
 
   ngOnInit() {
     this.LoadList();
+    this.router.events.forEach((event) => {
+      if(event instanceof NavigationEnd && event.url == this.router.url) {
+        this.doRefresh();
+      }
+    });
   }
 
   notImplemented(){

src/app/shared/gabinete-digital/expedients/expedients.page.ts

@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { NavigationExtras, Router } from '@angular/router';
+import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
 
 import { DailyWorkTask } from '../../../models/dailyworktask.model';
@@ -40,6 +40,11 @@ export class ExpedientsPage implements OnInit {
     //Inicializar segment
     this.segment = "expedientes";
     this.LoadList();
+    this.router.events.forEach((event) => {
+      if(event instanceof NavigationEnd && event.url == this.router.url) {
+        this.doRefresh();
+      }
+    });
   }
 
   segmentChanged(){
@@ -83,11 +88,12 @@ export class ExpedientsPage implements OnInit {
     });
   }
 
-  doRefresh(event) {
+  doRefresh() {
+    console.log('refresh expedientes1');
+    
     this.LoadList();
 
     setTimeout(() => {
-      event.target.complete();
     }, 2000);
   }
 

src/app/shared/gabinete-digital/pedidos/pedidos.page.html

@@ -2,7 +2,7 @@
   <div class="title">
     <div class="thetitle"><ion-label >Pedidos</ion-label></div>
     <div class="theicon">
-      <button class="btn-no-color" (click)="doRefresh($event)">
+      <button class="btn-no-color" (click)="doRefresh()">
         <ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
       </button>
     </div>
@@ -19,7 +19,7 @@
   </ion-toolbar>
 </ion-header>
 <ion-content>
-  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
+  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
       <ion-refresher-content
         pullingIcon="chevron-down-circle-outline"
         pullingText="deslize para actualizar"

src/app/shared/gabinete-digital/pedidos/pedidos.page.ts

@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { NavigationExtras, Router } from '@angular/router';
+import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
 
 import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
@@ -49,6 +49,11 @@ export class PedidosPage implements OnInit {
 
   ngOnInit() {
     this.LoadList();
+    this.router.events.forEach((event) => {
+      if(event instanceof NavigationEnd && event.url == this.router.url) {
+        this.doRefresh();
+      }
+    });
   }
   
   segmentChanged(ev: any) {
@@ -134,10 +139,9 @@ export class PedidosPage implements OnInit {
     console.log(this.taskType); 
   }
 
-  doRefresh(event) {
+  doRefresh() {
     this.LoadList();
     setTimeout(() => {
-      event.target.complete();
     }, 2000);
   }
 

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

@@ -1,5 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { NavigationExtras, Router } from '@angular/router';
+import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
 import { CalendarComponent } from 'ionic2-calendar';
 
 import { DailyWorkTask } from '../../../models/dailyworktask.model';
@@ -45,10 +45,14 @@ export class PendentesPage implements OnInit {
     //Inicializar segment
     this.segment = "despachos";
     this.LoadList();
-    this.authService.userData$.subscribe((res:any)=>{
+
-     console.log(res); 
+   this.router.events.forEach((event) => {
-   });
+    if(event instanceof NavigationEnd && event.url == this.router.url) {
+      this.doRefresh();
+    }
+  });
   }
+  
   segmentChanged(ev: any) {
     this.LoadList();
   }
@@ -64,7 +68,9 @@ export class PendentesPage implements OnInit {
  
   async LoadList(){
     this.showLoader = true;
-    this.pendentesList = new Array();
+    this.pendentesList = [];
+    console.log('clear');
+    
 
     let despachos = await this.processes.GetTasksList("Despacho", false).toPromise();
     let pareceres = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise();
@@ -72,7 +78,8 @@ export class PendentesPage implements OnInit {
     let expedientes = await this.processes.GetTasksList("Expediente", false).toPromise();
     let expedientes_pr = await this.processes.GetTasksList("Expediente do Presidente", false).toPromise();
 
-    let pendentes = despachos.concat(pareceres, deferimentos, expedientes, expedientes_pr).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending");
+    let pendentes = despachos.concat(pareceres, deferimentos, expedientes, expedientes_pr).filter(data => data.workflowInstanceDataFields.Status == "Pending");
+    
     pendentes.forEach(element => {
       let DocId = element.workflowInstanceDataFields.FolderID;
       let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
@@ -87,7 +94,7 @@ export class PendentesPage implements OnInit {
             "SerialNumber": element.serialNumber,
             "Folio": element.workflowInstanceDataFields.Subject,
             "Senders": element.workflowInstanceDataFields.Sender,
-            "CreateDate": taskDate,
+            "CreateDate":  new Date(element.taskStartDate),
             "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
             "Remetente": element.workflowInstanceDataFields.Sender,
             "DocumentsQty": 0,
@@ -102,7 +109,7 @@ export class PendentesPage implements OnInit {
           "SerialNumber": element.serialNumber,
           "Folio": element.workflowInstanceDataFields.Subject,
           "Senders": element.workflowInstanceDataFields.Sender,
-          "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
+          "CreateDate": new Date(element.taskStartDate),
           "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
           "Remetente": element.workflowInstanceDataFields.Remetente,
           "DocumentsQty": 0,
@@ -113,14 +120,23 @@ export class PendentesPage implements OnInit {
         this.pendentesList.push(task);
       });
     });
+    this.pendentesList = this.sortArrayISODate(this.pendentesList).reverse();
     this.showLoader = false;
   }
 
-  doRefresh(event) {
+  sortArrayISODate(myArray: any){
+    return myArray.sort(function(a, b) {
+      return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
+    });
+  }
+
+ 
+  doRefresh() {
+    console.log('Refresh pendentes');
+    
     this.LoadList();
  
     setTimeout(() => {
-      //event.target.complete();
     }, 2000);
   }