From 6861cdee9c6f8324c12b789663b2af88f3fa2715 Mon Sep 17 00:00:00 2001 From: Fatimah Alshammari Date: Tue, 13 Jul 2021 10:07:10 +0300 Subject: [PATCH] fixed qa issues --- .../hr-request-form.component.html | 14 +++++++------- .../hr-request-form.component.scss | 4 ++-- .../hr-request-form/hr-request-form.component.ts | 16 ++++++---------- .../hr-request/hr-request.component.html | 2 +- Mohem/src/assets/localization/i18n.json | 12 ++++++++++++ 5 files changed, 28 insertions(+), 20 deletions(-) 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 cbe2e50f..52e603a8 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 @@ -48,17 +48,17 @@ - - + + 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 4cf1d3ce..c0f5006c 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 @@ -272,7 +272,7 @@ ion-input { display: block; margin-bottom: 15px; // padding-top: 8px; - // padding-left: 15px; + padding-left: 3px; /* font-weight: bold; */ font-size: 14px; font-family: 'WorkSans-Bold'; @@ -425,7 +425,7 @@ ion-input { display: block; margin-top: 15px; padding-top: 8px; - padding-left: 15px; + padding-left: 3px; font-size: 14px; font-family: 'WorkSans-Bold'; } 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 421c0a57..d0b0d3bb 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 @@ -118,22 +118,19 @@ export class HrRequestFormComponent implements OnInit { onSelectChange(event, type) { const value = event.target.value; - this.depType = value; console.log(value); // this.topicTypeList =[]; // this.sectionTypeList =[]; if(type==1){ - this.getDepartmentSections(value); + this.depType = value; this.sectionTypeList =[]; - this.topicTypeList =[]; + this.topicTypeList =[]; + this.getDepartmentSections(value); }else if(type==2){ this.getSectionTopics(value); this.topicTypeList =[]; - - }else if(type==3){ - - }else{} + } } @@ -180,7 +177,7 @@ export class HrRequestFormComponent implements OnInit { } handlegetProjectResult(result) { this.Projectresult = result.Mohemm_Itg_ProjectsList; - this.projctid=this.Projectresult[0].projectId + this.projctid=this.Projectresult[0].projectId; this.getProjectDepartments(); } @@ -204,7 +201,7 @@ export class HrRequestFormComponent implements OnInit { } ////////////////////////////////////////////////////// - getDepartmentSections(value=null) { + getDepartmentSections(value) { const request = { EmployeeNumber: "", ItgProjectDepartmentId: value ?value : this.departTypeList.projectDepartmentId, @@ -218,7 +215,6 @@ export class HrRequestFormComponent implements OnInit { } handlegetDepartmentSectionsResult(result) { this.sectionTypeList = result.Mohemm_ITG_DepartmentSectionsList; - // this.getSectionTopics(); } 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 4361edfa..80f753d0 100644 --- a/Mohem/src/app/mowadhafi/hr-request/hr-request.component.html +++ b/Mohem/src/app/mowadhafi/hr-request/hr-request.component.html @@ -29,7 +29,7 @@ -

{{ts.trPK('userProfile','empNo')}}

+

{{ts.trPK('userProfile','empNo')}}

{{EmpNum}}
diff --git a/Mohem/src/assets/localization/i18n.json b/Mohem/src/assets/localization/i18n.json index 20112e2e..438a30b1 100644 --- a/Mohem/src/assets/localization/i18n.json +++ b/Mohem/src/assets/localization/i18n.json @@ -1203,6 +1203,18 @@ "en": "Related Topic", "ar": "عنوان ذو صله" }, + "selectSec": { + "en": "Select Section", + "ar": "اختر القسم" + }, + "selectTopic": { + "en": "Select Topic", + "ar": "اختر الموضوع" + }, + "selectDep": { + "en": "Select Department", + "ar": "اختر القسم" + }, "SupportingDocument": { "en": "Supporting Document", "ar": "ارفاق ملف"