From 96630d66066e961ec5fdabac7c0b24a4dd763a6e Mon Sep 17 00:00:00 2001 From: umasoodch Date: Mon, 24 Oct 2022 14:20:51 +0300 Subject: [PATCH] fixed moe issues --- .../eit-update-list.component.html | 18 +++++++++--------- .../eit-update-list.component.scss | 10 +++++++++- .../eit-update-list.component.ts | 18 +++++++++++------- .../employee-information.component.scss | 2 +- .../generic-header.component.html | 3 ++- .../worklist-main.component.html | 4 ++-- .../src/app/profile/home/home.component.html | 4 ++-- .../imgs/profile-icons/editingWhite.png | Bin 0 -> 1583 bytes Mohem/src/theme/styles.scss | 9 +++++++++ 9 files changed, 45 insertions(+), 23 deletions(-) create mode 100644 Mohem/src/assets/imgs/profile-icons/editingWhite.png 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 0000000000000000000000000000000000000000..6adddb71b17c0072d2c1977a90e85231ee245eaf GIT binary patch literal 1583 zcmbVMTWl0n7#?iJvZfDMA_TCR%qF71?3|h1Z94-amff!1$dpo6TZ|@qcINEvq&suQ znbYoWpA1nOwHOl;ACOoAA*34cr4JPoTf9V#4^q>{5K#&wMlgifH>0VZ*;~MX7bcmR zGjqQ4{r~shUhD6Bsx`1Nz%Wc}vNt|J-w*qD%WC@kY`U<6zScOs2Rw#(u+6_$F-MMW zV3_7*Gc`npv^|QBtq?SD28BwNL(vSgb63fM`Y0`sXY;e1tV0V@jN?;)Z*^*VTJ*A{_6<&p|{oew|Rv=_p<+^=??2y*a z#;}Xn&XCCK006dA4jC{5^-N|vD*;IqKtvEDJOD~qRw5C$c5&34Yh;yyc%o*EeyLoZ z5JwS&VzC%1hC|rR38E~^0+0kr;wggn$~J)|-u8lZhB)$c*K~-9ZPsUm89YK%j=Eaa zU^xw1+pEQiMocI{M-W56*Hi%-dIRT-xP^*wLl;m1S;!_H#flBAlg9*md3+b@#`bLn zXlymDVdIXzSXRS?M|wu7j9NhMi1t!t2MGhn!y~SadPb?6L0^rd#9Rakc2gJ^>Y3`V zyUa@A5MUqEpl;f}h{ta^g5r=Mm7{r+coFbYI3-4uXjBP@w}G$%KozQC!_1cN0*yv* zgVL%oAc6l1HgqM6T?nIslIjTBj zng%U0XmoURhIvVnB|aj_A}?oUnMWWCqMg~Uh!NH6=i^u(@pD^0Z~V{mdtH+@7cAT} zkKb~BQ7FBpN7GfV^~8SkVr^A0*-9NKQ1|Ow<#a!>$lz+f&3leOmA05il=L6cU4?l# zON!7%-8mYq|4>i@bzks%v8qJ)yU5DkEqz;u(_!E*8)JxmGzJ;6>GX2xm|A-!^AH_z zSCjGXRM(-!#d+;hur6`=@Ow?9X~VhT%WKk2>BIJui7#8Owd`Rwz113M+uT0WGH3=j z{qc!#VE)jFy@PMxIQDIR;`%;q>*@19PHtYDzI^jS(+6|M}8{rD_;6K7K}{3|LPm_8)pLiD^H)l{^qIO3(s{;{eItc;N7by zK4eZG9RGQy`GvXfy)U*dw||pMzb@uZS?ab&W~aWJ?;e=E^25oaR+b3E<