@@ -159,13 +174,18 @@
- {{employee.EMPLOYEE_DISPLAY_NAME}}
+ {{employee.EMPLOYEE_DISPLAY_NAME}}
-
+
+
+

+
@@ -209,7 +229,7 @@
(click)="submitAction()">
{{'general, submit' | translate}}
-
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 df8aa22c..ed3c7ca8 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
@@ -47,7 +47,7 @@ export class WorkListReplacementRollComponent implements OnInit {
userSelected: boolean;
actionHistory = [];
arr = [];
- favoriteUserList: [] = [];
+ favoriteUserList: any = [];
isFilter = true;
constructor(public worklistService: WorklistService, private cs: CommonService, public ts: TranslatorService, public workListMainService: WorklistMainService, public modalCtrl: ModalController) {
this.P_PAGE_NUM = 1;
@@ -488,8 +488,10 @@ export class WorkListReplacementRollComponent implements OnInit {
this.cs.stopLoading();
this.favoriteUserList = result['Mohemm_GetFavoriteReplacementsList'];
this.listOfFav = this.favoriteUserList;
-
- /**** THIS CODE TO CHECK STAR OF EMPLOYEE IF THE IT IS IN FAVOORIT LIST AND SHOW IN WORKFLOW LIST****/
+ this.favoriteUserList.forEach((obj) => {
+ obj.IsFavorite = true;
+ });
+ /**** THIS CODE TO CHECK STAR OF EMPLOYEE IF IT IS IN FAVORITE LIST AND SHOW IN WORKFLOW LIST****/
// this.actionHistory.forEach((obj, i) => {
// if(this.favoriteUserList.some(x => x['USER_NAME'] === obj.USER_NAME)) {
// this.actionHistory[i].isInFavorite = true;
@@ -517,6 +519,7 @@ export class WorkListReplacementRollComponent implements OnInit {
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;
if (this.favoriteUserList.some(x => x['USER_NAME'] === selEmp.USER_NAME)) {
let confirmBoxhtml = `
Do you want to add ` + selEmp.EMPLOYEE_DISPLAY_NAME + ` in your favorite list
@@ -547,12 +550,24 @@ export class WorkListReplacementRollComponent implements OnInit {
'EMPLOYEE_DISPLAY_NAME': selEmp['EMPLOYEE_DISPLAY_NAME'],
'EMAIL_ADDRESS': selEmp.EMAIL_ADDRESS,
'EMPLOYEE_IMAGE': selEmp.EMPLOYEE_IMAGE,
- 'IsFavorite': true
+ 'IsFavorite': selEmp.IsFavorite
}
];
this.saveUserFavruiteList(request);
}, () => { });
+ } 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);
}
} else {
const request =
@@ -565,10 +580,11 @@ export class WorkListReplacementRollComponent implements OnInit {
'IsFavorite': false
}
];
- this.saveUserFavruiteList(request);
+ this.saveUserFavruiteList(request);
}
}
+
listOfRealted: any = [];
listOfFav: any = [];
diff --git a/Mohem/src/assets/icon/HMG_LOGO.png b/Mohem/src/assets/icon/HMG_LOGO.png
new file mode 100644
index 00000000..d2dbe038
Binary files /dev/null and b/Mohem/src/assets/icon/HMG_LOGO.png differ