From b7767be9a1d6c7cc22b92f79844b49c0de0c5d23 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Tue, 17 Aug 2021 15:04:24 +0300 Subject: [PATCH] fixed tracking firestore issue --- .../services/attend-services/attend-scan.service.ts | 3 +++ .../attendance-options/attendance-options.component.ts | 2 ++ Mohem/src/app/home/wifi-model/wifi-modal.component.ts | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts b/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts index 9d20ed44..3e6be17c 100644 --- a/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts +++ b/Mohem/src/app/hmg-common/services/attend-services/attend-scan.service.ts @@ -237,6 +237,8 @@ export class AttendScanService { } public swipeAttendance() { + const firestoreDocument = this.common.sharedService.getSharedData('firebase-document', false); + const isPlatformValue = this.platform.is('ios') ? 'QR-IOS' : 'QR-ANDROID'; const request: attendanceSwipeScannerRequest = new attendanceSwipeScannerRequest(); request.PointType = 1; request.Latitude = this.lat; @@ -253,6 +255,7 @@ export class AttendScanService { console.log('Error inside in swipe attendance'); }) .subscribe((result: Response) => { + this.processFirebaseDocument(isPlatformValue, result, firestoreDocument.isDocumentAvailable); if (this.common.validResponse(result)) { console.log('response'); console.log(result); diff --git a/Mohem/src/app/home/attendance-options/attendance-options.component.ts b/Mohem/src/app/home/attendance-options/attendance-options.component.ts index d04b893f..a52d2842 100644 --- a/Mohem/src/app/home/attendance-options/attendance-options.component.ts +++ b/Mohem/src/app/home/attendance-options/attendance-options.component.ts @@ -177,6 +177,7 @@ export class AttendanceOptionsComponent implements OnInit { } public swipeAttendanceNFC(nfcSerialCode: any) { + const firestoreDocument = this.common.sharedService.getSharedData('firebase-document', false); const request: attendanceSwipeScannerRequest = new attendanceSwipeScannerRequest(); request.PointType = 2; request.Latitude = this.lat; @@ -191,6 +192,7 @@ export class AttendanceOptionsComponent implements OnInit { console.log("Error inside in swipe attendance"); }) .subscribe((result: Response) => { + this.attendScanService.processFirebaseDocument('NFC-IOS', result, firestoreDocument.isDocumentAvailable); if (this.common.validResponse(result)) { this.ngZone.run(() => { this.nfcIOSSuccess = true; diff --git a/Mohem/src/app/home/wifi-model/wifi-modal.component.ts b/Mohem/src/app/home/wifi-model/wifi-modal.component.ts index 6d8073d4..f06206ba 100644 --- a/Mohem/src/app/home/wifi-model/wifi-modal.component.ts +++ b/Mohem/src/app/home/wifi-model/wifi-modal.component.ts @@ -10,6 +10,7 @@ import { TranslatorService } from 'src/app/hmg-common/services/translator/transl import { Platform } from "@ionic/angular"; import { WifiWizard2 } from "@ionic-native/wifi-wizard-2/ngx"; import { OpenNativeSettings } from '@ionic-native/open-native-settings/ngx'; +import { AttendScanService } from "../../hmg-common/services/attend-services/attend-scan.service"; @Component({ selector: 'app-wifi-modal', @@ -36,6 +37,7 @@ export class WifiModalComponent implements OnInit { private wifiWizard2: WifiWizard2, private openNativeSettings: OpenNativeSettings, private platform: Platform, + public attendScanService: AttendScanService ) { } ngOnInit() { @@ -134,7 +136,9 @@ export class WifiModalComponent implements OnInit { } } - async swipeAttendanceWifi(code:any) { + async swipeAttendanceWifi(code:any) { + const firestoreDocument = this.common.sharedService.getSharedData('firebase-document', false); + const isPlatformValue = this.platform.is('ios') ? 'QR-IOS' : 'QR-ANDROID'; const request: attendanceSwipeScannerRequest = new attendanceSwipeScannerRequest(); request.PointType = 3; request.Latitude = this.lat; @@ -153,6 +157,7 @@ export class WifiModalComponent implements OnInit { this.disconnectWifi(); }) .subscribe((result: Response) => { + this.attendScanService.processFirebaseDocument(isPlatformValue, result, firestoreDocument.isDocumentAvailable); this.disconnectWifi(); if (this.common.validResponse(result)) { this.ngZone.run(() => {