diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 96aa9f284..1915b3bd8 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -146,10 +146,6 @@ export class GabineteDigitalPage implements OnInit, DoCheck { }; this.checkRoutes(); - - // this.eventoaprovacaostore.resetmd([]) - // this.eventoaprovacaostore.resetpr([]) - } ngDoCheck(): void { @@ -209,64 +205,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { } async loadAllProcesses() { - - this.processesbackend.GetTasksList("", false).subscribe(async res => { - - let allProcessesList = await this.processesbackend.GetTasksList("", false).toPromise(); - - allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento') - - if (!this.p.userRole(['PR'])) { - allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Assinar Diplomas') - } else if (this.p.userRole(['PR'])) { - allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Diploma Assinado') - } - - console.log('allProcessesList', allProcessesList); - - this.addProcessToDB(allProcessesList) - this.skeletonLoader = true; - - this.allProcessesList = []; - - allProcessesList.forEach(element => { - 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, - "CreateDate": new Date(element.taskStartDate), - "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, - "DocumentsQty": element.totalDocuments, - "DocId": element.workflowInstanceDataFields.DispatchDocId, - "FolderID": element.workflowInstanceDataFields.FolderID, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - "Status": element.workflowInstanceDataFields.Status, - "Agenda": element.workflowInstanceDataFields.Agenda, - "customDate": this.setFormatDate(new Date(element.workflowInstanceDataFields.StartDate), new Date(element.workflowInstanceDataFields.EndDate), element.workflowInstanceDataFields.IsAllDayEvent), - } - - this.allProcessesList.push(task); - this.allProcessesList = removeDuplicate(this.allProcessesList) - this.allProcessesList = this.sortArrayISODate(this.allProcessesList).reverse(); - - - - }); - - }, (error) => { - console.log('gabinete digital offline', error) - this.getAllProcessFromDB(); - }) - - this.skeletonLoader = false; - + this.LoadCounts(); } addProcessToDB(data) { @@ -345,9 +284,6 @@ export class GabineteDigitalPage implements OnInit, DoCheck { setFormatDate(start: any, end: any, allday: boolean) { let customDate; - /* start = new Date(); - end= new Date("2021-08-04T18:01:04.753Z"); */ - //end = new Date("2021-09-04T18:01:04.753Z"); const totalSeconds = Math.floor((end - (start)) / 1000);; const totalMinutes = Math.floor(totalSeconds / 60); @@ -385,6 +321,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck { (thedate.getMonth() + 1) + "/" + thedate.getFullYear(); } + getCustomHours(thedate: Date) { return thedate.getHours() + ":" + thedate.getMinutes(); @@ -551,8 +488,51 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.showLoader = true; let allPreocesses_ = await this.processesbackend.GetTasksList("", false).toPromise(); - let count_all_processes = Object.keys(allPreocesses_).length; + let allProcessesList = allPreocesses_; + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento') + + if (!this.p.userRole(['PR'])) { + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Assinar Diplomas') + } else if (this.p.userRole(['PR'])) { + allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Diploma Assinado') + } + + console.log('allProcessesList', allProcessesList); + + this.addProcessToDB(allProcessesList) + this.skeletonLoader = true; + + this.allProcessesList = []; + + allProcessesList.forEach(element => { + 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, + "CreateDate": new Date(element.taskStartDate), + "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, + "Remetente": element.workflowInstanceDataFields.Remetente, + "DocumentsQty": element.totalDocuments, + "DocId": element.workflowInstanceDataFields.DispatchDocId, + "FolderID": element.workflowInstanceDataFields.FolderID, + "WorkflowName": element.workflowDisplayName, + "activityInstanceName": element.activityInstanceName, + "Status": element.workflowInstanceDataFields.Status, + "Agenda": element.workflowInstanceDataFields.Agenda, + "customDate": this.setFormatDate(new Date(element.workflowInstanceDataFields.StartDate), new Date(element.workflowInstanceDataFields.EndDate), element.workflowInstanceDataFields.IsAllDayEvent), + } + + this.allProcessesList.push(task); + this.allProcessesList = removeDuplicate(this.allProcessesList) + this.allProcessesList = this.sortArrayISODate(this.allProcessesList).reverse(); + + }); let expedientes = await this.processesbackend.GetTaskListExpediente(false).toPromise(); expedientes = expedientes.filter(data => data.workflowInstanceDataFields.Status == "Active") @@ -595,7 +575,6 @@ export class GabineteDigitalPage implements OnInit, DoCheck { break; } - let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR', false).toPromise(); let mdEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal MDGPR', false).toPromise(); const eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal); @@ -603,15 +582,12 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.eventoaprovacaostore.resetmd(eventsMDGPRList); - let prEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial PR', false).toPromise(); let prEventsPessoal = await this.processesbackend.GetTasksList('Agenda Pessoal PR', false).toPromise(); const eventsPRList = prEventsOficial.concat(prEventsPessoal); this.eventoaprovacaostore.countPr = eventsPRList.length this.eventoaprovacaostore.resetpr(eventsPRList); - - let diplomasValidar = despachospr.filter(data => data.activityInstanceName == "Revisar Diploma"); this.count_dip_pv = Object.keys(diplomasValidar).length; this.deplomasStore.resetDiplomasReview(diplomasValidar) @@ -622,7 +598,6 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.deplomasStore.resetDiplomasList(diplomasAssinar) - let diplomasAssinados = despachospr.filter(data => data.activityInstanceName == "Diploma Assinado"); this.count_dip_as_pr = Object.keys(diplomasAssinados).length; this.deplomasStore.resetDiplomasAssinadoList(diplomasAssinados) @@ -654,8 +629,9 @@ export class GabineteDigitalPage implements OnInit, DoCheck { this.showExpedientesPr = true; break; } */ - this.LoadCounts(); - this.loadAllProcesses(); + + this.LoadCounts(); + // this.loadAllProcesses(); //this.refreshExpedientes(); if (event) { diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index 6c6dd30ee..409e85bf9 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -50,7 +50,7 @@ export class PedidosPage implements OnInit { public ThemeService: ThemeService ) { this.profile = 'mdgpr'; - } + } ngOnInit() {