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 00000000..46d08d07 Binary files /dev/null and b/Mohem/src/assets/imgs/mohemm-action/Doable.png differ 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 00000000..557ea6d3 Binary files /dev/null and b/Mohem/src/assets/imgs/mohemm-action/notDoable.png differ