Merge branch 'MOHEMM-Q2-DEV' into enad-Q1

# Conflicts:
#	Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html
#	Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html
enad-Q1
umasoodch 5 years ago
commit 53bc9d067e

@ -127,7 +127,7 @@
</ion-item> -->
</div>
<div [hidden]="isAnswer==true" *ngIf="favoriteUserList.length> 0 && !userSelected && ReplacementList.length ==0 && searchKeySelect =='4'">
<div [hidden]="isAnswer==true" *ngIf="favoriteUserList.length> 0 && !userSelected && ReplacementList.length ==0 && searchKeySelect == '4'">
<div class="uk-margin">
{{'replacementRoll, favorite' | translate}}
</div>

@ -89,7 +89,7 @@
</div>
<br/>
<div [hidden]="isAnswer==true" *ngIf="favoriteUserList.length> 0 && !userSelected && ReplacementList.length ==0 && searchBy =='4'">
<div [hidden]="isAnswer==true" *ngIf="favoriteUserList.length> 0 && !userSelected && ReplacementList.length ==0 && searchBy == '4'">
<div class="uk-margin">
{{'replacementRoll, favorite' | translate}}
</div>

@ -123,6 +123,6 @@
<ion-footer>
<div class="centerDiv">
<ion-button class="confirmEitOkButton" color="customnavy" ion-button (click)="openSubmitModal()">
{{ (isDelete ? 'general, delete' : 'general, submit') | translate }}</ion-button>
{{ 'general, submit' | translate }}</ion-button>
</div>
</ion-footer>
Loading…
Cancel
Save