diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 614364086..d64175488 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -1,8 +1,8 @@ - + - +

{{customDate}}

@@ -10,7 +10,6 @@

{{totalEvent}} evento agendado para hoje

{{totalEvent}} eventos agendados para hoje

-
{{currentHoursMinutes | date: 'HH:mm'}}
"{{currentEvent}}"
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 3598ff96a..e4f2c25b8 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -111,6 +111,7 @@ export class LoginPage implements OnInit { getToken() { this.notificatinsservice.getAndpostToken(this.username); + //alert('HERE'); } async Login() { diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts index 6759832fa..fdb05f95c 100644 --- a/src/app/services/notifications.service.ts +++ b/src/app/services/notifications.service.ts @@ -40,6 +40,7 @@ export class NotificationsService { } getAndpostToken(username) { + alert('ALERT' + username) if (this.platform.is('desktop') || this.platform.is('mobileweb')) { console.log('Notifications not supported') } else { @@ -139,7 +140,7 @@ export class NotificationsService { else if (data.Service === "gabinete-digital" && data.Object === "event-list") { this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event',data.IdObject, 'gabinete-digital'])); }else if (data.Service === "gabinete-digital" && data.Object === "despachos") { - + this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos',data.IdObject,'gabinete-digital'],{replaceUrl: true})); } else if (data.Service === "gabinete-digital" && data.Object === "parecer") { @@ -147,11 +148,11 @@ export class NotificationsService { this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos',data.IdObject,'gabinete-digital'])); } else if (data.Service === "gabinete-digital" && data.Object === "deferimento") { - + this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos',data.IdObject,'gabinete-digital'])); } else if (data.Service === "gabinete-digital" && data.Object === "despachos-pr") { - + let navigationExtras: NavigationExtras = { queryParams: { "serialNumber": data.IdObject, diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts index 430ea5abd..74584bf7c 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/shared/header/header.page.ts @@ -37,7 +37,7 @@ export class HeaderPage implements OnInit { } hideSearch(){ - if(this.router.url == '/home/events'){ + if(this.router.url == '/home/events' || this.router.url == '/home/chat'){ this.hideSearchBtn = true; } }