diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts index e0310306..1dec3179 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts @@ -94,6 +94,7 @@ export class ConfirmLoginComponent implements OnInit { ) { + this.loginData= this.sharedData.getSharedData(AuthenticationService.LOGIN_DATA, false); @@ -115,7 +116,9 @@ export class ConfirmLoginComponent implements OnInit { this.lastLogin = this.cs.sharedService.getSharedData(AuthenticationService.LAST_LOGIN, false); - + this.username = localStorage.getItem("user"); + this.password = localStorage.getItem("password"); + this.empname = localStorage.getItem("emp-name"); } diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts index 280d8664..24456221 100644 --- a/Mohem/src/app/authentication/login/login.component.ts +++ b/Mohem/src/app/authentication/login/login.component.ts @@ -113,21 +113,22 @@ export class LoginComponent implements OnInit, OnDestroy { this.remeberMyInfo(); } public remeberMyInfo() { - if (this.remeberMe) { + // if (this.remeberMe) { if(this.username){localStorage.setItem("user", this.username);} if(this.password){localStorage.setItem("password", this.password);} localStorage.setItem("remember", "true"); - } else { - localStorage.setItem("user", ""); - localStorage.setItem("password", ""); - localStorage.setItem("remember", "false"); - } + // } else { + // localStorage.setItem("user", ""); + // localStorage.setItem("password", ""); + // localStorage.setItem("remember", "false"); + // } } public onLogin() { // console.log("onLogin"); // this.checkAppUpdated(); // this.checkUserAuthentication(); + let deviceToken = localStorage.getItem('deviceToken'); if (deviceToken) { console.log('login enabled first time: ' + deviceToken); @@ -172,6 +173,10 @@ export class LoginComponent implements OnInit, OnDestroy { private checkUserAuthentication() { console.log("debug Here!!"); + console.log(this.username); + console.log(this.language); + console.log(this.password); + this.cs.startLoading(); const request = new LoginRequest(); request.P_USER_NAME = this.username;