From ede3af37c489e3fff2c92d918bd4600486037af7 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Thu, 20 Oct 2022 15:35:51 +0300 Subject: [PATCH] fixed moe issues --- Mohem/src/app/eit/add-eit/add-eit.component.ts | 1 - .../confirm-add-eit/confirm-add-eit.component.html | 2 +- .../confirm-add-eit/confirm-add-eit.component.scss | 8 ++++++++ Mohem/src/app/eit/eit-list/eit-list.component.html | 13 ++++++++----- Mohem/src/app/eit/eit-list/eit-list.component.scss | 13 +++++++++++++ Mohem/src/app/eit/eit-list/eit-list.component.ts | 5 ++--- .../employee-information.component.scss | 2 +- Mohem/src/app/my-team/home/home.component.html | 6 +++--- .../subordinate-leave.component.scss | 2 +- Mohem/src/app/profile/home/home.component.html | 4 ++-- .../{business-trip.png => Business trip.png} | Bin Mohem/src/assets/imgs/profile-icons/family-g.svg | 4 ++-- Mohem/src/assets/localization/i18n.json | 12 ++++++++++++ Mohem/src/theme/worklist.scss | 2 +- 14 files changed, 54 insertions(+), 20 deletions(-) rename Mohem/src/assets/icon/new-design/{business-trip.png => Business trip.png} (100%) diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.ts b/Mohem/src/app/eit/add-eit/add-eit.component.ts index 0ac1820a..11b1b446 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.ts +++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts @@ -553,7 +553,6 @@ export class AddEitComponent implements OnInit { if (obj.FORMAT_TYPE == "N") { const maxSize = obj.MAXIMUM_SIZE; const value = (document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value; - // this.username = value.length > 8 ? value.substring(0,8) : value; (document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value = value.length > maxSize ? value.substring(0, maxSize) : value; } diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html index b744cbad..87e43eea 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.html @@ -19,7 +19,7 @@
{{'general, addAttach' | translate}} *
-
+
--> + + +
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 0a1468f6..732b32a6 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.scss +++ b/Mohem/src/app/eit/eit-list/eit-list.component.scss @@ -332,3 +332,16 @@ z-index: 1; margin-left: 5px; } + .icon-img { + width: 20px; + height: 20px; + float: right; + margin-top: 20px; + } + + .icon-img-ar { + width: 20px; + height: 20px; + float: left; + margin-top: 20px; + } \ No newline at end of file diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.ts b/Mohem/src/app/eit/eit-list/eit-list.component.ts index b60e02a7..645166d5 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.ts +++ b/Mohem/src/app/eit/eit-list/eit-list.component.ts @@ -49,6 +49,7 @@ export class EitListComponent implements OnInit { accrualNetInfants: any; accrualUNetChild: any; accrualNetAdult: any; + addButton: string = 'Y'; public options = { cutoutPercentage: 80, @@ -80,6 +81,7 @@ export class EitListComponent implements OnInit { ngOnInit() { ///////////// + this.addButton = this.selMenu.GetMenuEntriesList.ADD_BUTTON; this.Sdate = new Date().toISOString(); this.getUserDetails(); ////////////////up @@ -227,9 +229,6 @@ export class EitListComponent implements OnInit { this.pAction = EIT_ACTION.UPDATE; this.cs.sharedService.setSharedData(this.getResEITTransactionList[i].Collection_Transaction, EITTransactionsRequest.SHARED_DATA); this.cs.sharedService.setSharedData(this.pAction, EITTransactionsRequest.SUBMIT_EIT_ACTION); - // this.fillEitTransactionTable(i); - // this.navCtrl.push("AddEitPage"); - // this.openEit(i); this.openEitNew(i); } deleteEIT(i) { diff --git a/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.scss b/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.scss index 240f7b1e..382f543a 100644 --- a/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.scss +++ b/Mohem/src/app/hmg-common/ui/employee-information/employee-information.component.scss @@ -91,7 +91,7 @@ width: 100%; text-overflow: ellipsis; white-space: nowrap; - overflow: hidden; + // overflow: hidden; display: block; margin-left: -10px; margin-top: -10px; diff --git a/Mohem/src/app/my-team/home/home.component.html b/Mohem/src/app/my-team/home/home.component.html index f3ac6890..2d769461 100644 --- a/Mohem/src/app/my-team/home/home.component.html +++ b/Mohem/src/app/my-team/home/home.component.html @@ -39,9 +39,9 @@
- - - + + +
diff --git a/Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.scss b/Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.scss index 2477cfb9..b55bdebb 100644 --- a/Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.scss +++ b/Mohem/src/app/my-team/subordinate-leave/subordinate-leave.component.scss @@ -173,7 +173,7 @@ width: 100%; text-overflow: ellipsis; white-space: nowrap; - overflow: hidden; + // overflow: hidden; display: block; margin-left: -10px; margin-top: -10px; diff --git a/Mohem/src/app/profile/home/home.component.html b/Mohem/src/app/profile/home/home.component.html index b377f854..b4b1b17b 100644 --- a/Mohem/src/app/profile/home/home.component.html +++ b/Mohem/src/app/profile/home/home.component.html @@ -59,8 +59,8 @@
- -
+ +
{{ts.trPK('userProfile','family-members')}} diff --git a/Mohem/src/assets/icon/new-design/business-trip.png b/Mohem/src/assets/icon/new-design/Business trip.png similarity index 100% rename from Mohem/src/assets/icon/new-design/business-trip.png rename to Mohem/src/assets/icon/new-design/Business trip.png diff --git a/Mohem/src/assets/imgs/profile-icons/family-g.svg b/Mohem/src/assets/imgs/profile-icons/family-g.svg index 553b6086..c4588ee3 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/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index e66e915c..a22c1ebc 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -2011,6 +2011,18 @@ "en": "My Team", "ar": "فريقي" }, + "search-email": { + "en": "Search By Email", + "ar": "البحث عن طريق البريد الإلكتروني" + }, + "search-name": { + "en": "Search By Name", + "ar": "البحث عن طريق الإسم" + }, + "search-username": { + "en": "Search By Username", + "ar": "البحث باسم المستخدم" + }, "total": { "en": "TOTAL", "ar": "عدد" diff --git a/Mohem/src/theme/worklist.scss b/Mohem/src/theme/worklist.scss index 48e1b662..4311fa49 100644 --- a/Mohem/src/theme/worklist.scss +++ b/Mohem/src/theme/worklist.scss @@ -5,8 +5,8 @@ } .footerSearchBtn { - padding: 50px !important; background: #f0efef !important; + height: 15% !important; }