From 57f3e509354a98d58914c6a2aa2aed42cca2ef29 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Sun, 15 Jan 2023 16:36:07 +0300 Subject: [PATCH] fixed srca issues --- .../confirm-login/confirm-login.component.ts | 2 +- .../src/app/authentication/login/login.component.scss | 8 ++++---- Mohem/src/app/authentication/sms-page/sms-page.page.ts | 2 +- .../services/authentication/authentication.service.ts | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts index 288999e1..1b7ea3d5 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.ts @@ -380,7 +380,7 @@ export class ConfirmLoginComponent implements OnInit { this.authService.checkSMS(request, () => { }, this.ts.trPK('general', 'ok')) .subscribe((result: SMSCheckResponse) => { if (this.cs.validResponse(result)) { - // this.cs.sharedService.setSharedData(result.MemberLoginList.P_ORACLE_USER_NAME, 'oracle-user-name'); + this.cs.sharedService.setSharedData(result.MemberLoginList.P_ORACLE_USER_NAME, 'oracle-user-name'); this.businessInfo = { show_business: result.BusinessCardPrivilege, name_en: result.MemberInformationList[0].EMPLOYEE_NAME_En, diff --git a/Mohem/src/app/authentication/login/login.component.scss b/Mohem/src/app/authentication/login/login.component.scss index f50ff117..592350bc 100644 --- a/Mohem/src/app/authentication/login/login.component.scss +++ b/Mohem/src/app/authentication/login/login.component.scss @@ -300,13 +300,13 @@ img.centerDiv { } .border-moe-right { - border-top-right-radius: 16px; - border-bottom-right-radius: 16px; + // border-top-right-radius: 16px; + // border-bottom-right-radius: 16px; } .border-moe-left { - border-top-left-radius: 16px; - border-bottom-left-radius: 16px; + // border-top-left-radius: 16px; + // border-bottom-left-radius: 16px; } .menuFooter { 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 5dfbac95..57d0feba 100644 --- a/Mohem/src/app/authentication/sms-page/sms-page.page.ts +++ b/Mohem/src/app/authentication/sms-page/sms-page.page.ts @@ -421,7 +421,7 @@ export class SmsPageComponent implements OnInit { if (this.common.validResponse(result)) { - // this.common.sharedService.setSharedData(result.MemberLoginList.P_ORACLE_USER_NAME, 'oracle-user-name') + this.common.sharedService.setSharedData(result.MemberLoginList.P_ORACLE_USER_NAME, 'oracle-user-name') //save business card info 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 1b0f2537..ebb839eb 100644 --- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts +++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts @@ -107,16 +107,16 @@ export class AuthenticationService { this.setPublicFields(request); const user = this.getAuthenticatedUser(); - // const oracleUserName = this.cs.sharedService.getSharedData('oracle-user-name', false); - // if (user && oracleUserName) { - if (user) { + const oracleUserName = this.cs.sharedService.getSharedData('oracle-user-name', false); + if (user && oracleUserName) { + // if (user) { const userName = this.cs.sharedService.getSharedData(LoginRequest.SHARED_DATA, false); request.P_SESSION_ID = user.P_SESSION_ID; request.MobileNumber = user.EMPLOYEE_MOBILE_NUMBER; request.LogInTokenID = user.LogInTokenID; request.TokenID = user.TokenID; - request.P_USER_NAME = userName; // '1100313582' ALWAYS USER NAME - request.UserName = userName; // '1100313582' + request.P_USER_NAME = oracleUserName; // '1100313582' ALWAYS USER NAME + request.UserName = oracleUserName; // '1100313582' userName request.P_EMAIL_ADDRESS = user.EMPLOYEE_EMAIL_ADDRESS; if (AuthenticationService.requireRelogin) { this.sessionTimeOutDialog();