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 1578a2cd..22a8df4f 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 @@ -1,25 +1,25 @@ - - - - {{'eit, update-title' | translate}} - - + +
- +
{{'worklistMain, notfDetails' | translate}}
-
+
+ + diff --git a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss index 2af99d10..b1f77544 100644 --- a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss +++ b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.scss @@ -14,4 +14,12 @@ right: 10px; position: absolute; top: 10px; - } \ No newline at end of file + } + + .editIconDiv-ar{ + left: 10px; + position: absolute; + top: 10px; + } + + \ No newline at end of file diff --git a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts index 98431cd3..b952ba64 100644 --- a/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts +++ b/Mohem/src/app/eit/eit-update-list/eit-update-list.component.ts @@ -5,6 +5,7 @@ import { Component, OnInit } from '@angular/core'; import { CommonService } from 'src/app/hmg-common/services/common/common.service'; import { EITNotificatonBodyResponse } from '../models/EITNotificationBodyRes'; import { EitService } from '../services/eit.service'; +import { TranslatorService } from "src/app/hmg-common/services/translator/translator.service"; @Component({ selector: 'app-eit-update-list', @@ -23,8 +24,9 @@ export class EitUpdateListComponent implements OnInit { private eitTransactionTbl: any = []; private eitRequest: EitRequest; private descFlex: string; + direction: string; - constructor(public cs: CommonService, public eitService: EitService, public modalController: ModalController) { + constructor(public cs: CommonService, public eitService: EitService, public modalController: ModalController, private ts: TranslatorService) { this.notificationBodyRes = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.SHARED_DATA, false); let notification = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); this.itemKey = notification.ITEM_KEY; @@ -32,6 +34,7 @@ export class EitUpdateListComponent implements OnInit { this.functionName = notification.FUNCTION_NAME; this.selEmp = notification.SELECTED_EMPLOYEE_NUMBER; this.descFlex = notification.DESC_FLEX_CONTEXT_CODE; + this.direction = TranslatorService.getCurrentLanguageName(); this.fillEitTransactionTable(); } @@ -67,12 +70,13 @@ export class EitUpdateListComponent implements OnInit { } updateTransactionList(list) { - list.forEach(element => { - const index = this.eitTransactionTbl.findIndex(x => x.TRANSACTION_NUMBER === element.TRANSACTION_NUMBER); - if (index != -1) - this.eitTransactionTbl.splice(index, 1); - }); - this.eitTransactionTbl = this.eitTransactionTbl ? this.eitTransactionTbl.concat(list) : list; + // list.forEach(element => { + // const index = this.eitTransactionTbl.findIndex(x => x.TRANSACTION_NUMBER === element.TRANSACTION_NUMBER); + // if (index != -1) + // this.eitTransactionTbl.splice(index, 1); + // }); + // this.eitTransactionTbl = this.eitTransactionTbl ? this.eitTransactionTbl.concat(list) : list; + this.eitTransactionTbl = list; } resubmitEit() { 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 382f543a..cf3ba641 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 @@ -53,7 +53,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/hmg-common/ui/generic-header/generic-header.component.html b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html index f7dfabdf..3b0aae40 100644 --- a/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html +++ b/Mohem/src/app/hmg-common/ui/generic-header/generic-header.component.html @@ -24,7 +24,8 @@
diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.html b/Mohem/src/app/notification/worklist-main/worklist-main.component.html index 1ab0c005..c17b6aec 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -745,14 +745,14 @@
-
+ diff --git a/Mohem/src/app/profile/home/home.component.html b/Mohem/src/app/profile/home/home.component.html index b4b1b17b..357464ec 100644 --- a/Mohem/src/app/profile/home/home.component.html +++ b/Mohem/src/app/profile/home/home.component.html @@ -354,7 +354,7 @@

{{data.CONTACT_NAME}}

-
+

{{ts.trPK('userProfile','update')}}

@@ -365,7 +365,7 @@

{{data.RELATIONSHIP}}

-
+

{{ts.trPK('userProfile','remove')}}

diff --git a/Mohem/src/assets/imgs/profile-icons/editingWhite.png b/Mohem/src/assets/imgs/profile-icons/editingWhite.png new file mode 100644 index 00000000..6adddb71 Binary files /dev/null and b/Mohem/src/assets/imgs/profile-icons/editingWhite.png differ diff --git a/Mohem/src/theme/styles.scss b/Mohem/src/theme/styles.scss index d06cd1f9..7f80c194 100644 --- a/Mohem/src/theme/styles.scss +++ b/Mohem/src/theme/styles.scss @@ -1966,4 +1966,13 @@ ion-app[dir="rtl"] { .iconBox img { margin: 5px !important; } +} + + +.float-right-moe { + float: right; +} + +.float-left-moe { + float: left; } \ No newline at end of file