From 06009698207d18e6aca9abdb4be9f450196a1c84 Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Wed, 1 Apr 2020 13:10:19 +0300 Subject: [PATCH 1/7] change text in payslip --- Mohem/src/assets/localization/i18n.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index f6790ae5..08576fb4 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -2457,7 +2457,7 @@ }, "earnings":{ "en": "Earnings", - "ar":"أرباح " + "ar":"مستحقات " }, "deductions":{ "en": "Deductions", From feee5f4c6f6afd1b1dc0753a7e91834388e40121 Mon Sep 17 00:00:00 2001 From: Salman Afzal Date: Wed, 1 Apr 2020 13:27:12 +0300 Subject: [PATCH 2/7] fixed arabic text for absence module --- .../absence/submit-absence/submit-absence.component.html | 8 ++++---- .../absence/submit-absence/submit-absence.component.ts | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.html b/Mohem/src/app/absence/submit-absence/submit-absence.component.html index 25cba6c1..1d36cd68 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.html +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.html @@ -15,20 +15,20 @@ {{ts.trPK('submitAbsence','startDate')}} - + {{ts.trPK('submitAbsence','startTime')}} - + {{ts.trPK('submitAbsence','endDate')}} - + {{ts.trPK('submitAbsence','endTime')}} - + {{ts.trPK('submitAbsence','totalDays')}} diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts index 45f7acad..cd965432 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts @@ -78,6 +78,8 @@ export class SubmitAbsenceComponent implements OnInit { getPassNotificationDetails: any; getPassdirfromNotifiPage: boolean = false; direction: string; + doneText: string; + cancelText: string; functionName: string = ""; private submitAbsObjList: any = []; @ViewChild(IonSelect) select: IonSelect; @@ -135,6 +137,8 @@ export class SubmitAbsenceComponent implements OnInit { ngOnInit() { this.getAbsenceTypes(); + this.doneText = this.direction === 'en' ? 'Done' : 'تم'; + this.cancelText = this.direction === 'en' ? 'Cancel' : 'إلغاء'; } private getAbsenceDffStructure() { const body = { From c6f3161eba9255fc5fb0d5d625dd37a43f5ee192 Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Wed, 1 Apr 2020 16:39:02 +0300 Subject: [PATCH 3/7] handle accural ticket balance --- Mohem/src/app/eit/eit-list/eit-list.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mohem/src/app/eit/eit-list/eit-list.component.ts b/Mohem/src/app/eit/eit-list/eit-list.component.ts index 144955aa..346c46ab 100644 --- a/Mohem/src/app/eit/eit-list/eit-list.component.ts +++ b/Mohem/src/app/eit/eit-list/eit-list.component.ts @@ -110,7 +110,7 @@ export class EitListComponent implements OnInit { getUserDetails(){ this.authService.loadAuthenticatedUser().subscribe((user: AuthenticatedUser) => { if (user) { - this.emp_no=user.EMPLOYEE_NUMBER; + // this.emp_no=user.EMPLOYEE_NUMBER; } }); @@ -124,7 +124,7 @@ export class EitListComponent implements OnInit { let todayDate = month + '/' + day + '/' + year; let effectiveDate = todayDate; const request = { - P_SELECTED_EMPLOYEE_NUMBER: this.emp_no, + P_SELECTED_EMPLOYEE_NUMBER: this.selEmp, P_EFFECTIVE_DATE: effectiveDate }; this.accrualService From ca16ed4ab58f0f8a72a4e12bf6537ab3dad1ed4d Mon Sep 17 00:00:00 2001 From: umasoodch Date: Thu, 2 Apr 2020 12:43:20 +0300 Subject: [PATCH 4/7] fixed UAT issue of itg notifications --- .../app/notification/home/home.component.html | 2 +- .../app/notification/home/home.component.ts | 18 +++++------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index 83571b02..2d582be3 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -12,7 +12,7 @@
{{newWorkListResponse.length + ITGCount}} {{ts.trPK('work-list','of')}} - {{newWorkListResponse.length}} of + {{newWorkListResponse.length}} {{ts.trPK('work-list','of')}}

{{totalRequestCount}}

{{newWorkListResponse[0].NO_OF_ROWS + ITGCount}}

{{newWorkListResponse[0].NO_OF_ROWS}}

diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 4a2dac84..8092dbf6 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -214,10 +214,8 @@ export class HomeComponent implements OnInit { } else if (notification.ITEM_TYPE === 'INVMOA') { this.filters[4].value = this.totalMR; this.data.datasets[0].data[3] = notification.OPEN_NTF_NUMBER; - } else if (notification.ITEM_TYPE === 'ITG') { - this.filters[5].value = notification.OPEN_NTF_NUMBER; - this.data.datasets[0].data[4] = notification.OPEN_NTF_NUMBER; } + this.data.datasets[0].data[4] = this.ITGCount; } this.showChart = true; this.common.stopLoading(); @@ -433,6 +431,9 @@ export class HomeComponent implements OnInit { } } else { this.newWorkListResponse = []; + this.data.datasets[0].data[4] = this.ITGCount; + this.showChart = true; + this.common.stopLoading(); } } @@ -525,21 +526,12 @@ export class HomeComponent implements OnInit { Details() { this.workListService.getITGDetails('', '', this.isPostNoLoad) .subscribe((result: any) => { + this.ITGCount = result.TotalCount; this.totalRequestCount = this.totalRequestCount + result.TotalCount; this.filters[5].value = result.TotalCount; }); } - ITGNotification() { - // this.Details(); - this.isAll = false; - this.isPR = false; - this.isPO = false; - this.isMR = false; - this.isHR = false; - this.isITG = true; - } - searchBtn() { this.isSearch = !this.isSearch; } From d6e378c69904c2fe55904db983560b1858c9e431 Mon Sep 17 00:00:00 2001 From: Salman Afzal Date: Thu, 2 Apr 2020 13:25:26 +0300 Subject: [PATCH 5/7] fixed itg issue --- Mohem/src/app/notification/home/home.component.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index 2d582be3..ebd99437 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -69,7 +69,7 @@
-
+
@@ -90,7 +90,10 @@
-
+
+ {{ts.trPK('work-list','No-data-available')}} +
+
{{ts.trPK('work-list','No-data-available')}}
From 8ea56df598214393a30254d036c1fa4a2b3c5a0b Mon Sep 17 00:00:00 2001 From: enadhilal Date: Tue, 7 Apr 2020 14:59:08 +0300 Subject: [PATCH 6/7] fix itg bugs --- .../device-permissions.service.ts | 2 +- .../app/notification/home/home.component.ts | 9 +++++++-- .../work-list-main-itg.component.html | 6 +++++- .../work-list-main-itg.component.ts | 20 ++++++++++++++++++- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/Mohem/src/app/hmg-common/services/device-permissions/device-permissions.service.ts b/Mohem/src/app/hmg-common/services/device-permissions/device-permissions.service.ts index 01f7a2b9..7859895f 100644 --- a/Mohem/src/app/hmg-common/services/device-permissions/device-permissions.service.ts +++ b/Mohem/src/app/hmg-common/services/device-permissions/device-permissions.service.ts @@ -132,7 +132,7 @@ export class DevicePermissionsService { return new Promise((resolve, reject) => { this.cs.confirmAlertDialogPrimarySecondary(() => { resolve(true); - }, this.ts.trPK('general', 'accept'), + }, this.ts.trPK('general', 'confirm'), () => { resolve(false); }, this.ts.trPK('general', 'not-now'), this.ts.trPK('general', 'confirm'), message diff --git a/Mohem/src/app/notification/home/home.component.ts b/Mohem/src/app/notification/home/home.component.ts index 4a2dac84..49f737a1 100644 --- a/Mohem/src/app/notification/home/home.component.ts +++ b/Mohem/src/app/notification/home/home.component.ts @@ -508,8 +508,11 @@ export class HomeComponent implements OnInit { this.ITGSegment[0].names = names; this.setActive(this.ITGSegment[0].code); } - for (let i = 1; i < result.RequestType.length; i++) { - this.ITGSegment[i] = { + console.log(result.RequestType); + let count =1; + for (let i = 0; i < result.RequestType.length; i++) { + console.log() + this.ITGSegment[count] = { name: result.RequestType[i].RequestTypeName, code: result.RequestType[i].RequestTypeCode, data: result.RequestType[i].RequestDetails, @@ -517,7 +520,9 @@ export class HomeComponent implements OnInit { }; datas[i] = result.RequestType[i].RequestDetails; names[i] = result.RequestType[i].RequestTypeCode; + count++; } + console.log(this.ITGSegment); }); } diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html index d7ca6888..554d5407 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html @@ -22,7 +22,11 @@
- + +
+ +
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 5de8fd21..eeb5f349 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 @@ -33,6 +33,7 @@ export class WorkListMainItgComponent implements OnInit { public request_details: any; public segmentsArray: { name: string, number: number }[] = []; public segmentData: { name: string, data: any }[] = []; + public requestDetailsData: { name: string, data: any }[] = []; public header: any = []; public rows: any = []; public workList: any; @@ -84,10 +85,20 @@ export class WorkListMainItgComponent implements OnInit { this.workListService.getITGFormDetails(this.request).subscribe((result: any) => { this.request_details = result.ITGRequest; this.grantInfo = result.ITGRequest.GrantFields; + let count =0; for (let i = 0; i < result.ITGRequest.FieldGoups.length; i++) { this.segmentsArray[i] = { name: result.ITGRequest.FieldGoups[i].Title, number: i }; this.segmentData[i] = { name: result.ITGRequest.FieldGoups[i].Title, data: result.ITGRequest.FieldGoups[i].Fields } + + for (let j = 0; j < this.segmentData[i].data.length; j++) { + if (this.segmentData[i].data[j].TableValue){ + this.requestDetailsData[count] ={ name:this.segmentData[i].data[j].TableValue.Header, + data: this.segmentData[i].data[j].TableValue.Rows} + count++; + } + } } + console.log(this.requestDetailsData) this.segmentsArray[this.segmentsArray.length] = { name: 'Approval Level', number: this.segmentsArray.length } this.workList = this.request_details.WFHistory; this.options = this.request_details.AllowedActions; @@ -203,7 +214,7 @@ export class WorkListMainItgComponent implements OnInit { request.ItemID = this.request_info.ItemID; request.TaskID = this.request_info.ID; request.Comments = this.commentText; - request.Comments = this.request_info.Comments; + // request.Comments = this.request_info.Comments; request.EmployeeNumber = this.request_info.EmployeeNumber; request.NewUserEMPId = this.replcamentID; this.common.confirmAlertDialogAction( @@ -212,6 +223,7 @@ export class WorkListMainItgComponent implements OnInit { url = WorkListMainItgComponent.APPROVAL; this.workListService.getITGActionRequest(request, url) .subscribe((result: any) => { + this.confirmMsg(1) // this.common.openNotificationPage(); this.skip(); }); @@ -219,6 +231,7 @@ export class WorkListMainItgComponent implements OnInit { url = WorkListMainItgComponent.REJECT; this.workListService.getITGActionRequest(request, url) .subscribe((result: any) => { + this.confirmMsg(2) // this.common.openNotificationPage(); this.skip(); }); @@ -228,8 +241,10 @@ export class WorkListMainItgComponent implements OnInit { if (!comments) { this.common.presentAlert(this.ts.trPK('worklist', 'empty-comment')); } else { + request.Comments = comments; this.workListService.getITGActionRequest(request, url) .subscribe((result: any) => { + this.confirmMsg(3) // this.common.openNotificationPage(); this.skip(); }); @@ -239,6 +254,7 @@ export class WorkListMainItgComponent implements OnInit { url = WorkListMainItgComponent.DELEGATE; this.workListService.getITGActionRequest(request, url) .subscribe((result: any) => { + this.confirmMsg(4) // this.common.openNotificationPage(); this.skip(); }); @@ -249,6 +265,7 @@ export class WorkListMainItgComponent implements OnInit { } else { this.workListService.getITGActionRequest(request, url) .subscribe((result: any) => { + this.confirmMsg(5) // this.common.openNotificationPage(); this.skip(); }); @@ -263,6 +280,7 @@ export class WorkListMainItgComponent implements OnInit { request.AdditionalFields = this.grantRequest; this.workListService.getITGActionRequest(request, url) .subscribe((result: any) => { + this.confirmMsg(6) // this.common.openNotificationPage(); this.skip(); }); From 5e0d1b9b8782fb2adea3d41a42b1478749882e4d Mon Sep 17 00:00:00 2001 From: Mohamed Mekawy Date: Tue, 7 Apr 2020 15:52:02 +0300 Subject: [PATCH 7/7] edit replacment issue & eit arabic text --- .../absence-replacement-list.component.ts | 5 +++-- .../app/absence/submit-absence/submit-absence.component.ts | 1 + Mohem/src/app/authentication/login/login.component.html | 4 ++-- Mohem/src/app/authentication/login/login.component.ts | 2 +- Mohem/src/app/eit/add-eit/add-eit.component.ts | 2 +- Mohem/src/app/notification/models/ReplacmentEmployeeReq.ts | 2 +- Mohem/src/app/uI-elements/text.input.ts | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) 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 cee6305f..0fcacdb7 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 @@ -22,6 +22,7 @@ export class AbsenceReplacementListComponent implements OnInit { selectedValue: any; inputSearch: any; selEmpName: any; + selectedReplacedEmp: any; selectedUserInf: any; userNote: any; getPassNotificationDetails: any; @@ -63,7 +64,7 @@ export class AbsenceReplacementListComponent implements OnInit { } ngOnInit() { - + this.selectedReplacedEmp = this.cs.sharedService.getSharedData('selectedReplacedEmp'); this.demoeAttach = [{ USER_NAME: '18888', EMPLOYEE_DISPLAY_NAME: "AAA fgfhfhfhf hyutyututut ", @@ -147,7 +148,7 @@ export class AbsenceReplacementListComponent implements OnInit { // this.WorkListReplacmentEmployeeObj.P_SEARCH_EMPLOYEE_DISPLAY_NAME=""; // this.WorkListReplacmentEmployeeObj.P_SEARCH_EMAIL_ADDRESS=this.inputSearch; // } - + this.WorkListReplacmentEmployeeObj.P_SELECTED_EMPLOYEE_NUMBER =this.selectedReplacedEmp; this.worklistService.getReplacmentEmployeeList(this.WorkListReplacmentEmployeeObj). subscribe((result: WorKListReplacmentEmployeeResponse) => { this.handleWorkListReplacmentEmployeeResult(result); diff --git a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts index cd965432..1d16e33a 100644 --- a/Mohem/src/app/absence/submit-absence/submit-absence.component.ts +++ b/Mohem/src/app/absence/submit-absence/submit-absence.component.ts @@ -247,6 +247,7 @@ export class SubmitAbsenceComponent implements OnInit { } async SearchReplacment() { + this.common.sharedService.setSharedData(this.selEmp, 'selectedReplacedEmp'); const modal = await this.modalCtrl.create({ component: AbsenceReplacementListComponent, backdropDismiss: false diff --git a/Mohem/src/app/authentication/login/login.component.html b/Mohem/src/app/authentication/login/login.component.html index 6fb821df..2d7c2a05 100644 --- a/Mohem/src/app/authentication/login/login.component.html +++ b/Mohem/src/app/authentication/login/login.component.html @@ -53,10 +53,10 @@
- +
{{ts.trPK('login','signup')}} diff --git a/Mohem/src/app/authentication/login/login.component.ts b/Mohem/src/app/authentication/login/login.component.ts index 5d486395..646557e9 100644 --- a/Mohem/src/app/authentication/login/login.component.ts +++ b/Mohem/src/app/authentication/login/login.component.ts @@ -71,7 +71,7 @@ export class LoginComponent implements OnInit, OnDestroy { public password: string; private language: string; public username: string; - public remeberMe: boolean; + public remeberMe = true; private iosLink: string; private androidLink: string; public currentLang = 1; diff --git a/Mohem/src/app/eit/add-eit/add-eit.component.ts b/Mohem/src/app/eit/add-eit/add-eit.component.ts index 48ab9c4d..d1b4ac7f 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.ts +++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts @@ -323,7 +323,7 @@ export class AddEitComponent implements OnInit { feildsList[i].APPLICATION_COLUMN_NAME, defaultVal, containerId, - defaultVal, + defaultValText, feildsList[i].MOBILE_ENABLED, feildsList[i].DISPLAY_FLAG, feildsList[i].REQUIRED_FLAG diff --git a/Mohem/src/app/notification/models/ReplacmentEmployeeReq.ts b/Mohem/src/app/notification/models/ReplacmentEmployeeReq.ts index 3cbbc80c..828f62a6 100644 --- a/Mohem/src/app/notification/models/ReplacmentEmployeeReq.ts +++ b/Mohem/src/app/notification/models/ReplacmentEmployeeReq.ts @@ -7,5 +7,5 @@ public P_PAGE_LIMIT : Number; public P_SEARCH_USER_NAME:String; public P_SEARCH_EMPLOYEE_DISPLAY_NAME:String; public P_SEARCH_EMAIL_ADDRESS:String; - +public P_SELECTED_EMPLOYEE_NUMBER:any; } \ No newline at end of file diff --git a/Mohem/src/app/uI-elements/text.input.ts b/Mohem/src/app/uI-elements/text.input.ts index 9a8632fe..985563b4 100644 --- a/Mohem/src/app/uI-elements/text.input.ts +++ b/Mohem/src/app/uI-elements/text.input.ts @@ -26,7 +26,7 @@ export class TextInput extends UiElement { // "
" + "" + " " + this.label + "" + - " " + + " " + " "; return template;