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

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)=>{
-   console.log(res); 
- });
+  this.router.events.forEach((event) => {
+    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;
-
-  @Input() profile:string;
+  loggeduser: User;
+  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');
-    /* console.log(this.navParams.get('md')); */
-    console.log(this.profile);
+    this.segment = this.loggeduser.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;
   }
+
+  sortArrayISODate(myArray: any){
+    return myArray.sort(function(a, b) {
+      return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
+    });
+  }
+
  
-  doRefresh(event) {
+  doRefresh() {
+    console.log('Refresh pendentes');
+    
     this.LoadList();
  
     setTimeout(() => {
-      //event.target.complete();
     }, 2000);
   }