From c542d0728e6c81dfa7ae6d5571a164b443b1e8c2 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Thu, 24 Jun 2021 16:15:53 +0100
Subject: [PATCH] save

---
 .../expediente-detail.page.ts                 | 54 ++++++++++++-------
 .../pedidos/pedido/pedido.page.ts             | 33 +++++++++---
 2 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
index 9d9dc654c..887f46844 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
@@ -97,27 +97,42 @@ export class ExpedienteDetailPage implements OnInit {
   }
 
   goBack() {
-    this.activatedRoute.paramMap.subscribe(params => {
-      switch (params["params"].caller) {
-        case 'events':
-          this.router.navigate(['/home',params["params"].caller]);
-          break;
-    
-        case 'gabinete-digital':
-          let navigationExtras: NavigationExtras = {
-            queryParams: {
-              "expedientes": true,
+    if(this.task.Status == "Pending"){
+      if (window.innerWidth <= 800) {
+        this.router.navigate(['/home/gabinete-digital/pendentes']);
+      } 
+      else {
+        let navigationExtras: NavigationExtras = {
+          queryParams: {
+              "pendentes": true,
             }
-          }
-          if( window.innerWidth < 801) {
-            this.router.navigate(['/home/gabinete-digital/expediente']);
-          } else {
-            this.router.navigate(['/home/gabinete-digital'], navigationExtras);
-          }
-          break;
-        
+        }
+        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       }
-    });
+    }
+    else{
+      this.activatedRoute.paramMap.subscribe(params => {
+        switch (params["params"].caller) {
+          case 'events':
+            this.router.navigate(['/home',params["params"].caller]);
+            break;
+      
+          case 'gabinete-digital':
+            let navigationExtras: NavigationExtras = {
+              queryParams: {
+                "expedientes": true,
+              }
+            }
+            if( window.innerWidth < 801) {
+              this.router.navigate(['/home/gabinete-digital/expediente']);
+            } else {
+              this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+            }
+            break;
+          
+        }
+      });
+    }
   }
 
   sendExpedienteToPending() {
@@ -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);
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 8102f6c3c..78ef5944b 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+++ b/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,17 +445,32 @@ export class PedidoPage implements OnInit {
   }
   
   goBack() {
-    if (window.innerWidth <= 800) {
-      this.router.navigate(['/home/gabinete-digital/pedidos']);
-    } else {
-      let navigationExtras: NavigationExtras = {
-        queryParams: {
-          "pedidos": true,
+    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 {
+        let navigationExtras: NavigationExtras = {
+          queryParams: {
+              "pedidos": true,
+            }
+        }
+        this.router.navigate(['/home/gabinete-digital'], navigationExtras);
       }
-      this.router.navigate(['/home/gabinete-digital'], navigationExtras);
     }
-
   }
   
 }