diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 5b40ba6e..2e8eef89 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -45,14 +45,14 @@ - + @@ -66,7 +66,7 @@ - + - + @@ -141,14 +141,14 @@ {{ts.trPK('myTeam','myTeam-header')}} - + @@ -165,7 +165,7 @@ --> - + - + diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 66d3a378..b78253c3 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -69,11 +69,6 @@ export class HomePage implements OnInit { public isFakeLocationUsed = false; public intervalCountdown: any; public statsButtons = [ - { - title: this.ts.trPK('attendance-tracking', 'title'), - link: '0', - show: true - }, { title: this.ts.trPK('home', 'worklist'), statsValue: 0, @@ -81,13 +76,6 @@ export class HomePage implements OnInit { link: '1', show: true }, - { - title: this.ts.trPK('home', 'missing-swipes'), - statsValue: 0, - icon: 'assets/icon/new-design/missing_swipe.png', - link: '2', - show: true - }, { title: this.ts.trPK('home', 'leave-balance'), statsValue: 0, @@ -304,8 +292,8 @@ export class HomePage implements OnInit { for (const servicePrivilage of AuthenticationService.servicePrivilage) { if (servicePrivilage.Previlege === false) { if (servicePrivilage.ServiceName === 'accrualBalance') { - this.statsButtons[3].show = false; - this.statsButtons[4].show = false; + this.statsButtons[1].show = false; + this.statsButtons[2].show = false; } if (servicePrivilage.ServiceName === 'vacationRule') { this.showVcationRule = false; @@ -316,8 +304,8 @@ export class HomePage implements OnInit { // document.getElementById(servicePrivilage.ServiceName).style.filter = // 'grayscale(1)'; } else { - this.statsButtons[3].show = true; - this.statsButtons[4].show = true; + this.statsButtons[1].show = true; + this.statsButtons[2].show = true; this.showVcationRule = true; } } @@ -370,8 +358,8 @@ export class HomePage implements OnInit { this.getMenu(); this.setServicesPrivilage(); this.openNotificationsDashbored(); - this.showOpenMissingSwipes(); - this.showAttendanceTracking(); + // this.showOpenMissingSwipes(); + // this.showAttendanceTracking(); this.getAccrualBalance(); } @@ -652,7 +640,8 @@ export class HomePage implements OnInit { if (this.common.validResponse(result)) { const key = 'P_OPEN_NTF_NUMBER'; this.countAllNotification = result[key]; - this.ITGCountAllNotification(); + // this.ITGCountAllNotification(); + this.statsButtons[0].statsValue = Math.floor(this.countAllNotification); this.common.sharedService.setSharedData( result, 'worklistNotifications' @@ -741,7 +730,7 @@ export class HomePage implements OnInit { this.accrualBalancesList = result.GetAccrualBalancesList; for (const accrualBalance of result.GetAccrualBalancesList) { if (accrualBalance.ACCURAL_PLAN_NAME === 'HMG Annual Vacation Accrual Plan') { - this.statsButtons[3].statsValue = accrualBalance.ACCRUAL_NET_ENTITLEMENT === null ? 0 : Number(accrualBalance.ACCRUAL_NET_ENTITLEMENT.toFixed(2)); + this.statsButtons[1].statsValue = accrualBalance.ACCRUAL_NET_ENTITLEMENT === null ? 0 : Number(accrualBalance.ACCRUAL_NET_ENTITLEMENT.toFixed(2)); this.common.sharedService.setSharedData(accrualBalance, 'leaveAccrualBalance'); this.common.sharedService.setSharedData(request, 'leaveAccrualBalanceDate'); this.common.sharedService.setSharedData(this.accrualBalancesList, 'tickitsbalance'); @@ -749,7 +738,7 @@ export class HomePage implements OnInit { totalTicketsLeft = totalTicketsLeft + accrualBalance.ACCRUAL_NET_ENTITLEMENT; } } - this.statsButtons[4].statsValue = Number(totalTicketsLeft.toFixed(2)); + this.statsButtons[2].statsValue = Number(totalTicketsLeft.toFixed(2)); } }); }