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

src/app/shared/popover/opts-expediente/opts-expediente.page.ts

@@ -349,7 +349,7 @@ export class OptsExpedientePage implements OnInit {
     });
 
     await modal.present();
-    modal.onDidDismiss().then( async (res)=>{
+    modal.onDidDismiss().then( async (res) => {
       console.log(res['data']);
 
       if(body == 'descartar') {
@@ -413,6 +413,5 @@ export class OptsExpedientePage implements OnInit {
       }
     });
   }
-  
 
 }

src/app/shared/popover/request-options/request-options.page.ts

@@ -10,6 +10,7 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar
 import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ToastService } from 'src/app/services/toast.service';
+import { Location } from '@angular/common';
 
 @Component({
   selector: 'app-request-options',
@@ -34,6 +35,7 @@ export class RequestOptionsPage implements OnInit {
     private toastService: ToastService,
     private router: Router,
     public p: PermissionService,
+    private location: Location
   ) { 
     this.task = this.navParams.get('task');
     this.fulltask = this.navParams.get('fulltask');
@@ -66,12 +68,13 @@ export class RequestOptionsPage implements OnInit {
   }
 
   close() {
-    if( window.innerWidth < 801){
-      this.popoverController.dismiss('close'); 
+    if( window.innerWidth < 801) {
+      this.modalController.dismiss('close');
     } else {
       this.modalController.dismiss('close');
     }
-    this.router.navigate(['/home/gabinete-digital/pedidos']);
+
+    // this.router.navigate(['/home/gabinete-digital/pedidos']);
   }
 
   sendExpedienteToPending() {
@@ -131,6 +134,8 @@ export class RequestOptionsPage implements OnInit {
         console.log('open discart');
         
         this.distartExpedientModal();
+      } else {
+        this.popoverController.dismiss('close')
       }
 
     });
@@ -152,7 +157,7 @@ export class RequestOptionsPage implements OnInit {
     
     await modal.present();
     modal.onDidDismiss().then(res=>{
-      if(res['data']=='close'){
+      if(res['data']=='close') {
         this.close();
       }