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

This commit is contained in:
Peter Maquiran
2021-07-07 09:51:05 +01:00
3 changed files with 19 additions and 12 deletions
@@ -42,8 +42,7 @@ export class ExpedientesPrPage implements OnInit {
ngOnInit() { ngOnInit() {
this.router.events.forEach((event) => { this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) { if(event instanceof NavigationEnd && event.url == this.router.url) {
this.LoadList(); this.refreshing();
console.log('not run');
} }
}); });
} }
@@ -107,6 +106,12 @@ export class ExpedientesPrPage implements OnInit {
} }
} }
refreshing() {
setTimeout(() => {
this.LoadList();
}, 1500);
}
doRefresh(event) { doRefresh(event) {
this.LoadList(); this.LoadList();
setTimeout(() => { setTimeout(() => {
@@ -35,21 +35,17 @@ export class ExpedientesPrPage implements OnInit {
private router: Router, private router: Router,
) { ) {
this.loggeduser = authService.ValidatedUser; this.loggeduser = authService.ValidatedUser;
this.LoadList();
} }
ngOnInit() { ngOnInit() {
this.LoadList();
this.router.events.forEach((event) => { this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) { if(event instanceof NavigationEnd && event.url == this.router.url) {
this.doRefresh(); this.refreshing();
} }
}); });
} }
notImplemented(){
this.alertService.presentAlert('Funcionalidade em desenvolvimento');
}
openExpedientDetailPage(data){ openExpedientDetailPage(data){
console.log(data); console.log(data);
this.openExpedientDetail.emit(data); this.openExpedientDetail.emit(data);
@@ -115,6 +111,12 @@ export class ExpedientesPrPage implements OnInit {
} }
} }
refreshing() {
setTimeout(() => {
this.LoadList();
}, 1500);
}
doRefresh() { doRefresh() {
this.LoadList(); this.LoadList();
setTimeout(() => { setTimeout(() => {
@@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ProcessesService } from 'src/app/services/processes.service'; 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 { AnimationController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page'; import { CreateProcessPage } from 'src/app/modals/create-process/create-process.page';
import { DelegarPage } from 'src/app/modals/delegar/delegar.page'; import { DelegarPage } from 'src/app/modals/delegar/delegar.page';
@@ -26,9 +26,9 @@ export class DespachosOptionsPage implements OnInit {
private router: Router, private router: Router,
private modalController: ModalController, private modalController: ModalController,
public popoverController: PopoverController, public popoverController: PopoverController,
private animationController: AnimationController,
private navParams: NavParams, private navParams: NavParams,
private toastService: ToastService) { private toastService: ToastService,
) {
this.task = this.navParams.get('task') this.task = this.navParams.get('task')
this.fulltask = this.navParams.get('fulltask') this.fulltask = this.navParams.get('fulltask')
} }
@@ -45,7 +45,7 @@ export class DespachosOptionsPage implements OnInit {
let classs; let classs;
if( window.innerWidth <= 800){ if( window.innerWidth <= 800){
classs = 'modal modal-desktop' classs = 'modal modal-desktop'
} else { } else {
classs = 'modal modal-desktop showAsideOptions' classs = 'modal modal-desktop showAsideOptions'
} }
const modal = await this.modalController.create({ const modal = await this.modalController.create({