From a048198f89cf87e6bb9e857b8310809b2b14d407 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Thu, 3 Mar 2022 15:08:13 +0300 Subject: [PATCH] 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