save

2026-04-19 04:57:52 +00:00 · 2021-07-06 15:15:48 +01:00
parent 48b5d94fb7
commit 7012c7a537
4 changed files with 69 additions and 113 deletions
@@ -293,6 +293,4 @@ export class DiplomaPage implements OnInit {
  }


-
-
 }
@@ -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>
@@ -1,5 +1,5 @@
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
+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 { removeDuplicate } from 'src/plugin/removeDuplicate.js'
@@ -24,6 +24,7 @@ constructor(
  private router: Router,
  private activatedRoute: ActivatedRoute,
  ) {
+    this.diplomasList = [];
    this.segment = 'validar';
    this.activatedRoute.queryParams.subscribe(params => {
      console.log('Cria');
@@ -33,22 +34,20 @@ constructor(
      } else if (params['segment'] == 'assinados') {
        this.segment = 'assinados';
      }
-      
-      this.loadDiplomas();
    });
+    
  }

  ngOnInit() {
    this.router.events.forEach((event) => {
      if(event instanceof NavigationEnd && event.url == this.router.url) {
        console.log('Atualiza');
-        this.LoadList();
+        this.refreshing();
      }
    });
-    
  }

-  async loadDiplomas(){
+  /* async loadDiplomas(){
    console.log('Load');
    
    this.activatedRoute.data.subscribe(data => {
@@ -61,7 +60,40 @@ constructor(
          diplomasValidar.forEach(async element => {
            let DocId = element.workflowInstanceDataFields.FolderID;
            let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
-            this.totalDocs = await this.getTotalDocs(DocId);
+
+            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);
@@ -85,62 +117,9 @@ constructor(
          });
          this.showLoader = false;
          break;
-
-        case 'assinados':
-          //this.diplomasList = new Array();
-          let diplomasAssinados = data.diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado");
-          diplomasAssinados.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 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.list.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.list.push(task);
-            });
-          });
-          this.diplomasList = removeDuplicate(this.list);
-          this.showLoader = false;
-          break;
      }
    });
-  }
+  } */

  async getTotalDocs(DocId:any){
    let res = await this.processes.GetDocumentDetails(DocId, '361').toPromise();
@@ -153,18 +132,7 @@ constructor(
  }
  
  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.loadDiplomas();
-    //this.LoadList();
+    this.LoadList();
  }

  goToDiploma(serialNumber:any) {
@@ -172,11 +140,16 @@ 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':
        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;
@@ -207,59 +180,44 @@ constructor(
      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.showLoader = false;
        break;
    }
  } 

+  async refreshing() {
+    setTimeout(() => {
+      this.LoadList();
+    }, 1500);
+  }

-  doRefresh(event) {
+
+  async doRefresh(event) {
    console.log('refresh');
    
    //this.loadDiplomas();
@@ -431,8 +431,8 @@ 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);
+      /* let navigationExtras: NavigationExtras = { queryParams: {"segment": segment}}; */
+      this.router.navigate(['/home/gabinete-digital/diplomas']/* , navigationExtras */);
    }
    else{
      this.closeAllDesktopComponents();