From c4846138ed9b040be9588244d5b6620a70c78883 Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Thu, 24 Jun 2021 16:22:41 +0300 Subject: [PATCH 1/2] fixed issues --- Mohem/src/app/app.component.html | 4 ++-- .../hr-request-form.component.html | 8 ++++---- .../hr-request-form.component.scss | 16 +++++++++++++++- .../hr-request-form.component.ts | 19 +++++++++++++++---- .../hr-request/hr-request.component.html | 12 +++++++----- .../my-request/my-request.component.html | 2 +- .../my-request/my-request.component.scss | 2 +- .../my-request/my-request.component.ts | 16 ++++++++++++---- 8 files changed, 57 insertions(+), 22 deletions(-) diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index 4f99a51b..d7a25f37 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -45,7 +45,7 @@ - + @@ -131,7 +131,7 @@ {{ts.trPK('myTeam','myTeam-header')}} - + diff --git a/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.html b/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.html index 6b2064ea..a74a5e39 100644 --- a/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.html +++ b/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.html @@ -16,7 +16,7 @@
- + -
- - +
+ {{ts.trPK('general','cancel')}} + {{ts.trPK('general','submit')}}
diff --git a/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.scss b/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.scss index cc1ebf50..4cf1d3ce 100644 --- a/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.scss +++ b/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.scss @@ -386,8 +386,15 @@ ion-input { margin-left: 15px; margin-right: 5px; font-family: 'WorkSans-bold'; + font-size: 16px; + min-height: 1.0cm; + --background: #d00a0a !important; } +.main-button{ + --box-shadow:none; + } + .gridSubmitBtn{ min-width: auto; // margin: 0px; @@ -403,7 +410,10 @@ ion-input { color: white; // margin-left: 15px; // margin-right: 5px; - font-family: 'WorkSans-bold';} + font-family: 'WorkSans-bold'; + font-size: 16px; + min-height: 1.0cm; + --background: #19a163 !important;} .filed-container{ @@ -512,4 +522,8 @@ select option[data-default] { padding-right: 20px !important; padding-top: 6px !important; color: #999999 !important; + } + + .button-native { + box-shadow: none!important; } \ No newline at end of file diff --git a/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.ts b/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.ts index 5c1bb330..ca777b85 100644 --- a/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.ts +++ b/Mohem/src/app/mowadhafi/hr-request-form/hr-request-form.component.ts @@ -54,9 +54,9 @@ export class HrRequestFormComponent implements OnInit { public sectionDep: any; public projectCode; public SelectedServiceType: any; - public depType: any =""; - public secType: any = ""; - public topicType: any=""; + public depType: any; + public secType: any; + public topicType: any; indexLastObj: any; addAttachRequest: any = []; TransactionID: any; @@ -108,6 +108,13 @@ export class HrRequestFormComponent implements OnInit { } + public isValidForm(): boolean { + if (this.depType && this.SelectedServiceType && this.secType && this.topicType) { + return false; + } + return true; +} + onSelectChange(event, type) { const value = event.target.value; @@ -248,7 +255,11 @@ export class HrRequestFormComponent implements OnInit { request.append('sectionId', this.secType); request.append('sectionTopicId', this.topicType); request.append('description', this.Description); - request.append('fileColl', this.selectedFile[0], this.selectedFile[0].name); + console.log("TEST:______") + console.log(this.selectedFile); + if(this.selectedFile && this.selectedFile !== undefined){ + request.append('fileColl', this.selectedFile[0], this.selectedFile[0].name); + } request.append('employeeNumber', authUser.P_USER_NAME); request.append('ticketStatus', 'new'); request.append('channelId', '3'); diff --git a/Mohem/src/app/mowadhafi/hr-request/hr-request.component.html b/Mohem/src/app/mowadhafi/hr-request/hr-request.component.html index 63b85eb7..89565f14 100644 --- a/Mohem/src/app/mowadhafi/hr-request/hr-request.component.html +++ b/Mohem/src/app/mowadhafi/hr-request/hr-request.component.html @@ -85,11 +85,7 @@
- -
- {{ts.trPK('userProfile','createHR-Request')}} -
-
+
@@ -129,3 +125,9 @@ + + +
+ {{ts.trPK('userProfile','createHR-Request')}} +
+
diff --git a/Mohem/src/app/mowadhafi/my-request/my-request.component.html b/Mohem/src/app/mowadhafi/my-request/my-request.component.html index a69a3e3d..aee2672f 100644 --- a/Mohem/src/app/mowadhafi/my-request/my-request.component.html +++ b/Mohem/src/app/mowadhafi/my-request/my-request.component.html @@ -30,7 +30,7 @@ {{ticket.ticketStatusName}} -
+
diff --git a/Mohem/src/app/mowadhafi/my-request/my-request.component.scss b/Mohem/src/app/mowadhafi/my-request/my-request.component.scss index 64f3f4d7..c72cd943 100644 --- a/Mohem/src/app/mowadhafi/my-request/my-request.component.scss +++ b/Mohem/src/app/mowadhafi/my-request/my-request.component.scss @@ -162,7 +162,7 @@ ion-content { padding: 30px; position: absolute; left: 85px; - bottom: 50%; + bottom: 40%; } .show{ background-color: white; diff --git a/Mohem/src/app/mowadhafi/my-request/my-request.component.ts b/Mohem/src/app/mowadhafi/my-request/my-request.component.ts index c2235258..24476202 100644 --- a/Mohem/src/app/mowadhafi/my-request/my-request.component.ts +++ b/Mohem/src/app/mowadhafi/my-request/my-request.component.ts @@ -19,6 +19,7 @@ export class MyRequestComponent implements OnInit { public ticketCount = 10; public ticketPage = 1; public increseCount = 0; + public ticketTotal :any; @Input() ngClass:string |string[]| Set| {[klass:string]:any;} @@ -73,12 +74,19 @@ export class MyRequestComponent implements OnInit { } handlegetTicketsByEmployeeResult(result){ - this.ticketsInfo=result.Mohemm_ITG_TicketsByEmployeeList + this.ticketsInfo=result.Mohemm_ITG_TicketsByEmployeeList; + this.ticketTotal=this.ticketsInfo[0].totalItemsCount; console.log("length______________________-."); console.log(this.ticketsInfo.length); - this.increseCount++; - this.ticketCount = this.ticketCount * this.increseCount - this.ticketPage = this.increseCount; + this.ticketCount += 10; + // this.ticketPage += 1; + // if(this.ticketsInfo.length > this.ticketCount){ + // this.ticketCount = this.ticketsInfo.length - this.ticketCount; + // }else{ + // this.ticketCount = this.ticketCount * this.increseCount + // } + // this.increseCount++; + // this.ticketPage = this.increseCount; // let x; // if(this.cs.validResponse(result)){ // x = JSON.parse(result.Mohemm_ITG_ResponseItem); From 46914e104d94ee8564c43a26d9e9377a342a94bb Mon Sep 17 00:00:00 2001 From: enadhilal Date: Thu, 24 Jun 2021 16:26:44 +0300 Subject: [PATCH 2/2] fixing ReportGenerated in itg work list --- .../work-list-main-itg.component.ts | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) 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 93bb8eb8..18506403 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 @@ -158,6 +158,9 @@ export class WorkListMainItgComponent implements OnInit { if (actionName == "Answer") { return "../assets/imgs/mohemm-action/info.png" } + if (actionName == "ReportGenerated") { + return "../assets/imgs/mohemm-action/info.png" + } } public segmentChangedClick(event: any) { @@ -400,6 +403,31 @@ export class WorkListMainItgComponent implements OnInit { } } + } else if (action == 7) { //grant + url = WorkListMainItgComponent.GRANT; + if (this.grantRequest) { + request.AdditionalFields = this.grantRequest; + this.workListService.getITGActionRequest(request, url) + .subscribe((result: any) => { + if (result.MessageStatus != 1) { + this.common.presentAlert(this.ts.trPK('general', 'error-itg')); + + } else if (result.MessageStatus == 1) { + this.messageSuccess = true; + setTimeout(() => { + this.messageSuccess = false; + this.common.sharedService.setSharedData(true, 'loadWorkList'); + // this.common.presentAlert(this.ts.trPK('worklistMain', 'Tran_Succ')); + this.common.sharedService.setSharedData(true, 'loadWorkList'); + this.confirmMsg(6); + this.skip(); + }, 2000); + } + }); + } else { + this.common.presentAlert(this.ts.trPK('worklist', 'empty-comment')); + } + } }, this.ts.trPK('general', 'ok'), () => { @@ -462,7 +490,9 @@ export class WorkListMainItgComponent implements OnInit { if (this.actionSelected === 'RequestInformation') { this.presentModal(3); } - + if (this.actionSelected === 'ReportGenerated') { + this.actionService(7, this.grantRequest); + } }