diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index a066ac5e..39623535 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -65,7 +65,7 @@ - + @@ -182,14 +182,15 @@ - + + diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts index e12565fa..2167a69d 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -1626,15 +1626,6 @@ export class CommonService { disable: false, total: 0 }, - { - value: 0, - name: 'MR', - active: false, - color: '#3cb9d5', - key: 'INVMOA', - disable: false, - total: 0 - }, { value: 0, name: 'PR', @@ -1652,49 +1643,17 @@ export class CommonService { key: 'POAPPRV', disable: false, total: 0 - }, - { - value: 0, - name: 'ITG', - active: false, - color: '#cc3232', - key: 'ITG', - disable: false, - total: 0 - }, - { - value: 0, - name: 'IC', - active: false, - color: '#9e7e97', - key: 'INVITEM', - disable: false, - total: 0 - }, - { - value: 0, - name: 'STAMP', - active: false, - color: '#ff9800', - key: 'STAMP', - disable: false, - total: 0, - }, - + } ]; public data = { datasets: [ { - data: [0, 0, 0, 0, 0, 0, 0], + data: [0, 0, 0, 0, 0], backgroundColor: [ '#18a169', - '#3cb9d5', '#114475', - '#38c9b3', - '#cc3232', - '#9e7e97', - '#ff9800' + '#38c9b3' ], borderWidth: 6 }] @@ -1705,21 +1664,12 @@ export class CommonService { // if (notification.ITEM_TYPE === 'HRSSA') { this.filters[0].value = this.filterKeys['HRSSA']; this.data.datasets[0].data[0] = this.filterKeys['HRSSA']; - // } else if (notification.ITEM_TYPE === 'INVMOA') { - this.filters[1].value = this.filterKeys['INVMOA']; - this.data.datasets[0].data[1] = this.filterKeys['INVMOA']; // } else if (notification.ITEM_TYPE === 'REQAPPRV') { - this.filters[2].value = this.filterKeys['REQAPPRV']; - this.data.datasets[0].data[2] = this.filterKeys['REQAPPRV']; + this.filters[1].value = this.filterKeys['REQAPPRV']; + this.data.datasets[0].data[1] = this.filterKeys['REQAPPRV']; // } else if (notification.ITEM_TYPE === 'POAPPRV') { - this.filters[3].value = this.filterKeys['POAPPRV']; - this.data.datasets[0].data[3] = this.filterKeys['POAPPRV']; - // } else if (notification.ITEM_TYPE === 'INVITEM') { - this.filters[5].value = this.filterKeys['INVITEM']; - this.data.datasets[0].data[5] = this.filterKeys['INVITEM']; - // } else if (notification.ITEM_TYPE === 'STAMP') { - this.filters[6].value = this.filterKeys['STAMP']; - this.data.datasets[0].data[6] = this.filterKeys['STAMP']; + this.filters[2].value = this.filterKeys['POAPPRV']; + this.data.datasets[0].data[2] = this.filterKeys['POAPPRV']; let val = { 'filters': [], 'data': {} }; diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 8b234183..4d308791 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -69,6 +69,11 @@ 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, @@ -292,7 +297,7 @@ export class HomePage implements OnInit { for (const servicePrivilage of AuthenticationService.servicePrivilage) { if (servicePrivilage.Previlege === false) { if (servicePrivilage.ServiceName === 'accrualBalance') { - this.statsButtons[1].show = false; + this.statsButtons[2].show = false; // this.statsButtons[2].show = false; } if (servicePrivilage.ServiceName === 'vacationRule') { @@ -304,7 +309,7 @@ export class HomePage implements OnInit { // document.getElementById(servicePrivilage.ServiceName).style.filter = // 'grayscale(1)'; } else { - this.statsButtons[1].show = true; + this.statsButtons[2].show = true; // this.statsButtons[2].show = true; this.showVcationRule = true; } @@ -363,8 +368,8 @@ export class HomePage implements OnInit { this.openNotificationsDashbored(); } - this.showOpenMissingSwipes(); - this.showAttendanceTracking(); + // this.showOpenMissingSwipes(); + // this.showAttendanceTracking(); var accrualBalance = this.common.sharedService.getSharedData('leaveAccrualBalance', false); if (!accrualBalance) this.getAccrualBalance(); @@ -464,7 +469,7 @@ export class HomePage implements OnInit { ); this.eitService - .getMenuEntries(request, '', '', this.isPostNoLoad) + .getMenuEntries(request, '', '', false) .subscribe((result: MenuResponse) => { this.handleMenuEntiresResult(result); }); @@ -649,7 +654,7 @@ export class HomePage implements OnInit { const key = 'P_OPEN_NTF_NUMBER'; this.countAllNotification = result[key]; // this.ITGCountAllNotification(); - this.statsButtons[0].statsValue = Math.floor(this.countAllNotification); + this.statsButtons[1].statsValue = Math.floor(this.countAllNotification); this.common.sharedService.setSharedData( result, 'worklistNotifications' @@ -741,7 +746,7 @@ export class HomePage implements OnInit { this.accrualBalancesList = result.GetAccrualBalancesList; for (const accrualBalance of result.GetAccrualBalancesList) { if (accrualBalance.ACCURAL_PLAN_NAME === 'SFHP Annual Leave Plan') { - this.statsButtons[1].statsValue = accrualBalance.ACCRUAL_NET_ENTITLEMENT === null ? 0 : Number(accrualBalance.ACCRUAL_NET_ENTITLEMENT.toFixed(2)); + this.statsButtons[2].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'); diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index 78d2e320..43a8fa5b 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -1,7 +1,7 @@ @@ -11,21 +11,6 @@ {{ts.trPK('work-list','open-analysis')}} -<<<<<<< HEAD - - {{newWorkListResponse.length + ITGCount}} {{ts.trPK('work-list','of')}} - 0 && selectedFilter !== 'ALL' && itemType !== ''">{{newWorkListResponse.length}} {{ts.trPK('work-list','of')}} - {{totalRequestCount}} - 0 && itemType === ''">{{newWorkListResponse[0].NO_OF_ROWS + ITGCount}} - 0 && selectedFilter !== 'ALL' && itemType !== ''">{{newWorkListResponse[0].NO_OF_ROWS}} - {{ts.trPK('work-list','total')}} {{ts.trPK('work-list','open-reqest')}} - - - - - - -======= {{totalRequestCount}} @@ -40,7 +25,6 @@ ->>>>>>> MOHEMM-Q3-DEV-LATEST { this.ITGCount = this.common.filterKeys['ITG'];//result.TotalCount; // this.totalRequestCount = this.totalRequestCount + result.TotalCount; - this.data.datasets[0].data[4] = this.common.filterKeys['ITG'];//this.ITGCount; - this.filters[4].value = this.common.filterKeys['ITG']; + this.data.datasets[0].data[3] = this.common.filterKeys['ITG'];//this.ITGCount; + this.filters[3].value = this.common.filterKeys['ITG']; this.receivedITGCount = true; //}); //}