Merge branch 'sultan26April' of https://gitlab.com/haroon6138/mohemmionic5 into sultan26April

sultan26April
Sultan Khan 5 years ago
commit 3e1aec52ec

@ -48,17 +48,17 @@
<ion-item lines="none" class="filed-container"> <ion-item lines="none" class="filed-container">
<select [(ngModel)]="depType" (change)="onSelectChange($event,1)" class="filed1" id="firstLabel" <select [(ngModel)]="depType" (change)="onSelectChange($event,1)" class="filed1" id="firstLabel"
placeholder="Select Department" type="text" required > placeholder="Select Department" type="text" required >
<option value="" selected>Select Department</option> <option value="" hidden selected>{{ts.trPK('userProfile','selectDep')}}</option>
<option [value]="x.projectDepartmentId" *ngFor="let x of departTypeList"> {{x.departmentName}} </option>
<option [value]="x.departmentId" *ngFor="let x of departTypeList"> {{x.departmentName}} </option> <!-- <option [value]="x.departmentId" *ngFor="let x of departTypeList"> {{x.departmentName}} </option> -->
</select> </select>
</ion-item> </ion-item>
<label class="labels">{{ts.trPK('userProfile','RelatedSection')}}</label> <label class="labels">{{ts.trPK('userProfile','RelatedSection')}}</label>
<ion-item lines="none" class="filed-container"> <ion-item lines="none" class="filed-container">
<select [(ngModel)]="secType" (change)="onSelectChange($event,2)" class="filed1" <select [(ngModel)]="secType" (change)="onSelectChange($event,2)" class="filed1"
selected="selected" placeholder="Select Sectiont" type="text" required> selected="selected" placeholder="Select Sectiont" type="text" required>
<option value="" selected>Select Section</option> <option value="" hidden selected>{{ts.trPK('userProfile','selectSec')}}</option>
<option [value]="x.sectionId" <option [value]="x.departmentSectionId"
*ngFor="let x of sectionTypeList"> *ngFor="let x of sectionTypeList">
{{x.sectionName}} </option> {{x.sectionName}} </option>
@ -68,8 +68,8 @@
<ion-item lines="none" class="filed-container"> <ion-item lines="none" class="filed-container">
<select [(ngModel)]="topicType" (change)="onSelectChange($event, 3)" class="filed1" <select [(ngModel)]="topicType" (change)="onSelectChange($event, 3)" class="filed1"
placeholder="Select Topic" type="text" required> placeholder="Select Topic" type="text" required>
<option value="" selected>Select Topic</option> <option value="" hidden selected>{{ts.trPK('userProfile','selectTopic')}}</option>
<option [value]="x.topicId" *ngFor="let x of topicTypeList"> {{x.topicName}} </option> <option [value]="x.sectionTopicId" *ngFor="let x of topicTypeList"> {{x.topicName}} </option>
</select> </select>
</ion-item> </ion-item>
</ion-list> </ion-list>

@ -272,7 +272,7 @@ ion-input {
display: block; display: block;
margin-bottom: 15px; margin-bottom: 15px;
// padding-top: 8px; // padding-top: 8px;
// padding-left: 15px; padding-left: 3px;
/* font-weight: bold; */ /* font-weight: bold; */
font-size: 14px; font-size: 14px;
font-family: 'WorkSans-Bold'; font-family: 'WorkSans-Bold';
@ -425,7 +425,7 @@ ion-input {
display: block; display: block;
margin-top: 15px; margin-top: 15px;
padding-top: 8px; padding-top: 8px;
padding-left: 15px; padding-left: 3px;
font-size: 14px; font-size: 14px;
font-family: 'WorkSans-Bold'; font-family: 'WorkSans-Bold';
} }

@ -118,22 +118,19 @@ export class HrRequestFormComponent implements OnInit {
onSelectChange(event, type) { onSelectChange(event, type) {
const value = event.target.value; const value = event.target.value;
this.depType = value;
console.log(value); console.log(value);
// this.topicTypeList =[]; // this.topicTypeList =[];
// this.sectionTypeList =[]; // this.sectionTypeList =[];
if(type==1){ if(type==1){
this.getDepartmentSections(value); this.depType = value;
this.sectionTypeList =[]; this.sectionTypeList =[];
this.topicTypeList =[]; this.topicTypeList =[];
this.getDepartmentSections(value);
}else if(type==2){ }else if(type==2){
this.getSectionTopics(value); this.getSectionTopics(value);
this.topicTypeList =[]; this.topicTypeList =[];
}
}else if(type==3){
}else{}
} }
@ -180,7 +177,7 @@ export class HrRequestFormComponent implements OnInit {
} }
handlegetProjectResult(result) { handlegetProjectResult(result) {
this.Projectresult = result.Mohemm_Itg_ProjectsList; this.Projectresult = result.Mohemm_Itg_ProjectsList;
this.projctid=this.Projectresult[0].projectId this.projctid=this.Projectresult[0].projectId;
this.getProjectDepartments(); this.getProjectDepartments();
} }
@ -204,7 +201,7 @@ export class HrRequestFormComponent implements OnInit {
} }
////////////////////////////////////////////////////// //////////////////////////////////////////////////////
getDepartmentSections(value=null) { getDepartmentSections(value) {
const request = { const request = {
EmployeeNumber: "", EmployeeNumber: "",
ItgProjectDepartmentId: value ?value : this.departTypeList.projectDepartmentId, ItgProjectDepartmentId: value ?value : this.departTypeList.projectDepartmentId,
@ -218,7 +215,6 @@ export class HrRequestFormComponent implements OnInit {
} }
handlegetDepartmentSectionsResult(result) { handlegetDepartmentSectionsResult(result) {
this.sectionTypeList = result.Mohemm_ITG_DepartmentSectionsList; this.sectionTypeList = result.Mohemm_ITG_DepartmentSectionsList;
// this.getSectionTopics(); // this.getSectionTopics();
} }

@ -29,7 +29,7 @@
</ion-col> </ion-col>
<ion-col> <ion-col>
<p class="p">{{ts.trPK('userProfile','empNo')}}</p> <p class="p" style="line-height: 12px !important;">{{ts.trPK('userProfile','empNo')}}</p>
<span class="Boldtext">{{EmpNum}}</span> <span class="Boldtext">{{EmpNum}}</span>
</ion-col> </ion-col>

@ -1203,6 +1203,18 @@
"en": "Related Topic", "en": "Related Topic",
"ar": "عنوان ذو صله" "ar": "عنوان ذو صله"
}, },
"selectSec": {
"en": "Select Section",
"ar": "اختر القسم"
},
"selectTopic": {
"en": "Select Topic",
"ar": "اختر الموضوع"
},
"selectDep": {
"en": "Select Department",
"ar": "اختر القسم"
},
"SupportingDocument": { "SupportingDocument": {
"en": "Supporting Document", "en": "Supporting Document",
"ar": "ارفاق ملف" "ar": "ارفاق ملف"

Loading…
Cancel
Save