diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts index ba59a45f1..90e775de8 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -114,7 +114,7 @@ export class DespachosPrPage implements OnInit { let task = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, + "Senders": element.workflowInstanceDataFields.Sender, "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.ts b/src/app/pages/gabinete-digital/despachos/despachos.page.ts index 20ca58fdb..ed82d9461 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.ts @@ -96,7 +96,7 @@ export class DespachosPage implements OnInit { let task = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, + "Senders": element.workflowInstanceDataFields.Sender, "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts index ed1b237f7..cdee909dc 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/pages/gabinete-digital/diplomas/diplomas.page.ts @@ -105,7 +105,7 @@ constructor( let task = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, + "Senders": element.workflowInstanceDataFields.Sender, "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, @@ -125,7 +125,7 @@ constructor( let task = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, + "Senders": element.workflowInstanceDataFields.Sender, "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, 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 3b81b2615..a1e17132a 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 @@ -97,8 +97,7 @@ export class ExpedienteDetailPage implements OnInit { this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ console.log(res); this.successMessage('Processo enviado para pendentes') - - this.close(); + this.goBack(); }, (error)=>{ this.badRequest() diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 8fd2c21f3..5a37081d6 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -69,7 +69,7 @@ export class ExpedientePage implements OnInit { let task: DailyWorkTask = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, + "Senders": element.workflowInstanceDataFields.Sender, "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts index 4e1353f72..e8a89f9ce 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts @@ -100,7 +100,11 @@ export class ExpedientePrPage implements OnInit { sendExpedienteToPending(){ this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{ console.log(res); - this.close(); + this.successMessage('Processo enviado para pendentes') + this.goBack(); + }, + (error)=>{ + this.badRequest() }); } diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index 71fea8590..de2056806 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -71,7 +71,7 @@ export class ExpedientesPrPage implements OnInit { let task: DailyWorkTask = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, + "Senders": element.workflowInstanceDataFields.Sender, "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index 21469bb43..b9f8afed9 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -49,10 +49,10 @@ -
+
Detalhes
-

+

diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts index eef6fb174..abe625250 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts @@ -151,7 +151,7 @@ export class PedidosPage implements OnInit { let task = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, + "Senders": element.workflowInstanceDataFields.Sender, "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, diff --git a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts index 2ccc35cb2..f9dcf01cb 100644 --- a/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/pages/gabinete-digital/pendentes/pendentes.page.ts @@ -24,6 +24,7 @@ export class PendentesPage implements OnInit { taskType: string; serialNumber:string; totalDocs:any; + showLoader: boolean; @Input() profile:string; segment:string; @@ -67,62 +68,57 @@ export class PendentesPage implements OnInit { } async LoadList(){ - this.processes.GetTasksList("Despacho", false).subscribe(despachos => { - //ParecerList - this.processes.GetTasksList("Pedido de Parecer", false).subscribe(pareceres => { - //DeferimentoList - this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(deferimentos => { - this.pendentesList = new Array(); - //PendentesList - let pendentes = despachos.concat(pareceres, deferimentos).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending"); - pendentes.forEach(element => { - let DocId = element.workflowInstanceDataFields.FolderID; - 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(); + this.showLoader = true; + this.pendentesList = new Array(); - 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.DocId, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - } - this.pendentesList.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 despachos = await this.processes.GetTasksList("Despacho", false).toPromise(); + let pareceres = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise(); + let deferimentos = await this.processes.GetTasksList("Pedido de Deferimento", false).toPromise(); + let expedientes = await this.processes.GetTasksList("Expediente", false).toPromise(); + let expedientes_pr = await this.processes.GetTasksList("Expediente do Presidente", false).toPromise(); - 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.DocId, - "WorkflowName": element.workflowDisplayName, - "activityInstanceName": element.activityInstanceName, - } - this.pendentesList.push(task); - }); - }); - console.log(pendentes); - console.log(this.pendentesList); - });//Fim deferimento - });//Fim parecer - });//Fim despacho + let pendentes = despachos.concat(pareceres, deferimentos, expedientes, expedientes_pr).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending"); + pendentes.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.pendentesList.push(task); + }, + (error)=>{ + let task = { + "SerialNumber": element.serialNumber, + "Folio": element.workflowInstanceDataFields.Subject, + "Senders": element.workflowInstanceDataFields.Sender, + "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'), + "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, + "Remetente": element.workflowInstanceDataFields.Remetente, + "DocumentsQty": 0, + "DocId": element.workflowInstanceDataFields.DocId, + "WorkflowName": element.workflowDisplayName, + "activityInstanceName": element.activityInstanceName, + } + this.pendentesList.push(task); + }); + }); + this.showLoader = false; } doRefresh(event) { diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts index 890c167f9..e8458062c 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -120,7 +120,7 @@ goToDespachoPr(serialNumber:any){ let task = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, + "Senders": element.workflowInstanceDataFields.Sender, "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.ts b/src/app/shared/gabinete-digital/despachos/despachos.page.ts index 585791bc0..1f78121fc 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.ts +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.ts @@ -107,7 +107,7 @@ export class DespachosPage implements OnInit { let task = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, + "Senders": element.workflowInstanceDataFields.Sender, "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index 62f33c54e..704681938 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -90,10 +90,10 @@ serialNumber:string; let task = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, + "Senders": element.workflowInstanceDataFields.Sender, "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, + "Remetente": element.workflowInstanceDataFields.Sender, "DocumentsQty": 0, "DocId": element.workflowInstanceDataFields.DocIdDiferimento, "WorkflowName": element.workflowDisplayName, diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index ae6967ecb..9061c93df 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -102,7 +102,7 @@ constructor( let task = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, + "Senders": element.workflowInstanceDataFields.Sender, "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index 3f4e44d73..f8973bdea 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -65,7 +65,7 @@ export class ExpedientesPrPage implements OnInit { let task: DailyWorkTask = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, + "Senders": element.workflowInstanceDataFields.Sender, "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, @@ -92,7 +92,7 @@ export class ExpedientesPrPage implements OnInit { let task: DailyWorkTask = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, + "Senders": element.workflowInstanceDataFields.Sender, "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index cf1e5de17..9d433cd06 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -69,7 +69,7 @@ export class ExpedientsPage implements OnInit { let task: DailyWorkTask = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, + "Senders": element.workflowInstanceDataFields.Sender, "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index a46c302ec..c5917c5c0 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -117,7 +117,7 @@ export class PedidosPage implements OnInit { let task = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, + "Senders": element.workflowInstanceDataFields.Sender, "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, diff --git a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts index 23d94681e..762f82f8c 100644 --- a/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts +++ b/src/app/shared/gabinete-digital/pendentes/pendentes.page.ts @@ -70,8 +70,9 @@ export class PendentesPage implements OnInit { let pareceres = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise(); let deferimentos = await this.processes.GetTasksList("Pedido de Deferimento", false).toPromise(); let expedientes = await this.processes.GetTasksList("Expediente", false).toPromise(); + let expedientes_pr = await this.processes.GetTasksList("Expediente do Presidente", false).toPromise(); - let pendentes = despachos.concat(pareceres, deferimentos, expedientes).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending"); + let pendentes = despachos.concat(pareceres, deferimentos, expedientes, expedientes_pr).reverse().filter(data => data.workflowInstanceDataFields.Status == "Pending"); pendentes.forEach(element => { let DocId = element.workflowInstanceDataFields.FolderID; let ApplicationId = element.workflowInstanceDataFields.ApplicationId; @@ -85,10 +86,10 @@ export class PendentesPage implements OnInit { let task = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, + "Senders": element.workflowInstanceDataFields.Sender, "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, - "Remetente": element.workflowInstanceDataFields.Remetente, + "Remetente": element.workflowInstanceDataFields.Sender, "DocumentsQty": 0, "DocId": element.workflowInstanceDataFields.DocIdDiferimento, "WorkflowName": element.workflowDisplayName, diff --git a/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.ts b/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.ts index a1a9e6fd3..611f2768b 100644 --- a/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.ts +++ b/src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component.ts @@ -119,7 +119,7 @@ constructor( let task = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, + "Senders": element.workflowInstanceDataFields.Sender, "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, @@ -138,7 +138,7 @@ constructor( let task = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, + "Senders": element.workflowInstanceDataFields.Sender, "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente,