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

src/app/pages/events/events.page.ts

@@ -88,6 +88,7 @@ export class EventsPage implements OnInit {
      }
 
   ngOnInit() {
+    this.activatedRoute.data.subscribe(data => console.log(data));
     //Inicializar segment
     this.segment = "Combinada";
     //Initialize profile as mdgpr
@@ -285,13 +286,11 @@ export class EventsPage implements OnInit {
       case 'MDGPR':
         this.processes.GetTasksList("Expediente", false).subscribe(result => {
           this.expedientList = result.reverse();
-          console.log(this.expedientList);
         });
         break;
       case 'PR':
         this.processes.GetTasksList("Expediente do Presidente", false).subscribe(result => {
           this.expedientList = result.reverse();
-          console.log(this.expedientList);
         });
         break;    
       default:

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

@@ -95,6 +95,7 @@ export class DiplomaPage implements OnInit {
       component: DeplomaOptionsPage,
       cssClass: 'exp-options',
       componentProps: {
+        serialNumber: this.serialNumber,
         task: this.task,
         fulltask: this.fulltask,
         taskAction:taskAction,
@@ -292,6 +293,4 @@ export class DiplomaPage implements OnInit {
   }
 
 
-
-
 }

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

@@ -16,10 +16,10 @@
   <ion-toolbar>
     <ion-segment [(ngModel)]="segment" (ionChange)="segmentChanged($event)">
       <ion-segment-button value="validar">
-        Diplomas por validar
+        Por validar
       </ion-segment-button>
       <ion-segment-button value="assinados">
-        Diplomas assinados PR
+        Assinados PR
       </ion-segment-button>
     </ion-segment>
   </ion-toolbar>
@@ -28,12 +28,7 @@
 
   <div class="main-content">
     <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
-      <ion-refresher-content
-        pullingIcon="chevron-down-circle-outline"
-        pullingText="deslize para actualizar"
-        refreshingSpinner="circles"
-        refreshingText="A actualizar...">
-      </ion-refresher-content>
+      <ion-refresher-content></ion-refresher-content>
     </ion-refresher>
   
     <div class="width-100" [ngSwitch]="segment">
@@ -57,7 +52,7 @@
                     </div>
                     <div class="exp-icon">
                       <ion-icon src="assets/images/icons-expediente-attachment.svg"></ion-icon>
-                      <label></label>
+                      <label>{{task.DocumentsQty}}</label>
                     </div>
                   </div>
                   <div class="exp-bottom-detail">

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

@@ -1,34 +1,31 @@
-import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
-import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import { ActivatedRoute, NavigationEnd, NavigationError, NavigationExtras, NavigationStart, Router } from '@angular/router';
+import { DailyWorkTask } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
-import { formatDate } from '@angular/common';
-import { ModalController, NavParams } from '@ionic/angular';
-import { AlertService } from 'src/app/services/alert.service';
-import { DiplomaPage } from 'src/app/pages/gabinete-digital/diplomas/diploma/diploma.page';
+import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
 
 @Component({
   selector: 'app-diplomas',
   templateUrl: './diplomas.page.html',
   styleUrls: ['./diplomas.page.scss'],
 })
-export class DiplomasPage implements OnInit {
-diplomasList:DailyWorkTask[] = [];
+export class DiplomasPage implements OnInit, OnDestroy {
+  list:DailyWorkTask[] = [];
+  diplomasList:DailyWorkTask[] = [];
 diplomasAssinadoList:DailyWorkTask[] = [];
 showLoader: boolean;
 totalDocs:any;
 serialNumber:string;
 
-@Input() profile:string;
-@Input() segment:string;
+segment:string;
 
 constructor(
   private processes:ProcessesService,
-  private modalController: ModalController,
-  private alertService: AlertService,
   private router: Router,
   private activatedRoute: ActivatedRoute,
   ) {
+    this.diplomasList = [];
+    this.segment = 'validar';
     this.activatedRoute.queryParams.subscribe(params => {
       console.log('Cria');
 
@@ -37,34 +34,103 @@ constructor(
       } else if (params['segment'] == 'assinados') {
         this.segment = 'assinados';
       }
-      
-      this.LoadList();
     });
+    
   }
 
   ngOnInit() {
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == this.router.url) {
-        console.log('Atualiza');
-        
-        this.LoadList();
+        this.refreshing();
       }
     });
-    console.log('Init');
-    this.LoadList();
+  }
+
+  /* async loadDiplomas(){
+    console.log('Load');
+    
+    this.activatedRoute.data.subscribe(data => {
+      console.log(data['diplomas']);
+      
+      switch (this.segment) {
+        case 'validar':
+         
+          let diplomasValidar = data['diplomas'].filter(data => data.activityInstanceName == "Revisar Diploma");
+          diplomasValidar.forEach(async element => {
+            let DocId = element.workflowInstanceDataFields.FolderID;
+            let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
+
+            let res = await this.processes.GetDocumentDetails(DocId, '361').toPromise();
+
+            let date = new Date(element.taskStartDate);
+            date.setMonth(date.getMonth() + 1);
+            let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+  
+            let task = {
+                "SerialNumber": element.serialNumber,
+                "Folio": element.workflowInstanceDataFields.Subject,
+                "Senders": element.workflowInstanceDataFields.Sender,
+                "CreateDate": taskDate,
+                "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+                "Remetente": element.workflowInstanceDataFields.Remetente,
+                "DocumentsQty": res.DocumentsTotal,
+                "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+                "WorkflowName": element.workflowDisplayName,
+                "activityInstanceName": element.activityInstanceName,
+            }
+            this.diplomasList.push(task);
+            this.diplomasList = removeDuplicate( this.diplomasList)
+            
+          });
+          this.showLoader = false;
+          break;
+
+        case 'assinados':
+          //this.diplomasList = new Array();
+          let diplomasAssinados = data.diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
+          diplomasAssinados.forEach(async element => {
+            let DocId = element.workflowInstanceDataFields.FolderID;
+            let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
+
+            let res = await this.processes.GetDocumentDetails(DocId, '361').toPromise();
+
+            let date = new Date(element.taskStartDate);
+            date.setMonth(date.getMonth() + 1);
+            let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+  
+            let task = {
+                "SerialNumber": element.serialNumber,
+                "Folio": element.workflowInstanceDataFields.Subject,
+                "Senders": element.workflowInstanceDataFields.Sender,
+                "CreateDate": taskDate,
+                "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+                "Remetente": element.workflowInstanceDataFields.Remetente,
+                "DocumentsQty": this.totalDocs,
+                "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+                "WorkflowName": element.workflowDisplayName,
+                "activityInstanceName": element.activityInstanceName,
+            }
+            this.diplomasList.push(task);
+            this.diplomasList = removeDuplicate( this.diplomasList)
+            
+          });
+          this.showLoader = false;
+          break;
+      }
+    });
+  } */
+
+  async getTotalDocs(DocId:any){
+    let res = await this.processes.GetDocumentDetails(DocId, '361').toPromise();
+    console.log(res.DocumentsTotal);
+    return res.DocumentsTotal;
+  }
+
+  ngOnDestroy(): void {
+    console.log('8. on destroy called');
   }
   
   segmentChanged(ev: any) {
-
-    let navigationExtras: NavigationExtras;
-
-    if (this.segment == 'assinados') {
-      navigationExtras= { queryParams: {"assinados": true,}};
-    } else if (this.segment == 'validar') {
-      navigationExtras = { queryParams: {"validar": true,}};
-    }
-
-    this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras);
     this.LoadList();
   }
 
@@ -73,115 +139,95 @@ constructor(
   }
 
   async LoadList(){
+    this.diplomasList = [];
+    console.log(this.diplomasList);
+    
     let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
-
+    
     switch (this.segment) {
       case 'validar':
-        this.diplomasList = new Array();
-        let diplomasValidar = diplomas.reverse().filter(data => data.activityInstanceName == "Revisar Diploma");
-        diplomasValidar.forEach(element => {
-          let DocId = element.workflowInstanceDataFields.FolderID;
-          let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
-          this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
-            this.totalDocs = res.DocumentsTotal;
-            console.log(res.DocumentsTotal);
+        let diplomasValidar = diplomas.filter(data => data.activityInstanceName == "Revisar Diploma");
+        console.log(diplomasValidar);
+        
+          diplomasValidar.forEach(async element => {
+            let DocId = element.workflowInstanceDataFields.FolderID;
+            let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
+            this.totalDocs = await this.getTotalDocs(DocId);
 
             let date = new Date(element.taskStartDate);
             date.setMonth(date.getMonth() + 1);
             let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
-
+  
             let task = {
-              "SerialNumber": element.serialNumber,
-              "Folio": element.workflowInstanceDataFields.Subject,
-              "Senders": element.workflowInstanceDataFields.Sender,
-              "CreateDate": taskDate,
-              "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-              "Remetente": element.workflowInstanceDataFields.Remetente,
-              "DocumentsQty": 0,
-              "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
-              "WorkflowName": element.workflowDisplayName,
-              "activityInstanceName": element.activityInstanceName,
+                "SerialNumber": element.serialNumber,
+                "Folio": element.workflowInstanceDataFields.Subject,
+                "Senders": element.workflowInstanceDataFields.Sender,
+                "CreateDate": taskDate,
+                "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+                "Remetente": element.workflowInstanceDataFields.Remetente,
+                "DocumentsQty": this.totalDocs,
+                "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
+                "WorkflowName": element.workflowDisplayName,
+                "activityInstanceName": element.activityInstanceName,
             }
             this.diplomasList.push(task);
-          },
-          (error)=> {
+            this.diplomasList = removeDuplicate(this.diplomasList);
+            this.diplomasList = this.sortArrayISODate(this.diplomasList).reverse();
             
-            let date = new Date(element.taskStartDate);
-            date.setMonth(date.getMonth() + 1);
-            let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
-
-            let task = {
-              "SerialNumber": element.serialNumber,
-              "Folio": element.workflowInstanceDataFields.Subject,
-              "Senders": element.workflowInstanceDataFields.Sender,
-              "CreateDate": taskDate,
-              "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-              "Remetente": element.workflowInstanceDataFields.Remetente,
-              "DocumentsQty": 0,
-              "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
-              "WorkflowName": element.workflowDisplayName,
-              "activityInstanceName": element.activityInstanceName,
-            }
-            this.diplomasList.push(task);
           });
-        });
-        this.showLoader = false;
+          this.showLoader = false;
         break;
       case 'assinados':
         this.diplomasList = new Array();
         let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
-        diplomasAssinados.forEach(element => {
+        diplomasAssinados.forEach(async element => {
           let DocId = element.workflowInstanceDataFields.FolderID;
           let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
-          this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
-            this.totalDocs = res.DocumentsTotal;
-            console.log(res.DocumentsTotal);
+          this.totalDocs = await this.getTotalDocs(DocId);
 
-            let date = new Date(element.taskStartDate);
-            date.setMonth(date.getMonth() + 1);
-            let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
+          let date = new Date(element.taskStartDate);
+          date.setMonth(date.getMonth() + 1);
+          let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
 
-            let task = {
+          let task = {
               "SerialNumber": element.serialNumber,
               "Folio": element.workflowInstanceDataFields.Subject,
               "Senders": element.workflowInstanceDataFields.Sender,
               "CreateDate": taskDate,
               "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
               "Remetente": element.workflowInstanceDataFields.Remetente,
-              "DocumentsQty": 0,
+              "DocumentsQty": this.totalDocs,
               "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
               "WorkflowName": element.workflowDisplayName,
               "activityInstanceName": element.activityInstanceName,
-            }
-            this.diplomasList.push(task);
-          },
-          (error)=> {
-            
-            let date = new Date(element.taskStartDate);
-            date.setMonth(date.getMonth() + 1);
-            let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds();
-
-            let task = {
-              "SerialNumber": element.serialNumber,
-              "Folio": element.workflowInstanceDataFields.Subject,
-              "Senders": element.workflowInstanceDataFields.Sender,
-              "CreateDate": taskDate,
-              "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
-              "Remetente": element.workflowInstanceDataFields.Remetente,
-              "DocumentsQty": 0,
-              "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
-              "WorkflowName": element.workflowDisplayName,
-              "activityInstanceName": element.activityInstanceName,
-            }
-            this.diplomasList.push(task);
-          });
+          }
+          this.diplomasList.push(task);
+          this.diplomasList = removeDuplicate(this.diplomasList);
+          this.diplomasList = this.sortArrayISODate(this.diplomasList).reverse();
+           
         });
         this.showLoader = false;
         break;
     }
   }
 
-  doRefresh(event) {
+  sortArrayISODate(myArray: any) {
+    return myArray.sort(function(a, b) {
+      return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
+    });
+  }
+
+  async refreshing() {
+    setTimeout(() => {
+      this.LoadList();
+    }, 1500);
+  }
+
+
+  async doRefresh(event) {
+    console.log('refresh');
+    
+    //this.loadDiplomas();
     this.LoadList();
     setTimeout(() => {
       event.target.complete();

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

@@ -431,8 +431,7 @@ export class GabineteDigitalPage implements OnInit {
 
   openDiplomasPage(segment:string) {
     if( window.innerWidth <= 801){
-      let navigationExtras: NavigationExtras = { queryParams: {"segment": segment}};
-      this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras);
+      this.router.navigate(['/home/gabinete-digital/diplomas']);
     }
     else{
       this.closeAllDesktopComponents();