diff --git a/Mohem/key.jks b/Mohem/key.jks index b608d41c..39fd02a6 100644 Binary files a/Mohem/key.jks and b/Mohem/key.jks differ diff --git a/Mohem/src/app/authentication/sms-page/sms-page.page.ts b/Mohem/src/app/authentication/sms-page/sms-page.page.ts index 57d0feba..85b11e31 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts @@ -417,6 +417,8 @@ export class SmsPageComponent implements OnInit { request.IsDeviceNFC = this.isNFCAvailable; + + this.authService.checkSMS(request, () => { }, this.translate.trPK('general', 'ok'), true).subscribe((result: SMSCheckResponse) => { if (this.common.validResponse(result)) { 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 9c0c8b92..61322cb3 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -28,8 +28,10 @@ export class ConnectorService { public static timeOut = 180 * 1000; // public static host = 'http://mohemm-app-test.srca.org.sa:1010/'; - public static host = 'https://erptstapp.srca.org.sa/' //TEST UAT - // public static host = 'https://masaderapp.srca.org.sa/' //LIVE + // public static host = 'https://erptstapp.srca.org.sa/' //TEST UAT + public static host = 'https://masaderapp.srca.org.sa/' //LIVE + // public static host = 'https://erpuat.sfh.med.sa/'; //UAR SFHP + diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 0f02c65a..99caadaf 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -173,6 +173,7 @@ export class HomePage implements OnInit { } ngOnInit() { + console.log('UUID IS: ' + this.device.uuid); let openDigitalIDCard = this.sharedData.getSharedData("loginWithDigitalIDButton", true); let openBusinessCard = this.sharedData.getSharedData("loginWithBusinessIDButton", true); this.direction = TranslatorService.getCurrentLanguageName(); @@ -840,7 +841,7 @@ export class HomePage implements OnInit { let totalTicketsLeft = 0; this.accrualBalancesList = result.GetAccrualBalancesList; for (const accrualBalance of result.GetAccrualBalancesList) { - if (accrualBalance.ACCURAL_PLAN_NAME === 'Annual Vacation Accrual' || accrualBalance.ACCURAL_PLAN_NAME == " خطة استحقاق الاجازة الاعتيادية") { + if (accrualBalance.ACCURAL_PLAN_NAME === 'Annual Vacation Accrual' || accrualBalance.ACCURAL_PLAN_NAME == "رصيد استحقاق الاجازة الاعتيادية") { 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');