From 0964ff43ff3abc1e52b3f4fa68b74e3c61f20385 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Tue, 10 Aug 2021 15:02:02 +0300 Subject: [PATCH] fixing bugs --- .../digital-id/digital-id.component.html | 10 +++--- .../app/erm-channel/home/home.component.html | 7 ++-- .../ui/button/button.component.scss | 2 +- .../work-list-main-itg.component.html | 12 +++---- .../work-list-main-itg.component.scss | 11 +++++++ .../work-list-replacement-itg.component.html | 2 +- .../work-list-replacement-itg.component.ts | 2 ++ .../worklist-advanced-search.component.html | 1 + .../worklist-main-ic.component.scss | 25 +++++++++++++++ .../worklist-main-mr.component.scss | 25 ++++++++++++++- .../worklist-main-po.component.scss | 32 +++++++++++++++++-- .../worklist-main-pr.component.scss | 25 +++++++++++++++ 12 files changed, 134 insertions(+), 20 deletions(-) diff --git a/Mohem/src/app/authentication/digital-id/digital-id.component.html b/Mohem/src/app/authentication/digital-id/digital-id.component.html index a33ccd44..5d4807eb 100644 --- a/Mohem/src/app/authentication/digital-id/digital-id.component.html +++ b/Mohem/src/app/authentication/digital-id/digital-id.component.html @@ -1,6 +1,6 @@ - - + + @@ -9,7 +9,7 @@ + src="../../../assets/imgs/profilePic.png">

{{userInfo.ASSIGNMENT_NUMBER}}

@@ -35,7 +35,7 @@ - +
@@ -56,7 +56,7 @@ - + diff --git a/Mohem/src/app/erm-channel/home/home.component.html b/Mohem/src/app/erm-channel/home/home.component.html index 911f0bd1..85e42f49 100644 --- a/Mohem/src/app/erm-channel/home/home.component.html +++ b/Mohem/src/app/erm-channel/home/home.component.html @@ -2,15 +2,16 @@ - +
{{setTime}}
- +
diff --git a/Mohem/src/app/hmg-common/ui/button/button.component.scss b/Mohem/src/app/hmg-common/ui/button/button.component.scss index 5fc4ac29..3610d2ec 100644 --- a/Mohem/src/app/hmg-common/ui/button/button.component.scss +++ b/Mohem/src/app/hmg-common/ui/button/button.component.scss @@ -38,7 +38,7 @@ margin-right: 6%; width: 88%; text-align: center; - font-size: 0.38cm; + font-size: 0.34cm; color: var(--ion-color-secondary); } diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html index 3153dbcd..fb428b73 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html @@ -466,22 +466,22 @@ - + - - {{action.name}} - {{'worklistMain, request' | translate}} + + {{action.name}} + {{'worklistMain, request' | translate}} - - Skip + + Skip diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.scss b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.scss index a2fcbc06..6310904b 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.scss +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.scss @@ -13,4 +13,15 @@ } .tabs-margin{ margin-left: 0px; +} + +@media only screen and (max-width: 320px) { + .footer-btn-img{ + max-width: none !important; + width: 40px !important; + } +} +.footer-btn-img{ + max-width: none; + width: 60px; } \ No newline at end of file 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 284f1d6e..a1e05362 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 @@ -147,7 +147,7 @@
-
+
diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts index 5ee7bec2..1f2fcd78 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts @@ -13,6 +13,7 @@ import { WorklistService } from '../service/worklist.service'; styleUrls: ['./work-list-replacement-itg.component.scss'], }) export class WorkListReplacementItgComponent implements OnInit { + messageSuccess = false; P_SEARCH_USER_NAME: string = ""; P_SEARCH_EMPLOYEE_DISPLAY_NAME: string = ""; P_SEARCH_EMAIL_ADDRESS: string = ""; @@ -128,6 +129,7 @@ export class WorkListReplacementItgComponent implements OnInit { if (this.isSave == true) { if (this.selEmp) { data = this.selEmp; + this.messageSuccess = true; } else { data = null; } diff --git a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html index 33b67cfb..67b487cc 100644 --- a/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html +++ b/Mohem/src/app/notification/worklist-advanced-search/worklist-advanced-search.component.html @@ -53,6 +53,7 @@ PO PR MR + IC diff --git a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss index cf5e4beb..61b57abd 100644 --- a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss +++ b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss @@ -7,6 +7,31 @@ margin-left: 0px; } +@media only screen and (max-width: 320px) { + .active-Segment { + font-size: 0.3cm !important; + background: #269DB8 !important; + text-transform: none; + --color-checked: none; + border-radius: 100px; + border:0; + } + .active-Segment ion-label{ + font-size: 8px !important; + color: white !important; + } + .normal-Segment ion-label{ + color: black; + font-size: 8px !important; + } + .normal-Segment { + font-size: 0.3cm; + text-transform: none; + --color-checked: none; + border: 0; + } +} + .active-Segment { font-size: 0.3cm !important; background: #269DB8 !important; diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss index ee5a0d37..424d9366 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss @@ -5,7 +5,30 @@ .margin-left { margin-left: 0px; } - +@media only screen and (max-width: 320px) { + .active-Segment { + font-size: 0.3cm !important; + background: #269DB8 !important; + text-transform: none; + --color-checked: none; + border-radius: 100px; + border:0; + } + .active-Segment ion-label{ + font-size: 8px !important; + color: white !important; + } + .normal-Segment ion-label{ + color: black; + font-size: 8px !important; + } + .normal-Segment { + font-size: 0.3cm; + text-transform: none; + --color-checked: none; + border: 0; + } +} .active-Segment { font-size: 0.3cm !important; background: #269DB8 !important; diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss index d5902df1..68182cd2 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss @@ -7,7 +7,8 @@ margin-left: 0px; } -.active-Segment { +@media only screen and (max-width: 320px) { + .active-Segment { font-size: 0.3cm !important; background: #269DB8 !important; text-transform: none; @@ -15,20 +16,45 @@ border-radius: 100px; border:0; } + .active-Segment ion-label{ + font-size: 8px !important; + color: white !important; + } + .normal-Segment ion-label{ + color: black; + font-size: 8px !important; + } + .normal-Segment { + font-size: 0.3cm; + text-transform: none; + --color-checked: none; + border: 0; + } +} + +.active-Segment { + font-size: 0.3cm; + background: #269DB8 ; + text-transform: none; + --color-checked: none; + border-radius: 100px; + border:0; + } .active-Segment ion-label{ font-size: 11px; color: white !important; } .normal-Segment ion-label{ - color: black !important; + color: black; font-size: 11px; } .normal-Segment { - font-size: 0.3cm !important; + font-size: 0.3cm; text-transform: none; --color-checked: none; border: 0; } + .action-btn { white-space: nowrap; font-size: 10px; diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss index a8895a39..fbd86699 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss @@ -7,6 +7,31 @@ margin-left: 0px; } +@media only screen and (max-width: 320px) { + .active-Segment { + font-size: 0.3cm !important; + background: #269DB8 !important; + text-transform: none; + --color-checked: none; + border-radius: 100px; + border:0; + } + .active-Segment ion-label{ + font-size: 8px !important; + color: white !important; + } + .normal-Segment ion-label{ + color: black; + font-size: 8px !important; + } + .normal-Segment { + font-size: 0.3cm; + text-transform: none; + --color-checked: none; + border: 0; + } +} + .active-Segment { font-size: 0.3cm !important; background: #269DB8 !important;