fixed bug# 687

added toasts MSG for survey and video erm
fixed fav for ITG
added new icons for action btn in ITG
enad-pre-live
enadhilal 4 years ago
parent c10590d58a
commit fe5f41e89e

@ -32,7 +32,7 @@ export class AbsenceReplacementListComponent implements OnInit {
P_PAGE_NUM: number; P_PAGE_NUM: number;
P_PAGE_LIMIT: number; P_PAGE_LIMIT: number;
ReplacementList: any = []; ReplacementList: any = [];
searchBy: string = ""; searchBy: string = "2";
IsReachEnd: boolean = false; IsReachEnd: boolean = false;
ReplacmentListRes: WorKListReplacmentEmployeeResponse; ReplacmentListRes: WorKListReplacmentEmployeeResponse;
private WorkListReplacmentEmployeeObj: WorkListReplacmentEmployeeRequest = new WorkListReplacmentEmployeeRequest(); private WorkListReplacmentEmployeeObj: WorkListReplacmentEmployeeRequest = new WorkListReplacmentEmployeeRequest();

@ -60,9 +60,14 @@ export class HomeComponent implements OnInit {
}, ( }, (
) => { }, this.ts.trPK('general', 'ok')).subscribe((result) => { ) => { }, this.ts.trPK('general', 'ok')).subscribe((result) => {
if (this.cs.validResponse(result)){
this.cs.greenToastPK("erm-channel", "viedo-success");
CommonService.SKIP = true; CommonService.SKIP = true;
this.cs.openHome(); this.cs.openHome();
}) }else{
this.cs.redToastPK("erm-channel", "erm-failed");
}
});
} }
} }

@ -52,9 +52,14 @@ export class SurveyComponent implements OnInit {
this.authService.saveAdsStatus(request, () => { }, this.ts.trPK('general', 'ok')).subscribe((result) => { this.authService.saveAdsStatus(request, () => { }, this.ts.trPK('general', 'ok')).subscribe((result) => {
if (this.cs.validResponse(result)){
this.cs.greenToastPK("erm-channel", "survey-success");
CommonService.SKIP = true; CommonService.SKIP = true;
this.cs.openHome(); this.cs.openHome();
}) }else{
this.cs.redToastPK("erm-channel", "erm-failed");
}
});
} }
select(rating) { select(rating) {
this.satisfied = rating; this.satisfied = rating;

@ -149,16 +149,16 @@ export class WorkListMainItgComponent implements OnInit {
return '../assets/imgs/mohemm-action/info.png'; return '../assets/imgs/mohemm-action/info.png';
} }
if (actionName === 'Grant') { if (actionName === 'Grant') {
return '../assets/imgs/mohemm-action/info.png'; return '../assets/imgs/mohemm-action/grant.png';
} }
if (actionName === 'Delegate') { if (actionName === 'Delegate') {
return '../assets/imgs/mohemm-action/delegate.png'; return '../assets/imgs/mohemm-action/delegate.png';
} }
if (actionName === 'Answer') { if (actionName === 'Answer') {
return '../assets/imgs/mohemm-action/info.png'; return '../assets/imgs/mohemm-action/answer.png';
} }
if (actionName === 'Question') { if (actionName === 'Question') {
return '../assets/imgs/mohemm-action/info.png'; return '../assets/imgs/mohemm-action/question.png';
} }
if (actionName === 'ReportGenerated') { if (actionName === 'ReportGenerated') {
return '../assets/imgs/mohemm-action/ReportGenerated.png'; return '../assets/imgs/mohemm-action/ReportGenerated.png';
@ -170,7 +170,7 @@ export class WorkListMainItgComponent implements OnInit {
return '../assets/imgs/mohemm-action/notDoable.png'; return '../assets/imgs/mohemm-action/notDoable.png';
} }
if (actionName === 'DataCorrected') { if (actionName === 'DataCorrected') {
return '../assets/imgs/mohemm-action/info.png'; return '../assets/imgs/mohemm-action/data-corrected.png';
} }
} }

@ -300,10 +300,10 @@ export class WorkListReplacementItgComponent implements OnInit {
const userIndex = this.favoriteUserList.findIndex(x => x['USER_NAME'] === userID); const userIndex = this.favoriteUserList.findIndex(x => x['USER_NAME'] === userID);
console.log(userIndex); console.log(userIndex);
if (userIndex === -1) { if (userIndex === -1) {
selEmp.IsFavorite = !selEmp.IsFavorite;
this.cs.presentConfirmDialog( this.cs.presentConfirmDialog(
confirmBoxhtml confirmBoxhtml
, () => { , () => {
selEmp.IsFavorite = !selEmp.IsFavorite;
const request = const request =
[ [
{ {

@ -445,13 +445,12 @@ export class WorkListReplacementRollComponent implements OnInit {
counter = 0; counter = 0;
onChangeSelect(select) { onChangeSelect(select) {
let selectValue = select.detail.value; let selectValue = select.detail.value;
if (selectValue == '1') { if (selectValue == '1') {
this.isSelect = true; this.isSelect = true;
this.isFilter = true; this.isFilter = true;
this.selectedType = 1; this.selectedType = 1;
this.listOfRealted = this.actionHistory; this.listOfRealted = this.actionHistory;
if (this.counter > 0) { // if (this.counter > 0) {
this.actionHistory.forEach((obj, i) => { this.actionHistory.forEach((obj, i) => {
if (this.favoriteUserList.find(x => x['USER_NAME'] === obj.USER_NAME)) { if (this.favoriteUserList.find(x => x['USER_NAME'] === obj.USER_NAME)) {
this.actionHistory[i].IsFavorite = true; this.actionHistory[i].IsFavorite = true;
@ -459,7 +458,7 @@ export class WorkListReplacementRollComponent implements OnInit {
this.actionHistory[i].IsFavorite = false; this.actionHistory[i].IsFavorite = false;
} }
}); });
} // }
this.counter = 1; this.counter = 1;
} else if (selectValue === '4') { } else if (selectValue === '4') {
// if (this.favoriteUserList.length === 0 || this.favoriteUserList === undefined) { // if (this.favoriteUserList.length === 0 || this.favoriteUserList === undefined) {
@ -523,7 +522,9 @@ export class WorkListReplacementRollComponent implements OnInit {
}); });
this.favLetter.forEach((obj, index) => { this.favLetter.forEach((obj, index) => {
if (this.activeSelectedLetter) { } if (this.activeSelectedLetter) {
this.selectedLetter(this.activeSelectedLetter);
}
if (index === 0) { if (index === 0) {
// this.selectedLetter(obj); // this.selectedLetter(obj);
this.favIsActive.push(true); this.favIsActive.push(true);
@ -547,9 +548,9 @@ export class WorkListReplacementRollComponent implements OnInit {
// }); // });
// } // }
// }); // });
} }
saveUserFavruiteList(request, isFav: boolean) { saveUserFavruiteList(request, isFav: boolean) {
this.worklistService.saveFavoriteList(request, () => { this.worklistService.saveFavoriteList(request, () => {
}).subscribe((result) => { }).subscribe((result) => {
if (this.cs.validResponse(result)) { if (this.cs.validResponse(result)) {
@ -561,13 +562,9 @@ saveUserFavruiteList(request, isFav: boolean) {
this.getFavruite(); this.getFavruite();
} }
}); });
} }
setFavorite(selEmp) { 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 = `<div> let confirmBoxhtml = `<div>
<h4>Do you want to add ` + selEmp.EMPLOYEE_DISPLAY_NAME + ` in your favorite list </h4> <h4>Do you want to add ` + selEmp.EMPLOYEE_DISPLAY_NAME + ` in your favorite list </h4>
<br/> <br/>
@ -591,6 +588,10 @@ setFavorite(selEmp) {
this.cs.presentConfirmDialog( this.cs.presentConfirmDialog(
confirmBoxhtml confirmBoxhtml
, () => { , () => {
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;
const request = const request =
[ [
{ {
@ -605,6 +606,10 @@ setFavorite(selEmp) {
this.saveUserFavruiteList(request, selEmp.IsFavorite); this.saveUserFavruiteList(request, selEmp.IsFavorite);
}, () => { }); }, () => { });
} else { } else {
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;
const request = const request =
[ [
{ {
@ -617,14 +622,14 @@ setFavorite(selEmp) {
]; ];
this.saveUserFavruiteList(request, false); this.saveUserFavruiteList(request, false);
} }
} }
listOfRealted: any = []; listOfRealted: any = [];
listOfFav: any = []; listOfFav: any = [];
filterList(event) { filterList(event) {
const val = event.target.value; const val = event.target.value;
if (this.selectedType === 1) { if (this.selectedType === 1) {
if (val === '') { if (val === '') {
@ -645,9 +650,9 @@ filterList(event) {
} else { } else {
return; return;
} }
} }
selectedLetter(el) { selectedLetter(el) {
this.isFavoriteLetterActive = true; this.isFavoriteLetterActive = true;
this.favLetter.forEach((letter, index) => { this.favLetter.forEach((letter, index) => {
if (letter === el) { if (letter === el) {
@ -668,13 +673,13 @@ selectedLetter(el) {
this.favIsActive[index] = false; this.favIsActive[index] = false;
} }
}); });
} }
returnIsActiveFunction(i) { returnIsActiveFunction(i) {
return this.favIsActive[i]; return this.favIsActive[i];
} }
clearSearchInput(){ clearSearchInput() {
this.inputSearch = ''; this.inputSearch = '';
} }
} }

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

@ -3442,6 +3442,17 @@
"give-comments": { "give-comments": {
"en": "Please give us a comments", "en": "Please give us a comments",
"ar": "من فضلك اعطنا تعليقات" "ar": "من فضلك اعطنا تعليقات"
},
"survey-success":{
"en":"Your survey has been submitted successfully",
"ar":"تم تقديم الاستبيان الخاص بك بنجاح"
},
"erm-failed":{
"en":"Something went wrong please try again",
"ar":"حدث خطأ ما. أعد المحاولة من فضلك"
},"viedo-success":{
"en":"Thank you for watching this video",
"ar":"شكرا لك على مشاهدة هذا الفيديو"
} }
}, },
"transaction": { "transaction": {

Loading…
Cancel
Save