improve request

This commit is contained in:
Peter Maquiran
2021-07-09 13:32:17 +01:00
parent cdece357e3
commit 1f34261db4
21 changed files with 74 additions and 23 deletions
+3
View File
@@ -183,7 +183,10 @@ export class AgendaPage implements OnInit {
ngOnInit() {
this.profile = "mdgpr";
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == "/home/agenda") {
if (this.segment == null){
this.segment = "Combinado";
@@ -14,14 +14,13 @@ import { FormGroup, FormBuilder, Validators } from "@angular/forms";
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { AttachmentsPage } from '../attachments/attachments.page';
@Component({
selector: 'app-edit-event',
templateUrl: './edit-event.page.html',
styleUrls: ['./edit-event.page.scss'],
})
export class EditEventPage implements OnInit {
export class EditEventPage implements OnInit {
loadedEvent: Event;
loadedEventAttachments: Attachment[];
+3 -1
View File
@@ -97,8 +97,10 @@ export class EventsPage implements OnInit {
this.showGreeting();
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
if(event instanceof NavigationEnd && event.url == pathname) {
this.RefreshEvents();
this.LoadList();
}
@@ -64,8 +64,11 @@ export class DespachosPrPage implements OnInit {
ngOnInit() {
//Inicializar segment
this.segment = "despachos";
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
if(event instanceof NavigationEnd && event.url == pathname) {
this.LoadList();
}
});
@@ -39,8 +39,11 @@ constructor(
}
ngOnInit() {
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
if(event instanceof NavigationEnd && event.url == pathname) {
this.refreshing();
}
});
@@ -36,8 +36,10 @@ export class EventListPage implements OnInit {
this.LoadToApproveEvents();
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
if(event instanceof NavigationEnd && event.url == pathname) {
this.LoadToApproveEvents();
}
});
@@ -40,8 +40,11 @@ export class ExpedientePage implements OnInit {
ngOnInit() {
this.LoadList();
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
if(event instanceof NavigationEnd && event.url == pathname) {
this.LoadList();
}
});
@@ -40,8 +40,11 @@ export class ExpedientesPrPage implements OnInit {
}
ngOnInit() {
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
if(event instanceof NavigationEnd && event.url == pathname) {
this.refreshing();
}
});
@@ -112,10 +112,15 @@ export class GabineteDigitalPage implements OnInit {
ngOnInit() {
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == pathname) {
this.checkRoutes();
this.LoadCounts();
console.log('yes', pathname)
} else {
console.log('not')
}
});
@@ -38,8 +38,10 @@ export class PendentesPage implements OnInit {
ngOnInit() {
//Inicializar segment
this.segment = "despachos";
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
if(event instanceof NavigationEnd && event.url == pathname) {
this.refreshing();
}
});
@@ -67,8 +67,11 @@ export class PublicationsPage implements OnInit {
}
ngOnInit() {
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
if(event instanceof NavigationEnd && event.url == pathname) {
this.getActions();
}
});
@@ -44,9 +44,11 @@ export class EventListPage implements OnInit {
}
this.LoadToApproveEvents();
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
if(event instanceof NavigationEnd && event.url == pathname) {
this.LoadToApproveEvents();
}
});
@@ -65,8 +65,11 @@ ngOnInit() {
//Inicializar segment
this.segment = "despachos";
this.LoadList();
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
if(event instanceof NavigationEnd && event.url == pathname) {
this.doRefresh();
}
});
@@ -65,8 +65,10 @@ export class DespachosPage implements OnInit {
//Inicializar segment
this.segment = "despachos";
this.LoadList();
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
if(event instanceof NavigationEnd && event.url == pathname) {
this.doRefresh();
}
});
@@ -32,8 +32,10 @@ serialNumber:string;
ngOnInit() {
this.LoadList();
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
if(event instanceof NavigationEnd && event.url == pathname) {
this.doRefresh();
}
});
@@ -30,8 +30,11 @@ constructor(
}
ngOnInit() {
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
if(event instanceof NavigationEnd && event.url == pathname) {
this.refreshing();
}
});
@@ -40,8 +40,10 @@ export class EventsToApprovePage implements OnInit {
this.LoadToApproveEvents();
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
if(event instanceof NavigationEnd && event.url == pathname) {
this.LoadToApproveEvents();
}
});
@@ -39,8 +39,11 @@ export class ExpedientesPrPage implements OnInit {
}
ngOnInit() {
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
if(event instanceof NavigationEnd && event.url == pathname) {
this.refreshing();
}
});
@@ -42,8 +42,10 @@ export class ExpedientsPage implements OnInit {
//Inicializar segment
this.segment = "expedientes";
this.LoadList();
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
if(event instanceof NavigationEnd && event.url == pathname) {
this.LoadList();
}
});
@@ -49,8 +49,10 @@ export class PedidosPage implements OnInit {
ngOnInit() {
this.LoadList();
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
if(event instanceof NavigationEnd && event.url == pathname) {
this.doRefresh();
}
});
@@ -46,8 +46,10 @@ export class PendentesPage implements OnInit {
this.segment = "despachos";
this.LoadList();
const pathname = window.location.pathname
this.router.events.forEach((event) => {
if(event instanceof NavigationEnd && event.url == this.router.url) {
if(event instanceof NavigationEnd && event.url == pathname) {
this.LoadList();
}
});