save

2026-04-20 05:16:07 +00:00 · 2021-07-06 13:21:51 +01:00
parent 74e8b3d0aa
commit 48b5d94fb7
9 changed files with 159 additions and 79 deletions
@@ -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:
@@ -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,
@@ -57,7 +57,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">
@@ -1,34 +1,30 @@
-import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
+import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
-import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
+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.segment = 'validar';
    this.activatedRoute.queryParams.subscribe(params => {
      console.log('Cria');

@@ -38,7 +34,7 @@ constructor(
        this.segment = 'assinados';
      }
      
-      this.LoadList();
+      this.loadDiplomas();
    });
  }

@@ -46,12 +42,114 @@ constructor(
    this.router.events.forEach((event) => {
      if(event instanceof NavigationEnd && event.url == this.router.url) {
        console.log('Atualiza');
-        
        this.LoadList();
      }
    });
-    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;
+            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": 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;
+
+        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();
+    console.log(res.DocumentsTotal);
+    return res.DocumentsTotal;
+  }
+
+  ngOnDestroy(): void {
+    console.log('8. on destroy called');
  }
  
  segmentChanged(ev: any) {
@@ -65,7 +163,8 @@ constructor(
    }

    this.router.navigate(['/home/gabinete-digital/diplomas'], navigationExtras);
-    this.LoadList();
+    this.loadDiplomas();
+    //this.LoadList();
  }

  goToDiploma(serialNumber:any) {
@@ -77,55 +176,33 @@ constructor(

    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");
+          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)
            
-            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();
@@ -135,7 +212,7 @@ constructor(
          let ApplicationId = element.workflowInstanceDataFields.ApplicationId;
          this.processes.GetDocumentDetails(DocId, '361').subscribe(res=>{
            this.totalDocs = res.DocumentsTotal;
-            console.log(res.DocumentsTotal);
+            //console.log(res.DocumentsTotal);

            let date = new Date(element.taskStartDate);
            date.setMonth(date.getMonth() + 1);
@@ -179,9 +256,13 @@ constructor(
        this.showLoader = false;
        break;
    }
-  }
+  } 
+

  doRefresh(event) {
+    console.log('refresh');
+    
+    //this.loadDiplomas();
    this.LoadList();
    setTimeout(() => {
      event.target.complete();