project migated to capacitor

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/jsonStore.service.ts

@@ -1,130 +0,0 @@
-///<reference path="../../../plugins/cordova-plugin-mfp/typings/worklight.d.ts" />
-/* ///<reference path="../../../plugins/cordova-plugin-mfp-jsonstore/typings/jsonstore.d.ts" /> */
-import { Injectable } from "@angular/core";
-
-@Injectable({
-    providedIn: 'root'
-})
-
-export class JsonStore {
-
-/*     createCollection(name, data) {
-
-        var collectionName = name;
-        var addOptions = {
-            // Mark data as dirty (true = yes, false = no), default true.
-            markDirty: true
-        };
-
-        var JSONStoreCollections = {};
-        JSONStoreCollections[collectionName] = {};
-        JSONStoreCollections[collectionName].searchFields = { UserId: 'integer' };
-
-        WL.JSONStore.init(JSONStoreCollections)
-
-            .then(function () {
-                WL.Logger.debug('Init done');
-                console.log('Init done');
-                return WL.JSONStore.get(collectionName).add(data, addOptions);
-
-            }).fail(function (err) {
-                WL.Logger.error(err);
-                console.log(err)
-            });
-
-    }
-
-    getCollection(collectionName) {
-
-        var allOptions = {
-            // Returns a maximum of 10 documents, default no limit.
-            limit: 10,
-            // Skip 0 documents, default no offset.
-            offset: 0,
-            // Search fields to return, default: ['_id', 'json'].
-            filter: ['UserId', 'json'],
-            // How to sort the returned values, default no sort.}]
-        };
-
-        var JSONStoreCollections = {};
-        JSONStoreCollections[collectionName] = {};
-        JSONStoreCollections[collectionName].searchFields = { UserId: 'integer' };
-
-      WL.JSONStore.init(JSONStoreCollections)
-            .then(function () {
-                WL.Logger.debug('Find all colletion data');
-                console.log('Find all colletion data');
-               
-
-            }).fail(function (err) {
-                WL.Logger.error(err);
-                console.log("JsonStore getColletion error ",err)
-            });
-
-            const data = WL.JSONStore.get(collectionName).findAll(allOptions).then((value) => {
-                console.log('Find all colletion data', value);
-                return JSON.parse(value);
-            });
-
-            
-            return data
-
-        //return notificationData
-    }
-
-    getColletionById(collectionName, value) {
-
-        var query = { UserId: value };
-
-        var allOptions = {
-            // Returns a maximum of 10 documents, default no limit.
-            limit: 10,
-            // Skip 0 documents, default no offset.
-            offset: 0,
-            // Search fields to return, default: ['_id', 'json'].
-            filter: ['UserId', 'json'],
-            // How to sort the returned values, default no sort.}]
-        };
-
-        var JSONStoreCollections = {};
-        JSONStoreCollections[collectionName] = {};
-        JSONStoreCollections[collectionName].searchFields = { UserId: 'integer' };
-
-        WL.JSONStore.init(JSONStoreCollections)
-            .then(function () {
-                WL.Logger.debug('Find colletion data by id');
-                console.log('Find colletion data by id');
-
-                return WL.JSONStore.get(collectionName).find(query, allOptions).then((value) => {
-                    console.log('Find colletion data by id', value);
-                });
-            }).fail(function (err) {
-                WL.Logger.error(err);
-                console.log(err)
-            });
-
-    }
-
-    replaceDocument(collectionName: string, document: any) {
-        /* var document = { Example of how identify the document to replace 
-            _id: 1, json: {name: 'chevy', age: 23}
-          }; 
-        var options = {};
-
-        WL.JSONStore.get(collectionName).replace(document, options).then(function (numberOfDocsReplaced) {
-            console.log("JsonStore replace document sucess: ", numberOfDocsReplaced)
-        }).fail(function (error) {
-            console.log("JsonStore replace document error: ", error)
-        });
-    }
-
-    removeDocument(collectionName: any,query: any,) {
-        /* var query = { _id: 1 };  Exemple of query
-        var options = { exact: true };
-        WL.JSONStore.get(collectionName).remove(query, options).then(function (numberOfDocsRemoved) {
-            console.log("JsonStore remove document sucess: ", numberOfDocsRemoved)
-        }).fail(function (error) {
-            console.log("JsonStore remove document erro: ", error)
-        });
-    } */
-}

src/app/services/notifications.service.ts

@@ -1,6 +1,5 @@
 /* eslint-disable */
 /* tslint:disable */
-/* ///<reference path="../../../plugins/cordova-plugin-mfp-push/typings/mfppush.d.ts" /> */
 import { Injectable, NgZone } from '@angular/core';
 import { ActivatedRoute } from '@angular/router'
 import { HttpClient } from '@angular/common/http';
@@ -11,13 +10,12 @@ import { Token } 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 '@ionic-native/fcm/ngx';
 //import { FCM } from 'cordova-plugin-fcm-with-dependecy-updated/ionic/ngx';
 
 @Injectable({
@@ -27,7 +25,7 @@ export class NotificationsService {
 
   adding: "intervenient" | "CC" = "intervenient";
   folderId: string;
-  DataArray: Array<String> = [];
+  DataArray = new Array();
 
   callbacks: {
     type: string,
@@ -46,10 +44,9 @@ export class NotificationsService {
     private toastService: ToastService,
     private zone: NgZone,
     private activeroute: ActivatedRoute,
-    private jsonstore: JsonStore,
     private eventtrigger: EventTrigger,
     private backgroundservice: BackgroundService,
-    private fcm: FCM) {
+    /* private fcm: FCM */) {
 
     this.storageService.get("Notifications").then((value) => {
 
@@ -88,7 +85,7 @@ export class NotificationsService {
     return this.http.get<Token[]>(`${geturl}`);
   }
 
-  getAndpostToken(username) {
+/*   getAndpostToken(username) {
     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
       console.log('Notifications not supported')
     } else {
@@ -135,14 +132,14 @@ export class NotificationsService {
         console.log(data.Object)
         console.log(data.IdObject)
 
-        /* this.DataArray.push(data)
+        this.DataArray.push(data)
         console.log("On ReceiveNotification", this.DataArray)
-        this.storageService.store("Notifications", this.DataArray) */
+        this.storageService.store("Notifications", this.DataArray)
 
 
       };
     });
-  }
+  } */
 
 
   /////////////////////////////////////////////////////