From f597f56f00ac3be054902d5d37f64cced8fd3aee Mon Sep 17 00:00:00 2001 From: enadhilal Date: Mon, 14 Feb 2022 16:12:14 +0300 Subject: [PATCH] =?UTF-8?q?stamp=20next=20is=20not=20working=20success=20m?= =?UTF-8?q?essage=20should=20be=20"Your=20action=20has=20been=20executed?= =?UTF-8?q?=20successfully!"=20if=20in=20case=20while=20approve=20reject?= =?UTF-8?q?=20delegate=20service=20gives=20error=20it=20should=20not=20mov?= =?UTF-8?q?e=20to=20next=20one=E2=80=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work-list-main-itg.component.ts | 14 +- .../work-list-replacement-itg.component.html | 29 +- .../work-list-replacement-itg.component.ts | 4 +- .../work-list-replacement-roll.component.html | 9 +- .../work-list-replacement-roll.component.ts | 263 +++++++++--------- .../worklist-main-ic.component.ts | 4 +- .../worklist-main-mr.component.ts | 4 +- .../worklist-main-po.component.ts | 4 +- .../worklist-main-pr.component.ts | 4 +- .../worklist-main.component.html | 44 ++- .../worklist-main/worklist-main.component.ts | 13 +- Mohem/src/assets/localization/i18n.json | 4 + 12 files changed, 234 insertions(+), 162 deletions(-) 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}}

+
+
+
+
+ +
@@ -238,7 +248,7 @@
+ *ngIf="favoriteUserList.length> 0 && !userSelected && ReplacementList.length ==0 && searchKeySelect == '4' && isFavoriteLetterActive">
{{'replacementRoll, favorite' | translate}}
@@ -269,6 +279,21 @@
+
+ +

+ select filter to show data +

+
+
+
+ +

+ Sorry there is no data +

+
+
+
diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts index ffddbe54..e70e8589 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.ts @@ -40,6 +40,7 @@ export class WorkListReplacementItgComponent implements OnInit { public direction = ''; arr = []; delegtedEmp; + isFavoriteLetterActive = false; public slideOptsOne = { slidesPerView: 6, @@ -341,7 +342,7 @@ export class WorkListReplacementItgComponent implements OnInit { this.favLetter.forEach((obj, index) => { if(this.activeSelectedLetter) {} if (index === 0) { - this.selectedLetter(obj); + // this.selectedLetter(obj); this.favIsActive.push(true); } else { this.favIsActive.push(false); @@ -412,6 +413,7 @@ export class WorkListReplacementItgComponent implements OnInit { } selectedLetter(el) { + this.isFavoriteLetterActive = true; this.favLetter.forEach((letter, index) => { if (letter === el) { this.favIsActive[index] = true; 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 0994d42a..6d73b5d9 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 @@ -181,7 +181,14 @@
-
+
+ +

+ 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 = `

+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 = `

Do you want to add ` + selEmp.EMPLOYEE_DISPLAY_NAME + ` in your favorite list



`; - if (selEmp.EMPLOYEE_IMAGE) { - confirmBoxhtml += '
'; - } - if (!selEmp.EMPLOYEE_IMAGE) { - confirmBoxhtml += '
'; - } + if (selEmp.EMPLOYEE_IMAGE) { + confirmBoxhtml += '
'; + } + if (!selEmp.EMPLOYEE_IMAGE) { + confirmBoxhtml += '
'; + } - confirmBoxhtml += `
+ confirmBoxhtml += `
` + selEmp.EMPLOYEE_DISPLAY_NAME + `
`; - const userIndex = this.favoriteUserList.findIndex(x => x['USER_NAME'] === selEmp.USER_NAME) - if (userIndex === -1) { - this.cs.presentConfirmDialog( - confirmBoxhtml - , () => { - 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': selEmp.IsFavorite - } - ]; - - this.saveUserFavruiteList(request, selEmp.IsFavorite); - }, () => { }); - } 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, false); - } + const userIndex = this.favoriteUserList.findIndex(x => x['USER_NAME'] === selEmp.USER_NAME) + if (userIndex === -1) { + this.cs.presentConfirmDialog( + confirmBoxhtml + , () => { + 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': selEmp.IsFavorite + } + ]; + + this.saveUserFavruiteList(request, selEmp.IsFavorite); + }, () => { }); + } 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, false); } +} - listOfRealted: any = []; - listOfFav: any = []; +listOfRealted: any = []; +listOfFav: any = []; - filterList(event) { - const val = event.target.value; - if (this.selectedType === 1) { - if (val === '') { - this.actionHistory = this.listOfRealted; - } else { - this.actionHistory = this.listOfRealted.filter((item) => { - return (item.NAME.toLowerCase().indexOf(val.toLowerCase()) > -1); - }); - } - } else if (this.selectedType === 4) { - if (val === '') { - this.favoriteUserList = this.listOfFav; - } else { - this.favoriteUserList = this.listOfFav.filter((item) => { - return (item.EMPLOYEE_DISPLAY_NAME.toLowerCase().indexOf(val.toLowerCase()) > -1); - }); - } +filterList(event) { + const val = event.target.value; + if (this.selectedType === 1) { + if (val === '') { + this.actionHistory = this.listOfRealted; + } else { + this.actionHistory = this.listOfRealted.filter((item) => { + return (item.NAME.toLowerCase().indexOf(val.toLowerCase()) > -1); + }); + } + } else if (this.selectedType === 4) { + if (val === '') { + this.favoriteUserList = this.listOfFav; } else { - return; + this.favoriteUserList = this.listOfFav.filter((item) => { + return (item.EMPLOYEE_DISPLAY_NAME.toLowerCase().indexOf(val.toLowerCase()) > -1); + }); } + } else { + return; } +} - selectedLetter(el) { - this.isFavoriteLetterActive = true; - this.favLetter.forEach((letter, index) => { - if (letter === el) { - this.favIsActive[index] = true; - this.activeSelectedLetter = el; - this.worklistService.getFavoriteByLetter(letter,() => { - }).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; - }); - } - }); - } else { - this.favIsActive[index] = false; - } - }); - } +selectedLetter(el) { + this.isFavoriteLetterActive = true; + this.favLetter.forEach((letter, index) => { + if (letter === el) { + this.favIsActive[index] = true; + this.activeSelectedLetter = el; + this.worklistService.getFavoriteByLetter(letter, () => { + }).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; + }); + } + }); + } else { + this.favIsActive[index] = false; + } + }); +} - returnIsActiveFunction(i) { - return this.favIsActive[i]; - } +returnIsActiveFunction(i) { + return this.favIsActive[i]; +} } diff --git a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts index 09a818f3..8aa95dfd 100644 --- a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts +++ b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.ts @@ -428,7 +428,7 @@ export class WorklistMainIcComponent implements OnInit { if (result.MessageStatus == 1) { this.common.sharedService.setSharedData(true, 'loadWorkList'); // this.messageSuccess = true; - this.common.greenToastPK('worklist', 'save-successfully'); + this.common.greenToastPK('worklist', 'done-successfully'); setTimeout(() => { // this.messageSuccess = false; // this.openNotificationsDashboard(); @@ -1214,7 +1214,7 @@ export class WorklistMainIcComponent implements OnInit { } else if (data.data.data == "Success") { // this.openNotificationsDashboard(); // this.messageSuccess = true; - this.common.greenToastPK('worklist', 'save-successfully'); + this.common.greenToastPK('worklist', 'done-successfully'); setTimeout(() => { // this.messageSuccess = false; this.nextNotfification(); diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts index b481ea5f..0237e6dc 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.ts @@ -369,7 +369,7 @@ export class WorklistMainMRComponent implements OnInit { if (result.MessageStatus == 1) { this.common.sharedService.setSharedData(true, 'loadWorkList'); // this.messageSuccess = true; - this.common.greenToastPK('worklist', 'save-successfully'); + this.common.greenToastPK('worklist', 'done-successfully'); setTimeout(() => { // this.messageSuccess = false; // this.openNotificationsDashboard(); @@ -1115,7 +1115,7 @@ export class WorklistMainMRComponent implements OnInit { } else if (data.data.data == 'Success') { // this.openNotificationsDashboard(); // this.messageSuccess = true; - this.common.greenToastPK('worklist', 'save-successfully'); + this.common.greenToastPK('worklist', 'done-successfully'); setTimeout(() => { // this.messageSuccess = false; this.nextNotfification(); diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts index eecd523e..ca8179b7 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.ts @@ -405,7 +405,7 @@ export class WorklistMainPoComponent implements OnInit { if (result.MessageStatus == 1) { this.common.sharedService.setSharedData(true, 'loadWorkList'); // this.messageSuccess = true; - this.common.greenToastPK('worklist', 'save-successfully'); + this.common.greenToastPK('worklist', 'done-successfully'); setTimeout(() => { // this.messageSuccess = false; // this.openNotificationsDashboard(); @@ -1182,7 +1182,7 @@ export class WorklistMainPoComponent implements OnInit { if (data.data.data === 'cancel' || data.data.data === undefined) { return; } else if (data.data.data === 'Success') { - this.common.greenToastPK('worklist', 'save-successfully'); + this.common.greenToastPK('worklist', 'done-successfully'); setTimeout(() => { this.nextNotfification(); }, 2000); diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts index 71b038cc..2d558b5b 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.ts @@ -394,7 +394,7 @@ export class WorklistMainPRComponent implements OnInit { // tslint:disable-next-line: triple-equals if (result.MessageStatus == 1) { this.common.sharedService.setSharedData(true, 'loadWorkList'); - this.common.greenToastPK('worklist', 'save-successfully'); + this.common.greenToastPK('worklist', 'done-successfully'); // show succsfull popup // this.messageSuccess = true; // setTimeout(() => { @@ -1115,7 +1115,7 @@ export class WorklistMainPRComponent implements OnInit { } else if (data.data.data == 'Success') { // this.openNotificationsDashboard(); // this.messageSuccess = true; - this.common.greenToastPK('worklist', 'save-successfully'); + this.common.greenToastPK('worklist', 'done-successfully'); setTimeout(() => { // this.messageSuccess = false; this.nextNotfification(); diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.html b/Mohem/src/app/notification/worklist-main/worklist-main.component.html index c093dc71..4ff66b17 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -51,7 +51,8 @@ getPassNotificationDetails?.REQUEST_TYPE != 'BASIC_DETAILS' && getPassNotificationDetails?.REQUEST_TYPE != 'CONTACT' && getPassNotificationDetails?.REQUEST_TYPE != 'PHONE_NUMBERS' && - getPassNotificationDetails?.REQUEST_TYPE != 'TERMINATION'"> + getPassNotificationDetails?.REQUEST_TYPE != 'TERMINATION' && + getPassNotificationDetails?.REQUEST_TYPE != 'CEI'">

{{'worklist, loading'| translate}} + getPassNotificationDetails?.REQUEST_TYPE != 'TERMINATION' && + getPassNotificationDetails?.REQUEST_TYPE != 'CEI'">

{{'worklist, loading'| translate}}

@@ -348,7 +350,8 @@ + getPassNotificationDetails?.REQUEST_TYPE != 'TERMINATION' && + getPassNotificationDetails?.REQUEST_TYPE != 'CEI'">

{{'worklist, loading'| translate}}

@@ -378,7 +381,40 @@ + getPassNotificationDetails?.REQUEST_TYPE == 'TERMINATION' && + getPassNotificationDetails?.REQUEST_TYPE != 'CEI'"> +
+

{{'worklist, loading'| translate}}

+
+ +
+

{{ 'general, empty' | translate}}

+
+
+ + +
+ + + +
+ +
+
+
+
+
+
+
+ + +

{{'worklist, loading'| translate}}

diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts index 4f98cba3..f02e2fdf 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.ts +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.ts @@ -225,7 +225,8 @@ export class WorklistMainComponent implements OnInit { false ); console.log(this.selectedFilter); - if (this.selectedFilter === 'HRSSA') { + if (this.selectedFilter === 'HRSSA' || this.selectedFilter === 'STAMP') { + console.log("ENAD") this.arr_hr_req_only = []; this.sortRequests(); } @@ -450,8 +451,8 @@ export class WorklistMainComponent implements OnInit { } else if (Type === "CEI"){ if (result.GetCEICollectionNotificationBodyList) { this.notificationBodyRes = - result.GetCEICollectionNotificationBodyList; - console.log(result); + result.GetCEICollectionNotificationBodyList[0].Collection_Notification; + console.log(result.GetCEICollectionNotificationBodyList[0].Collection_Notification); } } else if (Type === "STAMP_MS"){ @@ -558,7 +559,7 @@ export class WorklistMainComponent implements OnInit { // } // } // this.messageSuccess = true; - this.common.greenToastPK('worklist', 'save-successfully'); + this.common.greenToastPK('worklist', 'done-successfully'); setTimeout(() => { // this.messageSuccess = false; // this.openNotificationsDashboard(); @@ -1141,7 +1142,7 @@ export class WorklistMainComponent implements OnInit { return; } else if (data.data.data == "Success") { // this.messageSuccess = true; - this.common.greenToastPK('worklist', 'save-successfully'); + this.common.greenToastPK('worklist', 'done-successfully'); setTimeout(() => { // this.messageSuccess = false; this.nextNotfification(); @@ -1235,7 +1236,7 @@ export class WorklistMainComponent implements OnInit { } sortRequests() { for (let i = 0; i < this.notificationArray.length; i++) { - if (this.notificationArray[i].ITEM_TYPE === 'HRSSA') { + if (this.notificationArray[i].ITEM_TYPE === 'HRSSA' || this.notificationArray[i].ITEM_TYPE === 'STAMP') { this.arr_hr_req_only.push(this.notificationArray[i]); } } diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index e4f237f9..f1cf1501 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -2619,6 +2619,10 @@ "ar": "تم حفظ التغيير بنجاح", "en": "Your change has been saved successfully" }, + "done-successfully": { + "ar": "تم تنفيذ الإجراء الخاص بك بنجاح!", + "en": "Your action has been executed successfully!" + }, "save-error": { "ar": "هناك شئ خاطئ، يرجى المحاولة فى وقت لاحق", "en": "Something went wrong please try again later"