- 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/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
index a5ea51b22..a149ce9fa 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -84,22 +84,7 @@ export class DespachoPage implements OnInit {
}
goBack() {
-
- // this.activatedRoute.queryParams.subscribe(params => {
- // if(params["from"] == 'pendentes') {
- // this.router.navigate(['/home/gabinete-digital/pendentes']);
- // } else {
- // let navigationExtras: NavigationExtras = {
- // queryParams: {
- // "despachos": true,
- // }
- // };
- // this.router.navigate(['/home/gabinete-digital/despachos'], navigationExtras);
- // }
- // });
-
window.history.back()
-
}
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
index b6091247d..0e5367b5c 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
@@ -17,7 +17,7 @@
+
-
Diplomas para Assinar
{{count_dip_as}} Documentos