diff --git a/Mohem/src/app/app.scss b/Mohem/src/app/app.scss index 34043d9e..2dd0d349 100644 --- a/Mohem/src/app/app.scss +++ b/Mohem/src/app/app.scss @@ -7,12 +7,12 @@ .alert-radio-label.sc-ion-alert-md, .alert-radio-label.sc-ion-alert-ios { - //white-space: normal; + white-space: normal; } .alert-tappable.sc-ion-alert-md, .alert-tappable.sc-ion-alert-ios { - //height: 50px; + height: 70px; } .main-badge{ position: absolute; 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 f5eef814..6141871e 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.html +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.html @@ -34,7 +34,9 @@ -

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

+ +

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

+

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

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 a7f708bf..6cc023cc 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts @@ -73,6 +73,7 @@ export class ConfirmLoginComponent implements OnInit { empname: string; lastLoginDate: string; user_name: string; + FFloginType: any; constructor( @@ -515,8 +516,8 @@ export class ConfirmLoginComponent implements OnInit { loginWithFingurePrint(el: any) { - if (!el.disabled) { + this.FFloginType=el.value; this.startBiometricLoginIfAvailable(); @@ -527,7 +528,7 @@ export class ConfirmLoginComponent implements OnInit { faceReconization(el: any) { if (!el.disabled) { - + this.FFloginType=el.value; this.startBiometricLoginIfAvailable(); } @@ -700,7 +701,6 @@ export class ConfirmLoginComponent implements OnInit { } }else { - this.onlySMSBox = false; this.button(); diff --git a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts index aa5abdec..e7285713 100644 --- a/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts +++ b/Mohem/src/app/hmg-common/ui/welcome-login/welcome.component.ts @@ -107,7 +107,9 @@ export class WelcomeComponent implements OnInit, AfterViewInit, OnDestroy { // let todayDate = month + '/' + day + '/' + year; // this.lastLoginTime = moment(this.cs.evaluteDateAsObject(this.lastLoginDate)).format("HH:mm"); - this.logintype = parseInt(this.logintype) + // this.logintype = parseInt(this.user.LoginType) + this.logintype = this.user.LoginType; + console.log(" this.lastLoginTime" + this.lastLoginTime); console.log(" this.lastLoginDate" + this.lastLoginDate); diff --git a/Mohem/src/app/vacation-rule/home/home.component.html b/Mohem/src/app/vacation-rule/home/home.component.html index 459b9225..ba2b4758 100644 --- a/Mohem/src/app/vacation-rule/home/home.component.html +++ b/Mohem/src/app/vacation-rule/home/home.component.html @@ -79,7 +79,7 @@ {{notBadge}} -

{{item.RULE_STATUS}}


+

{{item.RULE_STATUS}}


{{item.RULE_NAME}} | {{item.ITEM_TYPE_DISPLAY_NAME}}


{{item.BEGIN_DATE | dateString }} - {{item.END_DATE | dateString}}

+ {{'vacation-rule, notification' | translate}} - - + {{x.NOTIFICATION_DISPLAY_NAME}} diff --git a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss index 2edaaec8..7edf7d17 100644 --- a/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss +++ b/Mohem/src/app/vacation-rule/vacation-type/vacation-type.component.scss @@ -92,11 +92,6 @@ color: black !important; margin:0; } -.select-full-width { - max-width: 100% !important; - width: 100% !important; - padding-left: 0 !important; -} // .progcontainer { // margin: auto; // text-align: center; diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 27ca32e7..9d75f038 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -154,6 +154,10 @@ "en": "To activate fingerprint login service, please verify by using one of the following options. ", "ar": "لتفعيل خدمة الدخول بالبصمة، يرجى التحقق من خلال احدى الخيارات التالية" }, + "verify-faceId": { + "en": "To activate face ID login service, please verify by using one of the following options. ", + "ar": "لتفعيل خدمة الدخول ببصمة الوجه، يرجى التحقق من خلال احدى الخيارات التالية" + }, "Verify-text":{ "en":"Verify its you", "ar":"Verify its you" diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index e53c9d69..66492f00 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1516,6 +1516,5 @@ table.monthview-datetable th small { } .alert-wrapper { - min-width: 80px;//what ever you like + min-width: 80% !important;//what ever you like } -