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 842fcf71..2bdcc8cf 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 @@ -50,7 +50,7 @@ export class AttendScanService { this.userData = this.common.sharedService.getSharedData(AuthenticatedUser.SHARED_DATA, false); } - getDeviceLocation(callback?:(latitude: number,longitude: number) => void) { + getDeviceLocation() { this.isFakeLocationUsed = false; const isVirtual = this.device.isVirtual; if (isVirtual === true) { @@ -69,11 +69,6 @@ export class AttendScanService { } this.lat = resp.latitude; this.longt = resp.longitude; - - if(callback != null){ - callback(this.lat,this.longt); - return; - } this.attendance(); } else { @@ -87,11 +82,6 @@ export class AttendScanService { if(resp && resp.coords.latitude && resp.coords.longitude) { this.lat = resp.coords.latitude; this.longt = resp.coords.longitude; - - if(callback != null){ - callback(this.lat,this.longt); - return; - } this.attendance(); } else { 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 4340434e..749ce172 100644 --- a/Mohem/src/app/home/wifi-model/wifi-modal.component.ts +++ b/Mohem/src/app/home/wifi-model/wifi-modal.component.ts @@ -21,9 +21,9 @@ export class WifiModalComponent implements OnInit { public userData: any = {}; public gifStatus = false; - private ssid = CommonService.MOHEMM_WIFI_SSID; // Mobile-Team-Official + private ssid = CommonService.MOHEMM_WIFI_SSID; private password = CommonService.MOHEMM_WIFI_PASSWORD; - private algo = 'WPA'; // WPA -> WPA2 + private algo = 'WPA'; constructor( public common: CommonService, @@ -43,55 +43,39 @@ export class WifiModalComponent implements OnInit { setTimeout(() => { this.startWifiConnection(); - } - , 1000); - } - - ionViewDidLeave() { - + }, 1000); } async startWifiConnection() { - const isAndroid = this.platform.is("android"); const isIOS = this.platform.is("ios"); if (isAndroid) { - console.log("Connecting wifi to mark attendance..."); this.wifiWizard2.connect(this.ssid, true, this.password, this.algo).then(async (value) =>{ - let ssid_ = await this.wifiWizard2.getConnectedSSID(); let bssid = await this.wifiWizard2.getConnectedBSSID(); console.log("Wifi Connected: Verified Access | " + value + " | " + ssid_ + " | " + bssid); setTimeout(() => { this.swipeAttendanceWifi(bssid); },2000); - }) .catch((err) => { - console.log(err); this.showErrorInvalidWorkspace(); - });; + }); } else if (isIOS) { if(this.wifiWizard2.isWifiEnabled){ - console.log("Connecting wifi to mark attendance..."); this.wifiWizard2.iOSConnectNetwork(this.ssid,this.password).then((value) => { - let bssid = this.wifiWizard2.getConnectedBSSID(); console.log("Wifi Connected: Verified Access | " + value + " | " + bssid); setTimeout(() => { this.swipeAttendanceWifi(this.ssid); },1000); - }) .catch((err) => { - console.log(err); this.showErrorInvalidWorkspace(); }); - - }else{ - console.log("Wifi not enabled..."); + } else{ this.common.showErrorMessageDialog(()=>{ this.openNativeSettings.open('wifi').then(()=>{}); }, @@ -102,10 +86,9 @@ export class WifiModalComponent implements OnInit { }​ - showErrorInvalidWorkspace(){ + showErrorInvalidWorkspace() { this.closeModal(); this.common.showErrorMessageDialog(()=>{ - }, this.ts.trPK("general", "ok"), this.ts.trPK("general","wifi-not-enable-text")); @@ -121,27 +104,17 @@ export class WifiModalComponent implements OnInit { } } - - async swipeAttendanceWifi(code:any) { - // this.attendScanService.getDeviceLocation( async (latitude, longitude)=>{ - - console.log("Marking attendance to server... at location: "); //+ latitude +","+longitude - let ip = await this.wifiWizard2.getWifiIP(); - let mac = await this.wifiWizard2.getConnectedBSSID(); - + async swipeAttendanceWifi(code:any) { const request: attendanceSwipeScannerRequest = new attendanceSwipeScannerRequest(); request.PointType = 3; - request.Latitude = 24.708761; - request.Longitude = 46.665952; + request.Latitude = 0; + request.Longitude = 0; request.QRValue = ""; request.NFCValue = ""; - request.WifiValue = "100";//code + "|" + ip + "|" + mac; + request.WifiValue = "100"; request.UID = this.device.uuid; request.UserName = this.userData.EMPLOYEE_NUMBER; - console.log("HTTP Request Mark Attendance:") - console.log(request); - this.attendance_service .attendanceSwipeScanner(request, () => { console.log("Error inside in swipe attendance"); @@ -161,7 +134,6 @@ export class WifiModalComponent implements OnInit { this.closeModal(); } }); - // }); } public closeModal() {