save

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.goBack();
-      this.close();
     },
     (error)=>{
       this.badRequest()

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()
     });
   }
 

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,16 +68,19 @@ export class PendentesPage implements OnInit {
   }
  
   async LoadList(){
-    this.processes.GetTasksList("Despacho", false).subscribe(despachos => {
+    this.showLoader = true;
-      //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");
+    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 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);
@@ -87,27 +91,23 @@ export class PendentesPage implements OnInit {
         let task = {
             "SerialNumber": element.serialNumber,
             "Folio": element.workflowInstanceDataFields.Subject,
-                  "Senders": element.workflowInstanceDataFields.Sender,
+            "Senders": element.originator.email,
             "CreateDate": taskDate,
             "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
             "Remetente": element.workflowInstanceDataFields.Remetente,
             "DocumentsQty": 0,
-                  "DocId": element.workflowInstanceDataFields.DocId,
+            "DocId": element.workflowInstanceDataFields.DocIdDiferimento,
             "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 task = {
           "SerialNumber": element.serialNumber,
           "Folio": element.workflowInstanceDataFields.Subject,
           "Senders": element.workflowInstanceDataFields.Sender,
-                  "CreateDate": taskDate,
+          "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'),
           "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
           "Remetente": element.workflowInstanceDataFields.Remetente,
           "DocumentsQty": 0,
@@ -118,11 +118,7 @@ export class PendentesPage implements OnInit {
         this.pendentesList.push(task);
       });
     });
-          console.log(pendentes);
+    this.showLoader = false;
-          console.log(this.pendentesList);
-        });//Fim deferimento
-      });//Fim parecer 
-    });//Fim despacho
   }
  
   doRefresh(event) {

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;