From 32270138e56ff6ec11e11dc7fbf7738b1bcaed33 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Wed, 3 Aug 2022 15:18:50 +0300 Subject: [PATCH 1/2] removed business card and digital id --- Mohem/src/app/app.component.html | 16 ++++++++-------- .../ui/welcome-login/welcome.component.html | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 2d340a4d..5ab3d98a 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -92,7 +92,7 @@ --> - + - + @@ -219,7 +219,7 @@ --> - + - + + From 6ba9a7b08b4fed39db2fedc45708d2fcadd0ddf2 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Thu, 4 Aug 2022 16:52:21 +0300 Subject: [PATCH 2/2] fixed moe issues --- Mohem/src/app/absence/home/home.component.ts | 4 +- .../services/common/common.service.ts | 2 +- .../services/connector/connector.service.ts | 2 +- Mohem/src/app/home/home.page.html | 4 +- Mohem/src/app/home/home.page.ts | 48 +++++++++++-------- .../add-address/add-address.component.html | 8 ++-- .../add-address/add-address.component.ts | 7 +-- .../add-basic-details.component.ts | 2 +- Mohem/src/app/profile/home/home.component.ts | 1 + 9 files changed, 43 insertions(+), 35 deletions(-) diff --git a/Mohem/src/app/absence/home/home.component.ts b/Mohem/src/app/absence/home/home.component.ts index e0e22e86..f76a31bf 100644 --- a/Mohem/src/app/absence/home/home.component.ts +++ b/Mohem/src/app/absence/home/home.component.ts @@ -263,8 +263,8 @@ export class HomeComponent implements OnInit { this.balance = result.GetAccrualBalancesList; } if (this.balance) { - this.accrualNet = this.balance[0].ACCRUAL_NET_ENTITLEMENT; - this.accrualUsed = this.balance[0].ACCRUAL_USED_ENTITLEMENT; + this.accrualNet = this.balance[1].ACCRUAL_NET_ENTITLEMENT; + this.accrualUsed = this.balance[1].ACCRUAL_USED_ENTITLEMENT; // this.accrualYearly = this.balance[0].ACCRUAL_YEARLY_ENTITLEMENT; // this.totalnumber= this.accrualNet + this.accrualUsed + this.accrualYearly; this.totalnumber = this.accrualNet + this.accrualUsed; 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 b4fd54bf..5c2c322f 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -1588,6 +1588,7 @@ export class CommonService { public totalCounter = 0; getTotalNumberOfWorklistRequest() { + console.log(this.sharedService.getSharedData('total-count', false)); this.totalCounter = parseInt(this.sharedService.getSharedData('total-count', false)); return this.totalCounter ? this.totalCounter : 0; } @@ -1600,7 +1601,6 @@ export class CommonService { public setFilterValues(data) { for (const notification of data) { - this.filterKeys[notification.ITEM_TYPE] = notification.OPEN_NTF_NUMBER } } diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts index 04f3a8ac..6fafe7da 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -27,7 +27,7 @@ export class ConnectorService { public static retryTimes = 0; public static timeOut = 180 * 1000; - //public static host = 'https://uat.hmgwebservices.com/'; + // public static host = 'https://uat.hmgwebservices.com/'; // public static host = 'https://hmgwebservices.com/'; public static host = 'http://riyt-mohemm1:1010/' //MOE constructor(public httpClient: HttpClient, diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html index 00a271ad..96135eb2 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -10,9 +10,9 @@ -
+ { + this.common.stopLoading(); this.handleMenuEntiresResult(result); }); } @@ -510,7 +512,7 @@ export class HomePage implements OnInit { if (result.GetMenuEntriesList[i].FUNCTION_NAME == 'HMG_TKT_NEW_EIT_SS') { this.ticketRequestObject = result.GetMenuEntriesList[i]; // tslint:disable-next-line: triple-equals - } else if (result.GetMenuEntriesList[i].FUNCTION_NAME == 'HR_LOA_SS') { + } else if (result.GetMenuEntriesList[i].FUNCTION_NAME == 'XXX_HR_EIT_LOA_CREATE_SS') { this.leaveRequestObject = result.GetMenuEntriesList[i]; // tslint:disable-next-line: triple-equals } else if (result.GetMenuEntriesList[i].FUNCTION_NAME == 'HMG_OTL_MISSING_SWIPE_EIT_SS') { @@ -671,6 +673,9 @@ export class HomePage implements OnInit { const key = 'P_OPEN_NTF_NUMBER'; this.countAllNotification = result[key]; this.statsButtons[0].statsValue = this.countAllNotification; + this.common.sharedService.setSharedData(this.statsButtons[0].statsValue, 'total-count'); + console.log(this.common.sharedService.getSharedData('total-count', false)); + console.log(this.common.getTotalNumberOfWorklistRequest()); this.common.stopLoading(); //this.ITGCountAllNotification(); this.common.sharedService.setSharedData( @@ -778,7 +783,7 @@ export class HomePage implements OnInit { ); selMenu.GetMenuEntriesList = subMenu; this.common.sharedService.setSharedData(selMenu, MenuResponse.SHARED_DATA); - if (subMenu.REQUEST_TYPE === 'ABSENCE') { + if (subMenu.REQUEST_TYPE === 'EIT' && subMenu.FUNCTION_NAME === 'XXX_HR_EIT_LOA_CREATE_SS') { this.common.openAbsencePage(); } else if (subMenu.REQUEST_TYPE === 'EIT') { this.common.openEitListPage(); @@ -818,16 +823,17 @@ export class HomePage implements OnInit { let totalTicketsLeft = 0; 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)); + if (accrualBalance.ACCURAL_PLAN_NAME === 'Annual Vacation Accrual') { + 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'); - } else { - totalTicketsLeft = totalTicketsLeft + accrualBalance.ACCRUAL_NET_ENTITLEMENT; + // this.common.sharedService.setSharedData(this.accrualBalancesList, 'tickitsbalance'); } + // else { + // totalTicketsLeft = totalTicketsLeft + accrualBalance.ACCRUAL_NET_ENTITLEMENT; + // } } - this.statsButtons[4].statsValue = Number(totalTicketsLeft.toFixed(2)); + // this.statsButtons[4].statsValue = Number(totalTicketsLeft.toFixed(2)); } }); } @@ -847,8 +853,8 @@ export class HomePage implements OnInit { // this.getDeviceLocation(); this.showAttendanceOptions(); // tslint:disable-next-line: triple-equals - } else if (link == '1' && this.showLoader === false) { - this.common.sharedService.setSharedData(this.statsButtons[1].statsValue, 'total-count'); + } else if (link == '1') { + // this.common.sharedService.setSharedData(this.statsButtons[1].statsValue, 'total-count'); this.common.startLoading(); this.common.openNotificationPage(); // tslint:disable-next-line: triple-equals diff --git a/Mohem/src/app/profile/add-address/add-address.component.html b/Mohem/src/app/profile/add-address/add-address.component.html index 695cd8b3..ef083651 100644 --- a/Mohem/src/app/profile/add-address/add-address.component.html +++ b/Mohem/src/app/profile/add-address/add-address.component.html @@ -9,17 +9,17 @@ - + + {{'vacation-rule, effectiveDate' | translate}}