save

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -97,6 +97,20 @@ export class ExpedienteDetailPage implements OnInit {
   }
 
   goBack() {
+    if(this.task.Status == "Pending"){
+      if (window.innerWidth <= 800) {
+        this.router.navigate(['/home/gabinete-digital/pendentes']);
+      } 
+      else {
+        let navigationExtras: NavigationExtras = {
+          queryParams: {
+              "pendentes": true,
+            }
+        }
+        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+      }
+    }
+    else{
       this.activatedRoute.paramMap.subscribe(params => {
         switch (params["params"].caller) {
           case 'events':
@@ -119,6 +133,7 @@ export class ExpedienteDetailPage implements OnInit {
         }
       });
     }
+  }
 
   sendExpedienteToPending() {
     this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
@@ -149,6 +164,7 @@ export class ExpedienteDetailPage implements OnInit {
         "FsId": res.workflowInstanceDataFields.FsId,
         "DocId": res.workflowInstanceDataFields.DocID,
         "WorkflowName": res.workflowDisplayName,
+        "Status": res.workflowInstanceDataFields.Status,
       }
 
       //console.log('task', this.task);

src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts

@@ -102,6 +102,7 @@ export class PedidoPage implements OnInit {
           "DeadlineType": res.workflowInstanceDataFields.DeadlineType,
           "ProcessInstanceID": res.workflowInstanceDataFields.InstanceID,
           "activityInstanceName": res.activityInstanceName,
+          "Status": res.workflowInstanceDataFields.Status,
         }
         console.log(this.task);
       }
@@ -126,6 +127,7 @@ export class PedidoPage implements OnInit {
           "DeadlineType": res.workflowInstanceDataFields.DeadlineType,
           "ProcessInstanceID": res.workflowInstanceDataFields.InstanceID,
           "activityInstanceName": res.activityInstanceName,
+          "Status": res.workflowInstanceDataFields.Status,
         }
         console.log(this.task);
       }
@@ -443,9 +445,24 @@ export class PedidoPage implements OnInit {
   }
   
   goBack() {
+    if(this.task.Status == "Pending"){
+      if (window.innerWidth <= 800) {
+        this.router.navigate(['/home/gabinete-digital/pendentes']);
+      } 
+      else {
+        let navigationExtras: NavigationExtras = {
+          queryParams: {
+              "pendentes": true,
+            }
+        }
+        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+      }
+    }
+    else{
       if (window.innerWidth <= 800) {
           this.router.navigate(['/home/gabinete-digital/pedidos']);
-    } else {
+      } 
+      else {
         let navigationExtras: NavigationExtras = {
           queryParams: {
               "pedidos": true,
@@ -453,7 +470,7 @@ export class PedidoPage implements OnInit {
         }
         this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       }
-
+    }
   }
   
 }