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 681ea344..58242557 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 @@ -273,7 +273,7 @@ export class WorkListMainItgComponent implements OnInit { } else if (result.MessageStatus === 1) { // this.messageSuccess = true; - this.common.greenToastPK('worklist', 'save-successfully'); + this.common.greenToastPK('worklist', 'done-successfully'); setTimeout(() => { // this.messageSuccess = false; this.common.sharedService.setSharedData(true, 'loadWorkList'); @@ -295,7 +295,7 @@ export class WorkListMainItgComponent implements OnInit { this.common.presentAlert(this.ts.trPK('general', 'error-itg')); } else if (result.MessageStatus === 1) { - this.common.greenToastPK('worklist', 'save-successfully'); + this.common.greenToastPK('worklist', 'done-successfully'); setTimeout(() => { // this.messageSuccess = true; this.common.sharedService.setSharedData(true, 'loadWorkList'); @@ -323,7 +323,7 @@ export class WorkListMainItgComponent implements OnInit { if (result.MessageStatus === 1) { // this.messageSuccess = true; - this.common.greenToastPK('worklist', 'save-successfully'); + this.common.greenToastPK('worklist', 'done-successfully'); setTimeout(() => { // this.messageSuccess = false; this.common.sharedService.setSharedData(true, 'loadWorkList'); @@ -347,7 +347,7 @@ export class WorkListMainItgComponent implements OnInit { } else if (result.MessageStatus === 1) { // this.messageSuccess = true; - this.common.greenToastPK('worklist', 'save-successfully'); + this.common.greenToastPK('worklist', 'done-successfully'); setTimeout(() => { // this.messageSuccess = false; this.common.sharedService.setSharedData(true, 'loadWorkList'); @@ -372,7 +372,7 @@ export class WorkListMainItgComponent implements OnInit { } else if (result.MessageStatus === 1) { // this.messageSuccess = true; - this.common.greenToastPK('worklist', 'save-successfully'); + this.common.greenToastPK('worklist', 'done-successfully'); setTimeout(() => { // this.messageSuccess = false; this.common.sharedService.setSharedData(true, 'loadWorkList'); @@ -400,7 +400,7 @@ export class WorkListMainItgComponent implements OnInit { } else if (result.MessageStatus === 1) { // this.messageSuccess = true; - this.common.greenToastPK('worklist', 'save-successfully'); + this.common.greenToastPK('worklist', 'done-successfully'); setTimeout(() => { // this.messageSuccess = false; this.common.sharedService.setSharedData(true, 'loadWorkList'); @@ -429,7 +429,7 @@ export class WorkListMainItgComponent implements OnInit { } else if (result.MessageStatus === 1) { // this.messageSuccess = true; - this.common.greenToastPK('worklist', 'save-successfully'); + this.common.greenToastPK('worklist', 'done-successfully'); setTimeout(() => { // this.messageSuccess = false; this.common.sharedService.setSharedData(true, 'loadWorkList'); 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 dfe64fd4..e3a9e8d5 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 @@ -135,7 +135,17 @@ -
{{filter}}
++ select filter to show data +
++ Sorry there is no data +
++ select filter to show data +
+Sorry there is no data 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 58ff1982..de6bf9f7 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 @@ -56,7 +56,7 @@ export class WorkListReplacementRollComponent implements OnInit { spaceBetween: 5 }; - public activeSelectedLetter:string; + public activeSelectedLetter: string; constructor(public worklistService: WorklistService, private cs: CommonService, public ts: TranslatorService, public workListMainService: WorklistMainService, public modalCtrl: ModalController) { this.P_PAGE_NUM = 1; @@ -463,7 +463,7 @@ export class WorkListReplacementRollComponent implements OnInit { this.counter = 1; } else if (selectValue === '4') { // if (this.favoriteUserList.length === 0 || this.favoriteUserList === undefined) { - this.getFavruite(); + // this.getFavruite(); // } this.isFilter = true; this.selectedType = 4; @@ -521,159 +521,156 @@ export class WorkListReplacementRollComponent implements OnInit { this.favLetter = this.favLetter.filter((elem, index, self) => { return index === self.indexOf(elem); }); - if (this.activeSelectedLetter) { - this.selectedLetter(this.activeSelectedLetter); - } else { - this.favLetter.forEach((obj, index) => { - if(this.activeSelectedLetter) {} - if (index === 0) { - // this.selectedLetter(obj); - this.favIsActive.push(true); - } else { - this.favIsActive.push(false); - } - }); - } - console.log(this.favLetter); - console.log(this.favIsActive); - } + + this.favLetter.forEach((obj, index) => { + if (this.activeSelectedLetter) { } + if (index === 0) { + // this.selectedLetter(obj); + this.favIsActive.push(true); + } else { + this.favIsActive.push(false); + } + }); + console.log(this.favLetter); + console.log(this.favIsActive); + } }); - // this.worklistService.getFavorite({}, () => { - - // }).subscribe((result) => { - // if (this.cs.validResponse(result)) { - // this.cs.stopLoading(); - // this.favoriteUserList = result['Mohemm_GetFavoriteReplacementsList']; - // this.listOfFav = this.favoriteUserList; - // this.favoriteUserList.forEach((obj) => { - // obj.IsFavorite = true; - // }); - // } - // }); - } + // this.worklistService.getFavorite({}, () => { + + // }).subscribe((result) => { + // if (this.cs.validResponse(result)) { + // this.cs.stopLoading(); + // this.favoriteUserList = result['Mohemm_GetFavoriteReplacementsList']; + // this.listOfFav = this.favoriteUserList; + // this.favoriteUserList.forEach((obj) => { + // obj.IsFavorite = true; + // }); + // } + // }); +} - saveUserFavruiteList(request, isFav: boolean) { - this.worklistService.saveFavoriteList(request, () => { - }).subscribe((result) => { - if (this.cs.validResponse(result)) { - if (isFav) { - this.cs.greenToastPK("replacementRoll", "favorite-saved"); - } else { - this.cs.redToastPK("replacementRoll", "favorite-unsaved"); - } - this.getFavruite(); +saveUserFavruiteList(request, isFav: boolean) { + this.worklistService.saveFavoriteList(request, () => { + }).subscribe((result) => { + if (this.cs.validResponse(result)) { + if (isFav) { + this.cs.greenToastPK("replacementRoll", "favorite-saved"); + } else { + this.cs.redToastPK("replacementRoll", "favorite-unsaved"); } - }); - } + this.getFavruite(); + } + }); +} - setFavorite(selEmp) { - 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; - let confirmBoxhtml = `


{{'worklist, loading'| translate}}
+ getPassNotificationDetails?.REQUEST_TYPE != 'TERMINATION' &&
+ getPassNotificationDetails?.REQUEST_TYPE != 'CEI'">
{{'worklist, loading'| translate}} ![]()
{{'worklist, loading'| translate}} ![]()
{{'worklist, loading'| translate}} ![]()
{{ 'general, empty' | translate}}
+{{'worklist, loading'| translate}} ![]()