peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

new route on notificatiwon serice

Browse Source
This commit is contained in:
Eudes Inácio
2023-06-11 13:54:53 +01:00
parent 1a64e616a3 96684cd1c2
commit b6ef9e191c
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/gabinete-digital.page.ts
+5 -4
View File
@@ -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);
src/app/services/notifications.service.ts
+6
View File
@@ -276,6 +276,12 @@ export class NotificationsService {
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas-assinar', notification.notification.data.IdObject, 'gabinete-digital']));
}
else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "diploma-revisao") {
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas', notification.notification.data.IdObject, 'gabinete-digital']));
}
else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "expedientes-pr") {
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', notification.notification.data.IdObject, 'gabinete-digital']));
} else if (notification.notification.data.Service === "chat") {