From f96cf769a2c7fea38c3bba070b645be4e6b1efa2 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Wed, 2 Mar 2022 15:47:11 +0300 Subject: [PATCH 1/8] toast msg top --- Mohem/src/app/hmg-common/services/common/common.service.ts | 6 +++--- .../app/hmg-common/services/connector/connector.service.ts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts index 677f6a8e..c11df3ff 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -216,7 +216,7 @@ export class CommonService { const toast = await this.toastController.create({ message: message, showCloseButton: true, - position: 'middle', + position: 'top', duration: 2000, closeButtonText: this.ts.trPK('general', 'close') }); @@ -235,7 +235,7 @@ export class CommonService { const toast = await this.toastController.create({ message: message, showCloseButton: true, - position: 'middle', + position: 'top', duration: 2000, color: 'danger', closeButtonText: this.ts.trPK('general', 'close') @@ -246,7 +246,7 @@ export class CommonService { const toast = await this.toastController.create({ message: message, showCloseButton: true, - position: 'middle', + position: 'top', duration: 2000, color: 'success', closeButtonText: this.ts.trPK('general', 'close') 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 5a1959c6..f472cb49 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -27,8 +27,8 @@ export class ConnectorService { public static retryTimes = 0; public static timeOut = 180 * 1000; - // public static host = 'https://uat.hmgwebservices.com/'; - public static host = 'https://hmgwebservices.com/'; + public static host = 'https://uat.hmgwebservices.com/'; + // public static host = 'https://hmgwebservices.com/'; constructor(public httpClient: HttpClient, public cs: CommonService, From a048198f89cf87e6bb9e857b8310809b2b14d407 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Thu, 3 Mar 2022 15:08:13 +0300 Subject: [PATCH 2/8] fixed fav in worklist design and added icon for doable and not doable --- .../work-list-main-itg.component.ts | 4 +-- .../work-list-replacement-itg.component.html | 33 ++++++++++++++---- .../work-list-replacement-itg.component.scss | 25 ++++++++++--- .../work-list-replacement-roll.component.html | 26 +++++++------- .../work-list-replacement-roll.component.scss | 28 ++++++++++++--- .../src/assets/imgs/mohemm-action/Doable.png | Bin 0 -> 1441 bytes .../assets/imgs/mohemm-action/notDoable.png | Bin 0 -> 1478 bytes 7 files changed, 84 insertions(+), 32 deletions(-) create mode 100644 Mohem/src/assets/imgs/mohemm-action/Doable.png create mode 100644 Mohem/src/assets/imgs/mohemm-action/notDoable.png diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts index afde12f7..7cd149d4 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts @@ -164,10 +164,10 @@ export class WorkListMainItgComponent implements OnInit { return '../assets/imgs/mohemm-action/ReportGenerated.png'; } if (actionName === 'Doable') { - return '../assets/imgs/mohemm-action/info.png'; + return '../assets/imgs/mohemm-action/Doable.png'; } if (actionName === 'NotDoable') { - return '../assets/imgs/mohemm-action/info.png'; + return '../assets/imgs/mohemm-action/notDoable.png'; } if (actionName === 'DataCorrected') { return '../assets/imgs/mohemm-action/info.png'; 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 a9a6c762..5c7f099d 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 @@ -170,7 +170,7 @@ -
+ +
+ +
+

{{filter}}

+
+
-
+
+ +
+

{{filter}}

+
+ +
+ + -
+
{{'replacementRoll, search-result' | translate}}
@@ -282,7 +301,7 @@
-
{{'replacementRoll, favorite' | translate}} @@ -314,14 +333,14 @@
-
+

{{'general, fav-showData' | translate}}

-
+

{{'general, fav-noData' | translate}} diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss index 5c9b62ba..d68f6187 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss @@ -281,10 +281,12 @@ ion-radio { } .isFavLetterActive { - background: #269db8; - width: 55px; - border-radius: 60px; - color: white; + color: #269db8; + display: block; + width: 100%; + float: right; + transition-duration: 0ms; + height: 30px; } .vl { border-left: 2px solid lightgray; @@ -292,7 +294,20 @@ ion-radio { } .searchText{ background: transparent; - color: #D55D5C; + color: #269db8; font-weight: bold; text-decoration: underline; +} + +.letterDiv{ + font-weight: bold; + width: 5%; + float: right; +} +.letterDivLoop{ + display: block; + width: 100%; + float: right; + transition-duration: 0ms; + height: 30px; } \ No newline at end of file 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 1f9c533d..aab1924a 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 @@ -126,24 +126,24 @@ -

- - -
+
+ +

{{filter}}

- - +
-
- - -
+
+ +

{{filter}}

- - +
@@ -191,7 +191,7 @@
-
+
{{'replacementRoll, favorite' | translate}}
diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss index b60d1508..c91a1973 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss @@ -208,10 +208,15 @@ ion-radio { font-size: 12px; } .isFavLetterActive { - background: #269db8; - width: 55px; - border-radius: 60px; - color: white; + // background: #269db8; + // width: 55px; + // border-radius: 60px; + color: #269db8; + display: block; + width: 100%; + float: right; + transition-duration: 0ms; + height: 30px; } .vl { border-left: 2px solid lightgray; @@ -225,11 +230,24 @@ ion-radio { } .searchText{ background: transparent; - color: #D55D5C; + color: #269db8; font-weight: bold; text-decoration: underline; } .filterClass input{ box-shadow: none !important; -webkit-box-shadow: none !important; +} + +.letterDiv{ + font-weight: bold; + width: 5%; + float: right; +} +.letterDivLoop{ + display: block; + width: 100%; + float: right; + transition-duration: 0ms; + height: 30px; } \ No newline at end of file diff --git a/Mohem/src/assets/imgs/mohemm-action/Doable.png b/Mohem/src/assets/imgs/mohemm-action/Doable.png new file mode 100644 index 0000000000000000000000000000000000000000..46d08d07325365424a64f010b0c832d160264530 GIT binary patch literal 1441 zcmV;S1z!4zP)%P}*TslmsM@ zAZvr}gNc42BYfe5MiNah@U~%m_`PZ^gTiI{YgIuWeJZ(+FYZ#&PD#|8+C^V9%i=N+iAjWq|vBPD?d^M&ItMp z`SJzE?*D4!^_IW%%#&N%#ppM(?H!19m}XxHsx`pUO7xoUo40zI7nS z4uqKzA4kCQLWAg@pTW3{usz~&4`kBG2RwL8?n>unvFU29gg@=}H#yKW8_nq-6&9e8lSxs+DKK z)^znbB{}{RWpqi-GgwT4G5A}S?G4f0&yFar&4P9K0zXhjn=IzH0e9G$kf(KR8f>jE z@T!D(%z$M}s?xUfGF`tXxO4wyc0ZFGD}qtVYNaJTHsBQBhr^@pCt*L*LQTWz557TP z9~-b~b=CHe$Nh-{dyc#<=n*i_(K=7CO<2`+s@yKy#)vxm(J{{+<;y%jOV7lh0`Gwm zR$|zWPG8_NK-`&+s6JM<7#7`UH^ubWt!cP+>mPAjj2%Wg8V2bQ;S#r!S(AgF-1M}m zW?Q}-6b7b4#z|hrKa)qRP4$Y5y}8CgpITGR?l}D;3|*fPwfPG=e8C%t@Svy#Ej=}C zPiRayBaO?;prL$eVj3f`{P@T-ON*8HLk(-hNwe&5!Ub3}@@!T{%(7!jX8EeSzH(Vw zd>YHkfM0KX^n|X#RUO;L(D-E90%RH3d~7eN*SBS08z_56H$G)X)hBHn8jirB;c)Wz z1z5rG8d{APGAkH$MXl({cyXIHeWh%Hd!IL1WA$2>j_H9a4w)j*C*lpc>1H4{@?#F1e&)pR!99KI@G^LE3ZumdLY>?<6O}j zrbdHmD_?hlzFi58x@wc%GTcb<_Cc|25pQdE;zmFnEh^_~SY~ zX2DkbgR5=828*J15!g*xvOg2u_1uNz{cLJFilr-+{*S;FZFBdl`84{CgKyCv4qC1* zbvnck5LCV&riyDede!&>>m`Jq`Bc)h#oVMm<4rkrk}DCZ_6Jtl0eMGfz0RN(P>fxU z$4g#R_ZREVtRh&|HBf4c-}chY!X7GvM+-=kacb%sze+vt@6TZAkt@4erswi6r+&rS z&feX~RCT1V}Gyt}K0j6I}xV!d*- v*xVr5C_QS3P>@F$N`o<}WH4J6Gui(a@-F2i1VfQ#00000NkvXXu0mjf$~d*j literal 0 HcmV?d00001 diff --git a/Mohem/src/assets/imgs/mohemm-action/notDoable.png b/Mohem/src/assets/imgs/mohemm-action/notDoable.png new file mode 100644 index 0000000000000000000000000000000000000000..557ea6d37f199eac0c74fc8a984273b7e32bb679 GIT binary patch literal 1478 zcmV;%1v&bOP)_xg(oUm-Bq%{+ zSR0fF6Mez)#)C$TCYbP`V7r-UWHUP90opA~CKXYJ3F=6M^-nN^4vpCmFb=og&+|=g zZEx>wZ|}WbZ_94dbld&TIltd`&Ue0lX9zl;`j7e>s*r641UE2Pga9=RVIh52>rj_d zgaJ$;gGu_HAbY>l&mmF3gRu_xSfREEpSGuY|Ij_mc6}=u+(Htq+N6rpiik5JeVnj- zhBLQ*G5T`bA6hKsC(9T*xya$P)Lgm@X46Z6G|7(AlukI z;1tB<59HB13$|b}0mk4@QM9+jw?8&2LCYZP@CUymkFK^DZUb=G@rbv5O%~ZEfADz$ z@t^_CmK3FFX(Nr_Lmb?Hp54s^$I?)oyjpKb#0Eg|c{n=ec?fnRC2D${fzT`T^??DM zRu|n7@p?X#$bL^~OS%Lsa&Mg^va4}f_mNt=XiE_5{7c6oBPy19zLuVzfjYbiLRjj< z9q9B2KL*5?iqWh0*W3XMZn2x9I&p0ZE?)avzb?l1BP|U>w1{x)*P<-Ri5}kYu&HX> zJ`d|AOpA=eJdA%NL@P{1Mao`X>7Y-OscK(1dJ2XwP3YD66FU5%%ZPB7UJYt;>16vN z3EduPU0ee#wF_s>7$M7-kKD7AtjvGX$r=G^mLASJ%gd=*X1lG(E+`vM`~`?4X+J=XcnnUqK6 zge9U<1Kt^O50?#DPC`ydA}s&=M#mC($Ms-VsFxL4CBk(JZp+vRs1fC|Wk*(tu;jvA zM9Y>e2mWa9F-ZJ1l?qkv;i1j0oUC};XJ6x*1-f>O)6YFS#2YWUJ5oE*seNjDYiz-9yR_6|l!4Dgy`B`G46+S@&Hi4a@ea>mdUUDO8;4$_7kf(`hI;Mu1q6lf`*L~JLa#=DaGikA zS56^KQ_K~rGu}{8CArii4T0ctJ0P#J^*1`nMw!H&JM>*9N6{ttey% zsARY&(&6dWYNa5u>E5=B(=H literal 0 HcmV?d00001 From ff2f7724a45ed355e7e3412a6dfe9d11720662d8 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Thu, 3 Mar 2022 16:02:35 +0300 Subject: [PATCH 3/8] fixing delegeate function in ITG --- .../work-list-replacement-itg.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 9ef56f82..3f6f35c9 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 @@ -177,10 +177,10 @@ export class WorkListReplacementItgComponent implements OnInit { if (this.selEmp) { data = this.selEmp; // this.messageSuccess = true; - this.cs.greenToastPK('worklist', 'save-successfully'); + // this.cs.greenToastPK('worklist', 'save-successfully'); } else { data = null; - this.cs.redToastPK('worklist', 'save-error'); + // this.cs.redToastPK('worklist', 'save-error'); } if (typeof this.callback == 'function') { this.callback(data); From 0dc956a1a2378f2094c21a7c0900b3d542f899cf Mon Sep 17 00:00:00 2001 From: enadhilal Date: Sun, 6 Mar 2022 14:34:15 +0300 Subject: [PATCH 4/8] enhance fav design --- .../work-list-replacement-itg.component.html | 10 +++++++--- .../work-list-replacement-itg.component.scss | 12 ++++++------ .../work-list-replacement-roll.component.html | 10 +++++----- .../work-list-replacement-roll.component.scss | 12 ++++++------ 4 files changed, 24 insertions(+), 20 deletions(-) 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 5c7f099d..f54b721a 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 @@ -333,16 +333,20 @@
-
+

{{'general, fav-showData' | translate}}

-
+
-

+

{{'general, fav-noData' | translate}}

diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss index d68f6187..be2d6286 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss @@ -283,14 +283,14 @@ ion-radio { .isFavLetterActive { color: #269db8; display: block; - width: 100%; + width: 60%; float: right; transition-duration: 0ms; - height: 30px; + height: 35px; } .vl { border-left: 2px solid lightgray; - height: 36px; + height: 42px; } .searchText{ background: transparent; @@ -301,13 +301,13 @@ ion-radio { .letterDiv{ font-weight: bold; - width: 5%; + width: 10%; float: right; } .letterDivLoop{ display: block; - width: 100%; + width: 60%; float: right; transition-duration: 0ms; - height: 30px; + height: 35px; } \ No newline at end of file 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 aab1924a..ef3ff306 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 @@ -86,7 +86,7 @@
-->
- +
@@ -192,7 +192,7 @@
-
+
{{'replacementRoll, favorite' | translate}}
@@ -222,16 +222,16 @@
-
+
-

+

{{'general, fav-showData' | translate}}

-

+

{{'general, fav-noData' | translate}}

diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss index c91a1973..ac20567e 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss @@ -213,14 +213,14 @@ ion-radio { // border-radius: 60px; color: #269db8; display: block; - width: 100%; + width: 60%; float: right; transition-duration: 0ms; - height: 30px; + height: 35px; } .vl { border-left: 2px solid lightgray; - height: 36px; + height: 42px; } .clearText{ background: transparent; @@ -241,13 +241,13 @@ ion-radio { .letterDiv{ font-weight: bold; - width: 5%; + width: 10%; float: right; } .letterDivLoop{ display: block; - width: 100%; + width: 60%; float: right; transition-duration: 0ms; - height: 30px; + height: 35px; } \ No newline at end of file From a6bfcbdd77952cd54bb68f3b4b130e9852d91fb5 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Tue, 8 Mar 2022 14:48:25 +0300 Subject: [PATCH 5/8] business card desined fixed, worklist IC requests approve and reject buttons fixed. --- .../business-card/business-card.component.html | 2 +- .../worklist-main-ic/worklist-main-ic.component.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Mohem/src/app/authentication/business-card/business-card.component.html b/Mohem/src/app/authentication/business-card/business-card.component.html index fd7a5978..337ac9fb 100644 --- a/Mohem/src/app/authentication/business-card/business-card.component.html +++ b/Mohem/src/app/authentication/business-card/business-card.component.html @@ -49,7 +49,7 @@ --> -
+
https://hmgwebservices.com/images/Moheem/CS.jpg

{{userInfo.name_en}}

{{jobName}}
diff --git a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts index 98a649a5..bb4f13d3 100644 --- a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts +++ b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts @@ -381,12 +381,12 @@ export class WorklistMainIcComponent implements OnInit { this.common.sharedService.setSharedData(this.notificationButtonRes, "passActionMore"); // console.log("test" + this.notificationButtonRes.length); for (let i = 0; i < this.notificationButtonRes.length; i++) { - if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVE") { + if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVE" || this.notificationButtonRes[i].BUTTON_ACTION == "APPROVED") { this.approve_label = this.notificationButtonRes[i].BUTTON_LABEL; this.approveDis = true; } else - if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECT") { + if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECT" || this.notificationButtonRes[i].BUTTON_ACTION == "REJECTED") { this.reject_label = this.notificationButtonRes[i].BUTTON_LABEL; this.rejectDis = true; } else @@ -401,7 +401,7 @@ export class WorklistMainIcComponent implements OnInit { this.closeDis = true; } else if ( - this.notificationButtonRes[i].BUTTON_ACTION != "APPROVE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECT" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE") { + this.notificationButtonRes[i].BUTTON_ACTION != "APPROVE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECT" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "APPROVED") { this.moreDisabled = false; } From c10590d58a673b26abe25a66c5155123733e011f Mon Sep 17 00:00:00 2001 From: enadhilal Date: Thu, 10 Mar 2022 11:38:04 +0300 Subject: [PATCH 6/8] change itg icons --- .../assets/imgs/mohemm-action/Doable-old.png | Bin 0 -> 1441 bytes .../src/assets/imgs/mohemm-action/Doable.png | Bin 1441 -> 1371 bytes .../imgs/mohemm-action/doable-2-old.png | Bin 0 -> 1371 bytes .../assets/imgs/mohemm-action/info-old.png | Bin 0 -> 1053 bytes Mohem/src/assets/imgs/mohemm-action/info.png | Bin 1053 -> 1293 bytes .../imgs/mohemm-action/notDoable-old.png | Bin 0 -> 1478 bytes .../assets/imgs/mohemm-action/notDoable.png | Bin 1478 -> 1461 bytes 7 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Mohem/src/assets/imgs/mohemm-action/Doable-old.png create mode 100644 Mohem/src/assets/imgs/mohemm-action/doable-2-old.png create mode 100644 Mohem/src/assets/imgs/mohemm-action/info-old.png create mode 100644 Mohem/src/assets/imgs/mohemm-action/notDoable-old.png diff --git a/Mohem/src/assets/imgs/mohemm-action/Doable-old.png b/Mohem/src/assets/imgs/mohemm-action/Doable-old.png new file mode 100644 index 0000000000000000000000000000000000000000..46d08d07325365424a64f010b0c832d160264530 GIT binary patch literal 1441 zcmV;S1z!4zP)%P}*TslmsM@ zAZvr}gNc42BYfe5MiNah@U~%m_`PZ^gTiI{YgIuWeJZ(+FYZ#&PD#|8+C^V9%i=N+iAjWq|vBPD?d^M&ItMp z`SJzE?*D4!^_IW%%#&N%#ppM(?H!19m}XxHsx`pUO7xoUo40zI7nS z4uqKzA4kCQLWAg@pTW3{usz~&4`kBG2RwL8?n>unvFU29gg@=}H#yKW8_nq-6&9e8lSxs+DKK z)^znbB{}{RWpqi-GgwT4G5A}S?G4f0&yFar&4P9K0zXhjn=IzH0e9G$kf(KR8f>jE z@T!D(%z$M}s?xUfGF`tXxO4wyc0ZFGD}qtVYNaJTHsBQBhr^@pCt*L*LQTWz557TP z9~-b~b=CHe$Nh-{dyc#<=n*i_(K=7CO<2`+s@yKy#)vxm(J{{+<;y%jOV7lh0`Gwm zR$|zWPG8_NK-`&+s6JM<7#7`UH^ubWt!cP+>mPAjj2%Wg8V2bQ;S#r!S(AgF-1M}m zW?Q}-6b7b4#z|hrKa)qRP4$Y5y}8CgpITGR?l}D;3|*fPwfPG=e8C%t@Svy#Ej=}C zPiRayBaO?;prL$eVj3f`{P@T-ON*8HLk(-hNwe&5!Ub3}@@!T{%(7!jX8EeSzH(Vw zd>YHkfM0KX^n|X#RUO;L(D-E90%RH3d~7eN*SBS08z_56H$G)X)hBHn8jirB;c)Wz z1z5rG8d{APGAkH$MXl({cyXIHeWh%Hd!IL1WA$2>j_H9a4w)j*C*lpc>1H4{@?#F1e&)pR!99KI@G^LE3ZumdLY>?<6O}j zrbdHmD_?hlzFi58x@wc%GTcb<_Cc|25pQdE;zmFnEh^_~SY~ zX2DkbgR5=828*J15!g*xvOg2u_1uNz{cLJFilr-+{*S;FZFBdl`84{CgKyCv4qC1* zbvnck5LCV&riyDede!&>>m`Jq`Bc)h#oVMm<4rkrk}DCZ_6Jtl0eMGfz0RN(P>fxU z$4g#R_ZREVtRh&|HBf4c-}chY!X7GvM+-=kacb%sze+vt@6TZAkt@4erswi6r+&rS z&feX~RCT1V}Gyt}K0j6I}xV!d*- v*xVr5C_QS3P>@F$N`o<}WH4J6Gui(a@-F2i1VfQ#00000NkvXXu0mjf$~d*j literal 0 HcmV?d00001 diff --git a/Mohem/src/assets/imgs/mohemm-action/Doable.png b/Mohem/src/assets/imgs/mohemm-action/Doable.png index 46d08d07325365424a64f010b0c832d160264530..36d8fb2532bf3413e47d6e2bce6562d5ec9b6957 100644 GIT binary patch delta 1336 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 literal 0 HcmV?d00001 diff --git a/Mohem/src/assets/imgs/mohemm-action/info-old.png b/Mohem/src/assets/imgs/mohemm-action/info-old.png new file mode 100644 index 0000000000000000000000000000000000000000..7d37568e27f4aa04ce6c47f93c0e6baf9ad5ce5f GIT binary patch literal 1053 zcmV+&1mgRNP)?t0+w-mg&t>C#$FXDn=d#r+OPL{L>d#H+FZH*vQq4JV9aZP5kyOWtsHvW)9 zcC$P4<;}dAd2gogk6+}2SCup zaz4GKvu;{oE!!CcFw2lBEj6oY55OFNrE)%f*zU{Pg0*ainq~n&w%v;O=!l``+JRPv zwQQ%r)*MhRTtNg~DCg62Di4Q-8wlmA) zSe!M*t1WL>p3oO!4l2}S-A2nsJ=ZmlRs6rmV+xjT#V3!N_2}bhbaK_Fy) zOAGIIQE33)KB!<}bJujy5SHy5dHRy5Uq?|QHQDTFEmmGR{)Oe8eNT%U(78xDj1YlE zWJ#IElETC$_59uq+`K3sVl3NrI4B4#iX@xE$1akHc2|Qo{YEhxHF^(In^e$WS#xAroDXU;$s{ ztHN@+;K)=-(<7HLGk!&SkFI-7B{iue{E~YiP&AdqTHg7HjZfb^@4xwcV1$xYj~}~X zjb-d;Dc3>OVe8XH-gDGzUiq0j!PPi7?v>PskUU6^zm96P6SXp+`Nj#8Y}GSs(lbY- zBUvkLg5`fB?#($TOGdZaX0R61JS{mT>E4P~i}ws~l#G)~t#VeLu-ptXG3vi$n8{Wf zIa`Khc;xL2> zOKUkF0G&r&xIbt3qoYr+@^P0ydx?X{$RQ>MC+|%eLUD+xRl=LRDp`%1=bDkjOaT4> XSsF*S(5IC600000NkvXXu0mjfnEmu2 literal 0 HcmV?d00001 diff --git a/Mohem/src/assets/imgs/mohemm-action/info.png b/Mohem/src/assets/imgs/mohemm-action/info.png index 7d37568e27f4aa04ce6c47f93c0e6baf9ad5ce5f..7d8f16c61637a513dfac734440c116e438114c0f 100644 GIT binary patch delta 1286 zcmV+h1^N1&2#pGm7k@hl1^@s6#U=8y00004b3#c}2nYxWd@Su=tVW%M)l>{W17+_ociHW|D^2UQi6HPE7 z5ox#7L?dlt2tG7BEs#os0*wI`6QKJO5?U}u3l2B||FB{yJ6R(1 z957yF_}$$2Nq;M#cD5m+a{_T^)UWqvvzw8u=fL1<5V1W7xGWn`vHvHa?@4GoBJI8( z()p5>tT!;Qia_)+(duFov235**d`%hC-ZqUI3)b9RHru^_~C5x;IEc7IMHTi-M2)nc(9IinBdY{6k2 zh~O_l?xtva%c$vE5?Pk-NzUj>hxwg{J9HxCZ+&hK*@i&yH4X4!9>|XDDga;M@q1W0 zcPF#ENb@W*qAcH9M|zxxQ*s>+kLypvE)=)PdOM9bL4$pHU^=_2fVV>J`sa7Z28>hu zQ`9Y>;(utJ4*B(!xVWdk+8uLUVb1hF_}2griV@=FA$`5#eFgZq2*T4WG3vgB1&_ zVC?4K@XnF5aDL*3YO`^CxqXzG<;hC@C5g7wE`Nv{l7ye{8&+>P!GdjMN4L$L7M}U? z7~J@0#x}yXk)55{@taf7+;`kIqSBCUWaXIMw`MssRnG@W^z9>OY#p<R_(vZ*E}lil945!ibsTqdg`0_DsWGOAy#Yq|~hMAbZy zGkFYwcu zC54P&B9?g&$b^6X&q>&Qirr9p(M9=2;D0-QBd}Vj9S4B((~{#-#=ZQIe4_*WQR)KA zxKC!bgERY~QcDg1XR_~Oedp0eO`Ew;>hEV`M(fqxx*Kc?R4+$`{hVT}Fyc-mdrd1*`YRHoiJ)hjl1 z4YVVQ^(^hRxw%yM)-2gUB w@mhJEKURtYQiOv%N~jIbXcfcRvX~10Utd5J1F&4Pi~s-t07*qoM6N<$f=%3jM*si- delta 1045 zcmV+w1nT>Z3Y`d$7k@ek1^@s64tXIK00009a7bBm000XT000XT0n*)m`~Uz0&q+i< zRA_?t0+w-mg&t>C#$ zFXDn=d#r+OPL{L>d#H+FZH*vQq4JV9aZP5kyOWtsHvW)9c7L-w^X1LFnR#!f@8skJ zCS}>qB!FT5cxem3VL6{(Gg%kyu$JwN0muO$$m*lVLw$0y!=R*F)OAGIIQE33)KB!<} zbJujy5SHy5dHRy5Uq?|QHQDTFEmmGR{)Oe8eNT%U(78xDj1YlEWJ#IElETC$_59uq z+`K3sVl3Na+lAy71x#9H3@h>cI*Jnz5xd|-rW7RhX6$9WBThw>u7AWB60xoH(o_{_C21VE{xV*uH=9*I-$E-~nLM70ZHdk}L zvr~Je_IMl(eRx7CZd}f%i+q}6Ugdd3k_xg(oUm-Bq%{+ zSR0fF6Mez)#)C$TCYbP`V7r-UWHUP90opA~CKXYJ3F=6M^-nN^4vpCmFb=og&+|=g zZEx>wZ|}WbZ_94dbld&TIltd`&Ue0lX9zl;`j7e>s*r641UE2Pga9=RVIh52>rj_d zgaJ$;gGu_HAbY>l&mmF3gRu_xSfREEpSGuY|Ij_mc6}=u+(Htq+N6rpiik5JeVnj- zhBLQ*G5T`bA6hKsC(9T*xya$P)Lgm@X46Z6G|7(AlukI z;1tB<59HB13$|b}0mk4@QM9+jw?8&2LCYZP@CUymkFK^DZUb=G@rbv5O%~ZEfADz$ z@t^_CmK3FFX(Nr_Lmb?Hp54s^$I?)oyjpKb#0Eg|c{n=ec?fnRC2D${fzT`T^??DM zRu|n7@p?X#$bL^~OS%Lsa&Mg^va4}f_mNt=XiE_5{7c6oBPy19zLuVzfjYbiLRjj< z9q9B2KL*5?iqWh0*W3XMZn2x9I&p0ZE?)avzb?l1BP|U>w1{x)*P<-Ri5}kYu&HX> zJ`d|AOpA=eJdA%NL@P{1Mao`X>7Y-OscK(1dJ2XwP3YD66FU5%%ZPB7UJYt;>16vN z3EduPU0ee#wF_s>7$M7-kKD7AtjvGX$r=G^mLASJ%gd=*X1lG(E+`vM`~`?4X+J=XcnnUqK6 zge9U<1Kt^O50?#DPC`ydA}s&=M#mC($Ms-VsFxL4CBk(JZp+vRs1fC|Wk*(tu;jvA zM9Y>e2mWa9F-ZJ1l?qkv;i1j0oUC};XJ6x*1-f>O)6YFS#2YWUJ5oE*seNjDYiz-9yR_6|l!4Dgy`B`G46+S@&Hi4a@ea>mdUUDO8;4$_7kf(`hI;Mu1q6lf`*L~JLa#=DaGikA zS56^KQ_K~rGu}{8CArii4T0ctJ0P#J^*1`nMw!H&JM>*9N6{ttey% zsARY&(&6dWYNa5u>E5=B(=H literal 0 HcmV?d00001 diff --git a/Mohem/src/assets/imgs/mohemm-action/notDoable.png b/Mohem/src/assets/imgs/mohemm-action/notDoable.png index 557ea6d37f199eac0c74fc8a984273b7e32bb679..017070f582815407fe97dc480ecd54ce60f3dd4d 100644 GIT binary patch delta 1427 zcmV;E1#J4p3$+W7G=FSKL_t(&L+zVQY#UV&$LH;)$k2+o2!X2zh>1ujvDM@PJwSRu zYE&Um0}?dq0g4c!oG6E?6<)L04n^XloG5UhJvFI>+HinY2&oViS|p^VByQ4(HbGE` zDn62m7DMcP{GX+D?e(tL_Im5J$sTgZzL___H}mFw?3hs%&wq3z5==|W1DXRN>PG56b+Zk4ezOk~!685b6N}r}lhaecJJ4m?(aQ-VXX=^AJ zJ8mXo3Y%1vT^jKOV@xi$AFs5-bVe|;UEz5AE!zY&5s7SM5<7~9l2-t#utQ@Sf22E+ zIF>J4;8`T1do+oChXyxS(SfH#;Nis9u$@|K5$UdX}rIl+2_rV7!z756W>seA&13Z)d1tDy^b#&7nS9K#b zOBt<=HGg{u>w_plnN3C`2auz@vHw>)s z*nh>*BRN1Lunwv>Xxltc6aftbD@ux7w3{C-+mSjh9ZIcURX zW1}Z^Qh$#%Xv4w^!)M-ko0b+Aa~>5Q?%eTm$-T#w+1cEC`9>W6aq{uZLBMJUW$jt> zEN!>@^6WZm1YObETHs-;WyuOy91(vUK7W|qPC9uUpJ$DpwaU6yS=wlPel~UjW+q!x zSTWz`4(zwgx<=skXSNlcmKp|DQ0f~CtE{U7n{6nJ+1S&b)r}J#E_J>w_1;y_I=x-2 z<$2ak&t`8I0XvPW)UIkn#uo@s$MzSi6)%vh_F}G_&H;N)eCzoVpR_iVBVg4=0DsH4 zo^ks8jVo8D%Zrr__}23kLutVXN(-KHYN*%c@vY|&6J)1X{JJ^(}c4ji^ z>1O{v%QM=V|JRrIY`SmqP-dKVcgN#z&RGwC0&1Ub9uc093MQ83pn$sM_B8PP?v z)0l=1bWjPHy5fHJLpf`?y%hxgVY@@ms1HV~Mn?;4d^7J4P4(T5T9 zhZ`)UFCz_YuBeh+9})bdrE5uIqZpBUYcu5TX%VLy)E7UNUte6dXZ41&s(yhb`vmsU8>=&|hEkk=j%9MB zJC?Y1>1Ct7BG`Oy|CLVnNfPyOVx5@V9hfV3Lz%yZI9XNj9KM_I3pj?JXT)bTjmB2B hw2aw#(aetj0E%tV6liT0EDQhu002ovPDHLkV1k$Y!SVnA delta 1444 zcmV;V1zY;H3&snOG=F_bL_t(&L+x8%Y*S?vKj*g78SxK`A%kJYwsvTuK_1wMk>Y~V zPNRY(C_!Ub8>PUq3PcVZHjoA<| z4!7RV^G$ATZ|`ky@4a1b%Wl$i+x^Ztzu$MxcfNmT2s)nnkAM0bs*r641UE2Pga9=R zVIh52>rj_dgaJ$;gGu_HAbY>l&mmF3gRu_xSfREEpSGuY|Ij_mc6}=u+(Htq+N6rp ziik5JeVnj-hBLQ*G5T`bA6hKsC(9T*x^J>V3?$aM(dD0nL^arD>8NP@KG4Z%M=kK=FAvI_7x@b|WQf zdYpmKEA;h&0i9MC-4XG6K9tCQPiRZJ1T1oIog}iWaas3~TDxdV5bOL)$08#tmU_OH zo}Pg^ynhKoSn9(a==29a2E><&(X02@+yM)2v74egacv4NUi(|WF2?pFEe%7oh;ZxI zqAbaY9^UYJ%gd=*X1lG(E+`vM`~ z`+u?_%RScl&6$)(<%A`oQUl%@au1gcSx!PuNFpr%`$oqSc*pf%R;ZU1StY`C3vSEU z2&fU|vSmkBiLm6tTtv&3EC>E*?=eXHHI)ig?%|=$uAH+ZANOCKw zwQ;U_Rz5~0@M>9F%R0f5WaUJc++LmGVSl}ZpE+~_ewnzcrC$`=n7)Ei%erb=T8?V? z(j=T5&pvt?{Pj0OL`@H44)Vp|sT6*BGLjSiq3Mv$1YBDhQhHS!rRRmUSh< zN(&05Y;0+=931zsv~gDgo9lg1J!|B2aV~Z}W_k9;>0{JAg@TgWbHe;%#&h+bX~WZtDp>}-+_RnJ z*|*IAYh@jD6Yx4V9vEyEY%^yo{eCtn+85tkH}5?3Dm|1bIqiyi+xMiZWt>a9yR_6|l!4Dgy`B`G z46+S@&Hi4a@ea>mdUUDO8;4$_7kf(`hI;Mu z1q6lf`*L~JLa#=DaGikAS56^KQ_K~rGu}{8CArii4T0ctJ0P#IqN?!=RP+AsG*%xtzpd^6b6W-Rg6b8U zy85>x6E{(4uh#~pc࠭HGYC(_~R)@r37vgzKoi_ Date: Tue, 15 Mar 2022 14:35:35 +0300 Subject: [PATCH 7/8] fixed bug# 687 added toasts MSG for survey and video erm fixed fav for ITG added new icons for action btn in ITG --- .../absence-replacement-list.component.ts | 2 +- .../app/erm-channel/home/home.component.ts | 11 +- .../erm-channel/survey/survey.component.ts | 11 +- .../work-list-main-itg.component.ts | 8 +- .../work-list-replacement-itg.component.ts | 2 +- .../work-list-replacement-roll.component.ts | 271 +++++++++--------- .../imgs/mohemm-action/data-corrected (2).png | Bin 0 -> 1818 bytes .../imgs/mohemm-action/data-corrected (3).png | Bin 0 -> 1824 bytes .../imgs/mohemm-action/data-corrected (4).png | Bin 0 -> 1940 bytes .../imgs/mohemm-action/data-corrected.png | Bin 0 -> 1560 bytes Mohem/src/assets/localization/i18n.json | 11 + 11 files changed, 171 insertions(+), 145 deletions(-) create mode 100644 Mohem/src/assets/imgs/mohemm-action/data-corrected (2).png create mode 100644 Mohem/src/assets/imgs/mohemm-action/data-corrected (3).png create mode 100644 Mohem/src/assets/imgs/mohemm-action/data-corrected (4).png create mode 100644 Mohem/src/assets/imgs/mohemm-action/data-corrected.png diff --git a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.ts b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.ts index 0fcacdb7..d2ef54b6 100644 --- a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.ts +++ b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.ts @@ -32,7 +32,7 @@ export class AbsenceReplacementListComponent implements OnInit { P_PAGE_NUM: number; P_PAGE_LIMIT: number; ReplacementList: any = []; - searchBy: string = ""; + searchBy: string = "2"; IsReachEnd: boolean = false; ReplacmentListRes: WorKListReplacmentEmployeeResponse; private WorkListReplacmentEmployeeObj: WorkListReplacmentEmployeeRequest = new WorkListReplacmentEmployeeRequest(); diff --git a/Mohem/src/app/erm-channel/home/home.component.ts b/Mohem/src/app/erm-channel/home/home.component.ts index 5bec5386..6d621078 100644 --- a/Mohem/src/app/erm-channel/home/home.component.ts +++ b/Mohem/src/app/erm-channel/home/home.component.ts @@ -60,9 +60,14 @@ export class HomeComponent implements OnInit { }, ( ) => { }, this.ts.trPK('general', 'ok')).subscribe((result) => { - CommonService.SKIP = true; - this.cs.openHome(); - }) + if (this.cs.validResponse(result)){ + this.cs.greenToastPK("erm-channel", "viedo-success"); + CommonService.SKIP = true; + this.cs.openHome(); + }else{ + this.cs.redToastPK("erm-channel", "erm-failed"); + } + }); } } diff --git a/Mohem/src/app/erm-channel/survey/survey.component.ts b/Mohem/src/app/erm-channel/survey/survey.component.ts index b547457b..a5a6d759 100644 --- a/Mohem/src/app/erm-channel/survey/survey.component.ts +++ b/Mohem/src/app/erm-channel/survey/survey.component.ts @@ -52,9 +52,14 @@ export class SurveyComponent implements OnInit { this.authService.saveAdsStatus(request, () => { }, this.ts.trPK('general', 'ok')).subscribe((result) => { - CommonService.SKIP = true; - this.cs.openHome(); - }) + if (this.cs.validResponse(result)){ + this.cs.greenToastPK("erm-channel", "survey-success"); + CommonService.SKIP = true; + this.cs.openHome(); + }else{ + this.cs.redToastPK("erm-channel", "erm-failed"); + } + }); } select(rating) { this.satisfied = rating; diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts index 7cd149d4..f31cf456 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.ts @@ -149,16 +149,16 @@ export class WorkListMainItgComponent implements OnInit { return '../assets/imgs/mohemm-action/info.png'; } if (actionName === 'Grant') { - return '../assets/imgs/mohemm-action/info.png'; + return '../assets/imgs/mohemm-action/grant.png'; } if (actionName === 'Delegate') { return '../assets/imgs/mohemm-action/delegate.png'; } if (actionName === 'Answer') { - return '../assets/imgs/mohemm-action/info.png'; + return '../assets/imgs/mohemm-action/answer.png'; } if (actionName === 'Question') { - return '../assets/imgs/mohemm-action/info.png'; + return '../assets/imgs/mohemm-action/question.png'; } if (actionName === 'ReportGenerated') { return '../assets/imgs/mohemm-action/ReportGenerated.png'; @@ -170,7 +170,7 @@ export class WorkListMainItgComponent implements OnInit { return '../assets/imgs/mohemm-action/notDoable.png'; } if (actionName === 'DataCorrected') { - return '../assets/imgs/mohemm-action/info.png'; + return '../assets/imgs/mohemm-action/data-corrected.png'; } } 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 3f6f35c9..9426bf97 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 @@ -300,10 +300,10 @@ export class WorkListReplacementItgComponent implements OnInit { const userIndex = this.favoriteUserList.findIndex(x => x['USER_NAME'] === userID); console.log(userIndex); if (userIndex === -1) { - selEmp.IsFavorite = !selEmp.IsFavorite; this.cs.presentConfirmDialog( confirmBoxhtml , () => { + selEmp.IsFavorite = !selEmp.IsFavorite; const request = [ { diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts index 9f3fad7f..0e2a6346 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts @@ -445,27 +445,26 @@ export class WorkListReplacementRollComponent implements OnInit { counter = 0; onChangeSelect(select) { let selectValue = select.detail.value; - if (selectValue == '1') { this.isSelect = true; this.isFilter = true; this.selectedType = 1; this.listOfRealted = this.actionHistory; - if (this.counter > 0) { - this.actionHistory.forEach((obj, i) => { - if (this.favoriteUserList.find(x => x['USER_NAME'] === obj.USER_NAME)) { - this.actionHistory[i].IsFavorite = true; - } else { - this.actionHistory[i].IsFavorite = false; - } - }); - } + // if (this.counter > 0) { + this.actionHistory.forEach((obj, i) => { + if (this.favoriteUserList.find(x => x['USER_NAME'] === obj.USER_NAME)) { + this.actionHistory[i].IsFavorite = true; + } else { + this.actionHistory[i].IsFavorite = false; + } + }); + // } this.counter = 1; } else if (selectValue === '4') { // if (this.favoriteUserList.length === 0 || this.favoriteUserList === undefined) { this.getFavruite(); // } - this.isFilter = true; + this.isFilter = true; this.selectedType = 4; } else if (selectValue === '2' || selectValue === '3' || selectValue === '5') { this.isSelect = true; @@ -523,7 +522,9 @@ export class WorkListReplacementRollComponent implements OnInit { }); this.favLetter.forEach((obj, index) => { - if (this.activeSelectedLetter) { } + if (this.activeSelectedLetter) { + this.selectedLetter(this.activeSelectedLetter); + } if (index === 0) { // this.selectedLetter(obj); this.favIsActive.push(true); @@ -531,150 +532,154 @@ export class WorkListReplacementRollComponent implements OnInit { this.favIsActive.push(false); } }); - console.log(this.favLetter); - console.log(this.favIsActive); - } + console.log(this.favLetter); + console.log(this.favIsActive); + } }); - // this.worklistService.getFavorite({}, () => { - - // }).subscribe((result) => { - // if (this.cs.validResponse(result)) { - // this.cs.stopLoading(); - // this.favoriteUserList = result['Mohemm_GetFavoriteReplacementsList']; - // this.listOfFav = this.favoriteUserList; - // this.favoriteUserList.forEach((obj) => { - // obj.IsFavorite = true; - // }); - // } - // }); -} + // this.worklistService.getFavorite({}, () => { + + // }).subscribe((result) => { + // if (this.cs.validResponse(result)) { + // this.cs.stopLoading(); + // this.favoriteUserList = result['Mohemm_GetFavoriteReplacementsList']; + // this.listOfFav = this.favoriteUserList; + // this.favoriteUserList.forEach((obj) => { + // obj.IsFavorite = true; + // }); + // } + // }); + } -saveUserFavruiteList(request, isFav: boolean) { - this.worklistService.saveFavoriteList(request, () => { - }).subscribe((result) => { - if (this.cs.validResponse(result)) { - if (isFav) { - this.cs.greenToastPK("replacementRoll", "favorite-saved"); - } else { - this.cs.redToastPK("replacementRoll", "favorite-unsaved"); + saveUserFavruiteList(request, isFav: boolean) { + this.worklistService.saveFavoriteList(request, () => { + }).subscribe((result) => { + if (this.cs.validResponse(result)) { + if (isFav) { + this.cs.greenToastPK("replacementRoll", "favorite-saved"); + } else { + this.cs.redToastPK("replacementRoll", "favorite-unsaved"); + } + this.getFavruite(); } - this.getFavruite(); - } - }); -} + }); + } -setFavorite(selEmp) { - selEmp.EMPLOYEE_DISPLAY_NAME = selEmp.EMPLOYEE_DISPLAY_NAME ? selEmp.EMPLOYEE_DISPLAY_NAME : selEmp.NAME; - selEmp.EMPLOYEE_IMAGE = selEmp.EMPLOYEE_IMAGE ? selEmp.EMPLOYEE_IMAGE : ''; - selEmp.EMAIL_ADDRESS = selEmp.EMAIL_ADDRESS ? selEmp.EMAIL_ADDRESS : ''; - selEmp.IsFavorite = !selEmp.IsFavorite; - let confirmBoxhtml = `
+ setFavorite(selEmp) { + let confirmBoxhtml = `

Do you want to add ` + selEmp.EMPLOYEE_DISPLAY_NAME + ` in your favorite list



`; - if (selEmp.EMPLOYEE_IMAGE) { - confirmBoxhtml += '
'; - } - if (!selEmp.EMPLOYEE_IMAGE) { - confirmBoxhtml += '
'; - } + if (selEmp.EMPLOYEE_IMAGE) { + confirmBoxhtml += '
'; + } + if (!selEmp.EMPLOYEE_IMAGE) { + confirmBoxhtml += '
'; + } - confirmBoxhtml += `
+ confirmBoxhtml += `
` + selEmp.EMPLOYEE_DISPLAY_NAME + `
`; - const userIndex = this.favoriteUserList.findIndex(x => x['USER_NAME'] === selEmp.USER_NAME) - if (userIndex === -1) { - this.cs.presentConfirmDialog( - confirmBoxhtml - , () => { - const request = - [ - { - 'USER_NAME': selEmp['USER_NAME'], - 'EMPLOYEE_DISPLAY_NAME': selEmp['EMPLOYEE_DISPLAY_NAME'], - 'EMAIL_ADDRESS': selEmp.EMAIL_ADDRESS, - 'EMPLOYEE_IMAGE': selEmp.EMPLOYEE_IMAGE, - 'IsFavorite': selEmp.IsFavorite - } - ]; - - this.saveUserFavruiteList(request, selEmp.IsFavorite); - }, () => { }); - } else { - const request = - [ - { - 'USER_NAME': selEmp['USER_NAME'], - 'EMPLOYEE_DISPLAY_NAME': selEmp['EMPLOYEE_DISPLAY_NAME'], - 'EMAIL_ADDRESS': selEmp.EMAIL_ADDRESS, - 'EMPLOYEE_IMAGE': selEmp.EMPLOYEE_IMAGE, - 'IsFavorite': false - } - ]; - this.saveUserFavruiteList(request, false); + const userIndex = this.favoriteUserList.findIndex(x => x['USER_NAME'] === selEmp.USER_NAME) + if (userIndex === -1) { + this.cs.presentConfirmDialog( + confirmBoxhtml + , () => { + selEmp.EMPLOYEE_DISPLAY_NAME = selEmp.EMPLOYEE_DISPLAY_NAME ? selEmp.EMPLOYEE_DISPLAY_NAME : selEmp.NAME; + selEmp.EMPLOYEE_IMAGE = selEmp.EMPLOYEE_IMAGE ? selEmp.EMPLOYEE_IMAGE : ''; + selEmp.EMAIL_ADDRESS = selEmp.EMAIL_ADDRESS ? selEmp.EMAIL_ADDRESS : ''; + selEmp.IsFavorite = !selEmp.IsFavorite; + const request = + [ + { + 'USER_NAME': selEmp['USER_NAME'], + 'EMPLOYEE_DISPLAY_NAME': selEmp['EMPLOYEE_DISPLAY_NAME'], + 'EMAIL_ADDRESS': selEmp.EMAIL_ADDRESS, + 'EMPLOYEE_IMAGE': selEmp.EMPLOYEE_IMAGE, + 'IsFavorite': selEmp.IsFavorite + } + ]; + + this.saveUserFavruiteList(request, selEmp.IsFavorite); + }, () => { }); + } else { + selEmp.EMPLOYEE_DISPLAY_NAME = selEmp.EMPLOYEE_DISPLAY_NAME ? selEmp.EMPLOYEE_DISPLAY_NAME : selEmp.NAME; + selEmp.EMPLOYEE_IMAGE = selEmp.EMPLOYEE_IMAGE ? selEmp.EMPLOYEE_IMAGE : ''; + selEmp.EMAIL_ADDRESS = selEmp.EMAIL_ADDRESS ? selEmp.EMAIL_ADDRESS : ''; + selEmp.IsFavorite = !selEmp.IsFavorite; + const request = + [ + { + 'USER_NAME': selEmp['USER_NAME'], + 'EMPLOYEE_DISPLAY_NAME': selEmp['EMPLOYEE_DISPLAY_NAME'], + 'EMAIL_ADDRESS': selEmp.EMAIL_ADDRESS, + 'EMPLOYEE_IMAGE': selEmp.EMPLOYEE_IMAGE, + 'IsFavorite': false + } + ]; + this.saveUserFavruiteList(request, false); + } } -} -listOfRealted: any = []; -listOfFav: any = []; + listOfRealted: any = []; + listOfFav: any = []; -filterList(event) { - const val = event.target.value; - if (this.selectedType === 1) { - if (val === '') { - this.actionHistory = this.listOfRealted; - } else { - this.actionHistory = this.listOfRealted.filter((item) => { - return (item.NAME.toLowerCase().indexOf(val.toLowerCase()) > -1); - }); - } - } else if (this.selectedType === 4) { - if (val === '') { - this.favoriteUserList = this.listOfFav; + filterList(event) { + const val = event.target.value; + if (this.selectedType === 1) { + if (val === '') { + this.actionHistory = this.listOfRealted; + } else { + this.actionHistory = this.listOfRealted.filter((item) => { + return (item.NAME.toLowerCase().indexOf(val.toLowerCase()) > -1); + }); + } + } else if (this.selectedType === 4) { + if (val === '') { + this.favoriteUserList = this.listOfFav; + } else { + this.favoriteUserList = this.listOfFav.filter((item) => { + return (item.EMPLOYEE_DISPLAY_NAME.toLowerCase().indexOf(val.toLowerCase()) > -1); + }); + } } else { - this.favoriteUserList = this.listOfFav.filter((item) => { - return (item.EMPLOYEE_DISPLAY_NAME.toLowerCase().indexOf(val.toLowerCase()) > -1); - }); + return; } - } else { - return; } -} -selectedLetter(el) { - this.isFavoriteLetterActive = true; - this.favLetter.forEach((letter, index) => { - if (letter === el) { - this.favIsActive[index] = true; - this.activeSelectedLetter = el; - this.worklistService.getFavoriteByLetter(letter, () => { - }).subscribe((result) => { - if (this.cs.validResponse(result)) { - this.cs.stopLoading(); - this.favoriteUserList = result['Mohemm_GetFavoriteReplacementsList']; - this.listOfFav = this.favoriteUserList; - this.favoriteUserList.forEach((obj) => { - obj.IsFavorite = true; - }); - } - }); - } else { - this.favIsActive[index] = false; - } - }); -} + selectedLetter(el) { + this.isFavoriteLetterActive = true; + this.favLetter.forEach((letter, index) => { + if (letter === el) { + this.favIsActive[index] = true; + this.activeSelectedLetter = el; + this.worklistService.getFavoriteByLetter(letter, () => { + }).subscribe((result) => { + if (this.cs.validResponse(result)) { + this.cs.stopLoading(); + this.favoriteUserList = result['Mohemm_GetFavoriteReplacementsList']; + this.listOfFav = this.favoriteUserList; + this.favoriteUserList.forEach((obj) => { + obj.IsFavorite = true; + }); + } + }); + } else { + this.favIsActive[index] = false; + } + }); + } -returnIsActiveFunction(i) { - return this.favIsActive[i]; -} + returnIsActiveFunction(i) { + return this.favIsActive[i]; + } -clearSearchInput(){ - this.inputSearch = ''; -} + clearSearchInput() { + this.inputSearch = ''; + } } diff --git a/Mohem/src/assets/imgs/mohemm-action/data-corrected (2).png b/Mohem/src/assets/imgs/mohemm-action/data-corrected (2).png new file mode 100644 index 0000000000000000000000000000000000000000..5d6dfd2acc026b284dc5e8f1e66bdb8a213d745d GIT binary patch literal 1818 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 Date: Wed, 23 Mar 2022 12:25:03 +0300 Subject: [PATCH 8/8] fixed bugs: MM-725 MM-726 MM-727 MM-714 MM-720 MM-722 MM-718 MM-706 MM-687 --- Mohem/src/app/my-team/details/details.component.ts | 3 ++- .../worklist-setting/worklist-setting.component.html | 8 ++++---- .../time-card-details/time-card-details.component.scss | 2 +- .../time-card-details/time-card-details.component.ts | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Mohem/src/app/my-team/details/details.component.ts b/Mohem/src/app/my-team/details/details.component.ts index 4469f7ec..98955dfd 100644 --- a/Mohem/src/app/my-team/details/details.component.ts +++ b/Mohem/src/app/my-team/details/details.component.ts @@ -235,7 +235,7 @@ export class DetailsComponent implements OnInit { ngOnInit() { this.common.startLoading(); this.intializeMemberDetail(); - this.showAttendanceTracking(); + // this.showAttendanceTracking(); // tslint:disable-next-line: max-line-length this.currentMonthName = this.direction === 'en' ? this.common.getMonthName(this.monthIndex) : this.common.getMonthNameAr(this.monthIndex); } @@ -266,6 +266,7 @@ export class DetailsComponent implements OnInit { if (this.activeSegment === 'Attendance') { this.common.startLoading(); this.initAttendance(); + this.showAttendanceTracking(); } else if (this.activeSegment != 'Attendance' && this.activeSegment != 'TeamMembers') { this.activeSegment = 'About'; diff --git a/Mohem/src/app/notification/worklist-setting/worklist-setting.component.html b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.html index 9f1ef3f6..490f2123 100644 --- a/Mohem/src/app/notification/worklist-setting/worklist-setting.component.html +++ b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.html @@ -18,15 +18,15 @@ -

item type

+

item type

-

FYA

+

FYA

         -

FYI

+

FYI

-

{{data.ITEM_TYPE}}

+

{{data.ITEM_TYPE}}

    diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss index ef433546..5cd0e320 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss @@ -852,7 +852,7 @@ $actionBtnSize : 36px; font-size: 18px; } span{ - font-size: 11px; + font-size: 9px; } } } diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts index 638d68e0..98f15742 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts @@ -184,7 +184,7 @@ export class TimeCardDetailsComponent implements OnInit { { data: [this.absentDays, this.attendedDays], backgroundColor: [ - '#269DB8', + '#292F42', '#269DB8' ], borderWidth: 2