This commit is contained in:
tiago.kayaya
2021-07-13 12:05:17 +01:00
parent 40de613773
commit ae090ad82d
7 changed files with 99 additions and 70 deletions
@@ -192,7 +192,7 @@ export class EditEventPage implements OnInit {
console.log(this.postEvent); console.log(this.postEvent);
this.postEvent.EventRecurrence.Type = this.selectedRecurringType; this.postEvent.EventRecurrence.Type = this.selectedRecurringType;
/* this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => { this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => {
if(this.initCalendarName != this.postEvent.CalendarName){ if(this.initCalendarName != this.postEvent.CalendarName){
let body = { let body = {
"EventId": this.postEvent.EventId, "EventId": this.postEvent.EventId,
@@ -205,7 +205,7 @@ export class EditEventPage implements OnInit {
}, error => { }, error => {
this.toastService.badRequest() this.toastService.badRequest()
}); */ });
this.isEventEdited = true; this.isEventEdited = true;
this.goBack(); this.goBack();
@@ -14,7 +14,7 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar
import { AuthService } from 'src/app/services/auth.service'; import { AuthService } from 'src/app/services/auth.service';
import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page'; import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page';
import { NavigationExtras, Router } from '@angular/router'; import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
@Component({ @Component({
selector: 'app-despachos', selector: 'app-despachos',
@@ -58,7 +58,18 @@ export class DespachosPage implements OnInit {
ngOnInit() { ngOnInit() {
//Inicializar segment //Inicializar segment
this.segment = "despachos"; this.segment = "despachos";
this.LoadList(); const pathname = window.location.pathname;
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == pathname) {
this.refreshing();
}
});
}
async refreshing() {
setTimeout(() => {
this.LoadList();
}, 1500);
} }
segmentChanged(ev: any) { segmentChanged(ev: any) {
@@ -1,5 +1,5 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { NavigationExtras, Router } from '@angular/router'; import { NavigationEnd, NavigationExtras, Router } from '@angular/router';
import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model'; import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service'; import { ProcessesService } from 'src/app/services/processes.service';
import { formatDate } from '@angular/common'; import { formatDate } from '@angular/common';
@@ -31,7 +31,12 @@ export class DiplomasAssinarPage implements OnInit {
} }
ngOnInit() { ngOnInit() {
this.LoadList(); const pathname = window.location.pathname;
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == pathname) {
this.refreshing();
}
});
} }
goToDiploma(serialNumber:any){ goToDiploma(serialNumber:any){
@@ -43,6 +48,12 @@ export class DiplomasAssinarPage implements OnInit {
this.router.navigate(['/home/gabinete-digital/diplomas-assinar/diploma-assinar'], navigationExtras); this.router.navigate(['/home/gabinete-digital/diplomas-assinar/diploma-assinar'], navigationExtras);
} }
async refreshing() {
setTimeout(() => {
this.LoadList();
}, 1500);
}
doRefresh(event) { doRefresh(event) {
this.LoadList(); this.LoadList();
setTimeout(() => { setTimeout(() => {
@@ -39,13 +39,10 @@ export class ExpedientePage implements OnInit {
} }
ngOnInit() { ngOnInit() {
this.LoadList();
const pathname = window.location.pathname const pathname = window.location.pathname
this.router.events.forEach((event) => { this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == pathname) { if(event instanceof NavigationEnd && event.url == pathname) {
this.LoadList(); this.refreshing();
} }
}); });
} }
@@ -83,6 +80,12 @@ export class ExpedientePage implements OnInit {
}); });
} }
async refreshing() {
setTimeout(() => {
this.LoadList();
}, 1500);
}
doRefresh(event) { doRefresh(event) {
this.LoadList(); this.LoadList();
setTimeout(() => { setTimeout(() => {
@@ -99,4 +102,3 @@ export class ExpedientePage implements OnInit {
} }
} }
@@ -41,8 +41,7 @@ export class ExpedientesPrPage implements OnInit {
ngOnInit() { ngOnInit() {
const pathname = window.location.pathname const pathname = window.location.pathname;
this.router.events.forEach((event) => { this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == pathname) { if(event instanceof NavigationEnd && event.url == pathname) {
this.refreshing(); this.refreshing();
@@ -1,5 +1,5 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router'; import { ActivatedRoute, NavigationEnd, NavigationExtras, Router } from '@angular/router';
import { CalendarComponent } from 'ionic2-calendar'; import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model'; import { DailyWorkTask, tasksList } from '../../../models/dailyworktask.model';
@@ -42,23 +42,24 @@ export class PedidosPage implements OnInit {
private alertService: AlertService, private alertService: AlertService,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
) { ) {
} //Inicializar segment
ngOnInit() {
//Inicializar segment
this.segment = 'parecer'; this.segment = 'parecer';
this.activatedRoute.queryParams.subscribe(params => { this.activatedRoute.queryParams.subscribe(params => {
if(params['deferimento'] == 'true') { if(params['deferimento'] == 'true') {
this.segment = 'deferimento'; this.segment = 'deferimento';
} else if (params['parecer'] == 'true') { } else if (params['parecer'] == 'true') {
this.segment = 'parecer'; this.segment = 'parecer';
} }
this.LoadList();
}); });
}
this.LoadList(); ngOnInit() {
const pathname = window.location.pathname;
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == pathname) {
this.refreshing();
}
});
} }
goBack() { goBack() {
@@ -158,6 +159,12 @@ export class PedidosPage implements OnInit {
} }
} }
refreshing() {
setTimeout(() => {
this.LoadList();
}, 1500);
}
doRefresh(event) { doRefresh(event) {
this.LoadList(); this.LoadList();
setTimeout(() => { setTimeout(() => {
@@ -167,4 +174,3 @@ export class PedidosPage implements OnInit {
} }
@@ -31,7 +31,7 @@ export class PendentesPage implements OnInit {
private alertService: AlertService, private alertService: AlertService,
private router: Router, private router: Router,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
) { ){
this.pendentesList = new Array(); this.pendentesList = new Array();
this.profile = 'mdgpr'; this.profile = 'mdgpr';
} }