diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index 2c3a5143f..07975558d 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -42,8 +42,7 @@ export class ExpedientesPrPage implements OnInit { ngOnInit() { this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == this.router.url) { - this.LoadList(); - console.log('not run'); + this.refreshing(); } }); } @@ -107,6 +106,12 @@ export class ExpedientesPrPage implements OnInit { } } + refreshing() { + setTimeout(() => { + this.LoadList(); + }, 1500); + } + doRefresh(event) { this.LoadList(); setTimeout(() => { diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index e0d3f51c4..62bfd8120 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -35,21 +35,17 @@ export class ExpedientesPrPage implements OnInit { private router: Router, ) { this.loggeduser = authService.ValidatedUser; + this.LoadList(); } ngOnInit() { - this.LoadList(); this.router.events.forEach((event) => { if(event instanceof NavigationEnd && event.url == this.router.url) { - this.doRefresh(); + this.refreshing(); } }); } - notImplemented(){ - this.alertService.presentAlert('Funcionalidade em desenvolvimento'); - } - openExpedientDetailPage(data){ console.log(data); this.openExpedientDetail.emit(data); @@ -115,6 +111,12 @@ export class ExpedientesPrPage implements OnInit { } } + refreshing() { + setTimeout(() => { + this.LoadList(); + }, 1500); + } + doRefresh() { this.LoadList(); setTimeout(() => { diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.ts b/src/app/shared/popover/despachos-options/despachos-options.page.ts index 583cca30b..c95eb1ad3 100644 --- a/src/app/shared/popover/despachos-options/despachos-options.page.ts +++ b/src/app/shared/popover/despachos-options/despachos-options.page.ts @@ -1,6 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { ProcessesService } from 'src/app/services/processes.service'; -import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { AnimationController, ModalController, NavParams, PopoverController } from '@ionic/angular'; import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page'; import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; @@ -26,9 +26,9 @@ export class DespachosOptionsPage implements OnInit { private router: Router, private modalController: ModalController, public popoverController: PopoverController, - private animationController: AnimationController, private navParams: NavParams, - private toastService: ToastService) { + private toastService: ToastService, + ) { this.task = this.navParams.get('task') this.fulltask = this.navParams.get('fulltask') } @@ -45,7 +45,7 @@ export class DespachosOptionsPage implements OnInit { let classs; if( window.innerWidth <= 800){ classs = 'modal modal-desktop' - } else { + } else { classs = 'modal modal-desktop showAsideOptions' } const modal = await this.modalController.create({