fixed fav in worklist design and added icon for doable and not doable

enad-pre-live
enadhilal 4 years ago
parent f96cf769a2
commit a048198f89

@ -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';

@ -170,7 +170,7 @@
</ion-list>
<div style="font-weight: bold;" *ngIf="searchKeySelect === '4' && !isFavoriteLetterActive">
<!-- <div style="font-weight: bold;" *ngIf="searchKeySelect === '4' && !isFavoriteLetterActive">
<ion-slides [options]="slideOptsOne">
<ion-slide *ngFor="let filter of favLetter; let i=index">
<div>
@ -178,9 +178,28 @@
</div>
</ion-slide>
</ion-slides>
</div> -->
<div class="letterDiv" *ngIf="searchKeySelect === '4' && !isFavoriteLetterActive && !userSelected">
<!-- <ion-slides [options]="slideOptsOne">
<ion-slide *ngFor="let filter of favLetter; let i=index"> -->
<div *ngFor="let filter of favLetter; let i=index" class="letterDivLoop">
<p (click)='selectedLetter(favLetter[i])'>{{filter}}</p>
</div>
<!-- </ion-slide>
</ion-slides> -->
</div>
<div style="font-weight: bold;" *ngIf="searchKeySelect === '4' && isFavoriteLetterActive">
<div class="letterDiv" *ngIf="searchKeySelect === '4' && isFavoriteLetterActive && !userSelected">
<!-- <ion-slides [options]="slideOptsOne">
<ion-slide *ngFor="let filter of favLetter; let i=index"> -->
<div [ngClass]="returnIsActiveFunction(i)? 'isFavLetterActive':'letterDivLoop'" *ngFor="let filter of favLetter; let i=index">
<p (click)='selectedLetter(favLetter[i])'>{{filter}}</p>
</div>
<!-- </ion-slide>
</ion-slides> -->
</div>
<!-- <div style="font-weight: bold;" *ngIf="searchKeySelect === '4' && isFavoriteLetterActive">
<ion-slides [options]="slideOptsOne">
<ion-slide *ngFor="let filter of favLetter; let i=index">
<div [ngClass]="returnIsActiveFunction(i)? 'isFavLetterActive':''">
@ -188,7 +207,7 @@
</div>
</ion-slide>
</ion-slides>
</div>
</div> -->
<!-- <ion-item>
<ion-list [(ngModel)]="selEmp" *ngIf="ReplacementList">
@ -209,7 +228,7 @@
</ion-item>
</ion-radio-group>
</ion-list> -->
<div *ngIf="!userSelected">
<div *ngIf="!userSelected" style="float: right;">
<div *ngIf="ReplacementList.length>0" class="uk-margin">
{{'replacementRoll, search-result' | translate}}
</div>
@ -282,7 +301,7 @@
</div>
<!-- favorite list -->
<div [hidden]="isAnswer==true"
<div [hidden]="isAnswer==true" style="width: 90%; float: left;"
*ngIf="favoriteUserList.length> 0 && !userSelected && ReplacementList.length ==0 && searchKeySelect == '4' && isFavoriteLetterActive">
<div class="uk-margin">
{{'replacementRoll, favorite' | translate}}
@ -314,14 +333,14 @@
</div>
</div>
<div *ngIf="favLetter.length > 0 && searchKeySelect == '4' && favoriteUserList.length === 0">
<div style="width: 90%; float: left;" *ngIf="favLetter.length > 0 && searchKeySelect == '4' && favoriteUserList.length === 0">
<ion-label>
<p style="text-align: center;">
{{'general, fav-showData' | translate}}
</p>
</ion-label>
</div>
<div *ngIf="favoriteUserList.length === 0 && searchKeySelect == '4' && favLetter.length ===0">
<div style="width: 90%; float: left;" *ngIf="favoriteUserList.length === 0 && searchKeySelect == '4' && favLetter.length ===0">
<ion-label>
<p style="text-align: center;">
{{'general, fav-noData' | translate}}

@ -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;
}

@ -126,24 +126,24 @@
</ion-grid>
</ion-list>
<div style="font-weight: bold;" *ngIf="searchBy === '4' && !isFavoriteLetterActive && !userSelected">
<ion-slides [options]="slideOptsOne">
<ion-slide *ngFor="let filter of favLetter; let i=index">
<div>
<div class="letterDiv" *ngIf="searchBy === '4' && !isFavoriteLetterActive && !userSelected">
<!-- <ion-slides [options]="slideOptsOne">
<ion-slide *ngFor="let filter of favLetter; let i=index"> -->
<div *ngFor="let filter of favLetter; let i=index" class="letterDivLoop">
<p (click)='selectedLetter(favLetter[i])'>{{filter}}</p>
</div>
</ion-slide>
</ion-slides>
<!-- </ion-slide>
</ion-slides> -->
</div>
<div style="font-weight: bold;" *ngIf="searchBy === '4' && isFavoriteLetterActive && !userSelected">
<ion-slides [options]="slideOptsOne">
<ion-slide *ngFor="let filter of favLetter; let i=index">
<div [ngClass]="returnIsActiveFunction(i)? 'isFavLetterActive':''">
<div class="letterDiv" *ngIf="searchBy === '4' && isFavoriteLetterActive && !userSelected">
<!-- <ion-slides [options]="slideOptsOne">
<ion-slide *ngFor="let filter of favLetter; let i=index"> -->
<div [ngClass]="returnIsActiveFunction(i)? 'isFavLetterActive':'letterDivLoop'" *ngFor="let filter of favLetter; let i=index">
<p (click)='selectedLetter(favLetter[i])'>{{filter}}</p>
</div>
</ion-slide>
</ion-slides>
<!-- </ion-slide>
</ion-slides> -->
</div>
<div class="noteInput" *ngIf="isAnswer==true">
@ -191,7 +191,7 @@
<br />
<!-- <div [hidden]="isAnswer==true"
*ngIf="favoriteUserList.length> 0 && !userSelected && ReplacementList.length ==0 && searchBy == '4'"> -->
<div [hidden]="isAnswer==true" *ngIf="favoriteUserList.length >0 && !userSelected && searchBy === '4'">
<div style="width: 90%; float: left;" [hidden]="isAnswer==true" *ngIf="favoriteUserList.length >0 && !userSelected && searchBy === '4'">
<div class="uk-margin">
{{'replacementRoll, favorite' | translate}}
</div>

@ -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;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Loading…
Cancel
Save