diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts index a24267323..c95f29ad0 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts @@ -81,80 +81,6 @@ export class DiplomasPage implements OnInit, OnDestroy { } - /* async loadDiplomas(){ - - - this.activatedRoute.data.subscribe(data => { - - - 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(); diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 318dad9a8..bcbafe5eb 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -545,6 +545,7 @@ export class GabineteDigitalPage implements OnInit { async LoadCounts() { let expedientes; + this.showLoader = true try { expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise(); @@ -618,6 +619,8 @@ export class GabineteDigitalPage implements OnInit { this.count_total_pending = Object.keys(pendentes).length; this.pendentesstore.count = this.count_total_pending; + pendentes = pendentes.map((element)=> this.customTaskPipe.transform(element)) + this.pendentesstore.reset(pendentes); let depachoAPI: any = await this.processesbackend.GetTasksList("Despacho do Presidente da República", false).toPromise(); @@ -661,8 +664,6 @@ export class GabineteDigitalPage implements OnInit { diplomasValidar = diplomasValidar.filter(data => data.activityInstanceName != "Tarefa de Despacho"); this.deplomasStore.resetDiplomasReview(diplomasValidar) - console.log('1!!!!!!!!!!!!!!!!!', diplomasValidar) - let diplomasAssinar = depachoAPI.filter(data => data.activityInstanceName == "Assinar Diploma"); diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index 4e3f74578..aa0c65633 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -112,7 +112,7 @@ export class PendentesPage implements OnInit { this.skeletonLoader = false; }, (error) => { - if(error.status == 0){ + if(error.status == 0) { this.getFromDb(); } }) diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts index a56318704..db9bb0e79 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts @@ -55,29 +55,31 @@ export class PendentesPage implements OnInit { async LoadList(){ this.skeletonLoader = true; - this.processes.GetPendingTasks(false).subscribe(async res => { - let pendentes = await this.processes.GetPendingTasks(false).toPromise(); - let pendentesList = []; + this.processes.GetPendingTasks(false).subscribe(async (pendentes) => { + this.skeletonLoader = false; - pendentes.forEach(element => { - let task: customTask = this.customTaskPipe.transform(element); - pendentesList.push(task); - }); + let pendentesList = []; - pendentesList = removeDuplicate( pendentesList) - pendentesList = this.sortService.sortDate(pendentesList, 'CreateDate') + pendentes.forEach(element => { + let task: customTask = this.customTaskPipe.transform(element); + pendentesList.push(task); + }); - this.listToPresent = pendentesList - this.pendentesstore.reset(pendentesList); - this.storage.set('pendente-list',pendentesList).then(() => { - + pendentesList = removeDuplicate( pendentesList) + pendentesList = this.sortService.sortDate(pendentesList, 'CreateDate') + + this.listToPresent = pendentesList + this.pendentesstore.reset(pendentesList); + this.storage.set('pendente-list',pendentesList).then(() => { + + }) + + }, (error) => { + if(error.status == 0){ + this.getFromDb(); + } }) - this.skeletonLoader = false; - }, (error) => { - if(error.status == 0){ - this.getFromDb(); - } - }) + } getFromDb() {