From 0f84f35d5a04338e780d6cf37c6c09529dda2f92 Mon Sep 17 00:00:00 2001 From: ashwaq Date: Thu, 9 Apr 2020 11:53:52 +0300 Subject: [PATCH] fix sms text, RFC Empty,Notifi-P_information --- .../confirm-login/confirm-login.component.ts | 14 ++++++++++++-- .../app/authentication/sms-page/sms-page.page.html | 6 +++--- .../app/authentication/sms-page/sms-page.page.ts | 4 +++- .../hmg-common/services/common/common.service.ts | 10 +++++++++- .../work-list-rfc/work-list-rfc.component.html | 8 +++++--- .../worklist-main/worklist-main.component.html | 3 ++- .../worklist-main/worklist-main.component.scss | 9 +-------- Mohem/src/assets/localization/i18n.json | 4 ++++ Mohem/src/theme/worklist.scss | 11 +++++++++++ 9 files changed, 50 insertions(+), 19 deletions(-) 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 6cc023cc..d2c073bd 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts @@ -318,6 +318,12 @@ export class ConfirmLoginComponent implements OnInit { console.log(el.value); localStorage.setItem("login-type",el.value); console.log("login-type: "+ localStorage.getItem("login-type")) + if(this.FFloginType == 3 || this.FFloginType == 2 ){ + this.cs.setActiveTypeLogin(el.value); + }else{ + this.cs.setActiveTypeLogin(0); + + } this.loginWithSMS(el); break; @@ -339,7 +345,7 @@ export class ConfirmLoginComponent implements OnInit { console.log(el.value); - + this.faceReconization(el); break; @@ -349,8 +355,12 @@ export class ConfirmLoginComponent implements OnInit { console.log(el.value); localStorage.setItem("login-type",el.value); + if(this.FFloginType == 3 || this.FFloginType == 2 ){ + this.cs.setActiveTypeLogin(el.value); + }else{ + this.cs.setActiveTypeLogin(0); - + } this.loginWithWhatsapp(el); break; diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.html b/Mohem/src/app/authentication/sms-page/sms-page.page.html index 194c34c6..c9d9d569 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.html +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.html @@ -21,9 +21,9 @@

{{'verificationcode,title' | translate}} {{'verificationcode,verificationcode' | translate}} {{'verificationcode,by' | translate}} - {{'verificationcode , sms' | translate}} - {{'verificationcode , whatsapp' | translate}} - + {{'verificationcode , sms' | translate}} + {{'verificationcode , whatsapp' | translate}} + {{'verificationcode,instruct' | translate}} {{'general,submit' | translate}}

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 d2250468..f3ef1889 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts @@ -82,6 +82,7 @@ export class SmsPageComponent implements OnInit { code: any; user_name: string; loginType: any; + activeType: any; constructor( @@ -107,7 +108,8 @@ export class SmsPageComponent implements OnInit { ngOnInit() { - + this.activeType=this.common.getActiveTypeLogin(); + console.log("activeType :"+this.activeType); this.count = 0; this.initTimer(); diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts index 42d94901..557390a6 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -81,6 +81,7 @@ export class CommonService { public updateImage:boolean=false; public setUpdateImg:any; DT: any; + activeType: any; constructor( public nav: NavController, public router: Router, @@ -1430,5 +1431,12 @@ public getMonthNameAr(value: number): string { return this.DT; } - + setActiveTypeLogin(activeType){ + this.activeType=activeType; + } + + getActiveTypeLogin(){ + return this.activeType; + } + } diff --git a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html index 1b542584..b0ec7d39 100644 --- a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html +++ b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html @@ -10,9 +10,9 @@
-
+