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 88ce83a56..cc120a3b4 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
@@ -65,6 +65,14 @@
+
+
+ Lista vazia
+
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 7508ef4b5..9f0e1e16a 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -248,11 +248,11 @@ export class GabineteDigitalPage implements OnInit {
let despachosPr;
switch (this.loggeduser.Profile) {
case 'MDGPR':
- despachosPr = despachospr.filter(data => data.activityInstanceName == "Tarefa de Despacho");
+ despachosPr = despachospr.filter(data => data.activityInstanceName == "Tarefa de Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active");
this.count_de_pr = Object.keys(despachosPr).length;
break;
case 'PR':
- despachosPr = despachospr.filter(data => data.activityInstanceName == "Concluir Despacho");
+ despachosPr = despachospr.filter(data => data.activityInstanceName == "Concluir Despacho").filter(data => data.workflowInstanceDataFields.Status == "Active")
this.count_de_pr = Object.keys(despachosPr).length;
break;
}
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
index c17b1eb16..1c1c1f8c6 100644
--- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
+++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.html
@@ -62,6 +62,14 @@
+
+
+ Lista vazia
+
+
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 5ac230ae6..b52bfb594 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
@@ -85,7 +85,7 @@ constructor (
this.LoadList();
}
- goToDespachoPr(serialNumber:any){
+ goToDespachoPr(serialNumber:any) {
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
@@ -103,56 +103,56 @@ constructor (
this.openExpedientDetail.emit(data);
}
- async LoadList() {
+ async LoadList() {
- this.skeletonLoader = true;
+ this.skeletonLoader = true;
+
+ let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
+ this.despachoList = [];
+
+ 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;
+ }
+
+ despachosPr = despachosPr.filter(data => data.workflowInstanceDataFields.Status == "Active");
+ console.log('despachosPr', 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": element.totalDocuments,
+ "DocId": element.workflowInstanceDataFields.DispatchDocID,
+ "FolderID": element.workflowInstanceDataFields.FolderID,
+ "WorkflowName": element.workflowDisplayName,
+ "activityInstanceName": element.activityInstanceName,
+ "Status": element.workflowInstanceDataFields.Status,
+ }
+
+ this.despachoList.push(task);
+ });
+
+ this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
+
+ this.skeletonLoader = false;
- let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
- this.despachoList = [];
-
- 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;
}
- despachosPr = despachosPr.filter(data => data.workflowInstanceDataFields.Status == "Active");
- console.log('despachosPr', 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": element.totalDocuments,
- "DocId": element.workflowInstanceDataFields.DispatchDocID,
- "FolderID": element.workflowInstanceDataFields.FolderID,
- "WorkflowName": element.workflowDisplayName,
- "activityInstanceName": element.activityInstanceName,
- "Status": element.workflowInstanceDataFields.Status,
- }
-
- this.despachoList.push(task);
- });
-
- this.despachoList = this.sortArrayISODate(this.despachoList).reverse()
-
- this.skeletonLoader = false;
-
- }
-
sortArrayISODate(myArray: any){
return myArray.sort(function(a, b) {
return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);