diff --git a/Mohem/src/app/authentication/check-user/check-user.component.html b/Mohem/src/app/authentication/check-user/check-user.component.html index 0f28d541..841a2b96 100644 --- a/Mohem/src/app/authentication/check-user/check-user.component.html +++ b/Mohem/src/app/authentication/check-user/check-user.component.html @@ -23,7 +23,7 @@ - {{ts.trPK('login','check-user-text1')}} + {{ts.trPK('login','check-user-place-holder')}} diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html index 9e1c419b..95971d3d 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html @@ -32,8 +32,8 @@

{{ts.trPK('login','verify-login-with')}}

-

{{ts.trPK('login','verify-fingerprint')}}

-

{{ts.trPK('login','verify-faceId')}}

+

{{ts.trPK('login','verify-fingerprint')}}

+

{{ts.trPK('login','verify-faceId')}}

diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.ts b/Mohem/src/app/authentication/sms-page/sms-page.page.ts index 2d15e3e7..d2250468 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts @@ -139,9 +139,13 @@ export class SmsPageComponent implements OnInit { console.log("deviceToken :"+this.deviceToken); this.loginTypeData= this.common.sharedService.getSharedData(SMSCheckRequest.SHARED_DATA, false); + if( this.loginTypeData){ this.loginType=this.loginTypeData.loginType; - console.log("loginType :"+this.loginTypeData.loginType); + console.log("loginType :"+this.loginTypeData.loginType); + }else{ + this.loginType=1; + } diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 94277c80..1de50935 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -161,10 +161,14 @@ "en": "Verify its you", "ar": "Verify its you" }, - "check-user-text1":{ + "check-user-place-holder":{ "en":"Employee ID", "ar":"رقم الموظف " }, + "check-user-text1": { + "en": "Please Enter your Employee ID, A ", + "ar": "يرجى ادخال رقم الموظف " + }, "check-user-text2": { "en": "login Code ", "ar": "رمز تسجيل الدخول"