From 33affad3bfab4113a1f2fd3817a1cc558b64c81b Mon Sep 17 00:00:00 2001 From: umasoodch Date: Wed, 19 Oct 2022 17:30:50 +0300 Subject: [PATCH] fixed moe issues --- .../src/app/eit/add-eit/add-eit.component.ts | 9 +++++ .../confirm-add-eit.component.ts | 6 ++-- Mohem/src/app/home/home.page.ts | 31 ++++++++++-------- .../app/notification/home/home.component.html | 4 +-- .../app/notification/home/home.component.scss | 8 +++++ .../worklist-main.component.html | 2 +- .../confirm-address.component.html | 9 +++-- .../confirm-basic-details.component.html | 12 +++++-- .../profile/contact/contact.component.html | 12 ++++--- .../assets/icon/new-design/business-trip.png | Bin 0 -> 668 bytes Mohem/src/assets/imgs/call-o.svg | 4 +-- Mohem/src/assets/imgs/call.svg | 6 ++-- Mohem/src/assets/localization/i18n.json | 4 +++ 13 files changed, 73 insertions(+), 34 deletions(-) create mode 100644 Mohem/src/assets/icon/new-design/business-trip.png 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 e36c1d5e..0ac1820a 100644 --- a/Mohem/src/app/eit/add-eit/add-eit.component.ts +++ b/Mohem/src/app/eit/add-eit/add-eit.component.ts @@ -548,6 +548,15 @@ export class AddEitComponent implements OnInit { // if(!x.value) // isEmpty=true; //emptyChildElement + + + if (obj.FORMAT_TYPE == "N") { + const maxSize = obj.MAXIMUM_SIZE; + const value = (document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value; + // this.username = value.length > 8 ? value.substring(0,8) : value; + (document.getElementById(obj.APPLICATION_COLUMN_NAME) as HTMLInputElement).value = value.length > maxSize ? value.substring(0, maxSize) : value; + } + elem.classList.remove("requiredClassElm"); if ( obj.CHILD_SEGMENTS_VS_Splited && diff --git a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts index 4c176b62..a937b67e 100644 --- a/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts +++ b/Mohem/src/app/eit/confirm-add-eit/confirm-add-eit.component.ts @@ -62,7 +62,7 @@ export class ConfirmAddEitComponent implements OnInit { indexLastObj: any = 0; filterAllowedType: any = ['application/pdf', 'image/jpeg', 'image/png', 'text/plain', 'image/jpg', 'application/vnd.ms-excel', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']; direction: string; - isAttachment: string; + isAttachment: string = 'N'; constructor(public modalController: ModalController, public cs: CommonService, private ts: TranslatorService, private eitService: EitService) { this.direction = TranslatorService.getCurrentLanguageName() @@ -78,7 +78,7 @@ export class ConfirmAddEitComponent implements OnInit { this.respID = this.cs.sharedService.getSharedData(MenuResponse.SHARED_SEL_RESP_ID, false); this.eitRequest = this.cs.sharedService.getSharedData(EitRequest.SHARED_DATA, false); this.isResubmitEIT = this.cs.sharedService.getSharedData('confirmAddEITData', false).isResubmit; - this.isAttachment = this.selMenu.GetMenuEntriesList.ATTACHMENT_REQUIRED; + // this.isAttachment = this.selMenu.GetMenuEntriesList.ATTACHMENT_REQUIRED; if (this.isResubmitEIT) { this.getPassNotificationDetails = this.cs.sharedService.getSharedData(EITNotificatonBodyResponse.NOT_WORKLIST, false); //WARINING ** // console.log("this.getPassNotificationDetails: " + this.getPassNotificationDetails); @@ -102,7 +102,7 @@ export class ConfirmAddEitComponent implements OnInit { this.itemKey = this.addrespList.SubmitEITTransactionList.P_ITEM_KEY; this.P_TransactionID = this.addrespList.SubmitEITTransactionList.P_TRANSACTION_ID; this.isDelete = this.isResubmitEIT = this.cs.sharedService.getSharedData('confirmAddEITData', false).isDelete; - + this.isAttachment = this.addrespList.SubmitEITTransactionList.P_ATTACHMENT_REQUIRED; this.getApproversList(); // this.confirmAddEit.submitEit(this.eitRequest).subscribe((result: AddEitResponse) => { diff --git a/Mohem/src/app/home/home.page.ts b/Mohem/src/app/home/home.page.ts index 1b9e66cc..fa5b2725 100644 --- a/Mohem/src/app/home/home.page.ts +++ b/Mohem/src/app/home/home.page.ts @@ -66,6 +66,7 @@ export class HomePage implements OnInit { camera: boolean; ticketRequestObject: any; leaveRequestObject: any; + businessLeaveRequestObject: any; missingSwipeRequestObject: any; public isShow = false; public showVcationRule = false; @@ -99,6 +100,13 @@ export class HomePage implements OnInit { link: '3', show: true, }, + { + title: this.ts.trPK('home', 'business-balance'), + statsValue: 0, + icon: 'assets/icon/new-design/business-trip.png', + link: '5', + show: true, + }, { title: this.ts.trPK('eit', 'my-reports'), statsValue: 0, @@ -193,11 +201,11 @@ export class HomePage implements OnInit { public slideSettingsTwo() { const width = this.platform.width(); this.slideOptsOne = { - slidesPerView: width > 320 ? 3.2 : 3, + slidesPerView: width > 320 ? 3.4 : 3, spaceBetween: 10 }; this.slideOptsTwo = { - slidesPerView: width > 320 ? 3.2 : 2.5, + slidesPerView: width > 320 ? 3.4 : 2.4, spaceBetween: width > 320 ? 10 : 5 }; this.showStaticServices = true; @@ -522,6 +530,8 @@ export class HomePage implements OnInit { // tslint:disable-next-line: triple-equals } else if (result.GetMenuEntriesList[i].FUNCTION_NAME == 'HMG_OTL_MISSING_SWIPE_EIT_SS') { this.missingSwipeRequestObject = result.GetMenuEntriesList[i]; + } else if (result.GetMenuEntriesList[i].FUNCTION_NAME == 'XXX_HR_EIT_BUSINESS_MISSION_SS') { + this.businessLeaveRequestObject = result.GetMenuEntriesList[i]; } } this.sortMenuEntires(result.GetMenuEntriesList); @@ -835,6 +845,8 @@ export class HomePage implements OnInit { this.common.sharedService.setSharedData(accrualBalance, 'leaveAccrualBalance'); this.common.sharedService.setSharedData(request, 'leaveAccrualBalanceDate'); // this.common.sharedService.setSharedData(this.accrualBalancesList, 'tickitsbalance'); + } else if (accrualBalance.ACCURAL_PLAN_NAME === 'Business Trip Accrual' || accrualBalance.ACCURAL_PLAN_NAME == "خطة استحقاق الإنتدابات") { + this.statsButtons[2].statsValue = accrualBalance.ACCRUAL_NET_ENTITLEMENT === null ? 0 : Number(accrualBalance.ACCRUAL_NET_ENTITLEMENT.toFixed(2)); } // else { // totalTicketsLeft = totalTicketsLeft + accrualBalance.ACCRUAL_NET_ENTITLEMENT; @@ -857,29 +869,20 @@ export class HomePage implements OnInit { // tslint:disable-next-line: triple-equals if (link == '0') { this.isFakeLocationUsed = false; - // this.getDeviceLocation(); this.showAttendanceOptions(); - // tslint:disable-next-line: triple-equals } else if (link == '1') { - // this.common.sharedService.setSharedData(this.statsButtons[1].statsValue, 'total-count'); this.common.startLoading(); this.common.openNotificationPage(); - // tslint:disable-next-line: triple-equals } else if (link == '2') { this.openPage(this.missingSwipeRequestObject); - // tslint:disable-next-line: triple-equals } else if (link == '3') { this.openPage(this.leaveRequestObject); - // tslint:disable-next-line: triple-equals } else if (link == '4') { - // this.openPage(this.ticketRequestObject); this.common.sharedService.setSharedData(this.myRequestData, MenuResponse.SELECTED_MENU); this.common.openConcurrentTransactionsHome(); - - // if (this.menuList) { - - // } - } + } else if (link == '5') { + this.openPage(this.businessLeaveRequestObject); + } } async openDigitalId() { diff --git a/Mohem/src/app/notification/home/home.component.html b/Mohem/src/app/notification/home/home.component.html index 69f6474d..d55b66ed 100644 --- a/Mohem/src/app/notification/home/home.component.html +++ b/Mohem/src/app/notification/home/home.component.html @@ -38,11 +38,11 @@ - + {{ts.trPK('work-list','clear-search')}} - + {{ts.trPK('work-list','advanced-search')}} diff --git a/Mohem/src/app/notification/home/home.component.scss b/Mohem/src/app/notification/home/home.component.scss index 5a128862..fb3ba717 100644 --- a/Mohem/src/app/notification/home/home.component.scss +++ b/Mohem/src/app/notification/home/home.component.scss @@ -521,4 +521,12 @@ ion-content { position: absolute; right: 160px; top: 100px; +} + +.float-r { + float: right; + } + +.float-l { + float: left; } \ No newline at end of file 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 b7e89723..1ab0c005 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.html +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.html @@ -451,7 +451,7 @@
- + diff --git a/Mohem/src/app/profile/confirm-address/confirm-address.component.html b/Mohem/src/app/profile/confirm-address/confirm-address.component.html index a3a64748..d6184c4d 100644 --- a/Mohem/src/app/profile/confirm-address/confirm-address.component.html +++ b/Mohem/src/app/profile/confirm-address/confirm-address.component.html @@ -1,9 +1,14 @@ - + + + + diff --git a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.html b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.html index 0505227b..55fc8571 100644 --- a/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.html +++ b/Mohem/src/app/profile/confirm-basic-details/confirm-basic-details.component.html @@ -1,9 +1,17 @@ - + + + + diff --git a/Mohem/src/app/profile/contact/contact.component.html b/Mohem/src/app/profile/contact/contact.component.html index 6cbfca25..4504ec2b 100644 --- a/Mohem/src/app/profile/contact/contact.component.html +++ b/Mohem/src/app/profile/contact/contact.component.html @@ -1,9 +1,11 @@ - -
+ + - - -
+ +
diff --git a/Mohem/src/assets/icon/new-design/business-trip.png b/Mohem/src/assets/icon/new-design/business-trip.png new file mode 100644 index 0000000000000000000000000000000000000000..c0362daf71504492e8be6896ad37d2f36f74ac4d GIT binary patch literal 668 zcmV;N0%QG&P)00004b3#c}2nYxW zds-c|*vSOa&wrWUm5}3cMX)Dj<>_ z#9K@Smk9N;r&z?)1U^$EQDY(O3OZk_#ay*!j{@> zJn^E}u7@t()k+agC9!*wuooM%6csfMjwQFok_zj2#k9cn=%We}w5mX#w!E+%b*# zPNix;)XYMypoM@sFxyfGf8*O-KU@J7EHpH>dh4+nif7VWw4CFK)hwnmnk~Uqn@7cz z4qH8h7iRBD!6s1IhNLZNpIQlD>{FU-Ec+56y)T845sfr3b!oz-yVg=(UG(BMvQ3{V zb4v4Pb(V#Y3iH!Z&jhLzYNaKF>Z4g$N7l|p)pxhIZNpRvMElgUm2h_@6vnmpKVMp5 zDl0Yy;T Cp)h;^ literal 0 HcmV?d00001 diff --git a/Mohem/src/assets/imgs/call-o.svg b/Mohem/src/assets/imgs/call-o.svg index b5a9434a..8c77e70f 100644 --- a/Mohem/src/assets/imgs/call-o.svg +++ b/Mohem/src/assets/imgs/call-o.svg @@ -1,6 +1,6 @@ - - + + diff --git a/Mohem/src/assets/imgs/call.svg b/Mohem/src/assets/imgs/call.svg index e7b1638d..60216890 100644 --- a/Mohem/src/assets/imgs/call.svg +++ b/Mohem/src/assets/imgs/call.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 2ad2f0c1..e66e915c 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -1199,6 +1199,10 @@ "en": "Leave Balance", "ar": "رصيد الإجازات" }, + "business-balance": { + "en": "Business Trip Balance", + "ar": "رصيد رحلة العمل" + }, "": { "en": "", "ar": ""