From b2d3b147d282933851d85e91c5d38135fb9ef79a Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 7 Jun 2021 12:18:45 +0100 Subject: [PATCH] save --- .../despachos-pr/despachos-pr.page.html | 4 +- .../despachos-pr/despachos-pr.page.ts | 72 +++++++++++-------- .../gabinete-digital.page.html | 2 +- .../pedidos/pedido/pedido.page.ts | 7 +- .../pedidos/pedidos.page.html | 5 +- .../gabinete-digital/pedidos/pedidos.page.ts | 47 ++++++------ 6 files changed, 74 insertions(+), 63 deletions(-) diff --git a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html index eb3d2d921..e20c1f0d7 100644 --- a/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html +++ b/src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.html @@ -6,7 +6,7 @@
- Despachos Presidenciais + Despachos Presidenciais !! Despachos
@@ -36,7 +36,7 @@ (click)="goToDespachoPr(task.SerialNumber)" > -
+
{{ task.CreateDate | date: 'dd-MM-yy' }} 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 90e775de8..654cdb92b 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 @@ -64,8 +64,6 @@ export class DespachosPrPage implements OnInit { ngOnInit() { //Inicializar segment this.segment = "despachos"; - this.LoadList(); - this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == this.router.url) { this.LoadList(); @@ -97,36 +95,48 @@ export class DespachosPrPage implements OnInit { } async LoadList() { + this.despachoList = new Array(); - - this.loading = true; - - let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); - - console.log(result); - await result.forEach( (element, index) => { - + this.loading = true; + + let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); + console.log(result); + + let despachosPr; + switch (this.loggeduser.Profile) { + case 'MDGPR': + despachosPr = result.reverse().filter(data => data.activityInstanceName == "Tarefa de Despacho"); + break; + case 'PR': + despachosPr = result.reverse().filter(data => data.activityInstanceName == "Concluir Despacho"); + break; + } + console.log(despachosPr); + + despachosPr.forEach( (element, index) => { + 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.despachoList.push(task) - + 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.despachoList.push(task); + console.log(this.despachoList); }); + console.log(this.despachoList); this.despachoList = this.sortArrayISODate(this.despachoList).reverse() @@ -139,10 +149,10 @@ export class DespachosPrPage implements OnInit { }) }); - + this.loading = false; - - } + + } sortArrayISODate(myArray: any) { return myArray.sort(function(a, b) { diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 48d560d71..e6b0a286b 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -139,8 +139,8 @@

Diplomas para Assinar

{{count_dip_as}} Documentos

+
-
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 31376a64a..e68de53dc 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts @@ -362,7 +362,7 @@ export class PedidoPage implements OnInit { await modal.present(); modal.onDidDismiss(); } - + async openAddNoteModal(actionName:string) { let classs; if( window.innerWidth <= 800){ @@ -377,25 +377,22 @@ export class PedidoPage implements OnInit { cssClass: classs, backdropDismiss: true }); + await modal.present(); modal.onDidDismiss().then(res => { - - const DocumentToSave = res.data.documents.map((e) => { return { ApplicationId: e.ApplicationType, SourceId: e.Id, } }); - let docs = { ProcessInstanceID: "", Attachments: DocumentToSave, } - if(res.data){ if(actionName == 'Solicitar Reapreciação') { diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html index b689c3329..6c8c6db92 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.html @@ -56,6 +56,9 @@
{{task.Remetente}}
+
+ {{task.activityInstanceName}} +
@@ -87,7 +90,7 @@ {{task.Remetente}}
- {{task.WorkflowName}} + {{task.activityInstanceName}}
diff --git a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts index b313655e8..fdf553e69 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedidos.page.ts @@ -98,22 +98,25 @@ export class PedidosPage implements OnInit { this.openExpedientDetail.emit(data); } - LoadList(){ + async LoadList(){ if(this.segment == 'parecer'){ this.taskType = "Pedido de Parecer"; - this.processes.GetTasksList("Pedido de Parecer", false).subscribe(result => { - this.taskslist = result; - console.log(result); - - this.parecerList = new Array(); - let res = result.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(); + let parecer = await this.processes.GetTasksList("Pedido de Parecer", false).toPromise(); + let parecerPr = await this.processes.GetTasksList("Pedido de Parecer do Presidente", false).toPromise(); - let task = { + let allParecer = parecer.concat(parecerPr).reverse(); + console.log(allParecer); + + this.parecerList = new Array(); + + allParecer.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.originator.email, @@ -124,14 +127,13 @@ export class PedidosPage implements OnInit { "DocId": element.workflowInstanceDataFields.DocIdDiferimento, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, - } - this.parecerList.push(task); - }); - console.log(this.parecerList); - + } + this.parecerList.push(task); }); + console.log(this.parecerList); + } - else if(this.segment == 'deferimento'){ + else if(this.segment == 'deferimento') { this.taskType = "Pedido de Deferimento"; this.processes.GetTasksList("Pedido de Deferimento", false).subscribe(result => { this.taskslist = result; @@ -141,12 +143,11 @@ export class PedidosPage implements OnInit { this.deferimentoList = new Array(); let res = result.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 = { + let task = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, "Senders": element.workflowInstanceDataFields.Sender, @@ -157,7 +158,7 @@ export class PedidosPage implements OnInit { "DocId": element.workflowInstanceDataFields.DocIdDiferimento, "WorkflowName": element.workflowDisplayName, "activityInstanceName": element.activityInstanceName, - } + } this.deferimentoList.push(task); }); console.log(this.deferimentoList);