Merge branch 'MOHEMM-Q2-DEV' into enad-Q1

MOHEMM-SFH-COLORS
umasoodch 4 years ago
commit dc60f42e73

@ -157,7 +157,7 @@ export class AttendScanService {
try {
let result = {};
await this.firebasex.fetchDocumentInFirestoreCollection(userID, this.collection, (document: any) => {
console.log("Successfully Fetched the document with id =");
console.log("Successfully Fetched the document with id =" + userID);
result = {
isDocumentAvailable: true,
document: document
@ -175,6 +175,11 @@ export class AttendScanService {
})
} catch(error) {
console.log(error);
const result = {
isDocumentAvailable: false,
document: null
};
this.common.sharedService.setSharedData(result, 'firebase-document');
this.common.stopLoading();
}
}
@ -183,7 +188,13 @@ export class AttendScanService {
try {
let currentFirebaseDocument = this.common.sharedService.getSharedData('firebase-document');
let currentSwipeArray = currentFirebaseDocument.document.swipeData;
currentSwipeArray.push(resultObject);
if (currentSwipeArray) {
currentSwipeArray.push(resultObject);
} else {
let swipeData = [];
swipeData.push(resultObject);
currentSwipeArray = swipeData;
}
const updatedDocument = {
swipeData: currentSwipeArray
};
@ -198,13 +209,22 @@ export class AttendScanService {
}
}
public processFirebaseDocument(mode: string, result: any, isDocumentAvailable: boolean) {
public checkDocumentAvailability(resultObject: any) {
const firestoreDocument = this.common.sharedService.getSharedData('firebase-document', false);
if (firestoreDocument) {
if (firestoreDocument.isDocumentAvailable) {
this.updateFirebaseDocument(resultObject);
} else {
this.createNewDocument(resultObject);
}
} else {
this.createNewDocument(resultObject);
}
}
public processFirebaseDocument(mode: string, result: any) {
try {
console.log(mode);
console.log(result);
console.log(isDocumentAvailable);
this.userData = this.common.sharedService.getSharedData(AuthenticatedUser.SHARED_DATA, false);
console.log(this.userData);
const resultObject = {
modeOfAttendance: mode,
messageStatus: result.MessageStatus,
@ -213,11 +233,7 @@ export class AttendScanService {
pointID: result.SWP_AuthenticateAndSwipeUserModel.PointID,
branchDescription: result.SWP_AuthenticateAndSwipeUserModel.BranchDescription
}
if (isDocumentAvailable) {
this.updateFirebaseDocument(resultObject);
} else {
this.createNewDocument(resultObject);
}
this.checkDocumentAvailability(resultObject);
} catch (error) {
console.log(error);
}
@ -237,8 +253,9 @@ 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 enableFirestore = this.common.sharedService.getSharedData('enableFirestore', false);
const request: attendanceSwipeScannerRequest = new attendanceSwipeScannerRequest();
request.PointType = 1;
request.Latitude = this.lat;
@ -255,7 +272,9 @@ export class AttendScanService {
console.log('Error inside in swipe attendance');
})
.subscribe((result: Response) => {
this.processFirebaseDocument(isPlatformValue, result, firestoreDocument.isDocumentAvailable);
if (enableFirestore) {
this.processFirebaseDocument(isPlatformValue, result);
}
if (this.common.validResponse(result)) {
console.log('response');
console.log(result);
@ -264,23 +283,4 @@ export class AttendScanService {
}
});
}
// public swipeAttendanceNFC (nfcSerialCode: any) {
// const request: attendanceSwipeScannerRequest = new attendanceSwipeScannerRequest();
// request.PointType = 2;
// request.Latitude = 0;
// request.Longitude = 0;
// request.QRValue = "";
// request.NFCValue = nfcSerialCode;
// request.UID = this.device.uuid;
// request.UserName = this.userData.EMPLOYEE_NUMBER;
// this.attendance_service.attendanceSwipeScanner(request, () => {
// console.log('Error inside in swipe attendance');
// }).subscribe((result: Response) => {
// if (this.common.validResponse(result)) {
// this.modalController.dismiss();
// }
// });
// }
}

@ -37,6 +37,7 @@ export class AttendanceOptionsComponent implements OnInit {
public enableLocationQR = false;
public enableLocationNFC = false;
public enableLocationWIFI = false;
public enableFirestore = false;
public deviceNFC = false;
public nfcIOSSuccess = false;
public lat = 0;
@ -75,7 +76,6 @@ export class AttendanceOptionsComponent implements OnInit {
this.priviligeList = AuthenticationService.servicePrivilage;
this.setServicesPrivilage();
this.checkNFCStatus("one");
this.checkFirebaseDocument();
}
public checkFirebaseDocument() {
@ -112,43 +112,40 @@ export class AttendanceOptionsComponent implements OnInit {
}
public setServicesPrivilage() {
for (const servicePrivilage of AuthenticationService.servicePrivilage) {
if (
servicePrivilage.Previlege &&
servicePrivilage.ServiceName === "enableNFC"
) {
this.serviceEnableNFC = true;
}
if (
servicePrivilage.Previlege &&
servicePrivilage.ServiceName === "enableQR"
) {
this.serviceEnableQR = true;
}
if (
servicePrivilage.Previlege &&
servicePrivilage.ServiceName === "enableWIFI"
) {
this.serviceEnableWifi = true;
}
if (
servicePrivilage.Previlege &&
servicePrivilage.ServiceName === "enableLocationQR"
) {
this.enableLocationQR = true;
}
if (
servicePrivilage.Previlege &&
servicePrivilage.ServiceName === "enableLocationNFC"
) {
this.enableLocationNFC = true;
}
if (
servicePrivilage.Previlege &&
servicePrivilage.ServiceName === "enableLocationWIFI"
) {
this.enableLocationWIFI = true;
try {
for (const servicePrivilage of AuthenticationService.servicePrivilage) {
if (servicePrivilage.Previlege && servicePrivilage.ServiceName === "enableNFC") {
this.serviceEnableNFC = true;
}
if (servicePrivilage.Previlege && servicePrivilage.ServiceName === "enableQR") {
this.serviceEnableQR = true;
}
if (servicePrivilage.Previlege && servicePrivilage.ServiceName === "enableWIFI") {
this.serviceEnableWifi = true;
}
if (servicePrivilage.Previlege && servicePrivilage.ServiceName === "enableLocationQR") {
this.enableLocationQR = true;
}
if (servicePrivilage.Previlege && servicePrivilage.ServiceName === "enableLocationNFC") {
this.enableLocationNFC = true;
}
if (servicePrivilage.Previlege && servicePrivilage.ServiceName === "enableLocationWIFI") {
this.enableLocationWIFI = true;
}
if (servicePrivilage.Previlege && servicePrivilage.ServiceName === "enableFirestore") {
this.enableFirestore = true;
this.common.sharedService.setSharedData(true, 'enableFirestore');
this.checkFirebaseDocument();
} else {
this.enableFirestore = false;
this.common.sharedService.setSharedData(false, 'enableFirestore');
this.common.stopLoading();
}
}
} catch (error) {
console.log(error);
this.common.stopLoading();
}
}
@ -165,19 +162,17 @@ export class AttendanceOptionsComponent implements OnInit {
}
public async nfcModal() {
const firestoreDocument = this.common.sharedService.getSharedData('firebase-document', false);
const modal = await this.modalController.create({
component: NfcModalComponent,
showBackdrop: true,
backdropDismiss: true,
componentProps:{ enableLocationNFC: this.enableLocationNFC, lat: this.lat, longt: this.longt, isDocumentAvailable: firestoreDocument.isDocumentAvailable},
componentProps:{ enableLocationNFC: this.enableLocationNFC, lat: this.lat, longt: this.longt},
});
modal.cssClass = "nfc-modal";
await modal.present();
}
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;
@ -192,7 +187,9 @@ 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.enableFirestore) {
this.attendScanService.processFirebaseDocument('NFC-IOS', result);
}
if (this.common.validResponse(result)) {
this.ngZone.run(() => {
this.nfcIOSSuccess = true;

@ -20,7 +20,6 @@ export class NfcModalComponent implements OnInit {
public gifStatus = false;
public nfcReader: any;
public enableLocationNFC: boolean;
public isDocumentAvailable: boolean;
public lat: number;
public longt: number;
@ -39,7 +38,6 @@ export class NfcModalComponent implements OnInit {
this.userData = this.common.sharedService.getSharedData(AuthenticatedUser.SHARED_DATA, false);
this.startAndroidNfc();
console.log(this.enableLocationNFC);
console.log(this.isDocumentAvailable);
}
ionViewDidLeave() {
@ -60,6 +58,7 @@ export class NfcModalComponent implements OnInit {
public swipeAttendanceNFC (nfcSerialCode: any) {
this.nfcReader.unsubscribe();
const enableFirestore = this.common.sharedService.getSharedData('enableFirestore', false);
const request: attendanceSwipeScannerRequest = new attendanceSwipeScannerRequest();
request.PointType = 2;
request.Latitude = this.lat;
@ -73,7 +72,9 @@ export class NfcModalComponent implements OnInit {
console.log('Error inside in swipe attendance');
this.modalController.dismiss();
}).subscribe((result: Response) => {
this.attendScanService.processFirebaseDocument('NFC-ANDROID', result, this.isDocumentAvailable);
if (enableFirestore) {
this.attendScanService.processFirebaseDocument('NFC-ANDROID', result);
}
if (this.common.validResponse(result)) {
this.ngZone.run(() => {
this.gifStatus = true;

@ -137,8 +137,9 @@ export class WifiModalComponent implements OnInit {
}
async swipeAttendanceWifi(code:any) {
const firestoreDocument = this.common.sharedService.getSharedData('firebase-document', false);
const isPlatformValue = this.platform.is('ios') ? 'WIFI-IOS' : 'WIFI-ANDROID';
const isPlatformValue = this.platform.is('ios') ? 'WIFI-IOS' : 'WIFI-ANDROID';
const enableFirestore = this.common.sharedService.getSharedData('enableFirestore', false);
const request: attendanceSwipeScannerRequest = new attendanceSwipeScannerRequest();
request.PointType = 3;
request.Latitude = this.lat;
@ -157,7 +158,9 @@ export class WifiModalComponent implements OnInit {
this.disconnectWifi();
})
.subscribe((result: Response) => {
this.attendScanService.processFirebaseDocument(isPlatformValue, result, firestoreDocument.isDocumentAvailable);
if (enableFirestore) {
this.attendScanService.processFirebaseDocument(isPlatformValue, result);
}
this.disconnectWifi();
if (this.common.validResponse(result)) {
this.ngZone.run(() => {

Loading…
Cancel
Save