From 050eca72454c5d337c928e03757e4f6957012a5f Mon Sep 17 00:00:00 2001 From: enadhilal Date: Mon, 23 Mar 2020 14:31:24 +0300 Subject: [PATCH] fix app direction and itg all segment --- Mohem/package.json | 2 +- Mohem/src/app/app.component.ts | 6 ++--- .../authentication/login/login.component.html | 4 +-- .../authentication/login/login.component.ts | 16 ++++++++--- .../app/notification/home/home.component.html | 2 +- .../app/notification/home/home.component.ts | 27 ++++++++++++------- 6 files changed, 35 insertions(+), 22 deletions(-) diff --git a/Mohem/package.json b/Mohem/package.json index 764d3105..49311c3b 100755 --- a/Mohem/package.json +++ b/Mohem/package.json @@ -203,4 +203,4 @@ "android" ] } -} +} \ No newline at end of file diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index 6021ea82..0a08df19 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -129,8 +129,7 @@ export class AppComponent implements OnInit, AfterViewInit { this.events.subscribe('myTeamFlag', myTeamFlag => { this.TeamFlag = myTeamFlag; }); - // this.TeamFlag = this.cs.sharedService.getSharedData("myTeamFlag",false); - // console.log("this.TeamFlag>>>>>>>>>"+ this.TeamFlag); + console.log("this.TeamFlag>>>>>>>>>"+ this.TeamFlag); } private initializeDirection() { this.direction = TranslatorService.getCurrentDirection(); @@ -156,8 +155,7 @@ export class AppComponent implements OnInit, AfterViewInit { this.menu.enable(false); this.logoutFlage=true; this.events.publish('logoutFlage', this.logoutFlage); - this.cs.setUpdateImage("",false); - this.TeamFlag ="false"; + this.getLastLoginInfo(); // this.cs.openLogin(); diff --git a/Mohem/src/app/authentication/login/login.component.html b/Mohem/src/app/authentication/login/login.component.html index 46cecfb8..6fb821df 100644 --- a/Mohem/src/app/authentication/login/login.component.html +++ b/Mohem/src/app/authentication/login/login.component.html @@ -62,8 +62,8 @@ {{ts.trPK('login','signup')}}
- - + +
diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts index 5736609d..5fdbbd87 100644 --- a/Mohem/src/app/authentication/login/login.component.ts +++ b/Mohem/src/app/authentication/login/login.component.ts @@ -74,7 +74,7 @@ export class LoginComponent implements OnInit, OnDestroy { public remeberMe: boolean; private iosLink: string; private androidLink: string; - public currentLang: any = 1; + public currentLang = 1; private patientOutSA: boolean; private loginTokenID: string; private isMobileFingerPrint: boolean; @@ -95,14 +95,18 @@ export class LoginComponent implements OnInit, OnDestroy { private checkUserResult: CheckUserAuthenticationResponse; ngOnInit() { - console.log("ENAD TEST!!!") + this.currentLang = TranslatorService.getCurrentLanguageCode(); + console.log(TranslatorService.CURRENT_LANGUAGE) + console.log(TranslatorService.EN) if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) { this.language = "US"; + this.changeLanguage('2') } else { this.language = "AR"; + this.changeLanguage('1') } - this.ts.switchLanguage(); - this.currentLang = TranslatorService.getCurrentLanguageCode(); + console.log("current lang: "+this.currentLang) + //this.ts.switchLanguage(); // this.deviceToken= this.cs.sharedService.getSharedData(AuthenticationService.DEVICE_TOKEN, false); // console.log("get deviceToken login"+ this.deviceToken) @@ -191,7 +195,10 @@ export class LoginComponent implements OnInit, OnDestroy { } public changeLanguage(langNumber) { + console.log("current lang: "+this.currentLang) + console.log("click lang: "+langNumber) if(this.currentLang == langNumber){ + this.currentLang = langNumber; return; }else{ this.ts.switchLanguage(); @@ -202,6 +209,7 @@ export class LoginComponent implements OnInit, OnDestroy { } this.currentLang = TranslatorService.getCurrentLanguageCode(); } + this.currentLang = langNumber; } public forgetPasswordPage() { this.cs.openUserForgot(); diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index e2a26be5..f6c4951a 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -52,7 +52,7 @@ - + {{segment.name}} diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 5997d8ce..6e9631a5 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -151,6 +151,10 @@ export class HomeComponent implements OnInit { slidesPerView: 4.3, spaceBetween: 10 }; + public slideOptsTwo = { + slidesPerView: 1.3, + spaceBetween: 10 + }; constructor( public common: CommonService, public ts: TranslatorService, @@ -497,14 +501,19 @@ export class HomeComponent implements OnInit { Count() { const datas = []; const names = []; - this.ITGSegment[0] = { - name: 'All', - code: 'All', - data: null, - style: false - }; - this.workListService.getITGCount('', '', this.isPostNoLoad) + this.workListService.getITGCount('', '', this.isPostNoLoad) .subscribe((result: any) => { + if(result.RequestType.length > 0){ + this.ITGSegment[0] = { + name: 'All', + code: 'All', + data: null, + style: false + }; + this.ITGSegment[0].data = datas; + this.ITGSegment[0].names = names; + this.setActive(this.ITGSegment[0].code); + } for (let i = 1; i < result.RequestType.length; i++) { this.ITGSegment[i] = { name: result.RequestType[i].RequestTypeName, @@ -515,9 +524,7 @@ export class HomeComponent implements OnInit { datas[i] = result.RequestType[i].RequestDetails; names[i] = result.RequestType[i].RequestTypeCode; } - this.ITGSegment[0].data = datas; - this.ITGSegment[0].names = names; - this.setActive(this.ITGSegment[0].code); + }); }