Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

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

@@ -87,7 +87,11 @@ export class ExpedienteDetailPage implements OnInit {
     this.toastService.presentToast('Não foi possível fazer login"');
   }
 
-  goBack(){
+  goBack() {
+    window.history.back()
+  }
+
+  /* goBack(){
     let navigationExtras: NavigationExtras = {
       queryParams: {
           "expedientes": true,
@@ -98,7 +102,7 @@ export class ExpedienteDetailPage implements OnInit {
     } else {
       this.router.navigate(['/home/gabinete-digital'], navigationExtras);
     }
-  }
+  } */
 
   sendExpedienteToPending(){
     this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
@@ -242,7 +246,8 @@ export class ExpedienteDetailPage implements OnInit {
 
           try {     
             await this.processes.CompleteTask(otherbody).toPromise()
-            this.successMessage()
+            this.successMessage();
+            this.goBack();
           } catch (error) {
             this.badRequest()
           }
@@ -255,8 +260,9 @@ export class ExpedienteDetailPage implements OnInit {
       else{
         if(res['data']== 'Yes'){
           try {          
-            //await this.processes.CompleteTask(body).toPromise()
-            this.successMessage()
+            await this.processes.CompleteTask(body).toPromise();
+            this.successMessage();
+            this.goBack();
           } catch (error) {
             this.badRequest()
           }
@@ -270,7 +276,8 @@ export class ExpedienteDetailPage implements OnInit {
           
           try {
             await this.processes.UpdateTaskStatus(this.task.FolderId);
-            this.successMessage()
+            this.successMessage();
+            this.goBack();
           } catch (error) {
             this.badRequest()
           }