Merge with migraCapacitor

src/app/app.module.ts

@@ -65,8 +65,8 @@ import { Media } from '@ionic-native/media/ngx';
 import { StreamingMedia } from '@ionic-native/streaming-media/ngx';
 import { PhotoViewer } from '@ionic-native/photo-viewer/ngx';
 
-import { FCM } from '@ionic-native/fcm/ngx';
-import { FirebaseX } from '@ionic-native/firebase-x/ngx';
+/* import { FCM } from '@ionic-native/fcm/ngx';
+import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */
 //import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
 
 @NgModule({
@@ -115,8 +115,8 @@ import { FirebaseX } from '@ionic-native/firebase-x/ngx';
     //File,
     WebView,
     FilePath,
-    FCM,
-    FirebaseX,
+   /*  FCM,
+    FirebaseX, */
     WebsocketService,
     ChatService,
     ScreenOrientation,

src/app/home/home.page.ts

@@ -3,7 +3,7 @@
 import { Component, OnInit, NgZone } from '@angular/core';
 import { Event } from '../models/event.model';
 import { NotificationsService } from '../services/notifications.service';
-import { WebNotificationsService } from '../services/webnotifications.service';
+/*import { WebNotificationsService } from '../services/webnotifications.service'; */
 import { AlertController, Platform } from '@ionic/angular';
 import { Router, ActivatedRoute } from '@angular/router';
 import { ToDayEventStorage } from '../store/to-day-event-storage.service';
@@ -14,7 +14,7 @@ import { InativityService } from '../services/inativity.service';
 import { SessionStore } from '../store/session.service';
 import { StorageService } from '../services/storage.service';
 import { File } from '@ionic-native/file/ngx';
-import { WebNotificationPopupService } from '../services/notification/web-notification-popup.service';
+/* import { WebNotificationPopupService } from '../services/notification/web-notification-popup.service'; */
 import { DocumentCounterService } from '../services/worker/document-counter.service';
 import { PermissionService } from '../services/worker/permission.service';
 import { Network } from '@ionic-native/network/ngx';
@@ -24,7 +24,10 @@ import { Storage } from '@ionic/storage';
 import { EventsService } from 'src/app/services/events.service';
 import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx';
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> migraCapacitor
 @Component({
   selector: 'app-home',
   templateUrl: './home.page.html',
@@ -73,20 +76,24 @@ export class HomePage implements OnInit {
     private notificationsService: NotificationsService,
     private platform: Platform,
     private activeroute: ActivatedRoute,
-    private webnotification: WebNotificationsService,
+    /* private webnotification: WebNotificationsService, */
     public p: PermissionService,
     public documentCounterService: DocumentCounterService,
     private despachoRule: DespachoService,
     private inativityService: InativityService,
     private storageService: StorageService,
-    private webNotificationPopupService: WebNotificationPopupService,
+    /* private webNotificationPopupService: WebNotificationPopupService, */
     private backgroundservice: BackgroundService,
     private offlinemanager: OfflineManagerService,
     private storage: Storage,
     private eventservice: EventsService,
+<<<<<<< HEAD
     private screenOrientation: ScreenOrientation) {
+=======
+    private screenOrientation: ScreenOrientation,) {
+>>>>>>> migraCapacitor
 
-    this.webNotificationPopupService.askNotificationPermission()
+    /* this.webNotificationPopupService.askNotificationPermission() */
 
     this.router.events.subscribe((val) => {
       document.querySelectorAll('ion-modal').forEach((e: any) => e.remove())
@@ -114,17 +121,24 @@ export class HomePage implements OnInit {
 
   ngOnInit() {
 
+<<<<<<< HEAD
     this.notificationsService.onReceviNotification();
+=======
+    this.notificationsService.onReciveForeground();
+    this.notificationsService.onReciveBackground();
+>>>>>>> migraCapacitor
 
     window.addEventListener('online', () => {
       console.log('Became online')
       this.backgroundservice.online()
       if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+<<<<<<< HEAD
         this.webnotification.webconnection();
+=======
+
+>>>>>>> migraCapacitor
       } else {
-        this.notificationsService.onReceviNotification();
-        //this.mobilefirstConnect();
-        //this.notificationsService.onReceviNotification();
+        /* this.notificationsService.onReceviNotification(); */
         this.offlinemanager.synchnize()
       }
     });
@@ -146,12 +160,12 @@ export class HomePage implements OnInit {
 
   updateList() {
 
-    this.notificationsService.registerCallback(
-      'despachos',
-      () => {
-        this.despachoRule.getList({ updateStore: true })
-      }
-    )
+    /*  this.notificationsService.registerCallback(
+       'despachos',
+       () => {
+         this.despachoRule.getList({ updateStore: true })
+       }
+     ) */
 
     document.addEventListener('pause', function () {
       // console.log('App going to background');

src/app/modals/profile/profile.page.html

@@ -56,8 +56,8 @@
               </div>
               <div class="approve-event-detail">
                 <p *ngIf = "item.Service == 'agenda'">{{item.Location}}</p>
-                <h3 id="profile-title">{{item.alert}}</h3>
-                <p *ngIf = "item.Service != 'agenda'">{{item.desc}}</p>
+                <h3 id="profile-title">{{item.title}}</h3>
+                <p *ngIf = "item.Service != 'agenda'">{{item.body}}</p>
               </div>
               <!-- <div class="notification-label-MD-official" *ngIf = "item.Service == 'agenda' && item.TypeAgenda == 'official' && item.Role == '100000011'"   ></div>
               <div class="notification-label-MD-pessoal" *ngIf = "item.Service == 'agenda' && item.TypeAgenda == 'pessoal' && item.Role == '100000011'"   ></div>

src/app/modals/profile/profile.page.ts

@@ -5,9 +5,8 @@ import { LoginUserRespose } from 'src/app/models/user.model';
 import { AuthService } from 'src/app/services/auth.service';
 import { LocalstoreService } from 'src/app/store/localstore.service';
 import { EditProfilePage } from './edit-profile/edit-profile.page';
-import { JsonStore } from '../../services/jsonStore.service';
 import { StorageService } from '../../services/storage.service';
-import { NotificationsService } from '../../services/notifications.service';
+/* import { NotificationsService } from '../../services/notifications.service'; */
 import { SessionStore } from 'src/app/store/session.service';
 import { EventTrigger } from '../../services/eventTrigger.service';
 import { ThemeService } from 'src/app/services/theme.service'
@@ -37,12 +36,11 @@ export class ProfilePage implements OnInit {
     private animationController: AnimationController,
     private router: Router,
     private localstoreService: LocalstoreService,
-    private jsonstore: JsonStore,
     private storageservice: StorageService,
     private zone: NgZone,
-    private notificationservice: NotificationsService,
+    /* private notificationservice: NotificationsService, */
     private platform: Platform,
-    private notificationsService: NotificationsService,
+    /* private notificationsService: NotificationsService, */
     private eventtrigger: EventTrigger,
     public ThemeService: ThemeService
   ) {
@@ -61,14 +59,14 @@ export class ProfilePage implements OnInit {
       this.getNotificationData();
     }
 
-    this.notificationsService.registerCallback(
+   /*  this.notificationsService.registerCallback(
       'any',
       () => {
         setTimeout(()=>{
           this.getNotificationData();
         }, 100)
       }
-    )
+    ) */
 
   }
 
@@ -85,33 +83,40 @@ export class ProfilePage implements OnInit {
     this.storageservice.get("Notifications").then((value) => {
       console.log("Init get store", value)
 
-      /* var data = JSON.parse(value); */
-      console.log("Init store parse", value)
-      if(typeof(value) == 'string') {
-        value = JSON.parse(value)
-        console.log("CSDfdvdf",value)
-      }
-
       this.DataArray = []
       value.forEach((element,i) => {
         console.log("ARaaAA", element)
-        let notificationObject;
-        if(element.payload){
+        let notificationObject = {
+          index: i,
+          title: element.title,
+          Service: element.data.Service,
+          Object: element.data.Object,
+          IdObject: element.data.IdObject,
+          FolderId: element.data.FolderId,
+          body: element.body,
+          dateInit: this.getFormatedTime(element.data.dateInit),
+          dateEnd: this.getFormatedTime(element.data.dateEnd),
+          Location: element.data.Location,
+          TypeAgenda: element.data.TypeAgenda,
+          Role: element.data.Role,
+          Status: element.data.Status
+        }
+        /* if(element.payload){
           var payload = JSON.parse(element.payload)
           notificationObject = {
-            index: i,
-            alert: element.alert,
+            //index: i,
+            //alert: element.alert,
             Service: payload.Service,
             Object: payload.Object,
             IdObject: payload.IdObject,
-            FolderId: payload.FolderId,
-            desc: payload.desc,
-            dateInit: this.getFormatedTime(payload.dateInit),
-            dateEnd: this.getFormatedTime(payload.dateEnd),
-            Location: payload.Location,
-            TypeAgenda: payload.TypeAgenda,
-            Role: payload.Role,
-            Status: payload.Status
+            //FolderId: payload.FolderId,
+            //desc: payload.desc,
+            //dateInit: this.getFormatedTime(payload.dateInit),
+            //dateEnd: this.getFormatedTime(payload.dateEnd),
+            //Location: payload.Location,
+            //TypeAgenda: payload.TypeAgenda,
+            //Role: payload.Role,
+            //Status: payload.Status
           }
         } else {
           notificationObject = {
@@ -128,9 +133,9 @@ export class ProfilePage implements OnInit {
             TypeAgenda: element.TypeAgenda,
             Role: element.Role,
             Status: element.Status
-          }
-        }
-
+          } 
+        }*/
+        
 
         this.DataArray.push(notificationObject)
       });
@@ -200,7 +205,7 @@ export class ProfilePage implements OnInit {
       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', IdObject, 'gabinete-digital']));
     }
 
-    this.notificationservice.tempClearArray();
+    //this.notificationservice.tempClearArray();
     this.deleteNotification(index);
     this.eventtrigger.publishSomeData({
       notification: "deleted"

src/app/models/token.model.ts

@@ -1,4 +1,4 @@
-export class Token {
+export class Tokenn {
     UserId: number;
     TokenId: string;
     Status: number;

src/app/pages/chat/chat.page.ts

@@ -26,7 +26,7 @@ import { NavigationStart, NavigationEnd, Router } from '@angular/router';
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
 import { environment } from 'src/environments/environment';
-import { NotificationsService } from 'src/app/services/notifications.service';
+//import { NotificationsService } from 'src/app/services/notifications.service';
 import { TimeService } from 'src/app/services/functions/time.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { DataService } from 'src/app/services/data.service';

src/app/pages/events/events.page.ts

@@ -121,12 +121,6 @@ export class EventsPage implements OnInit {
 
   ngOnInit() {
 
-      try {
-        this.sqliteservice.databaseConn();
-      } catch (error) {
-        console.log("Error creating local database: ", error)
-      }
-
     this.segment = "Combinada";
     this.profile = "mdgpr";
 

src/app/pages/gabinete-digital/gabinete-digital.page.ts

@@ -19,7 +19,7 @@ import { WaitForDomService } from 'src/app/services/dom/wait-for-dom.service';
 import { TotalDocumentStore } from 'src/app/store/total-document.service';
 import { DeplomasStore } from 'src/app/store/deplomas.service';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
-import { NotificationsService } from 'src/app/services/notifications.service';
+//import { NotificationsService } from 'src/app/services/notifications.service';
 import { DespachoService } from 'src/app/Rules/despacho.service';
 import { ChangeProfileService } from 'src/app/services/change-profile.service';
 import { PermissionService } from 'src/app/services/worker/permission.service';
@@ -124,7 +124,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
     authService: AuthService,
     public p: PermissionService,
     public waitForDomService: WaitForDomService,
-    private notificationsService: NotificationsService,
+    //private notificationsService: NotificationsService,
     private despachoRule: DespachoService,
     private sqliteservice: SqliteService,
     private platform: Platform,

src/app/pages/inactivity/inactivity.page.ts

@@ -141,7 +141,9 @@ export class InactivityPage implements OnInit {
   }
 
   getToken() {
-    //this.notificatinsservice.getAndpostToken(this.username);
+    this.notificatinsservice.requestPermissions();
+    this.notificatinsservice.registrationError();
+    this.notificatinsservice.getAndpostToken(this.username);
   }
 
   setCode(code: string) {

src/app/pages/login/login.page.ts

@@ -74,6 +74,8 @@ export class LoginPage implements OnInit {
   }
 
   getToken() {
+    this.notificatinsservice.requestPermissions();
+    this.notificatinsservice.registrationError();
     this.notificatinsservice.getAndpostToken(this.username);
   }
 

src/app/services/jsonStore.service.spec.ts

@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { JsonStore } from './jsonStore.service';
-
-describe('JsonStore', () => {
-  let service: JsonStore;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(JsonStore);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});

src/app/services/notifications.service.ts

@@ -6,18 +6,15 @@ import { HttpClient } from '@angular/common/http';
 import { environment } from 'src/environments/environment';
 import { StorageService } from 'src/app/services/storage.service';
 import { AuthConnstants } from 'src/app/config/auth-constants';
-import { Token } from '../models/token.model';
+import { Tokenn } from '../models/token.model';
 import { ModalController, AlertController, AnimationController, Platform } from '@ionic/angular';
 import { NavigationExtras, Router } from '@angular/router';
 import { ToastService } from '../services/toast.service';
-import { JsonStore } from './jsonStore.service';
 import { BackgroundService } from './background.service';
 import { v4 as uuidv4 } from 'uuid';
 import { EventTrigger } from '../services/eventTrigger.service';
 import { SessionStore } from '../store/session.service';
-
-import { FCM } from '@ionic-native/fcm/ngx';
-//import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
+import { ActionPerformed, PushNotificationSchema, PushNotifications, Token, } from '@capacitor/push-notifications';
 
 @Injectable({
   providedIn: 'root'
@@ -26,7 +23,7 @@ export class NotificationsService {
 
   adding: "intervenient" | "CC" = "intervenient";
   folderId: string;
-  DataArray: Array<String> = [];
+  DataArray = new Array();
 
   callbacks: {
     type: string,
@@ -45,9 +42,9 @@ export class NotificationsService {
     private toastService: ToastService,
     private zone: NgZone,
     private activeroute: ActivatedRoute,
-    private jsonstore: JsonStore,
     private eventtrigger: EventTrigger,
-    private backgroundservice: BackgroundService) {
+    private backgroundservice: BackgroundService,
+    /* private fcm: FCM */) {
 
       this.storageService.get("Notifications").then((value) => {
 
@@ -85,23 +82,128 @@ export class NotificationsService {
   getTokenByUserIdAndId(user, userID) {
     const geturl = environment.apiURL + 'notifications/user/' + userID;
 
-    return this.http.get<Token[]>(`${geturl}`);
+    return this.http.get<Tokenn[]>(`${geturl}`);
   }
 
+  requestPermissions() {
+    PushNotifications.requestPermissions().then(result => {
+      if (result.receive === 'granted') {
+        // Register with Apple / Google to receive push via APNS/FCM
+        PushNotifications.register();
+      } else {
+        // Show some error
+      }
+    });
+  }
+
+  getAndpostToken(username) {
+    if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+      console.log('Notifications not supported')
+    } else {
+      const geturl = environment.apiURL + 'notifications/token';
+      PushNotifications.addListener('registration',
+        (token: Token) => {
+          console.log('token: ', token.value)
+          this.storageService.store(username, token.value);
+          this.storageService.get(username).then(value => {
+            console.log('STORAGE TOKEN', value)
+            this.storageService.get(AuthConnstants.USER).then(res => {
+              console.log('USERID', res);
+              const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
+              const body = {
+                UserId: res.UserId,
+                TokenId: token.value,
+                Status: 1,
+                Service: 1
+              };
+
+              this.http.post<Tokenn>(`${geturl}`, body, { headers }).subscribe(data => {
+                console.log('TOKEN USER MIDLE', data);
+              }, (error) => {
+                console.log('Post token to backend', error)
+              })
+            });
+
+          });
+        }
+      );
+    }
+
+  }
+
+  registrationError() {
+    PushNotifications.addListener('registrationError',
+      (error: any) => {
+        console.log('Error on registration: ' + JSON.stringify(error));
+      }
+    );
+  }
+
+  onReciveForeground() {
+    PushNotifications.addListener('pushNotificationReceived',
+      (notification: PushNotificationSchema) => {
+        console.log('Push received: ' + JSON.stringify(notification));
+        this.DataArray.push(notification)
+        console.log("On ReceiveNotification", this.DataArray)
+        this.storageService.store("Notifications", this.DataArray)
+        this.eventtrigger.publishSomeData({
+          notification: "recive"
+        })
+      }
+    );
+  }
+
+  onReciveBackground() {
+    PushNotifications.addListener('pushNotificationActionPerformed',
+      (notification: ActionPerformed) => {
+        console.log('Push action performed: ' + JSON.stringify(notification));
+        this.notificatinsRoutes(notification)
+      }
+    );
+  }
+
+
+
+  /*  
+  
+    async onReceviNotification() {
+      this.fcm.onNotification().subscribe(data => {
+        if (data.click_action) {
+          console.log("Received in background: ", data);
+  
+          this.notificatinsRoutes(data)
+  
+        } else {
+          console.log("Received in foreground: ", data);
+  
+          console.log(data.Service)
+          console.log(data.Object)
+          console.log(data.IdObject)
+  
+          this.DataArray.push(data)
+          console.log("On ReceiveNotification", this.DataArray)
+          this.storageService.store("Notifications", this.DataArray)
+  
+  
+        };
+      });
+    } */
+
+
   /////////////////////////////////////////////////////
 
   /* getTokenByUserIdAndId(user, userID) {
     const geturl = environment.apiURL + 'notifications/user/' + userID;
-
+  
     return this.http.get<Token[]>(`${geturl}`);
   }
- */
+  */
   /*   getAndpostToken(username) {
-  
+   
       if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
         //console.log('Notifications not supported')
       } else {
-  
+   
         const geturl = environment.apiURL + 'notifications/token';
         if(window['WLAuthorizationManager']) {
           if(window['WLAuthorizationManager'].obtainAccessToken) {
@@ -153,17 +255,17 @@ export class NotificationsService {
             );
           }
         }
-  
+   
       }
-  
+   
     } */
 
   tempClearArray() {
-    this.DataArray = [];
+    this.DataArray = new Array;
   }
 
   /*   async onReceviNotification() {
-  
+   
       if(window['WLAuthorizationManager']) {
         if(window['WLAuthorizationManager'].obtainAccessToken) {
           window['WLAuthorizationManager'].obtainAccessToken("push.mobileclient").then(
@@ -178,33 +280,30 @@ export class NotificationsService {
                   console.log("Push notification failure intialized: " + failureResponse);
                 }
               );
-
-              window['MFPPush'].registerDevice(null, async (successResponse) => {
-                console.log("Successfully registered: " + JSON.stringify(successResponse));
-                console.log('token: ', successResponse.deviceId)
-                await this.storageService.store(username, successResponse.deviceId).then((tokennoti) => {
-                  console.log('token store',tokennoti)
-                });
-                await this.storageService.get(username).then(value => {
-                  console.log('STORAGE TOKEN', value)
-                  this.storageService.get(AuthConnstants.USER).then(res => {
-                    console.log('USERID', res);
-                    const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
-                    const body = {
-                      UserId: res.UserId,
-                      TokenId: successResponse.deviceId,
-                      Status: 1,
-                      Service: 1
-                    };
-                    this.http.post<Token>(`${geturl}`, body, { headers }).subscribe(data => {
-                      console.log('TOKEN USER MIDLE', data);
-                    })
-                  });
-
-                });
-              },
-                function (failureResponse) {
-                  console.log("Successfully failue: " + JSON.stringify(failureResponse));
+              var notificationReceived = (message) => {
+                //this.jsonstore.createCollection('Notifications',message);
+                this.DataArray.push(message)
+                console.log("On ReceiveNotification", this.DataArray)
+                this.storageService.store("Notifications",this.DataArray)
+                
+                console.log(message);
+                this.eventtrigger.publishSomeData({
+                  notification: "recive"
+                })
+                var data = JSON.parse(message.payload);
+   
+                //synchro.$send(data)
+                
+                console.log('data.Service', data.Service); // module
+                console.log('data.IdObject', data.IdObject); // Object id
+                console.log('data.Object', data.Object); // details
+      
+                if(message.actionName){
+                  this.notificatinsRoutes(data);
+                } else {
+                 /*  this.toastService.notificationMessage(message.alert,this.notificatinsRoutes, data); 
+                 //this.notificatinsRoutes(data);
+                 console.log(data)
                 }
                 
                 this.callbacks.forEach( e=> {
@@ -212,7 +311,7 @@ export class NotificationsService {
                     e.funx()
                   }
                 })
-  
+   
               }
             }, (error) => {
               console.log('Push notification recived: failure ' + error.responseText);
@@ -221,54 +320,54 @@ export class NotificationsService {
           );
         }
       }
-  
-  
+   
+   
     } */
 
-  notificatinsRoutes = (data) => {
-    if (data.Service === "agenda") {
-      this.zone.run(() => this.router.navigate(['/home/agenda', data.IdObject, 'agenda']));
+  notificatinsRoutes = (notification) => {
+    if (notification.data.Service === "agenda") {
+      this.zone.run(() => this.router.navigate(['/home/agenda', notification.data.IdObject, 'agenda']));
     }
-    else if (data.Service === "gabinete-digital" && data.Object === "expediente") {
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expediente', data.IdObject, 'gabinete-digital']));
+    else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "expediente") {
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expediente', notification.data.IdObject, 'gabinete-digital']));
     }
-    else if (data.Service === "agenda" && data.Object === "event-list") {
-      this.zone.run(() => this.router.navigate(['/home/agenda/event-list/approve-event', data.IdObject, 'agenda']));
-    } else if (data.Service === "gabinete-digital" && data.Object === "despachos") {
+    else if (notification.data.Service === "agenda" && notification.data.Object === "event-list") {
+      this.zone.run(() => this.router.navigate(['/home/agenda/event-list/approve-event', notification.data.IdObject, 'agenda']));
+    } else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "despachos") {
 
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos', data.IdObject, 'gabinete-digital'], { replaceUrl: true }));
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos', notification.data.IdObject, 'gabinete-digital'], { replaceUrl: true }));
     }
-    else if (data.Service === "gabinete-digital" && data.Object === "parecer") {
+    else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "parecer") {
 
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', data.IdObject, 'gabinete-digital']));
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', notification.data.IdObject, 'gabinete-digital']));
     }
-    else if (data.Service === "gabinete-digital" && data.Object === "deferimento") {
+    else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "deferimento") {
 
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', data.IdObject, 'gabinete-digital']));
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', notification.data.IdObject, 'gabinete-digital']));
     }
-    else if (data.Service === "gabinete-digital" && data.Object === "despachos-pr") {
+    else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "despachos-pr") {
 
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos-pr', data.IdObject, 'gabinete-digital']));
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos-pr', notification.data.IdObject, 'gabinete-digital']));
     }
-    else if (data.Service === "accoes" && data.Object === "accao") {
-      this.zone.run(() => this.router.navigate(['/home/publications', data.IdObject]));
+    else if (notification.data.Service === "accoes" && notification.data.Object === "accao") {
+      this.zone.run(() => this.router.navigate(['/home/publications', notification.data.IdObject]));
     }
-    else if (data.Service === "accoes" && data.Object === "publicacao") {
-      this.zone.run(() => this.router.navigate(['/home/publications/view-publications', data.FolderId, data.IdObject]));
+    else if (notification.data.Service === "accoes" && notification.data.Object === "publicacao") {
+      this.zone.run(() => this.router.navigate(['/home/publications/view-publications', notification.data.FolderId, notification.data.IdObject]));
     }
-    else if (data.Service === "gabinete-digital" && data.Object === "diplomas") {
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas', data.IdObject, 'gabinete-digital']));
+    else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "diplomas") {
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas', notification.data.IdObject, 'gabinete-digital']));
     }
-    else if (data.Service === "gabinete-digital" && data.Object === "diplomas-assinar") {
+    else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "diplomas-assinar") {
       let navigationExtras: NavigationExtras = {
         queryParams: {
-          "serialNumber": data.IdObject,
+          "serialNumber": notification.data.IdObject,
         }
       };
       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas-assinar/diploma-assinar'], navigationExtras));
     }
-    else if (data.Service === "gabinete-digital" && data.Object === "expedientes-pr") {
-      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', data.IdObject, 'gabinete-digital']));
+    else if (notification.data.Service === "gabinete-digital" && notification.data.Object === "expedientes-pr") {
+      this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', notification.data.IdObject, 'gabinete-digital']));
     }
   }
 

src/app/services/webnotifications.service.ts

@@ -3,7 +3,7 @@ import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { environment } from 'src/environments/environment';
 import { StorageService } from 'src/app/services/storage.service';
 import { AuthConnstants } from 'src/app/config/auth-constants';
-import { Token } from '../models/token.model';
+import { Tokenn } from '../models/token.model';
 import { ModalController, AlertController, AnimationController, Platform } from '@ionic/angular';
 import { NavigationExtras, Router } from '@angular/router';
 import { ToastService } from './toast.service';

src/app/shared/header/header.page.ts

@@ -6,7 +6,7 @@ import { LoginUserRespose } from 'src/app/models/user.model';
 import { ProfilePage } from 'src/app/modals/profile/profile.page';
 import { StorageService } from '../../services/storage.service';
 import { SessionStore } from 'src/app/store/session.service';
-import { NotificationsService } from '../../services/notifications.service';
+//import { NotificationsService } from '../../services/notifications.service';
 import { environment } from 'src/environments/environment';
 import { EventTrigger } from '../../services/eventTrigger.service';
 import { ThemeService } from '../../services/theme.service';
@@ -35,7 +35,7 @@ export class HeaderPage implements OnInit {
     private animationController: AnimationController,
     private storageservice: StorageService,
     private platform: Platform,
-    private notificationsService: NotificationsService,
+    //private notificationsService: NotificationsService,
     private eventrigger: EventTrigger,
     public ThemeService: ThemeService
   ) {
@@ -67,7 +67,7 @@ export class HeaderPage implements OnInit {
 
   }
   
-  UpdateNotificationCount() {
+ /*  UpdateNotificationCount() {
     this.notificationsService.registerCallback(
       'any',
       () => {
@@ -76,7 +76,7 @@ export class HeaderPage implements OnInit {
         }, 100)
       }
     )
-  }
+  } */
 
    notificationLengthData() {
     this.storageservice.get("Notifications").then((value) => {