no message

MOHEMM-Q3-DEV-LATEST
Zohaib Iqbal Kambrani 5 years ago
parent e67ade154f
commit 7ee282c9fc

22501
Mohem/package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -56,7 +56,6 @@
"@ionic-native/wifi-wizard-2": "^5.31.1", "@ionic-native/wifi-wizard-2": "^5.31.1",
"@ionic-native/zbar": "^5.10.0", "@ionic-native/zbar": "^5.10.0",
"@ionic/angular": "^4.1.0", "@ionic/angular": "^4.1.0",
"@mauron85/cordova-plugin-background-geolocation": "^3.1.0",
"@ng-bootstrap/ng-bootstrap": "^4.2.2", "@ng-bootstrap/ng-bootstrap": "^4.2.2",
"@swimlane/ngx-charts": "^10.1.0", "@swimlane/ngx-charts": "^10.1.0",
"angular-calendar": "^0.26.11", "angular-calendar": "^0.26.11",
@ -221,8 +220,7 @@
"wifiwizard2": {} "wifiwizard2": {}
}, },
"platforms": [ "platforms": [
"android", "android"
"ios"
] ]
} }
} }

@ -360,6 +360,11 @@ export class ConfirmLoginComponent implements OnInit {
this.authService.checkSMS(request, () => {}, this.ts.trPK('general', 'ok')) this.authService.checkSMS(request, () => {}, this.ts.trPK('general', 'ok'))
.subscribe((result: SMSCheckResponse) => { .subscribe((result: SMSCheckResponse) => {
if (this.cs.validResponse(result)) { if (this.cs.validResponse(result)) {
// Wifi Credientials
CommonService.MOHEMM_WIFI_SSID = result.Mohemm_Wifi_SSID;
CommonService.MOHEMM_WIFI_PASSWORD = result.Mohemm_Wifi_Password;
AuthenticationService.servicePrivilage = result.Privilege_List; AuthenticationService.servicePrivilage = result.Privilege_List;
this.authService.setAuthenticatedUser(result).subscribe(() => { this.authService.setAuthenticatedUser(result).subscribe(() => {
localStorage.setItem('emp-name', result.MemberInformationList[0].EMPLOYEE_NAME); localStorage.setItem('emp-name', result.MemberInformationList[0].EMPLOYEE_NAME);

@ -192,6 +192,11 @@ export class SmsPageComponent implements OnInit {
request.IsDeviceNFC = this.isNFCAvailable; request.IsDeviceNFC = this.isNFCAvailable;
this.authService.checkSMS(request, () => {}, this.translate.trPK('general', 'ok')).subscribe((result: SMSCheckResponse) => { this.authService.checkSMS(request, () => {}, this.translate.trPK('general', 'ok')).subscribe((result: SMSCheckResponse) => {
if (this.common.validResponse(result)) { if (this.common.validResponse(result)) {
// Wifi Credientials
CommonService.MOHEMM_WIFI_SSID = result.Mohemm_Wifi_SSID;
CommonService.MOHEMM_WIFI_PASSWORD = result.Mohemm_Wifi_Password;
AuthenticationService.servicePrivilage = result.Privilege_List; AuthenticationService.servicePrivilage = result.Privilege_List;
this.authService.setAuthenticatedUser(result).subscribe(() => { this.authService.setAuthenticatedUser(result).subscribe(() => {
localStorage.setItem('emp-name', result.MemberInformationList[0].EMPLOYEE_NAME); localStorage.setItem('emp-name', result.MemberInformationList[0].EMPLOYEE_NAME);

@ -38,9 +38,6 @@ import { SendActivationByType } from 'src/app/authentication/models/sendActivati
}) })
export class AuthenticationService { export class AuthenticationService {
public static MOBILE_USER = 102;
/* login methods */ /* login methods */
public static loginURL = 'Services/Authentication.svc/REST/CheckPatientAuthentication'; public static loginURL = 'Services/Authentication.svc/REST/CheckPatientAuthentication';
public static checkUserAuthURL = 'Services/Authentication.svc/REST/CheckPatientAuthentication'; public static checkUserAuthURL = 'Services/Authentication.svc/REST/CheckPatientAuthentication';

@ -17,5 +17,7 @@ export class SMSCheckResponse extends Response {
public CompanyImageURL:string; public CompanyImageURL:string;
public EMPLOYEE_MOBILE_NUMBER:string; public EMPLOYEE_MOBILE_NUMBER:string;
public EMPLOYEE_NAME:string; public EMPLOYEE_NAME:string;
public Mohemm_Wifi_SSID:string;
public Mohemm_Wifi_Password:string;
} }

@ -33,6 +33,10 @@ import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
providedIn: 'root' providedIn: 'root'
}) })
export class CommonService { export class CommonService {
public static MOHEMM_WIFI_SSID = "";
public static MOHEMM_WIFI_PASSWORD = "";
public static months_en_long = [ public static months_en_long = [
'January', 'January',
'February', 'February',

@ -24,8 +24,8 @@ export class ConnectorService {
public static timeOut = 120 * 1000; public static timeOut = 120 * 1000;
// public static host = 'http://10.50.100.113:6060/'; // development service // public static host = 'http://10.50.100.113:6060/'; // development service
// public static host = 'https://uat.hmgwebservices.com/'; public static host = 'https://uat.hmgwebservices.com/';
public static host = 'https://hmgwebservices.com/'; // public static host = 'https://hmgwebservices.com/';
// public static host = 'http://10.50.100.198:6060/'; // 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.113:6060/'; // development service
/* public static host = 'http://10.50.100.198:6060/'; /* public static host = 'http://10.50.100.198:6060/';

@ -43,7 +43,7 @@
<ion-row padding> <ion-row padding>
<ion-col size="5" [ngClass]="{'margin-col': direction === 'en', 'disable-attendance': false}" class="buttonStyle" > <ion-col size="5" [ngClass]="{'margin-col': direction === 'en', 'disable-attendance': false}" class="buttonStyle" >
<div class="textAndIcon" (click)="startWifi()"> <div class="textAndIcon" (click)="startWifi()">
<img src="../assets/imgs/nfc_icon.png" /> <img src="../assets/imgs/wifi_icon.png" />
<p>{{ "general, wifi-text" | translate }}</p> <p>{{ "general, wifi-text" | translate }}</p>
</div> </div>
</ion-col> </ion-col>

@ -21,8 +21,8 @@ export class WifiModalComponent implements OnInit {
public userData: any = {}; public userData: any = {};
public gifStatus = false; public gifStatus = false;
private ssid = 'HMG-MobileApp'; // Mobile-Team-Official private ssid = CommonService.MOHEMM_WIFI_SSID; // Mobile-Team-Official
private password = '12345678'; private password = CommonService.MOHEMM_WIFI_PASSWORD;
private algo = 'WPA'; // WPA -> WPA2 private algo = 'WPA'; // WPA -> WPA2
constructor( constructor(
@ -78,9 +78,8 @@ export class WifiModalComponent implements OnInit {
console.log("Connecting wifi to mark attendance..."); console.log("Connecting wifi to mark attendance...");
this.wifiWizard2.iOSConnectNetwork(this.ssid,this.password).then((value) => { this.wifiWizard2.iOSConnectNetwork(this.ssid,this.password).then((value) => {
let ssid_ = this.wifiWizard2.getConnectedSSID();
let bssid = this.wifiWizard2.getConnectedBSSID(); let bssid = this.wifiWizard2.getConnectedBSSID();
console.log("Wifi Connected: Verified Access | " + value + " | " + ssid_ + " | " + bssid); console.log("Wifi Connected: Verified Access | " + value + " | " + bssid);
setTimeout(() => { setTimeout(() => {
this.swipeAttendanceWifi(this.ssid); this.swipeAttendanceWifi(this.ssid);
},1000); },1000);

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Loading…
Cancel
Save