diff --git a/Mohem/src/app/eit/home/home.component.html b/Mohem/src/app/eit/home/home.component.html index 944ae6ef..761904cc 100644 --- a/Mohem/src/app/eit/home/home.component.html +++ b/Mohem/src/app/eit/home/home.component.html @@ -1,5 +1,5 @@ - + {{headerTitle}} @@ -10,34 +10,40 @@ - - - - + + + - + - +
- - {{menuItem.PROMPT}} - - + + {{menuItem.PROMPT}} + + + + +
- - + - -  {{subPage.PROMPT}} - - + +  {{subPage.PROMPT}} + + +
- +
\ No newline at end of file diff --git a/Mohem/src/app/eit/home/home.component.scss b/Mohem/src/app/eit/home/home.component.scss index 76bf1ca5..cc7f2852 100644 --- a/Mohem/src/app/eit/home/home.component.scss +++ b/Mohem/src/app/eit/home/home.component.scss @@ -4,16 +4,16 @@ ion-item.custCollabs.item.item-block.item-ios { } .ion-item-styling { - -webkit-box-shadow: 0px 2px 7px 0px #7f8c8d; - -moz-box-shadow: 0px 2px 7px 0px #7f8c8d; - box-shadow: 0px 2px 7px 0px #7f8c8d; - color: #209a83 !important; - border: 0px; - border-radius: 5px; + color: black; line-height: 2; margin: 8px 2px; min-height: 40px; background-color: #ffffff; + border-bottom: 1px solid #c8c8c8; +} + +.header-toolbar-new{ + --background: #22c6b3; } ion-item.item.item-block { diff --git a/Mohem/src/app/eit/home/home.component.ts b/Mohem/src/app/eit/home/home.component.ts index 75909a97..cb228fed 100644 --- a/Mohem/src/app/eit/home/home.component.ts +++ b/Mohem/src/app/eit/home/home.component.ts @@ -21,7 +21,7 @@ export class HomeComponent implements OnInit { this.menu = this.cs.sharedService.getSharedData('menuEntries', false); this.selMenu = this.cs.sharedService.getSharedData(MenuResponse.SHARED_DATA, false); const title: string = this.ts.trPK('eit', 'my-requests'); - this.headerTitle = this.selMenu.List_Menu.MENU_NAME ? this.selMenu.List_Menu.MENU_NAME : title; + this.headerTitle = this.menu.PROMPT ? this.menu.PROMPT : title; } ngOnInit() { } @@ -40,6 +40,7 @@ export class HomeComponent implements OnInit { this.selectedMenu = index; } } + console.log("selected>>>>>>>"+this.selectedMenu); } goToRequest(menuEntry) { diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index c29c014b..bba5dc30 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -554,10 +554,13 @@ export class HomePage implements OnInit { this.common.openAbsencePage(); } else if (subMenu.REQUEST_TYPE === 'EIT') { this.common.openEitListPage(); - } - if (subMenu.REQUEST_TYPE === 'PAYSLIP') { + } else if (subMenu.REQUEST_TYPE === 'PAYSLIP') { this.common.openPayslipPage(); + } else if (subMenu.MENU_ENTRY_TYPE === 'MENU') { + this.common.sharedService.setSharedData(selMenu.GetMenuEntriesList, "menuEntries"); + this.common.openEITPage(); } + } getAccrualBalance() {