- - +
diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts index cb5608577..9d3208a45 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts @@ -41,7 +41,6 @@ constructor( ngOnInit() { this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == this.router.url) { - console.log('Atualiza'); this.refreshing(); } }); @@ -172,7 +171,8 @@ constructor( "activityInstanceName": element.activityInstanceName, } this.diplomasList.push(task); - this.diplomasList = removeDuplicate( this.diplomasList) + this.diplomasList = removeDuplicate(this.diplomasList); + this.diplomasList = this.sortArrayISODate(this.diplomasList).reverse(); }); this.showLoader = false; @@ -202,13 +202,20 @@ constructor( "activityInstanceName": element.activityInstanceName, } this.diplomasList.push(task); - this.diplomasList = removeDuplicate( this.diplomasList) - + this.diplomasList = removeDuplicate(this.diplomasList); + this.diplomasList = this.sortArrayISODate(this.diplomasList).reverse(); + }); this.showLoader = false; break; } - } + } + + sortArrayISODate(myArray: any) { + return myArray.sort(function(a, b) { + return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0); + }); + } async refreshing() { setTimeout(() => { diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 28f1bfa46..3e3e06a8c 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/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(); diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index 27ccb6ac5..dddaae1d8 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -2,10 +2,9 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angu 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'; 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', @@ -33,7 +32,7 @@ constructor( ngOnInit() { this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == this.router.url) { - this.LoadList(); + this.refreshing(); } }); } @@ -51,123 +50,93 @@ constructor( } async LoadList(){ - this.diplomasList = new Array(); - - console.log('OOOKAY'); + this.diplomasList = []; + console.log(this.diplomasList); let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); - - console.log(diplomas); switch (this.segment) { case 'validar': - let diplomasValidar = diplomas.reverse().filter(data => data.activityInstanceName == "Revisar Diploma"); + let diplomasValidar = diplomas.filter(data => data.activityInstanceName == "Revisar Diploma"); console.log(diplomasValidar); - 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 date = new Date(element.taskStartDate); - date.setMonth(date.getMonth() + 1); - let taskDate = date.getFullYear()+"-"+ date.getMonth()+"-"+date.getDate()+" "+date.getHours()+":"+date.getMinutes()+ ":"+date.getSeconds(); + + diplomasValidar.forEach(async element => { + let DocId = element.workflowInstanceDataFields.FolderID; + let ApplicationId = element.workflowInstanceDataFields.ApplicationId; + this.totalDocs = await this.getTotalDocs(DocId); - let task = { - "SerialNumber": element.serialNumber, - "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, - "CreateDate": taskDate, - "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": 0, - "DocId": element.workflowInstanceDataFields.DispatchDocID, - "FolderID": element.workflowInstanceDataFields.FolderID, - "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.DispatchDocID, - "FolderID": element.workflowInstanceDataFields.FolderID, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - } + 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.diplomasList = this.sortArrayISODate(this.diplomasList).reverse(); + }); - }); - this.showLoader = false; + this.showLoader = false; break; case 'assinados': - console.log(this.segment); this.diplomasList = new Array(); let diplomasAssinados = diplomas.reverse().filter(data => data.activityInstanceName == "Diploma Assinado"); - console.log(diplomasAssinados); - 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, - "DocId": element.workflowInstanceDataFields.DispatchDocID, - "FolderID": element.workflowInstanceDataFields.FolderID, + "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.DispatchDocID, - "FolderID": element.workflowInstanceDataFields.FolderID, - "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; } } + async getTotalDocs(DocId:any){ + let res = await this.processes.GetDocumentDetails(DocId, '361').toPromise(); + console.log(res.DocumentsTotal); + return res.DocumentsTotal; + } + 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); + } doRefresh() { this.LoadList();