diff --git a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.ts b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.ts index 0fcacdb7..d2ef54b6 100644 --- a/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.ts +++ b/Mohem/src/app/absence/absence-replacement-list/absence-replacement-list.component.ts @@ -32,7 +32,7 @@ export class AbsenceReplacementListComponent implements OnInit { P_PAGE_NUM: number; P_PAGE_LIMIT: number; ReplacementList: any = []; - searchBy: string = ""; + searchBy: string = "2"; IsReachEnd: boolean = false; ReplacmentListRes: WorKListReplacmentEmployeeResponse; private WorkListReplacmentEmployeeObj: WorkListReplacmentEmployeeRequest = new WorkListReplacmentEmployeeRequest(); diff --git a/Mohem/src/app/authentication/business-card/business-card.component.html b/Mohem/src/app/authentication/business-card/business-card.component.html index fd7a5978..337ac9fb 100644 --- a/Mohem/src/app/authentication/business-card/business-card.component.html +++ b/Mohem/src/app/authentication/business-card/business-card.component.html @@ -49,7 +49,7 @@ --> -
+
https://hmgwebservices.com/images/Moheem/CS.jpg

{{userInfo.name_en}}

{{jobName}}
diff --git a/Mohem/src/app/erm-channel/home/home.component.ts b/Mohem/src/app/erm-channel/home/home.component.ts index 5bec5386..6d621078 100644 --- a/Mohem/src/app/erm-channel/home/home.component.ts +++ b/Mohem/src/app/erm-channel/home/home.component.ts @@ -60,9 +60,14 @@ export class HomeComponent implements OnInit { }, ( ) => { }, this.ts.trPK('general', 'ok')).subscribe((result) => { - CommonService.SKIP = true; - this.cs.openHome(); - }) + if (this.cs.validResponse(result)){ + this.cs.greenToastPK("erm-channel", "viedo-success"); + CommonService.SKIP = true; + this.cs.openHome(); + }else{ + this.cs.redToastPK("erm-channel", "erm-failed"); + } + }); } } diff --git a/Mohem/src/app/erm-channel/survey/survey.component.ts b/Mohem/src/app/erm-channel/survey/survey.component.ts index b547457b..a5a6d759 100644 --- a/Mohem/src/app/erm-channel/survey/survey.component.ts +++ b/Mohem/src/app/erm-channel/survey/survey.component.ts @@ -52,9 +52,14 @@ export class SurveyComponent implements OnInit { this.authService.saveAdsStatus(request, () => { }, this.ts.trPK('general', 'ok')).subscribe((result) => { - CommonService.SKIP = true; - this.cs.openHome(); - }) + if (this.cs.validResponse(result)){ + this.cs.greenToastPK("erm-channel", "survey-success"); + CommonService.SKIP = true; + this.cs.openHome(); + }else{ + this.cs.redToastPK("erm-channel", "erm-failed"); + } + }); } select(rating) { this.satisfied = rating; diff --git a/Mohem/src/app/hmg-common/services/common/common.service.ts b/Mohem/src/app/hmg-common/services/common/common.service.ts index b38053f4..46229ced 100644 --- a/Mohem/src/app/hmg-common/services/common/common.service.ts +++ b/Mohem/src/app/hmg-common/services/common/common.service.ts @@ -216,7 +216,7 @@ export class CommonService { const toast = await this.toastController.create({ message: message, showCloseButton: true, - position: 'middle', + position: 'top', duration: 2000, closeButtonText: this.ts.trPK('general', 'close') }); @@ -235,7 +235,7 @@ export class CommonService { const toast = await this.toastController.create({ message: message, showCloseButton: true, - position: 'middle', + position: 'top', duration: 2000, color: 'danger', closeButtonText: this.ts.trPK('general', 'close') @@ -246,7 +246,7 @@ export class CommonService { const toast = await this.toastController.create({ message: message, showCloseButton: true, - position: 'middle', + position: 'top', duration: 2000, color: 'success', closeButtonText: this.ts.trPK('general', 'close') diff --git a/Mohem/src/app/my-team/details/details.component.ts b/Mohem/src/app/my-team/details/details.component.ts index 4469f7ec..98955dfd 100644 --- a/Mohem/src/app/my-team/details/details.component.ts +++ b/Mohem/src/app/my-team/details/details.component.ts @@ -235,7 +235,7 @@ export class DetailsComponent implements OnInit { ngOnInit() { this.common.startLoading(); this.intializeMemberDetail(); - this.showAttendanceTracking(); + // this.showAttendanceTracking(); // tslint:disable-next-line: max-line-length this.currentMonthName = this.direction === 'en' ? this.common.getMonthName(this.monthIndex) : this.common.getMonthNameAr(this.monthIndex); } @@ -266,6 +266,7 @@ export class DetailsComponent implements OnInit { if (this.activeSegment === 'Attendance') { this.common.startLoading(); this.initAttendance(); + this.showAttendanceTracking(); } else if (this.activeSegment != 'Attendance' && this.activeSegment != 'TeamMembers') { this.activeSegment = 'About'; 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 afde12f7..f31cf456 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 @@ -149,28 +149,28 @@ export class WorkListMainItgComponent implements OnInit { return '../assets/imgs/mohemm-action/info.png'; } if (actionName === 'Grant') { - return '../assets/imgs/mohemm-action/info.png'; + return '../assets/imgs/mohemm-action/grant.png'; } if (actionName === 'Delegate') { return '../assets/imgs/mohemm-action/delegate.png'; } if (actionName === 'Answer') { - return '../assets/imgs/mohemm-action/info.png'; + return '../assets/imgs/mohemm-action/answer.png'; } if (actionName === 'Question') { - return '../assets/imgs/mohemm-action/info.png'; + return '../assets/imgs/mohemm-action/question.png'; } if (actionName === 'ReportGenerated') { return '../assets/imgs/mohemm-action/ReportGenerated.png'; } if (actionName === 'Doable') { - return '../assets/imgs/mohemm-action/info.png'; + return '../assets/imgs/mohemm-action/Doable.png'; } if (actionName === 'NotDoable') { - return '../assets/imgs/mohemm-action/info.png'; + return '../assets/imgs/mohemm-action/notDoable.png'; } if (actionName === 'DataCorrected') { - return '../assets/imgs/mohemm-action/info.png'; + return '../assets/imgs/mohemm-action/data-corrected.png'; } } 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 a9a6c762..f54b721a 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 @@ -170,7 +170,7 @@ -
+ +
+ +
+

{{filter}}

+
+ +
+ +
+ +
+

{{filter}}

+
+
-
+ -
+
{{'replacementRoll, search-result' | translate}}
@@ -282,7 +301,7 @@
-
{{'replacementRoll, favorite' | translate}} @@ -314,16 +333,20 @@
-
+

{{'general, fav-showData' | translate}}

-
+
-

+

{{'general, fav-noData' | translate}}

diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss index 5c9b62ba..be2d6286 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss @@ -281,18 +281,33 @@ ion-radio { } .isFavLetterActive { - background: #269db8; - width: 55px; - border-radius: 60px; - color: white; + color: #269db8; + display: block; + width: 60%; + float: right; + transition-duration: 0ms; + height: 35px; } .vl { border-left: 2px solid lightgray; - height: 36px; + height: 42px; } .searchText{ background: transparent; - color: #D55D5C; + color: #269db8; font-weight: bold; text-decoration: underline; +} + +.letterDiv{ + font-weight: bold; + width: 10%; + float: right; +} +.letterDivLoop{ + display: block; + width: 60%; + float: right; + transition-duration: 0ms; + height: 35px; } \ No newline at end of file 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 9ef56f82..9426bf97 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 @@ -177,10 +177,10 @@ export class WorkListReplacementItgComponent implements OnInit { if (this.selEmp) { data = this.selEmp; // this.messageSuccess = true; - this.cs.greenToastPK('worklist', 'save-successfully'); + // this.cs.greenToastPK('worklist', 'save-successfully'); } else { data = null; - this.cs.redToastPK('worklist', 'save-error'); + // this.cs.redToastPK('worklist', 'save-error'); } if (typeof this.callback == 'function') { this.callback(data); @@ -300,10 +300,10 @@ export class WorkListReplacementItgComponent implements OnInit { const userIndex = this.favoriteUserList.findIndex(x => x['USER_NAME'] === userID); console.log(userIndex); if (userIndex === -1) { - selEmp.IsFavorite = !selEmp.IsFavorite; this.cs.presentConfirmDialog( confirmBoxhtml , () => { + selEmp.IsFavorite = !selEmp.IsFavorite; const request = [ { 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 1f9c533d..ef3ff306 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 @@ -86,7 +86,7 @@
-->
- +
@@ -126,24 +126,24 @@ -
- - -
+
+ +

{{filter}}

- - +
-
- - -
+
+ +

{{filter}}

- - +
@@ -191,8 +191,8 @@
-
-
+
+
{{'replacementRoll, favorite' | translate}}
@@ -222,16 +222,16 @@
-
+
-

+

{{'general, fav-showData' | translate}}

-

+

{{'general, fav-noData' | translate}}

diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss index b60d1508..ac20567e 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss @@ -208,14 +208,19 @@ ion-radio { font-size: 12px; } .isFavLetterActive { - background: #269db8; - width: 55px; - border-radius: 60px; - color: white; + // background: #269db8; + // width: 55px; + // border-radius: 60px; + color: #269db8; + display: block; + width: 60%; + float: right; + transition-duration: 0ms; + height: 35px; } .vl { border-left: 2px solid lightgray; - height: 36px; + height: 42px; } .clearText{ background: transparent; @@ -225,11 +230,24 @@ ion-radio { } .searchText{ background: transparent; - color: #D55D5C; + color: #269db8; font-weight: bold; text-decoration: underline; } .filterClass input{ box-shadow: none !important; -webkit-box-shadow: none !important; +} + +.letterDiv{ + font-weight: bold; + width: 10%; + float: right; +} +.letterDivLoop{ + display: block; + width: 60%; + float: right; + transition-duration: 0ms; + height: 35px; } \ No newline at end of file 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 9f3fad7f..0e2a6346 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 @@ -445,27 +445,26 @@ export class WorkListReplacementRollComponent implements OnInit { counter = 0; onChangeSelect(select) { let selectValue = select.detail.value; - if (selectValue == '1') { this.isSelect = true; this.isFilter = true; this.selectedType = 1; this.listOfRealted = this.actionHistory; - if (this.counter > 0) { - this.actionHistory.forEach((obj, i) => { - if (this.favoriteUserList.find(x => x['USER_NAME'] === obj.USER_NAME)) { - this.actionHistory[i].IsFavorite = true; - } else { - this.actionHistory[i].IsFavorite = false; - } - }); - } + // if (this.counter > 0) { + this.actionHistory.forEach((obj, i) => { + if (this.favoriteUserList.find(x => x['USER_NAME'] === obj.USER_NAME)) { + this.actionHistory[i].IsFavorite = true; + } else { + this.actionHistory[i].IsFavorite = false; + } + }); + // } this.counter = 1; } else if (selectValue === '4') { // if (this.favoriteUserList.length === 0 || this.favoriteUserList === undefined) { this.getFavruite(); // } - this.isFilter = true; + this.isFilter = true; this.selectedType = 4; } else if (selectValue === '2' || selectValue === '3' || selectValue === '5') { this.isSelect = true; @@ -523,7 +522,9 @@ export class WorkListReplacementRollComponent implements OnInit { }); this.favLetter.forEach((obj, index) => { - if (this.activeSelectedLetter) { } + if (this.activeSelectedLetter) { + this.selectedLetter(this.activeSelectedLetter); + } if (index === 0) { // this.selectedLetter(obj); this.favIsActive.push(true); @@ -531,150 +532,154 @@ export class WorkListReplacementRollComponent implements OnInit { this.favIsActive.push(false); } }); - console.log(this.favLetter); - console.log(this.favIsActive); - } + 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"); + 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(); } - 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) { + 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 + , () => { + 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 = + [ + { + '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 { + 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 = + [ + { + '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; + 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); + }); + } } else { - this.favoriteUserList = this.listOfFav.filter((item) => { - return (item.EMPLOYEE_DISPLAY_NAME.toLowerCase().indexOf(val.toLowerCase()) > -1); - }); + return; } - } 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]; + } -clearSearchInput(){ - this.inputSearch = ''; -} + clearSearchInput() { + this.inputSearch = ''; + } } 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 98a649a5..bb4f13d3 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 @@ -381,12 +381,12 @@ export class WorklistMainIcComponent implements OnInit { this.common.sharedService.setSharedData(this.notificationButtonRes, "passActionMore"); // console.log("test" + this.notificationButtonRes.length); for (let i = 0; i < this.notificationButtonRes.length; i++) { - if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVE") { + if (this.notificationButtonRes[i].BUTTON_ACTION == "APPROVE" || this.notificationButtonRes[i].BUTTON_ACTION == "APPROVED") { this.approve_label = this.notificationButtonRes[i].BUTTON_LABEL; this.approveDis = true; } else - if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECT") { + if (this.notificationButtonRes[i].BUTTON_ACTION == "REJECT" || this.notificationButtonRes[i].BUTTON_ACTION == "REJECTED") { this.reject_label = this.notificationButtonRes[i].BUTTON_LABEL; this.rejectDis = true; } else @@ -401,7 +401,7 @@ export class WorklistMainIcComponent implements OnInit { this.closeDis = true; } else if ( - this.notificationButtonRes[i].BUTTON_ACTION != "APPROVE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECT" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE") { + this.notificationButtonRes[i].BUTTON_ACTION != "APPROVE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECT" && this.notificationButtonRes[i].BUTTON_ACTION != "REQUEST_INFO" && this.notificationButtonRes[i].BUTTON_ACTION != "CLOSE" && this.notificationButtonRes[i].BUTTON_ACTION != "REJECTED" && this.notificationButtonRes[i].BUTTON_ACTION != "APPROVED") { this.moreDisabled = false; } diff --git a/Mohem/src/app/notification/worklist-setting/worklist-setting.component.html b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.html index 9f1ef3f6..490f2123 100644 --- a/Mohem/src/app/notification/worklist-setting/worklist-setting.component.html +++ b/Mohem/src/app/notification/worklist-setting/worklist-setting.component.html @@ -18,15 +18,15 @@ -

item type

+

item type

-

FYA

+

FYA

         -

FYI

+

FYI

-

{{data.ITEM_TYPE}}

+

{{data.ITEM_TYPE}}

    diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss index ef433546..5cd0e320 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.scss @@ -852,7 +852,7 @@ $actionBtnSize : 36px; font-size: 18px; } span{ - font-size: 11px; + font-size: 9px; } } } diff --git a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts index 638d68e0..98f15742 100644 --- a/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts +++ b/Mohem/src/app/time-card/time-card-details/time-card-details.component.ts @@ -184,7 +184,7 @@ export class TimeCardDetailsComponent implements OnInit { { data: [this.absentDays, this.attendedDays], backgroundColor: [ - '#269DB8', + '#292F42', '#269DB8' ], borderWidth: 2 diff --git a/Mohem/src/assets/imgs/mohemm-action/Doable-old.png b/Mohem/src/assets/imgs/mohemm-action/Doable-old.png new file mode 100644 index 00000000..46d08d07 Binary files /dev/null and b/Mohem/src/assets/imgs/mohemm-action/Doable-old.png differ diff --git a/Mohem/src/assets/imgs/mohemm-action/Doable.png b/Mohem/src/assets/imgs/mohemm-action/Doable.png new file mode 100644 index 00000000..36d8fb25 Binary files /dev/null and b/Mohem/src/assets/imgs/mohemm-action/Doable.png differ diff --git a/Mohem/src/assets/imgs/mohemm-action/data-corrected (2).png b/Mohem/src/assets/imgs/mohemm-action/data-corrected (2).png new file mode 100644 index 00000000..5d6dfd2a Binary files /dev/null and b/Mohem/src/assets/imgs/mohemm-action/data-corrected (2).png differ diff --git a/Mohem/src/assets/imgs/mohemm-action/data-corrected (3).png b/Mohem/src/assets/imgs/mohemm-action/data-corrected (3).png new file mode 100644 index 00000000..40525d72 Binary files /dev/null and b/Mohem/src/assets/imgs/mohemm-action/data-corrected (3).png differ diff --git a/Mohem/src/assets/imgs/mohemm-action/data-corrected (4).png b/Mohem/src/assets/imgs/mohemm-action/data-corrected (4).png new file mode 100644 index 00000000..b73bed66 Binary files /dev/null and b/Mohem/src/assets/imgs/mohemm-action/data-corrected (4).png differ diff --git a/Mohem/src/assets/imgs/mohemm-action/data-corrected.png b/Mohem/src/assets/imgs/mohemm-action/data-corrected.png new file mode 100644 index 00000000..a05cd2bc Binary files /dev/null and b/Mohem/src/assets/imgs/mohemm-action/data-corrected.png differ diff --git a/Mohem/src/assets/imgs/mohemm-action/doable-2-old.png b/Mohem/src/assets/imgs/mohemm-action/doable-2-old.png new file mode 100644 index 00000000..36d8fb25 Binary files /dev/null and b/Mohem/src/assets/imgs/mohemm-action/doable-2-old.png differ diff --git a/Mohem/src/assets/imgs/mohemm-action/info-old.png b/Mohem/src/assets/imgs/mohemm-action/info-old.png new file mode 100644 index 00000000..7d37568e Binary files /dev/null and b/Mohem/src/assets/imgs/mohemm-action/info-old.png differ diff --git a/Mohem/src/assets/imgs/mohemm-action/info.png b/Mohem/src/assets/imgs/mohemm-action/info.png index 7d37568e..7d8f16c6 100644 Binary files a/Mohem/src/assets/imgs/mohemm-action/info.png and b/Mohem/src/assets/imgs/mohemm-action/info.png differ diff --git a/Mohem/src/assets/imgs/mohemm-action/notDoable-old.png b/Mohem/src/assets/imgs/mohemm-action/notDoable-old.png new file mode 100644 index 00000000..557ea6d3 Binary files /dev/null and b/Mohem/src/assets/imgs/mohemm-action/notDoable-old.png differ diff --git a/Mohem/src/assets/imgs/mohemm-action/notDoable.png b/Mohem/src/assets/imgs/mohemm-action/notDoable.png new file mode 100644 index 00000000..017070f5 Binary files /dev/null and b/Mohem/src/assets/imgs/mohemm-action/notDoable.png differ diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 2c05fc99..043db2b5 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -3458,6 +3458,17 @@ "give-comments": { "en": "Please give us a comments", "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": {