fix update

This commit is contained in:
Peter Maquiran
2023-06-11 12:21:07 +01:00
parent 223eae1a83
commit 96684cd1c2
2 changed files with 11 additions and 10 deletions
@@ -1,7 +1,7 @@
import { Component, ElementRef, OnInit, ViewChild } from '@angular/core';
import { ProcessesService } from 'src/app/services/processes.service';
import { ModalController } from '@ionic/angular';
import {NavigationEnd, NavigationExtras, Router } from '@angular/router';
import {NavigationEnd, NavigationExtras, Router, NavigationStart } from '@angular/router';
import { LoginUserRespose } from 'src/app/models/user.model';
import { ExpedientsPage } from 'src/app/shared/gabinete-digital/expedients/expedients.page';
@@ -242,9 +242,9 @@ export class GabineteDigitalPage implements OnInit {
this.LoadCounts();
this.checkFilter();
const pathname = window.location.pathname
const pathname = '/home/gabinete-digital'
this.router.events.forEach((event) => {
if (event instanceof NavigationEnd && event.url == pathname) {
if (event instanceof NavigationEnd && event.url.includes(pathname)) {
this.waitForDomService.selector({
selector: 'app-gabinete-digital ion-content .aside-wrapper',
callback: () => {
@@ -389,6 +389,7 @@ export class GabineteDigitalPage implements OnInit {
// console.log(this.router.url, this.router.url.includes('processes=true'))
// alert('hello')
console.log(this.router.url, this.router.url)
if (this.router.url.includes('processes=true')) {
this.openAllProcessesPage();
this.checkUser()
@@ -510,7 +511,7 @@ export class GabineteDigitalPage implements OnInit {
this.closeAllDesktopComponents();
let navigationExtras: NavigationExtras = { queryParams: { "processes": true, } };
if (window.innerWidth < 701) {
this.router.navigate(['/home/gabinete-digital']);
// this.router.navigate(['/home/gabinete-digital']);
}
else {
// this.router.navigate(['/home/gabinete-digital'], navigationExtras);
+6 -6
View File
@@ -1,12 +1,12 @@
export let versionData = {
"shortSHA": "bc53c4f01",
"SHA": "bc53c4f0199184957fef3d968d7a72a16f221550",
"shortSHA": "223eae1a8",
"SHA": "223eae1a835c1b1d890c78f7c8c876acf3082b57",
"branch": "feature/gabinete-search",
"lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Sun Jun 11 08:22:02 2023 +0100'",
"lastCommitMessage": "remove name",
"lastCommitNumber": "4971",
"lastCommitTime": "'Sun Jun 11 10:02:51 2023 +0100'",
"lastCommitMessage": "add to igingore",
"lastCommitNumber": "4972",
"change": "",
"changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: .gitignore\n\tmodified: src/app/models/dailyworktask.model.ts",
"changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts",
"changeAuthor": "peter.maquiran"
}