fixing menu and scrolling in EIT

mekawy-issues
enadhilal 6 years ago
parent 04e35853a5
commit 7c4d3327d6

@ -3,7 +3,163 @@
<ion-app [dir]="direction"> <ion-app [dir]="direction">
<ion-split-pane> <ion-split-pane>
<ion-menu [side]=" direction === 'rtl' ? 'end' : 'start'" [swipeGesture]="false"> <!-- <ion-menu [side]=" direction === 'rtl' ? 'end' : 'start'" [swipeGesture]="false"> -->
<ion-menu side='start' *ngIf="direction ==='ltr'">
<ion-content class="sidebar-menu">
<div class="header-div">
<div>
<ion-button class="closeIcon" (click)="closeMenu()">
<img style= "height: 18px !important;" src="../assets/imgs/close_menu_icon.png "></ion-button>
</div>
<div *ngIf='direction==="ltr"' style="border-bottom: rgb(190, 186, 186) solid 1px;" >
<img class="mohemmLogo" src="../assets/imgs/menu_mohemm_logo.png" ></div>
<hr>
<div *ngIf='direction ==="rtl"' style="border-bottom: rgb(190, 186, 186) solid 1px;" >
<img class="mohemmLogo-ar" src="../assets/imgs/menu_mohemm_logo.png" ></div>
<hr>
</div>
<div class="centerDiv homeBox" (click)="openPersonalInfo()">
<div [ngClass]="direction==='ltr'? 'profileDiv':'profileDiv-ar'">
<!-- <ion-img class="profileImg" src="{{user_image}}"></ion-img> -->
<img class="profileImg" [src]="user_image">
<p class="TxtPlace">{{User_name_Emp}}</p>
<p class="TxtPlaces"> {{User_Job_name}}</p>
</div>
</div>
<!-- <div class="changeImgBtn">
<button ion-button icon-only menuToggle class="menubutton" (click)="changeImage()">
<ion-icon (click)="changeImage();" class="changeIcon" name="md-create"></ion-icon></button>
</div> -->
<!-- <div class="changeImgBtn">
<ion-button class="editIcon" (click)="changeImage()">
<img style= "height: 13px !important;" src="../assets/imgs/edit_icon.png ">
</ion-button>
<img class="menuImg" [src]="user_image"></div> -->
<!-- <div class="centerDiv">
<p class="TxtPlace">{{ts.trPK('home')}}, {{User_name_Emp}}</p>
//<div> <img src="{{user_image}}" class="profileImg"></div>
//<div><img class="menuImg" [src]="user_image"></div>
<p class="TxtPlaces">{{ts.trPK('home')}}, {{User_Job_name}}</p>
</div> -->
<div style="border-bottom: rgb(190, 187, 187) solid 1px;" >
<button [ngClass]="direction ==='ltr'? 'logout':'logout-ar'" ion-button (click)="logout();" > {{ts.trPK('home','logout')}}</button>
</div>
<!-- <div>
<ion-item (click)="logout();">
<ion-thumbnail slot="start" class="menu-thumb">
<img width="30" src="../assets/imgs/signout.png" item-left>
</ion-thumbnail>
<ion-label>
{{ts.trPK('home','logout')}}
</ion-label>
</ion-item>
</div> -->
<br>
<ion-list>
<ion-item (click)="profile()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 24px !important;" src="../assets/imgs/profile_icon.png" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('userProfile','title')}}
</ion-label>
</ion-item>
<!-- <ion-item (click)="openChangePassword()"> -->
<ion-item (click)="openChangePassword()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 25px !important;" src="../assets/imgs/lock_icon.png" item-left>
</ion-thumbnail>
<ion-label class="changepassword" >
{{ts.trPK('login','changepassword')}}
<ion-badge [ngClass]=" direction === 'rtl' ? 'end-badge' : 'start-badge'" slot="end" color="danger" class="main-badge">{{notBadge}}</ion-badge>
</ion-label>
<!-- <button class="menu-item" ion-item menuClose ion-item (click)="goToWorkListPage()" >
</button> -->
</ion-item>
<ion-item [hidden]="TeamFlag!='true'" (click)="openMyTeamPage()">
<ion-thumbnail slot="start" class="menu-thumb">
<img style= "height: 14px !important;" src="../assets/imgs/my_team_icon.png" item-left>
</ion-thumbnail>
<ion-label class="profile">
{{ts.trPK('myTeam','myTeam-header')}}
</ion-label>
</ion-item>
<!-- <ion-item (click)="profile()">
<ion-thumbnail slot="start" class="menu-thumb">
<img width="30" src="../assets/imgs/profile_icon.png" item-left>
</ion-thumbnail>
<ion-label>
{{ts.trPK('userProfile','title')}}
</ion-label>
</ion-item> -->
<!-- <ion-item (click)="logout();">
<ion-thumbnail slot="start" class="menu-thumb">
<img width="30" src="../assets/imgs/signout.png" item-left>
</ion-thumbnail>
<ion-label>
{{ts.trPK('home','logout')}}
</ion-label>
</ion-item> -->
</ion-list>
<div class="" style="text-align:center">
<img src="{{companyUrl}}" class="CompanyImg logoImg">
<p class="companyTxt">{{CompanyImageDescription}}</p>
</div>
<div class="menuFooter">
<!-- <div> <img src="../assets/imgs/CS.png" class="CompanyImg"></div> -->
<p class="companyTxt">{{companyDesc}}</p>
</div>
</ion-content>
</ion-menu>
<ion-menu side='end' *ngIf="direction ==='rtl'">
<ion-content class="sidebar-menu"> <ion-content class="sidebar-menu">
<div class="header-div"> <div class="header-div">
<div> <div>
@ -157,7 +313,6 @@
<p class="companyTxt">{{companyDesc}}</p> <p class="companyTxt">{{companyDesc}}</p>
</div> </div>
</ion-content> </ion-content>
</ion-menu> </ion-menu>
<ion-router-outlet main></ion-router-outlet> <ion-router-outlet main></ion-router-outlet>

@ -62,8 +62,8 @@
<a (click)="signUp()">{{ts.trPK('login','signup')}}</a> <a (click)="signUp()">{{ts.trPK('login','signup')}}</a>
</div> </div>
<div class="gridDiv" aria-disabled="true"> <div class="gridDiv" aria-disabled="true">
<button class="gridBtn" ion-button (click)="changeLanguage()" [ngClass]="{'active':this.currentLang ==1}">English</button> <button class="gridBtn" ion-button (click)="changeLanguage('1')" [ngClass]="{'active':this.currentLang ==1}">English</button>
<button class="gridBtn arTxt" ion-button (click)="changeLanguage()" [ngClass]="{'active':this.currentLang ==2}">عربي</button> <button class="gridBtn arTxt" ion-button (click)="changeLanguage('2')" [ngClass]="{'active':this.currentLang ==2}">عربي</button>
<!-- <button class="gridBtn" ion-button (click)="changeLanguage()" style="background: #dcdcdc !important;color: #ccc6c6 !important;margin: 1px;width: 49%">English</button> <!-- <button class="gridBtn" ion-button (click)="changeLanguage()" style="background: #dcdcdc !important;color: #ccc6c6 !important;margin: 1px;width: 49%">English</button>
<button class="gridBtn arTxt" ion-button (click)="changeLanguage()" style="background: #dcdcdc !important;color: #ccc6c6 !important;margin: 1px;width: 49%">عربي</button> --> <button class="gridBtn arTxt" ion-button (click)="changeLanguage()" style="background: #dcdcdc !important;color: #ccc6c6 !important;margin: 1px;width: 49%">عربي</button> -->
</div> </div>

@ -93,6 +93,14 @@ export class LoginComponent implements OnInit, OnDestroy {
} }
ngOnInit() { 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); // this.deviceToken= this.cs.sharedService.getSharedData(AuthenticationService.DEVICE_TOKEN, false);
// console.log("get deviceToken login"+ this.deviceToken) // console.log("get deviceToken login"+ this.deviceToken)
@ -178,18 +186,25 @@ export class LoginComponent implements OnInit, OnDestroy {
ngOnDestroy(): void { ngOnDestroy(): void {
this.backClicked(); this.backClicked();
} }
public changeLanguage() {
this.ts.switchLanguage(); public changeLanguage(langNumber) {
if (TranslatorService.CURRENT_LANGUAGE == TranslatorService.EN) { if(this.currentLang == langNumber){
this.language = "US"; return;
} else { }else{
this.language = "AR"; 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() { private forgetPasswordPage() {
this.cs.openUserForgot(); this.cs.openUserForgot();
} }
private hideSplashScreen(stopLoading = false) { private hideSplashScreen(stopLoading = false) {
// this.splash.hide(); // this.splash.hide();
if (stopLoading) { if (stopLoading) {

@ -1176,7 +1176,7 @@ export class AddEitComponent implements OnInit {
let numbervalue: any = 0; let numbervalue: any = 0;
let dateValue: any = null; let dateValue: any = null;
let transNo: number = this.comtransNo; let transNo: number = this.comtransNo;
let textValue = ""; let textValue : any;
// if(this.ExtraObj.transactionNo) // if(this.ExtraObj.transactionNo)
// transNo=this.ExtraObj.transactionNo; // transNo=this.ExtraObj.transactionNo;
for (let i = 0; i < this.eitResponse.length; i++) { for (let i = 0; i < this.eitResponse.length; i++) {
@ -1230,7 +1230,11 @@ export class AddEitComponent implements OnInit {
} else { } else {
elem.classList.remove("requiredClassElm"); elem.classList.remove("requiredClassElm");
} }
if (elemVal) varcharValue = elemVal; if (elemVal != 'null'){
varcharValue = elemVal;
} else{
elemVal = null;
}
valuseArr.push({ valuseArr.push({
TRANSACTION_NUMBER: transNo, TRANSACTION_NUMBER: transNo,
NAME: this.eitResponse[i].APPLICATION_COLUMN_NAME, NAME: this.eitResponse[i].APPLICATION_COLUMN_NAME,

@ -141,12 +141,15 @@ export class EitListComponent implements OnInit {
this.P_PAGE_NUM++; this.P_PAGE_NUM++;
this.EITTransactionsListObj.P_PAGE_NUM = this.P_PAGE_NUM; this.EITTransactionsListObj.P_PAGE_NUM = this.P_PAGE_NUM;
result.GetEITTransactionList.forEach(vr => { result.GetEITTransactionList.forEach(vr => {
if (vr.Collection_Transaction[0].ROW_NUM == vr.Collection_Transaction[0].NO_OF_ROWS) { console.log(vr.length);
this.IsReachEnd = true; if(vr.length && vr.length != 0){
} else { if (vr.Collection_Transaction[0].ROW_NUM == vr.Collection_Transaction[0].NO_OF_ROWS) {
this.IsReachEnd = false; this.IsReachEnd = true;
} else {
this.IsReachEnd = false;
}
this.getResEITTransactionList.push(vr);
} }
this.getResEITTransactionList.push(vr);
}); });
} else { } else {
this.IsReachEnd = true; this.IsReachEnd = true;

@ -64,7 +64,8 @@
<ion-label> <ion-label>
<b text-wrap>{{menuItem.PROMPT}}</b> <b text-wrap>{{menuItem.PROMPT}}</b>
<ion-icon style="float: right;font-size: 25px;color: grey;" name="arrow-forward"></ion-icon> <!-- <ion-icon style="float: right;font-size: 25px;color: grey;" name="arrow-forward"></ion-icon> -->
<ion-icon [ngClass]='direction == "en"? "span-arrow-en":"span-arrow-ar"' name="arrow-forward"></ion-icon>
</ion-label> </ion-label>

@ -160,15 +160,15 @@
}, },
"check-user-text1":{ "check-user-text1":{
"en":"Please Enter your Employee ID, A ", "en":"Please Enter your Employee ID, A ",
"ar":"" "ar":"يرجى ادخال رقم الموظف "
}, },
"check-user-text2":{ "check-user-text2":{
"en":"login Code ", "en":"login Code ",
"ar":"" "ar":"رمز تسجيل الدخول"
}, },
"check-user-text3":{ "check-user-text3":{
"en":"will be sent to your mobile number", "en":"will be sent to your mobile number",
"ar":"" "ar":"سيتم ارساله الى رقم هاتفك"
} }
}, },
"verificationcode": { "verificationcode": {

Loading…
Cancel
Save