diff --git a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts index 6c277e62..74819bf6 100644 --- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts +++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts @@ -133,7 +133,7 @@ export class AuthenticationService { }else{ mobileType = 'android'; } - request.VersionID = 2.6; + request.VersionID = 2.7; request.Channel = 31; request.LanguageID = TranslatorService.getCurrentLanguageCode(); request.MobileType = mobileType; 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 d17f3521..f655dcb9 100644 --- a/Mohem/src/app/home/attendance-options/attendance-options.component.ts +++ b/Mohem/src/app/home/attendance-options/attendance-options.component.ts @@ -109,8 +109,6 @@ export class AttendanceOptionsComponent implements OnInit { servicePrivilage.ServiceName === "enableWIFI" ) { this.serviceEnableWifi = true; - } else { - this.serviceEnableWifi = 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 abc86a16..208682cf 100644 --- a/Mohem/src/app/home/wifi-model/wifi-modal.component.ts +++ b/Mohem/src/app/home/wifi-model/wifi-modal.component.ts @@ -170,11 +170,15 @@ export class WifiModalComponent implements OnInit { } async isWifiAvailable(ssid:string){ - let avaialble_wifi = await this.wifiWizard2.scan(); - let find_ = avaialble_wifi.find(element => { + let avaialble_wifi = await this.wifiWizard2.scan(); + let find = avaialble_wifi.find(element => { return element.SSID == ssid; }); - console.log("find: " + find_.SSID); - return find_.SSID == ssid; + + if (find === undefined) { + return false; + } else { + return find.SSID == ssid; + } } } diff --git a/Mohem/src/app/profile/home/home.component.html b/Mohem/src/app/profile/home/home.component.html index 261988e0..86ee5a08 100644 --- a/Mohem/src/app/profile/home/home.component.html +++ b/Mohem/src/app/profile/home/home.component.html @@ -20,7 +20,8 @@