diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index d327d588..1390c719 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -62,7 +62,7 @@ -->
- + @@ -185,7 +185,7 @@ -->
- + diff --git a/Mohem/src/app/app.component.ts b/Mohem/src/app/app.component.ts index 0c01d253..b4468a06 100644 --- a/Mohem/src/app/app.component.ts +++ b/Mohem/src/app/app.component.ts @@ -222,6 +222,7 @@ export class AppComponent implements OnInit { this.events.subscribe('myTeamFlag', myTeamFlag => { this.TeamFlag = myTeamFlag; this.menuList = this.cs.sharedService.getSharedData(MenuResponse.MENU_LIST, false); + console.log(this.menuList); }); } diff --git a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss index 7be7a63d..105de352 100644 --- a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss +++ b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss @@ -18,6 +18,7 @@ .iconBox img{ margin: 0px auto 10px; display: block; + width: 35px; // max-width: 35%; } diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 6e8deb5f..fb03f242 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -372,7 +372,8 @@ export class HomePage implements OnInit { callDashboardServices() { this.getMenu(); - this.setServicesPrivilage(); + this.statsButtons[1].show = true; + // this.setServicesPrivilage(); if (this.common.getTotalNumberOfWorklistRequest()) { this.statsButtons[0].statsValue = this.common.getTotalNumberOfWorklistRequest(); this.showLoader = false; @@ -384,7 +385,7 @@ export class HomePage implements OnInit { //this.showAttendanceTracking(); //var accrualBalance = this.common.sharedService.getSharedData('leaveAccrualBalance', false); // if (!accrualBalance) - // this.getAccrualBalance(); + this.getAccrualBalance(); } public Vacation_Rule() { @@ -427,6 +428,8 @@ export class HomePage implements OnInit { if (this.menuList[i].MENU_TYPE === 'M') { this.events.publish('myTeamFlag', 'true'); // this.common.sharedService.setSharedData('true', "myTeamFlag"); + } else { + this.events.publish('myTeamFlag', 'false'); } }