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

src/app/shared/gabinete-digital/diplomas/diplomas.page.html

@@ -19,15 +19,6 @@
   </ion-toolbar>
 </ion-header>
 <ion-content>
-  <ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
-      <ion-refresher-content
-        pullingIcon="chevron-down-circle-outline"
-        pullingText="deslize para actualizar"
-        refreshingSpinner="circles"
-        refreshingText="A actualizar...">
-      </ion-refresher-content>
-    </ion-refresher>
-  
   <div class="width-100 overflow-y-auto height-100" [ngSwitch]="segment">
     <div *ngIf="diplomasList">
       <ion-list *ngSwitchCase="'validar'">

src/app/shared/gabinete-digital/diplomas/diplomas.page.ts

@@ -31,10 +31,9 @@ constructor(
   }
 
   ngOnInit() {
-    this.LoadList();
     this.router.events.forEach((event) => {
       if(event instanceof NavigationEnd && event.url == this.router.url) {
-        this.doRefresh();
+        this.LoadList();
       }
     });
   }
@@ -57,9 +56,12 @@ constructor(
   }
 
   async LoadList(){
+    this.diplomasList = new Array();
+
+    console.log('OOOKAY');
     
     let diplomas = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise();
-    this.diplomasList = new Array();
+    
 
     console.log(diplomas);
     switch (this.segment) {
@@ -168,16 +170,12 @@ constructor(
           });
         });
         this.showLoader = false;
-        
         break;
     }
   }
 
   doRefresh() {
     this.LoadList();
-    setTimeout(() => {
-      //event.target.complete();
-    }, 2000);
   }
 
 }

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

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { AnimationController, ModalController, PopoverController } from '@ionic/angular';
 import { AddNotePage } from 'src/app/modals/add-note/add-note.page';
 import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page';
@@ -27,7 +27,8 @@ export class DeplomaOptionsPage implements OnInit {
     private activatedRoute: ActivatedRoute,
     private processes: ProcessesService,
     private animationController: AnimationController,
-    private toastService: ToastService) { 
+    private toastService: ToastService,
+    private router: Router,) { 
       this.activatedRoute.queryParams.subscribe(params => {
         if(params["serialNumber"]) {
           this.serialnumber = params["serialNumber"];
@@ -150,7 +151,8 @@ export class DeplomaOptionsPage implements OnInit {
 
 
   goBack() {
-    this.close()
+    this.close();
+    this.router.navigate(['/home/gabinete-digital/diplomas']);
   }