diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index a8762509..36557be0 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -3,7 +3,163 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + {{User_name_Emp}} + + + {{User_Job_name}} + + + + + + + + + + + + + + + + + + + + + + {{ts.trPK('home','logout')}} + + + + + + + + + + + + + + + + + {{ts.trPK('userProfile','title')}} + + + + + + + + + + {{ts.trPK('login','changepassword')}} + + {{notBadge}} + + + + + + + + + + {{ts.trPK('myTeam','myTeam-header')}} + + + + + + + + + {{CompanyImageDescription}} + + + + {{companyDesc}} + + + + @@ -157,7 +313,6 @@ {{companyDesc}} - diff --git a/Mohem/src/app/authentication/login/login.component.html b/Mohem/src/app/authentication/login/login.component.html index 2dd41792..159c97af 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')}} - English - عربي + English + عربي diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts index aa8ad0a2..c1dd4c25 100644 --- a/Mohem/src/app/authentication/login/login.component.ts +++ b/Mohem/src/app/authentication/login/login.component.ts @@ -93,6 +93,14 @@ export class LoginComponent implements OnInit, OnDestroy { } ngOnInit() { + console.log("ENAD TEST!!!") + if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) { + this.language = "US"; + } else { + this.language = "AR"; + } + this.ts.switchLanguage(); + this.currentLang = TranslatorService.getCurrentLanguageCode(); // this.deviceToken= this.cs.sharedService.getSharedData(AuthenticationService.DEVICE_TOKEN, false); // console.log("get deviceToken login"+ this.deviceToken) @@ -178,18 +186,25 @@ export class LoginComponent implements OnInit, OnDestroy { ngOnDestroy(): void { this.backClicked(); } - public changeLanguage() { - this.ts.switchLanguage(); - if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) { - this.language = "US"; - } else { - this.language = "AR"; + + public changeLanguage(langNumber) { + if(this.currentLang == langNumber){ + return; + }else{ + this.ts.switchLanguage(); + if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) { + this.language = "US"; + } else { + this.language = "AR"; + } + this.currentLang = TranslatorService.getCurrentLanguageCode(); } - this.currentLang = TranslatorService.getCurrentLanguageCode(); } + private forgetPasswordPage() { this.cs.openUserForgot(); } + private hideSplashScreen(stopLoading = false) { // this.splash.hide(); if (stopLoading) { diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.ts b/Mohem/src/app/eit/add-eit/add-eit.component.ts index 81cc100e..f9101271 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.ts +++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts @@ -1176,7 +1176,7 @@ export class AddEitComponent implements OnInit { let numbervalue: any = 0; let dateValue: any = null; let transNo: number = this.comtransNo; - let textValue = ""; + let textValue : any; // if(this.ExtraObj.transactionNo) // transNo=this.ExtraObj.transactionNo; for (let i = 0; i < this.eitResponse.length; i++) { @@ -1230,7 +1230,11 @@ export class AddEitComponent implements OnInit { } else { elem.classList.remove("requiredClassElm"); } - if (elemVal) varcharValue = elemVal; + if (elemVal != 'null'){ + varcharValue = elemVal; + } else{ + elemVal = null; + } valuseArr.push({ TRANSACTION_NUMBER: transNo, NAME: this.eitResponse[i].APPLICATION_COLUMN_NAME, diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.ts b/Mohem/src/app/eit/eit-list/eit-list.component.ts index 92e41259..2576093b 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.ts +++ b/Mohem/src/app/eit/eit-list/eit-list.component.ts @@ -141,12 +141,15 @@ export class EitListComponent implements OnInit { this.P_PAGE_NUM++; this.EITTransactionsListObj.P_PAGE_NUM = this.P_PAGE_NUM; result.GetEITTransactionList.forEach(vr => { - if (vr.Collection_Transaction[0].ROW_NUM == vr.Collection_Transaction[0].NO_OF_ROWS) { - this.IsReachEnd = true; - } else { - this.IsReachEnd = false; + console.log(vr.length); + if(vr.length && vr.length != 0){ + if (vr.Collection_Transaction[0].ROW_NUM == vr.Collection_Transaction[0].NO_OF_ROWS) { + this.IsReachEnd = true; + } else { + this.IsReachEnd = false; + } + this.getResEITTransactionList.push(vr); } - this.getResEITTransactionList.push(vr); }); } else { this.IsReachEnd = true; diff --git a/Mohem/src/app/eit/home/home.component.html b/Mohem/src/app/eit/home/home.component.html index 7591dd7e..5008b103 100644 --- a/Mohem/src/app/eit/home/home.component.html +++ b/Mohem/src/app/eit/home/home.component.html @@ -64,7 +64,8 @@ {{menuItem.PROMPT}} - + + diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index fc8c4bf8..abca23ca 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -160,15 +160,15 @@ }, "check-user-text1":{ "en":"Please Enter your Employee ID, A ", - "ar":"" + "ar":"يرجى ادخال رقم الموظف " }, "check-user-text2":{ "en":"login Code ", - "ar":"" + "ar":"رمز تسجيل الدخول" }, "check-user-text3":{ "en":"will be sent to your mobile number", - "ar":"" + "ar":"سيتم ارساله الى رقم هاتفك" } }, "verificationcode": {
{{User_name_Emp}}
{{User_Job_name}}
{{CompanyImageDescription}}
{{companyDesc}}