diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts index 2857c3b1..acd8ff0e 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -24,8 +24,8 @@ export class ConnectorService { public static timeOut = 120 * 1000; // public static host = 'http://10.50.100.113:6060/'; // development service -public static host = 'https://uat.hmgwebservices.com/'; - // public static host = 'https://hmgwebservices.com/'; +// public static host = 'https://uat.hmgwebservices.com/'; + public static host = 'https://hmgwebservices.com/'; // public static host = 'http://10.50.100.198:6060/'; // public static host = 'http://10.50.100.113:6060/'; // development service /* public static host = 'http://10.50.100.198:6060/'; 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 6de60b72..d17f3521 100644 --- a/Mohem/src/app/home/attendance-options/attendance-options.component.ts +++ b/Mohem/src/app/home/attendance-options/attendance-options.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, NgZone } from "@angular/core"; +import { Component, OnInit, NgZone, VERSION } from "@angular/core"; import { NFC } from "@ionic-native/nfc/ngx"; import { CommonService } from "src/app/hmg-common/services/common/common.service"; import { Platform } from "@ionic/angular"; @@ -13,6 +13,9 @@ import { attendanceSwipeScannerRequest } from "src/app/home/models/attendanceSwi import { Device } from "@ionic-native/device/ngx"; import { AttendanceService } from "src/app/home/services/attendance.services"; import { Response } from "src/app/hmg-common/services/models/response"; +import { WifiWizard2 } from "@ionic-native/wifi-wizard-2/ngx"; +import { OpenNativeSettings } from '@ionic-native/open-native-settings/ngx'; +import { DevicePermissionsService } from 'src/app/hmg-common/services/device-permissions/device-permissions.service'; @@ -41,7 +44,10 @@ export class AttendanceOptionsComponent implements OnInit { public modalController: ModalController, private device: Device, private attendance_service: AttendanceService, - public ngZone: NgZone + public ngZone: NgZone, + private wifiWizard2: WifiWizard2, + private openNativeSettings: OpenNativeSettings, + private devicePermissionsService:DevicePermissionsService ) {} ngOnInit() { @@ -173,21 +179,51 @@ export class AttendanceOptionsComponent implements OnInit { // Wifi Attendance public async startWifi() { + const isAndroid = this.platform.is("android"); + const isIOS = this.platform.is("ios"); + const isWifiEnabled = await this.wifiWizard2.isWifiEnabled(); + + if(isIOS){ + if(!isWifiEnabled){ + this.showWifiNotEnabled(); + return; + } + + }else if(isAndroid){ + let locationPermission = await this.devicePermissionsService.requestLocationAutherization(); + if(!locationPermission){ + return; + } + + if(!isWifiEnabled){ + this.wifiWizard2.setWifiEnabled(true).then(()=>{ + this.startWifi(); + }).catch((err) => { + console.debug(err); + this.showWifiNotEnabled(); + }); + return; + } + } + + // opening wifi dailog if all above conditions are passed (isWifiEnabled == true) let modal = await this.modalController.create({ component: WifiModalComponent, showBackdrop: true, - backdropDismiss: true, + backdropDismiss: false, }); modal.cssClass = "wifi-modal"; await modal.present(); + } + + - // modal = await this.modalController.create({ - // component: NfcModalComponent, - // showBackdrop: true, - // backdropDismiss: true, - // }); - // modal.cssClass = "nfc-modal"; - // await modal.present(); + showWifiNotEnabled(){ + this.common.showErrorMessageDialog(()=>{ + // this.openNativeSettings.open('wifi').then(()=>{}); + }, + this.ts.trPK("general", "ok"), + this.ts.trPK("general","wifi-not-enable-text")); } } diff --git a/Mohem/src/app/home/wifi-model/wifi-modal.component.html b/Mohem/src/app/home/wifi-model/wifi-modal.component.html index f064e06f..5a87fce4 100644 --- a/Mohem/src/app/home/wifi-model/wifi-modal.component.html +++ b/Mohem/src/app/home/wifi-model/wifi-modal.component.html @@ -3,13 +3,13 @@
-{{ "general, wifi-connect-message" | translate }}
-
+ {{ "general, success-attendance" | translate }}