From 3f8c8a7a0743031910632e80d1663d54b8979d61 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Sun, 1 Jan 2023 10:48:48 +0300 Subject: [PATCH] fixed srca issues --- .../absence-confirm.component.scss | 2 +- Mohem/src/app/absence/home/home.component.scss | 4 ++-- Mohem/src/app/app.component.scss | 10 +++++----- .../confirm-login/confirm-login.component.scss | 2 +- .../confirm-login/confirm-login.component.ts | 2 +- .../authentication/login/login.component.scss | 4 ++-- .../authentication/sms-page/sms-page.page.ts | 2 +- .../app/eit/eit-list/eit-list.component.html | 2 +- .../app/eit/eit-list/eit-list.component.scss | 2 +- .../eit-update-list.component.html | 4 ++-- .../authentication/authentication.service.ts | 11 ++++++----- .../services-button.component.scss | 2 +- .../stats-button/stats-button.component.scss | 6 +++--- Mohem/src/app/home/home.page.scss | 2 +- .../app/my-team/details/details.component.scss | 12 ++++++------ .../add-basic-details.component.scss | 2 +- .../confirm-address.component.scss | 3 ++- .../confirm-basic-details.component.scss | 3 ++- .../confirm-contact.component.scss | 2 +- Mohem/src/app/profile/home/home.component.scss | 18 +++++++++--------- .../imgs/profile-icons/basic-detail@21.svg | 2 +- .../src/assets/imgs/profile-icons/family-g.svg | 2 +- .../assets/imgs/profile-icons/info-a@2x.svg | 2 +- .../imgs/profile-icons/main address-a@2x.svg | 2 +- Mohem/src/theme/styles.scss | 2 +- Mohem/src/theme/variables.scss | 4 ++-- 26 files changed, 56 insertions(+), 53 deletions(-) diff --git a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss index 88d0367b..339e60ed 100644 --- a/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss +++ b/Mohem/src/app/absence/absence-confirm/absence-confirm.component.scss @@ -265,7 +265,7 @@ ion-card-content.confirm-details { } .header-toolbar-new{ - --background: #024d71; + --background: #BE332F; } .confirmEitOkButton{ diff --git a/Mohem/src/app/absence/home/home.component.scss b/Mohem/src/app/absence/home/home.component.scss index 411fade8..8a69d878 100644 --- a/Mohem/src/app/absence/home/home.component.scss +++ b/Mohem/src/app/absence/home/home.component.scss @@ -230,7 +230,7 @@ position: absolute; content: ""; // background: #BE332F; - // background: #024d71; + // background: #BE332F; height: 140px; width: 100%; left: 0; @@ -276,7 +276,7 @@ // color: black; // background-color: #CB3232; // // background-color: #BE332F; -// // background-color: #024d71; +// // background-color: #BE332F; // width: 11%; // height: 6px; // } diff --git a/Mohem/src/app/app.component.scss b/Mohem/src/app/app.component.scss index 5c58dad0..2030c73e 100644 --- a/Mohem/src/app/app.component.scss +++ b/Mohem/src/app/app.component.scss @@ -83,7 +83,7 @@ hr { .logout { background-color: #c6903e; border: none; - color: #004D71; + color: black; text-align: center; text-decoration: none; display: inline-block; @@ -101,7 +101,7 @@ hr { .logout-ar { background-color: #c6903e; border: none; - color: #004D71; + color: black; text-align: center; text-decoration: none; display: inline-block; @@ -293,7 +293,7 @@ button.menu-item.item.item-block.item-ios { .TxtPlace { font-size: 20px; - color: #004D71; + color: black; font-weight: bold; text-overflow: ellipsis; overflow: hidden; @@ -305,7 +305,7 @@ button.menu-item.item.item-block.item-ios { .TxtPlaces { font-size: 14px; - color: #004D71; + color: black; font-weight: bold; // font-family: 'Inter' !important; text-overflow: ellipsis; @@ -353,7 +353,7 @@ button.menu-item.item.item-block.item-ios { .companyTxt { font-size: 12px; - color: #004D71; + color: black; text-align: center; font-family: 'Inter' !important; } diff --git a/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss b/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss index 11a47728..30839e74 100644 --- a/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss +++ b/Mohem/src/app/authentication/confirm-login/confirm-login.component.scss @@ -33,6 +33,6 @@ } .p-color { - color: #004D71; + color: black; font-weight: bold; } \ No newline at end of file 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 1b7ea3d5..288999e1 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 44f773eb..1d590e9d 100644 --- a/Mohem/src/app/authentication/login/login.component.scss +++ b/Mohem/src/app/authentication/login/login.component.scss @@ -174,7 +174,7 @@ img.centerDiv { } .first-circle { - background: #024D71 !important; + background: #BE332F !important; border-radius: 50%; height: 310px; width: 310px; @@ -322,7 +322,7 @@ img.centerDiv { .companyTxt { font-size: 12px; - color: #004D71; + color: black; text-align: center; font-family: 'Inter' !important; } \ No newline at end of file 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..5dfbac95 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/eit/eit-list/eit-list.component.html b/Mohem/src/app/eit/eit-list/eit-list.component.html index 8e197250..bc79ab47 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.html +++ b/Mohem/src/app/eit/eit-list/eit-list.component.html @@ -229,7 +229,7 @@ - +

diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.scss b/Mohem/src/app/eit/eit-list/eit-list.component.scss index a39701df..d6038801 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.scss +++ b/Mohem/src/app/eit/eit-list/eit-list.component.scss @@ -103,7 +103,7 @@ h4 { .contentEit:before { position: absolute; content: ""; -// background: #024d71; +// background: #BE332F; height: 140px; width: 100%; left: 0; diff --git a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html index abd89005..ab698bda 100644 --- a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html +++ b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.html @@ -7,14 +7,14 @@
- +
{{'worklistMain, notfDetails' | translate}}
-
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 d1b3e3e5..1b0f2537 100644 --- a/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts +++ b/Mohem/src/app/hmg-common/services/authentication/authentication.service.ts @@ -107,15 +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) { + // 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 = oracleUserName; // '1100313582' ALWAYS USER NAME - request.UserName = oracleUserName; // '1100313582' + request.P_USER_NAME = userName; // '1100313582' ALWAYS USER NAME + request.UserName = userName; // '1100313582' request.P_EMAIL_ADDRESS = user.EMPLOYEE_EMAIL_ADDRESS; if (AuthenticationService.requireRelogin) { this.sessionTimeOutDialog(); @@ -147,7 +148,7 @@ export class AuthenticationService { } else { mobileType = 'android'; } - request.VersionID = 1.0; + request.VersionID = 3.9; request.Channel = 31; request.LanguageID = TranslatorService.getCurrentLanguageCode(); request.MobileType = mobileType; diff --git a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss index 6c273a47..28015f86 100644 --- a/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss +++ b/Mohem/src/app/hmg-common/ui/services-button/services-button.component.scss @@ -35,7 +35,7 @@ font-size: 8px; text-align: center; margin-top: 10px; - color: #004D71; + color: black; font-weight: bold; letter-spacing: 0px; } \ No newline at end of file diff --git a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss index e4b3a074..26fa81b7 100644 --- a/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss +++ b/Mohem/src/app/hmg-common/ui/stats-button/stats-button.component.scss @@ -36,7 +36,7 @@ span { font-size: 25px; font-weight: bold; - color: #004D71; + color: black; text-align: center; display: block; } @@ -47,7 +47,7 @@ ion-app[dir="rtl"] .titleBox { } .pClass { - // color: #004D71; + // color: black; // width: 85%; // margin-top: 5px; // font-weight: bold; @@ -56,7 +56,7 @@ ion-app[dir="rtl"] .titleBox { // font-size: 15px !important; - color: #004D71; + color: black; width: 100%; margin-top: 5px; font-weight: bold; diff --git a/Mohem/src/app/home/home.page.scss b/Mohem/src/app/home/home.page.scss index 4a37714d..a8c7a4bf 100644 --- a/Mohem/src/app/home/home.page.scss +++ b/Mohem/src/app/home/home.page.scss @@ -43,7 +43,7 @@ ion-title { ion-label { display: block; - color: #004D71 !important; + color: black !important; font-size: 16px; font-weight: bold; letter-spacing: 0.16px; diff --git a/Mohem/src/app/my-team/details/details.component.scss b/Mohem/src/app/my-team/details/details.component.scss index f590c7c0..5d1d32a4 100644 --- a/Mohem/src/app/my-team/details/details.component.scss +++ b/Mohem/src/app/my-team/details/details.component.scss @@ -942,7 +942,7 @@ $actionBtnSize : 36px; .name { text-align: center; letter-spacing: -0.84px; - color: #004D71; + color: black; font-weight: bold; opacity: 1; font-family: 'Inter' !important; @@ -964,7 +964,7 @@ $actionBtnSize : 36px; .subTitle { text-align: center; letter-spacing: -0.56px; - color: #004D71; + color: black; font-weight: bold; opacity: 1; font-family: var(--fontFamilyPoppins-SemiBold, inherit); @@ -978,7 +978,7 @@ $actionBtnSize : 36px; line-height: 20px; font-size: 20px; letter-spacing: -0.8px; - color: #004D71; + color: black; font-weight: bold; opacity: 1; margin-top: 20px; @@ -1002,7 +1002,7 @@ $actionBtnSize : 36px; line-height: 5px; font-size: 16px; letter-spacing: -0.64px; - color: #004D71; + color: black; font-weight: bold; opacity: 1; } @@ -1013,7 +1013,7 @@ $actionBtnSize : 36px; line-height: 20px; font-size: 20px; letter-spacing: -0.8px; - color: #004D71; + color: black; font-weight: bold; opacity: 1; margin-top: 20px; @@ -1040,7 +1040,7 @@ $actionBtnSize : 36px; line-height: 5px; font-size: 18px; letter-spacing: -0.64px; - color: #004D71; + color: black; font-weight: bold; opacity: 1; padding: 1px 5px 1px 5px; diff --git a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss index cc3a0615..82533bbc 100644 --- a/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss +++ b/Mohem/src/app/profile/add-basic-details/add-basic-details.component.scss @@ -25,7 +25,7 @@ .header-toolbar-new{ - --background: #024d71; + --background: #BE332F; } .addEitOkButton{ white-space: normal !important; diff --git a/Mohem/src/app/profile/confirm-address/confirm-address.component.scss b/Mohem/src/app/profile/confirm-address/confirm-address.component.scss index 64149050..c9a51b15 100644 --- a/Mohem/src/app/profile/confirm-address/confirm-address.component.scss +++ b/Mohem/src/app/profile/confirm-address/confirm-address.component.scss @@ -231,7 +231,7 @@ } .header-toolbar-new{ - --background: #024d71; + --background: #BE332F; } .title{ margin-top: -37px; @@ -266,3 +266,4 @@ text-align: left; } +} \ No newline at end of file diff --git a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss index c539c320..b532a9c1 100644 --- a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss +++ b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.scss @@ -231,7 +231,7 @@ } .header-toolbar-new{ - --background: #024d71; + --background: #BE332F; } .title{ margin-top: -37px; @@ -266,3 +266,4 @@ text-align: left; } +} \ No newline at end of file diff --git a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss index 44e9c89a..79ca3552 100644 --- a/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss +++ b/Mohem/src/app/profile/confirm-contact/confirm-contact.component.scss @@ -231,7 +231,7 @@ } .header-toolbar-new{ - --background: #024d71; + --background: #BE332F; } .title{ margin-top: -37px; diff --git a/Mohem/src/app/profile/home/home.component.scss b/Mohem/src/app/profile/home/home.component.scss index 542290ba..efe0198a 100644 --- a/Mohem/src/app/profile/home/home.component.scss +++ b/Mohem/src/app/profile/home/home.component.scss @@ -1330,7 +1330,7 @@ $actionBtnSize: 36px; .name { text-align: center; letter-spacing: -0.84px; - color: #004D71; + color: black; opacity: 1; font-weight: bold; line-height: 21px; @@ -1343,7 +1343,7 @@ $actionBtnSize: 36px; font-size: 13px; line-height: 6px; letter-spacing: -0.52px; - color: #004D71; + color: black; opacity: 1; font-family: 'Inter' !important; } @@ -1352,7 +1352,7 @@ $actionBtnSize: 36px; .subTitle { text-align: center; letter-spacing: -0.52px; - color: #004D71; + color: black; opacity: 1; font-weight: bold; font-size: 16px; @@ -1387,7 +1387,7 @@ $actionBtnSize: 36px; line-height: 30px; font-size: 20px; letter-spacing: -0.8px; - color: #004D71; + color: black; font-weight: bold; opacity: 1; margin-top: 12px; @@ -1400,7 +1400,7 @@ $actionBtnSize: 36px; line-height: 30px; font-size: 20px; letter-spacing: -0.8px; - color: #004D71; + color: black; font-weight: bold; opacity: 1; margin-top: -3px; @@ -1426,7 +1426,7 @@ $actionBtnSize: 36px; line-height: 20px; font-size: 16px; letter-spacing: -0.64px; - color: #004D71; + color: black; font-weight: bold; opacity: 1; } @@ -1438,7 +1438,7 @@ $actionBtnSize: 36px; line-height: 30px; font-size: 20px; letter-spacing: -0.8px; - color: #004D71; + color: black; font-weight: bold; opacity: 1; margin-top: 12px; @@ -1451,7 +1451,7 @@ $actionBtnSize: 36px; line-height: 30px; font-size: 20px; letter-spacing: -0.8px; - color: #004D71; + color: black; font-weight: bold; opacity: 1; margin-top: -3px; @@ -1476,7 +1476,7 @@ $actionBtnSize: 36px; line-height: 20px; font-size: 16px; letter-spacing: -0.64px; - color: #004D71; + color: black; font-weight: bold; opacity: 1; font-family: 'Inter' !important; diff --git a/Mohem/src/assets/imgs/profile-icons/basic-detail@21.svg b/Mohem/src/assets/imgs/profile-icons/basic-detail@21.svg index 5d5b510f..43d73f81 100644 --- a/Mohem/src/assets/imgs/profile-icons/basic-detail@21.svg +++ b/Mohem/src/assets/imgs/profile-icons/basic-detail@21.svg @@ -1,6 +1,6 @@ - + diff --git a/Mohem/src/assets/imgs/profile-icons/family-g.svg b/Mohem/src/assets/imgs/profile-icons/family-g.svg index c4588ee3..a3a042ea 100644 --- a/Mohem/src/assets/imgs/profile-icons/family-g.svg +++ b/Mohem/src/assets/imgs/profile-icons/family-g.svg @@ -1,6 +1,6 @@ - + diff --git a/Mohem/src/assets/imgs/profile-icons/info-a@2x.svg b/Mohem/src/assets/imgs/profile-icons/info-a@2x.svg index faa7b256..7342e740 100644 --- a/Mohem/src/assets/imgs/profile-icons/info-a@2x.svg +++ b/Mohem/src/assets/imgs/profile-icons/info-a@2x.svg @@ -1,6 +1,6 @@ - + diff --git a/Mohem/src/assets/imgs/profile-icons/main address-a@2x.svg b/Mohem/src/assets/imgs/profile-icons/main address-a@2x.svg index 81069c34..cf61bde9 100644 --- a/Mohem/src/assets/imgs/profile-icons/main address-a@2x.svg +++ b/Mohem/src/assets/imgs/profile-icons/main address-a@2x.svg @@ -1,6 +1,6 @@ - + diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index dd948176..db1f811d 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1920,7 +1920,7 @@ ion-app[dir="rtl"] { } .ion-color-secondary { - --ion-color-base: #004D71 !important; + --ion-color-base: black !important; } ion-app[dir="ltr"] { diff --git a/Mohem/src/theme/variables.scss b/Mohem/src/theme/variables.scss index 4f4e2e16..cf8ad97b 100644 --- a/Mohem/src/theme/variables.scss +++ b/Mohem/src/theme/variables.scss @@ -114,9 +114,9 @@ --primary: #3ac1f1; --secondary: #19a163; --danger: #f53d3d; - --customnavy: #44A7A1; + --customnavy: #c6903e; --light: #ffffff; - --dark: #004D71; + --dark: black; --gray: #e4e5e7; --custgreen: #44A7A1; --cusgray: #d9d9d9;