From 8f9ef27ee153dac57ed430e65bb52d2e1e9f8c55 Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Mon, 2 Mar 2020 09:58:36 +0300 Subject: [PATCH] add my team to side menu & handle accural balance in absence page --- Mohem/src/app/absence/home/home.component.ts | 10 ++++++---- Mohem/src/app/app.component.html | 9 +++++++++ Mohem/src/app/app.component.ts | 14 +++++++++++++- Mohem/src/app/home/home.page.html | 7 ------- Mohem/src/app/home/home.page.ts | 12 +++++++++--- Mohem/src/assets/imgs/my_team_icon.png | Bin 0 -> 470 bytes Mohem/src/assets/localization/i18n.json | 4 ++-- 7 files changed, 39 insertions(+), 17 deletions(-) create mode 100644 Mohem/src/assets/imgs/my_team_icon.png diff --git a/Mohem/src/app/absence/home/home.component.ts b/Mohem/src/app/absence/home/home.component.ts index 398820e9..05b25d8b 100644 --- a/Mohem/src/app/absence/home/home.component.ts +++ b/Mohem/src/app/absence/home/home.component.ts @@ -55,7 +55,9 @@ export class HomeComponent implements OnInit { public absService: AbsenceListService, public accrualService: AccrualService, public authService: AuthenticationService - ) {} + ) { + // this.userData =this.common.sharedService.getSharedData(AuthenticatedUser.SHARED_DATA,false); + } ngOnInit() { @@ -66,8 +68,8 @@ export class HomeComponent implements OnInit { private getUserDetails(){ this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => { if (user) { - this.emp_no=user.EMPLOYEE_NUMBER; - this.getAccrualBalance(); + // this.emp_no=user.EMPLOYEE_NUMBER; + // this.getAccrualBalance(); } }); @@ -236,7 +238,7 @@ createAbsence() { let todayDate = month + '/' + day + '/' + year; let effectiveDate = todayDate; const request = { - P_SELECTED_EMPLOYEE_NUMBER: this.emp_no, + P_SELECTED_EMPLOYEE_NUMBER: this.selEmp, P_EFFECTIVE_DATE: effectiveDate }; diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 4a975deb..42371b1a 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -114,6 +114,15 @@ --> + + + + + + + {{ts.trPK('myTeam','myTeam-header')}} + +