peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-21 05:45:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix notification

Browse Source
This commit is contained in:
Peter Maquiran
2024-06-28 07:44:43 +01:00
parent ac0ead4885
commit 0281db0d83
18 changed files with 243 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/services/Repositorys/Agenda/agenda-data-repository.service.ts
+1 -1
View File
@@ -108,7 +108,7 @@ export class AgendaDataRepositoryService {
}
async searchEvent(queryParameters: {value}, tracing?: TracingType) {
async searchEvent(queryParameters: {value, status}, tracing?: TracingType) {
const result = await this.agendaDataService.searchEvent(queryParameters)
return result.map( response => {
APINODReturn(EventListDataOutputDTOSchema, response, 'get/Events', tracing)
src/app/services/Repositorys/Agenda/agenda-data.service.ts
+1 -1
View File
@@ -74,7 +74,7 @@ export class AgendaDataService {
return this.http.get<any>(`${this.baseUrl}/Events`, { params });
}
searchEvent(queryParameter: {value}) {
searchEvent(queryParameter: {value, status}) {
return this.httpService.get<EventListOutputDTO>(`${this.baseUrl}/Events`, queryParameter);
}
src/app/services/Repositorys/Agenda/mapper/EventDetailsMapper.ts
+1
View File
@@ -82,6 +82,7 @@ export class EventMapper {
// "RoleDescription": null,
// "RoleId": 0
})),
"Status": status,
"IsMeeting": category,
"IsRecurring": dto.isRecurring,
"IsAllDayEvent": dto.isAllDayEvent,
src/app/services/Repositorys/Agenda/mapper/EventToApproveDetailsMapper.ts
+8 -1
View File
@@ -79,6 +79,13 @@ export class EventToApproveDetailsMapper {
let status;
if(dto.status == EEventStatus.Pending) {
status = 'Pending'
} else if(dto.status == EEventStatus.Revision) {
status = 'Revision'
}
return {
"owner": dto.owner,
"serialNumber": dto.id,
@@ -119,7 +126,7 @@ export class EventToApproveDetailsMapper {
// "MDName": "Eduardo Vilarinho",
// "MDEmail": "evilarinho@gabinetedigital.local",
// "OriginatorComments": "",
"Status": "Active",
"Status": status,
"TimeZone": getTextInsideParentheses(new Date(dto.startDate)+ ''),
"Agenda": category ,
"EventType": dto.type,
src/app/services/notification/notifications.service.ts
+1 -1
View File
@@ -176,7 +176,7 @@ export class NotificationsService {
notificatinsRoutes = (notification) => {
console.log('BACK BACK',notification)
console.log('BACK BACK 32',notification)
if (notification.notification.data.Service === "agenda" && notification.notification.data.IdObject.length > 10) {
src/app/services/notifications.service.ts
+36 -32
View File
@@ -14,9 +14,7 @@ import { notificationObject } from '../models/notifications';
import { Capacitor } from '@capacitor/core';
import { AngularFireMessaging } from '@angular/fire/messaging';
import { NotificationHolderService } from 'src/app/store/notification-holder.service';
import { ChatService } from 'src/app/services/chat.service';
import { FCM } from '@capacitor-community/fcm';
import { ChatSystemService } from './chat/chat-system.service';
import {ChatController} from 'src/app/controller/chat'
import { TracingType, XTracer, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer';
import { z } from 'zod';
@@ -73,7 +71,7 @@ export class NotificationsService {
private NotificationRepositoryService: NotificationRepositoryService) {
// this.onReciveForeground();
// this.onReciveBackground();
this.onReciveBackground();
}
@@ -363,64 +361,70 @@ export class NotificationsService {
}
@XTracer({name:'Notification/notificatinsRoutes', bugPrint: true, module:'notification'})
@XTracer({name:'phone-notification/notificationRoutes', bugPrint: true, module:'notification'})
notificatinsRoutes (notification, tracing?: TracingType) {
try {
console.log('BACK BACK', notification)
console.log('BACK BACK 12', notification)
if (notification.notification.data.Service === "agenda" && notification.notification.data.IdObject.length > 10) {
if (notification.notification.data.service === "agenda" ) {
const data = JSON.parse(notification.notification.data.item)
if(data.status == 1) {
this.zone.run(() => this.router.navigate(['/home/agenda/event-list/approve-event', notification.notification.data.idObject, 'agenda']));
} else {
this.zone.run(() => this.router.navigate(['/home/agenda', notification.notification.data.idObject, 'agenda']));
}
this.zone.run(() => this.router.navigate(['/home/agenda', notification.notification.data.IdObject, 'agenda']));
this.zone.run(() => this.router.navigate(['/home/agenda', notification.notification.data.idObject, 'agenda']));
}
else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "expedientes") {
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expediente', notification.notification.data.IdObject, 'gabinete-digital']));
else if (notification.notification.data.service === "gabinete-digital" && notification.notification.data.object === "expedientes") {
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expediente', notification.notification.data.idObject, 'gabinete-digital']));
}
else if (notification.notification.data.Service === "agenda" && notification.notification.data.Object === "event-list") {
else if (notification.notification.data.service === "agenda" && notification.notification.data.object === "event-list") {
//this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event',IdObject, 'agenda']));
this.zone.run(() => this.router.navigate(['/home/agenda/event-list/approve-event', notification.notification.data.IdObject, 'agenda']));
this.zone.run(() => this.router.navigate(['/home/agenda/event-list/approve-event', notification.notification.data.idObject, 'agenda']));
} else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "despachos") {
} else if (notification.notification.data.service === "gabinete-digital" && notification.notification.data.object === "despachos") {
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos', notification.notification.data.IdObject, 'gabinete-digital'], { replaceUrl: true }));
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos', notification.notification.data.idObject, 'gabinete-digital'], { replaceUrl: true }));
}
else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "parecer") {
else if (notification.notification.data.service === "gabinete-digital" && notification.notification.data.object === "parecer") {
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', notification.notification.data.IdObject, 'gabinete-digital']));
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', notification.notification.data.idObject, 'gabinete-digital']));
}
else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "deferimento") {
else if (notification.notification.data.service === "gabinete-digital" && notification.notification.data.object === "deferimento") {
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', notification.notification.data.IdObject, 'gabinete-digital']));
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', notification.notification.data.idObject, 'gabinete-digital']));
}
else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "despachos-pr") {
else if (notification.notification.data.service === "gabinete-digital" && notification.notification.data.object === "despachos-pr") {
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos-pr', notification.notification.data.IdObject, 'gabinete-digital']));
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos-pr', notification.notification.data.idObject, 'gabinete-digital']));
}
else if (notification.notification.data.Service === "accoes" && notification.notification.data.Object === "accao") {
this.zone.run(() => this.router.navigate(['/home/publications', notification.notification.data.IdObject]));
else if (notification.notification.data.service === "accoes" && notification.notification.data.object === "accao") {
this.zone.run(() => this.router.navigate(['/home/publications', notification.notification.data.idObject]));
}
else if (notification.notification.data.Service === "accoes" && notification.notification.data.Object === "publicacao") {
else if (notification.notification.data.service === "accoes" && notification.notification.data.object === "publicacao") {
this.zone.run(() => this.router.navigate(['/home/publications/view-publications', notification.notification.data.FolderId, notification.data.IdObject]));
}
else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "diplomas") {
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 === "diplomas") {
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 === "diplomas-assinar") {
else if (notification.notification.data.service === "gabinete-digital" && notification.notification.data.object === "diplomas-assinar") {
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas-assinar', notification.notification.data.IdObject, 'gabinete-digital']));
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") {
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']));
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") {
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") {
let navigationExtras: NavigationExtras = { queryParams: { "roomId": notification.notification.data.IdObject, } };
let navigationExtras: NavigationExtras = { queryParams: { "roomId": notification.notification.data.idObject, } };
if (window.location.search.includes("roomId")) {
this.zone.run(() => this.router.navigate(['/home/chat']));