diff --git a/Mohem/src/app/absence/home/home.component.ts b/Mohem/src/app/absence/home/home.component.ts index b3c4c8cf..93cde181 100644 --- a/Mohem/src/app/absence/home/home.component.ts +++ b/Mohem/src/app/absence/home/home.component.ts @@ -95,17 +95,17 @@ export class HomeComponent implements OnInit { false ); this.leaveAccrualBalance = this.common.sharedService.getSharedData('leaveAccrualBalance', false); - console.log("this.leaveAccrualBalance>>>>>>>>>>" + this.leaveAccrualBalance.ACCRUAL_NET_ENTITLEMENT); + // console.log("this.leaveAccrualBalance>>>>>>>>>>" + this.leaveAccrualBalance.ACCRUAL_NET_ENTITLEMENT); /*** ACCRUAL_NET_ENTITLEMENT: 24.59 ACCRUAL_USED_ENTITLEMENT: 0 ACCRUAL_YEARLY_ENTITLEMENT: 50.4*/ - this.accrualNet = this.leaveAccrualBalance.ACCRUAL_NET_ENTITLEMENT; - this.accrualUsed = this.leaveAccrualBalance.ACCRUAL_USED_ENTITLEMENT; - this.accrualYearly = this.leaveAccrualBalance.ACCRUAL_YEARLY_ENTITLEMENT; - this.totalnumber = this.accrualNet + this.accrualUsed + this.accrualYearly; - this.totalnumber = this.totalnumber.toFixed(3); - this.request = this.common.sharedService.getSharedData('leaveAccrualBalanceDate', false); + // this.accrualNet = this.leaveAccrualBalance.ACCRUAL_NET_ENTITLEMENT; + // this.accrualUsed = this.leaveAccrualBalance.ACCRUAL_USED_ENTITLEMENT; + // this.accrualYearly = this.leaveAccrualBalance.ACCRUAL_YEARLY_ENTITLEMENT; + // this.totalnumber = this.accrualNet + this.accrualUsed + this.accrualYearly; + // this.totalnumber = this.totalnumber.toFixed(3); + // this.request = this.common.sharedService.getSharedData('leaveAccrualBalanceDate', false); console.log("this.request" + this.request.P_EFFECTIVE_DATE); this.effectiveDate = this.request.P_EFFECTIVE_DATE; this.data = { @@ -249,11 +249,11 @@ export class HomeComponent implements OnInit { P_EFFECTIVE_DATE: effectiveDate }; - this.accrualService - .getAccrualBalances(request) - .subscribe((result: any) => { - this.handleAccrualResult(result); - }); + // this.accrualService + // .getAccrualBalances(request) + // .subscribe((result: any) => { + // this.handleAccrualResult(result); + // }); } } diff --git a/Mohem/src/app/accrual-balances/home/home.component.ts b/Mohem/src/app/accrual-balances/home/home.component.ts index 7739075c..4b8c7c23 100644 --- a/Mohem/src/app/accrual-balances/home/home.component.ts +++ b/Mohem/src/app/accrual-balances/home/home.component.ts @@ -46,11 +46,11 @@ export class HomeComponent implements OnInit { P_SELECTED_EMPLOYEE_NUMBER: this.emp_no, P_EFFECTIVE_DATE: effectiveDate }; - this.accrualService - .getAccrualBalances(request) - .subscribe((result: any) => { - this.handleAccrualResult(result); - }); + // this.accrualService + // .getAccrualBalances(request) + // .subscribe((result: any) => { + // this.handleAccrualResult(result); + // }); } } handleAccrualResult(result) { diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.ts b/Mohem/src/app/eit/eit-list/eit-list.component.ts index 5bde6589..dcc05a2e 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.ts +++ b/Mohem/src/app/eit/eit-list/eit-list.component.ts @@ -128,11 +128,11 @@ export class EitListComponent implements OnInit { P_SELECTED_EMPLOYEE_NUMBER: this.selEmp, P_EFFECTIVE_DATE: effectiveDate }; - this.accrualService - .getAccrualBalances(request) - .subscribe((result: any) => { - this.handleAccrualResult(result); - }); + // this.accrualService + // .getAccrualBalances(request) + // .subscribe((result: any) => { + // this.handleAccrualResult(result); + // }); } } handleAccrualResult(result) { diff --git a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts index 7a6413ae..47a0c271 100644 --- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts +++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts @@ -142,8 +142,8 @@ export class AuthenticationService { } else { mobileType = 'android'; } - request.VersionID = 3.2; - request.Channel = 43; + request.VersionID = 3.8; + request.Channel = 31; request.LanguageID = TranslatorService.getCurrentLanguageCode(); request.MobileType = mobileType; 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 ca8275ff..493a3c78 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -27,8 +27,8 @@ export class ConnectorService { public static retryTimes = 0; public static timeOut = 180 * 1000; - public static host = 'http://10.10.150.249:1234/'; - // public static host = 'https://uat.hmgwebservices.com/'; + // public static host = 'http://10.10.150.249:1234/'; + public static host = 'https://uat.hmgwebservices.com/'; // public static host = 'https://hmgwebservices.com/'; diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index b6ceb5e9..e16a355a 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -372,8 +372,8 @@ export class HomePage implements OnInit { // this.showOpenMissingSwipes(); // this.showAttendanceTracking(); var accrualBalance = this.common.sharedService.getSharedData('leaveAccrualBalance', false); - if (!accrualBalance) - this.getAccrualBalance(); + // if (!accrualBalance) + // this.getAccrualBalance(); } public Vacation_Rule() { @@ -788,7 +788,7 @@ export class HomePage implements OnInit { this.openPage(this.missingSwipeRequestObject); // tslint:disable-next-line: triple-equals } else if (link == '3') { - this.openPage(this.leaveRequestObject); + // this.openPage(this.leaveRequestObject); // tslint:disable-next-line: triple-equals } else if (link == '4') { this.openPage(this.ticketRequestObject);