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 7f7b4fca..e9a5d891 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(()=>{ - }, "OK", "Failed to validate workspace, Make sure you are in HMG workspace coverage."); @@ -121,11 +104,9 @@ 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 + console.log("Marking attendance to server... at location: "); let ip = await this.wifiWizard2.getWifiIP(); let mac = await this.wifiWizard2.getConnectedBSSID(); @@ -139,9 +120,6 @@ export class WifiModalComponent implements OnInit { 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 +139,6 @@ export class WifiModalComponent implements OnInit { this.closeModal(); } }); - // }); } public closeModal() {