From 7ae9bb1b5b90f6422a7f27610c4b28ce5de411f7 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Thu, 8 Jul 2021 12:48:06 +0300 Subject: [PATCH] fixed dependencies issues and updated firebase plugin --- Mohem/config.xml | 1 - Mohem/package.json | 51 +++++++++++-------- Mohem/src/app/home/home.page.ts | 25 ++++++++- .../add-basic-details.component.ts | 12 +++-- 4 files changed, 61 insertions(+), 28 deletions(-) diff --git a/Mohem/config.xml b/Mohem/config.xml index 20f4924f..f23adff8 100644 --- a/Mohem/config.xml +++ b/Mohem/config.xml @@ -114,7 +114,6 @@ - diff --git a/Mohem/package.json b/Mohem/package.json index 8d76c7a1..94d82c02 100644 --- a/Mohem/package.json +++ b/Mohem/package.json @@ -37,7 +37,7 @@ "@ionic-native/file": "^5.18.0", "@ionic-native/file-path": "^5.18.0", "@ionic-native/fingerprint-aio": "^5.18.0", - "@ionic-native/firebase-x": "^5.21.5", + "@ionic-native/firebase-x": "^5.34.0", "@ionic-native/geolocation": "^5.10.0", "@ionic-native/globalization": "^5.18.0", "@ionic-native/health": "^5.4.0", @@ -82,7 +82,7 @@ "cordova-plugin-file": "^6.0.2", "cordova-plugin-filepath": "^1.5.6", "cordova-plugin-fingerprint-aio": "^3.0.0", - "cordova-plugin-firebasex": "^7.0.2", + "cordova-plugin-firebasex": "^13.0.0", "cordova-plugin-geolocation": "^4.0.2", "cordova-plugin-globalization": "^1.11.0", "cordova-plugin-inappbrowser": "^3.1.0", @@ -172,9 +172,6 @@ "cordova-plugin-ionic-webview": { "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" }, - "cordova-android-support-gradle-release": { - "ANDROID_SUPPORT_VERSION": "27.+" - }, "cordova.plugins.diagnostic": { "ANDROID_SUPPORT_VERSION": "28.+" }, @@ -197,20 +194,6 @@ "cordova-plugin-fingerprint-aio": { "FACEID_USAGE_DESCRIPTION": "User Authentication" }, - "cordova-plugin-firebasex": { - "FIREBASE_ANALYTICS_COLLECTION_ENABLED": "true", - "FIREBASE_PERFORMANCE_COLLECTION_ENABLED": "true", - "FIREBASE_CRASHLYTICS_COLLECTION_ENABLED": "true", - "ANDROID_ICON_ACCENT": "#FF00FFFF", - "ANDROID_PLAY_SERVICES_TAGMANAGER_VERSION": "17.0.0", - "ANDROID_FIREBASE_ANALYTICS_VERSION": "17.2.1", - "ANDROID_FIREBASE_MESSAGING_VERSION": "20.0.0", - "ANDROID_FIREBASE_CONFIG_VERSION": "19.0.3", - "ANDROID_FIREBASE_PERF_VERSION": "19.0.1", - "ANDROID_FIREBASE_AUTH_VERSION": "19.1.0", - "ANDROID_CRASHLYTICS_VERSION": "2.10.1", - "ANDROID_CRASHLYTICS_NDK_VERSION": "2.1.1" - }, "cordova-plugin-androidx": {}, "cordova-plugin-androidx-adapter": {}, "cordova-plugin-background-geolocation": { @@ -218,11 +201,37 @@ }, "phonegap-nfc": {}, "wifiwizard2": {}, - "cordova-plugin-x-socialsharing": {} + "cordova-plugin-x-socialsharing": {}, + "cordova-plugin-firebasex": { + "FIREBASE_ANALYTICS_COLLECTION_ENABLED": "true", + "FIREBASE_PERFORMANCE_COLLECTION_ENABLED": "true", + "FIREBASE_CRASHLYTICS_COLLECTION_ENABLED": "true", + "ANDROID_ICON_ACCENT": "#FF00FFFF", + "ANDROID_FIREBASE_PERFORMANCE_MONITORING": "false", + "ANDROID_PLAY_SERVICES_TAGMANAGER_VERSION": "17.0.0", + "ANDROID_PLAY_SERVICES_AUTH_VERSION": "19.0.0", + "ANDROID_FIREBASE_ANALYTICS_VERSION": "19.0.0", + "ANDROID_FIREBASE_MESSAGING_VERSION": "22.0.0", + "ANDROID_FIREBASE_CONFIG_VERSION": "21.0.0", + "ANDROID_FIREBASE_PERF_VERSION": "20.0.1", + "ANDROID_FIREBASE_AUTH_VERSION": "21.0.1", + "ANDROID_FIREBASE_INAPPMESSAGING_VERSION": "20.0.0", + "ANDROID_FIREBASE_FIRESTORE_VERSION": "23.0.1", + "ANDROID_FIREBASE_FUNCTIONS_VERSION": "20.0.0", + "ANDROID_FIREBASE_IID_VERSION": "21.1.0", + "ANDROID_FIREBASE_INSTALLATIONS_VERSION": "17.0.0", + "ANDROID_FIREBASE_CRASHLYTICS_VERSION": "18.0.1", + "ANDROID_FIREBASE_CRASHLYTICS_NDK_VERSION": "18.0.1", + "ANDROID_GSON_VERSION": "2.8.7", + "ANDROID_FIREBASE_PERF_GRADLE_PLUGIN_VERSION": "1.4.0" + }, + "cordova-android-support-gradle-release": { + "ANDROID_SUPPORT_VERSION": "27.+" + } }, "platforms": [ "android", "ios" ] } -} +} \ No newline at end of file diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 18a71a22..0ea34a0a 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -39,6 +39,7 @@ import { Router } from '@angular/router'; import { BackgroundGeolocation } from '@ionic-native/background-geolocation/ngx'; import { NFC, Ndef } from "@ionic-native/nfc/ngx" import { DigitalIdComponent } from '../authentication/digital-id/digital-id.component'; +import { FirebaseX } from '@ionic-native/firebase-x/ngx'; @Component({ selector: 'app-home', @@ -158,7 +159,8 @@ export class HomePage implements OnInit { private platform: Platform, public backgroundGeolocation: BackgroundGeolocation, public modalController: ModalController, - private nfc: NFC + private nfc: NFC, + public firebasex: FirebaseX ) { this.events.subscribe('img-change', displayImg => { this.userImage = this.sanitizer.bypassSecurityTrustUrl( @@ -188,6 +190,27 @@ export class HomePage implements OnInit { } } + testy() { + // var logMessage = 'testing'; + // var stackTrace = null; + // this.firebasex.logError(logMessage, stackTrace).then( result => { + // console.log('posted successfully;'); + // }); + var document = { + "a_string": "foo", + "a_list": [1, 2, 3], + "an_object": { + "an_integer": 1, + } + }; + var collection = "test"; + this.firebasex.addDocumentToFirestoreCollection(document, collection, function(documentId){ + console.log("Successfully added document with id="+documentId); + }, function(error){ + console.error("Error adding document: "+error); + }); + } + ionViewWillEnter() { this.common.startLoading(); this.common.sharedService.setSharedData(true, 'loadWorkList'); diff --git a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.ts b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.ts index 3d8b9608..5592e376 100644 --- a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.ts +++ b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.ts @@ -122,8 +122,9 @@ export class AddBasicDetailsComponent implements OnInit { ngOnInit() {} ngAfterViewInit() { - this.getEitDffStructure(); - // this.getColumnStructure(); + // this.getEitDffStructure(); + this.getColumnStructure(); + } public getColumnStructure() { @@ -156,10 +157,11 @@ export class AddBasicDetailsComponent implements OnInit { this.drawEitFields(result.GetBasicDetColsStructureList); } } + public handleBasicDffStructureResult(result) { - if (result.GetEITDFFStructureList != null) { - this.eitResponse = result.GetEITDFFStructureList; - this.drawEitFields(result.GetEITDFFStructureList); + if (result.GetBasicDetDffStructureList != null) { + this.eitResponse = result.GetBasicDetDffStructureList; + this.drawEitFields(result.GetBasicDetDffStructureList); } }