From 9d639c24cdcf76aadd0c123847dc3a0569dcb352 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Sat, 24 Sep 2022 15:03:54 +0300 Subject: [PATCH] fixed moe issues --- .../absence-replacement-list.component.html | 4 +-- .../services/connector/connector.service.ts | 4 +-- Mohem/src/app/home/home.page.html | 2 +- Mohem/src/app/home/home.page.scss | 2 ++ .../work-list-replacement-itg.component.html | 20 ++++++------- .../work-list-replacement-roll.component.html | 18 ++++++------ .../work-list-rfc.component.html | 4 +-- .../home/home.component.html | 4 +-- .../profile/contact/contact.component.html | 2 +- .../replacement-list.component.html | 4 +-- Mohem/src/theme/styles.scss | 29 ++++++++++++++++--- 11 files changed, 58 insertions(+), 35 deletions(-) diff --git a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.html b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.html index d86a6c96..71480043 100644 --- a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.html +++ b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.html @@ -123,10 +123,10 @@
- + {{'general, submit' | translate}} - + {{'general, cancel' | translate}}
\ No newline at end of file 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 fe9f4efe..d58dd00c 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -27,10 +27,10 @@ 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.mopm.gov.sa:1010/' // MOE vpn - // public static host = 'https://hrmsys.moenergy.gov.sa/' + public static host = 'https://hrmsys.moenergy.gov.sa/' diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html index 97857bc4..2302b8e5 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -25,7 +25,7 @@ - + {{menuItem.PROMPT}} diff --git a/Mohem/src/app/home/home.page.scss b/Mohem/src/app/home/home.page.scss index e2635cb2..9516ffe5 100644 --- a/Mohem/src/app/home/home.page.scss +++ b/Mohem/src/app/home/home.page.scss @@ -81,6 +81,8 @@ ion-label { width: 100%; margin-top: 25px; margin-bottom: 0px; + margin-right: 10px !important; + margin-left: 10px !important; h3 { font-size: 18px; diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html index 7f43134b..db6d06e6 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html @@ -256,14 +256,14 @@ -
-
-
--> +
+ @@ -324,14 +324,14 @@ {{employee.EMPLOYEE_DISPLAY_NAME}} -
-
+ --> diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html index 960618f8..d2a76e7b 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html @@ -180,14 +180,14 @@ {{employee.NAME}} -
-
+ --> @@ -214,14 +214,14 @@ {{employee.EMPLOYEE_DISPLAY_NAME}} -
-
+ --> @@ -263,14 +263,14 @@ -
-
+ --> @@ -310,16 +310,16 @@
{{'general, submit' | translate}} {{'general, submit' | translate}} - {{'general, cancel' | translate}}
diff --git a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html index d856fe4d..c8e3ad4c 100644 --- a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html +++ b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.html @@ -76,10 +76,10 @@
- + {{'general, submit' | translate}} - + {{'general, cancel' | translate}}
\ No newline at end of file diff --git a/Mohem/src/app/pending-transaction/home/home.component.html b/Mohem/src/app/pending-transaction/home/home.component.html index 6ac756a4..04c33c16 100644 --- a/Mohem/src/app/pending-transaction/home/home.component.html +++ b/Mohem/src/app/pending-transaction/home/home.component.html @@ -93,9 +93,9 @@
- + {{'general, submit' | translate}} - + {{'general, reset' | translate}}
diff --git a/Mohem/src/app/profile/contact/contact.component.html b/Mohem/src/app/profile/contact/contact.component.html index 8fed9814..6cbfca25 100644 --- a/Mohem/src/app/profile/contact/contact.component.html +++ b/Mohem/src/app/profile/contact/contact.component.html @@ -45,7 +45,7 @@
- + {{'userProfile, update' | translate}}
diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html index 692a683a..403a6a67 100644 --- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html +++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.html @@ -109,10 +109,10 @@
- + {{'general, save' | translate}} - + {{'general, cancel' | translate}}
\ No newline at end of file diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index 7db962e5..fc1dff01 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1279,11 +1279,13 @@ div.no-dataDiv { // min-width: 200px; min-height: 45px !important; border-radius: 5px !important; + --border-radius: 5px !important; width: 125px !important; min-width: 5px !important; width: 10px !important; margin: 8px !important; --background: transparent; + --box-shadow: none; } @@ -1295,11 +1297,13 @@ div.no-dataDiv { // min-width: 200px; min-height: 45px !important; border-radius: 5px !important; + --border-radius: 5px !important; width: 125px !important; min-width: 5px !important; width: 10px !important; margin: 8px !important; --background: transparent; + --box-shadow: none; } .checkOutOkBtn { @@ -1308,6 +1312,7 @@ div.no-dataDiv { margin-top: 10px !important; margin-bottom: 10px !important; border-radius: 5px !important; + --border-radius: 5px !important; height: 40px !important; min-height: 40px !important; background: var(--lightblue) !important; @@ -1319,7 +1324,7 @@ div.no-dataDiv { border: none !important; width: 80%; --background: var(--lightblue) !important; - + --box-shadow: none; } .checkOutCancelBtn { @@ -1328,6 +1333,7 @@ div.no-dataDiv { margin-top: 10px !important; margin-bottom: 10px !important; border-radius: 5px !important; + --border-radius: 5px !important; height: 40px !important; min-height: 40px !important; background: var(--darkblue) !important; @@ -1339,6 +1345,7 @@ div.no-dataDiv { border: none !important; width: 80%; --background: var(--darkblue) !important; + --box-shadow: none; } .buttonClassWhite { @@ -1903,7 +1910,7 @@ ion-app[dir="rtl"] { } .pClass { - font-size: 11px; + font-size: 10px; } } @@ -1914,8 +1921,8 @@ ion-app[dir="rtl"] { ion-app[dir="ltr"] { - .slideFullWidth .swiper-container .swiper-wrapper .swiper-slide:first-child { - // margin-left: 15px !important; + .dynamic-form .swiper-container .swiper-wrapper .swiper-slide:first-child { + margin-left: 5px !important; } @@ -1930,6 +1937,20 @@ ion-app[dir="ltr"] { ion-app[dir="rtl"] { + .slideFullWidth .swiper-container .swiper-wrapper .swiper-slide:first-child { + margin-right: 10px; + } + + .dynamic-form .swiper-container .swiper-wrapper .swiper-slide:first-child { + margin-right: 10px !important; + } + + .attendance-module { + ion-button { + height: 40px !important; + } + } + .slideFullWidth { margin-right: 0px !important; }