diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 566e0b48a..0ec1e84b3 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -1348,8 +1348,8 @@ export class AgendaPage implements OnInit { InstanceId: saveData.workflowInstanceDataFields.InstanceId || "" } - this.mobileComponent.transparentEventList = true; this.mobileComponent.showEventToApprove = true; + this.mobileComponent.showEventList = false } diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts index 463db1e0e..beb06a609 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts @@ -84,7 +84,7 @@ export class DespachoPrPage implements OnInit { this.modalController.dismiss(); } - goBack(){ + goBack() { if (window.innerWidth <= 800) { this.router.navigate(['/home/gabinete-digital/despachos-pr']); } else { @@ -322,6 +322,9 @@ export class DespachoPrPage implements OnInit { this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ this.goBack(); this.toastService.successMessage('Processo enviado para pendentes') + },()=>{ + + this.toastService.badRequest('Processo não encontrado') }); } diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 4b7df4b6e..bab6d723e 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -217,7 +217,7 @@ export class ExpedienteDetailPage implements OnInit { await modal.present(); modal.onDidDismiss().then( async(res)=>{ let body = res['data']; - if(res['data']){ + if(res['data']) { await this.distartExpedientModal(body); } else{ diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts index df97e3941..2ce7dfb96 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -278,6 +278,9 @@ export class PedidoPage implements OnInit { sendExpedienteToPending() { this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ this.goBack(); + },()=>{ + + this.toastService.badRequest('Processo não encontrado') }); } diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts index fad691ce2..3dc4ecd16 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts @@ -138,35 +138,40 @@ export class PedidosPage implements OnInit { } else if(this.segment == 'deferimento') { this.taskType = "Pedido de Deferimento"; - await this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => { + this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => { - this.taskslist = result.filter(data => data.workflowInstanceDataFields.Status == "Active") - this.skeletonLoader = false console.log(result); this.deferimentoList = []; - let res = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active") + + let res = result.filter(data => data.workflowInstanceDataFields.Status == "Active") + res = res.reverse() res.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(); + 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": element.totalDocuments, - "DocId": element.workflowInstanceDataFields.DocIdDiferimento, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - } - this.deferimentoList.push(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": element.totalDocuments, + "DocId": element.workflowInstanceDataFields.DocIdDiferimento, + "WorkflowName": element.workflowDisplayName, + "activityInstanceName": element.activityInstanceName, + } + + if(element.workflowInstanceDataFields.Status == "Active") { + this.deferimentoList.push(task); + } + + }); }); diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts index 52753528f..c91f5d4bc 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.ts +++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts @@ -67,6 +67,9 @@ export class DespachosOptionsPage implements OnInit { this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ console.log(res); this.close(); + },()=>{ + + this.toastService.badRequest('Processo não encontrado') }); } diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts index 5747797be..03e3b311d 100644 --- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts +++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.ts @@ -98,6 +98,9 @@ export class DespachosPrOptionsPage implements OnInit { this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ console.log(res); this.close(); + },()=>{ + + this.toastService.badRequest('Processo não encontrado') }); } diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts index cc1a79208..3cb8d26e3 100644 --- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts +++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts @@ -247,6 +247,9 @@ export class OptsExpedientePrPage implements OnInit { this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ console.log(res); this.close(); + },()=>{ + + this.toastService.badRequest('Processo não encontrado') }); } diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts index ad3342191..d1284d828 100644 --- a/src/app/shared/popover/opts-expediente/opts-expediente.page.ts +++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.ts @@ -109,6 +109,9 @@ export class OptsExpedientePage implements OnInit { this.close(); this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ this.goBack(); + },()=>{ + + this.toastService.badRequest('Processo não encontrado') }); } diff --git a/src/app/shared/popover/request-options/request-options.page.ts b/src/app/shared/popover/request-options/request-options.page.ts index aff65ac08..d701c7b11 100644 --- a/src/app/shared/popover/request-options/request-options.page.ts +++ b/src/app/shared/popover/request-options/request-options.page.ts @@ -75,7 +75,11 @@ export class RequestOptionsPage implements OnInit { this.processes.SetTaskToPending(this.task.SerialNumber).subscribe(res=>{ console.log(res); this.close(); + },()=>{ + + this.toastService.badRequest('Processo não encontrado') }); + } async openBookMeetingModal(task: any) {