diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
index 5936fdbb5..9da9d7551 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html
@@ -171,11 +171,17 @@
Applicant Details
-
+
+
+
+ {{tl.name}}
+
+
+
+
-
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
index 48b443dc7..3eca90e92 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
@@ -34,6 +34,7 @@ export class AddPdComponent implements OnInit, OnDestroy {
relationShipList: any;
errorMessage: any;
loanAmtInWords : any;
+ titleList: any;
// Dynamic co applicant
createWithLongContent = false;
dynamicCoApplicant = [];
@@ -56,6 +57,7 @@ export class AddPdComponent implements OnInit, OnDestroy {
this.getStateCityList();
this.getPDTypeList();
this.getRelationMaster();
+ this.getTitleMaster();
this.loadFormData();
}
@@ -74,6 +76,7 @@ export class AddPdComponent implements OnInit, OnDestroy {
fk_pd_type: [null],
fk_customer_segment: [null],
loan_amount: [null,Validators.compose([Validators.pattern('^[0-9]*$')])],
+ applicant_title_name: [''],
applicant_name: [null],
mobile_no: [null,Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],
// landline : [null,Validators.compose([Validators.minLength(12),Validators.maxLength(13)])],
@@ -81,7 +84,6 @@ export class AddPdComponent implements OnInit, OnDestroy {
stdcode:[null, Validators.compose([Validators.minLength(2),Validators.maxLength(4),Validators.pattern('^[0-9]*$')])],
landline : [null, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
company_name: [null],
-
addressline1: [null],
fk_city: [null],
fk_state: [null],
@@ -169,6 +171,18 @@ export class AddPdComponent implements OnInit, OnDestroy {
}
}, error => this.errorMessage = error);
}
+ // get title master
+ getTitleMaster() {
+ let relation ="TITLES";
+ this._pd.getAllMasterDatas(relation).subscribe(
+ data => {
+ if (data.status == 200) {
+ this.titleList=data.records.filter(val=>val.isactive==1);
+
+ }
+ }, error => this.errorMessage = error);
+
+ }
createItem(): FormGroup {
return this._fb.group({
label: ['Co Applicant'],
@@ -298,7 +312,9 @@ export class AddPdComponent implements OnInit, OnDestroy {
this._PDtriggerForm.controls['applicant_name'].setValidators([Validators.required]);
this._PDtriggerForm.controls['applicant_name'].updateValueAndValidity();
-
+ this._PDtriggerForm.controls['applicant_title_name'].setValidators([Validators.required]);
+ this._PDtriggerForm.controls['applicant_title_name'].updateValueAndValidity();
+
this._PDtriggerForm.controls['mobile_no'].setValidators([Validators.required]);
this._PDtriggerForm.controls['mobile_no'].updateValueAndValidity();
@@ -341,7 +357,10 @@ export class AddPdComponent implements OnInit, OnDestroy {
this._PDtriggerForm.controls['applicant_name'].clearValidators();
this._PDtriggerForm.controls['applicant_name'].updateValueAndValidity();
-
+
+ this._PDtriggerForm.controls['applicant_title_name'].clearValidators();
+ this._PDtriggerForm.controls['applicant_title_name'].updateValueAndValidity();
+
this._PDtriggerForm.controls['mobile_no'].clearValidators();
this._PDtriggerForm.controls['mobile_no'].updateValueAndValidity();
@@ -393,6 +412,7 @@ export class AddPdComponent implements OnInit, OnDestroy {
if(formValue.applicant_name){
pd_applicant_details.push({
"applicant_name":formValue.applicant_name,
+ "applicant_title_name":formValue.applicant_title_name,
"company_name":formValue.company_name,
"mobile_no":formValue.mobile_no,
"landline":formValue.stdcode +'-'+formValue.landline,
@@ -401,7 +421,6 @@ export class AddPdComponent implements OnInit, OnDestroy {
});
}
- console.log(pd_applicant_details);
// formValue.items.forEach((itemElement, itemIndex) => {
// let obj1 = {
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html
index cdee436c6..c3752a9d2 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html
@@ -18,7 +18,14 @@
Main Applicant
-
+
+
+
+ {{tl.name}}
+
+
+
+
@@ -36,7 +43,7 @@
+91
Enter Valid STD Code.
-
-
+
Enter Valid Landline Number.
@@ -48,7 +55,14 @@
Co Applicant
-->
-
+
+
+
+ {{tl.name}}
+
+
+
+
@@ -70,7 +84,7 @@
+91
Enter Valid STD Number.
-
-
+
Enter Valid Landline Number.
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts
index c7541c588..ee60614e6 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts
@@ -20,6 +20,7 @@ export class EditPdApplicantComponent implements OnInit {
coApplicantItems:FormArray;
emptyData:any;
relationShipList:any;
+ titleList: any;
constructor(private _fb: FormBuilder,
private _pd: PdTrigerService, notifier: NotifierService, private dialogRef: MatDialogRef,
@Inject(MAT_DIALOG_DATA) public data: any) {
@@ -36,6 +37,7 @@ export class EditPdApplicantComponent implements OnInit {
this.loadEmptyFormData()
}
this.getRelationMaster();
+ this.getTitleMaster();
}
loadEmptyFormData() {
@@ -64,6 +66,8 @@ export class EditPdApplicantComponent implements OnInit {
landline: [landline, Validators.compose([Validators.minLength(6),Validators.maxLength(8)])],
company_name: [this.mainApplicantData[0].company_name],
applicant_type: [this.mainApplicantData[0].applicant_type, Validators.compose([Validators.required])],
+ applicant_title_name: [this.mainApplicantData[0].applicant_title_name, Validators.compose([Validators.required])],
+
coApplicantItems: this._fb.array([]),
});
// bind dynamic co applicant data
@@ -76,7 +80,6 @@ export class EditPdApplicantComponent implements OnInit {
}
createItem(listData): FormGroup {
if(listData){
- console.log(listData.landline);
let stdcode;
let landline;
if(listData.landline != null){
@@ -88,10 +91,10 @@ export class EditPdApplicantComponent implements OnInit {
stdcode = null;
landline = null;
}
- console.log(landline);
return this._fb.group({
label: ['Co Applicant'],
fk_applicant_primary_id: [listData.pd_co_applicant_id],
+ applicant_title_name: [listData.applicant_title_name, Validators.compose([Validators.required])],
coapplicantName: [listData.applicant_name, Validators.compose([Validators.required])],
coapplicant_mobile_no: [listData.mobile_no,Validators.compose([Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])],
coapplicant_stdcode: [stdcode, Validators.compose([Validators.minLength(2),Validators.maxLength(4)])],
@@ -106,6 +109,7 @@ export class EditPdApplicantComponent implements OnInit {
return this._fb.group({
label: ['Co Applicant'],
fk_applicant_primary_id: [null],
+ applicant_title_name: [null, Validators.compose([Validators.required])],
coapplicantName: [null, Validators.compose([Validators.required])],
coapplicant_mobile_no: [null, Validators.compose([Validators.minLength(10),Validators.maxLength(12),Validators.pattern('^[0-9]*$')])],
coapplicant_stdcode: [null, Validators.compose([Validators.minLength(2),Validators.maxLength(4)])],
@@ -114,6 +118,7 @@ export class EditPdApplicantComponent implements OnInit {
relationship: [null],
applicant_type: [0],
company_name: [null],
+
});
}
@@ -143,6 +148,8 @@ export class EditPdApplicantComponent implements OnInit {
"landline":formValue.stdcode+'-'+formValue.landline,
"applicant_type":formValue.applicant_type,
"relation":formValue.relationship,
+ "applicant_title_name": formValue.applicant_title_name,
+
"isactive":1
}];
formValue.coApplicantItems.forEach((itemElement, itemIndex) => {
@@ -163,11 +170,10 @@ export class EditPdApplicantComponent implements OnInit {
concat_landline = null;
}
-
- console.log(concat_landline);
let obj1 = {
"fk_pd_id": this.data.pdID,
"pd_co_applicant_id": itemElement.fk_applicant_primary_id,
+ "applicant_title_name":itemElement.applicant_title_name,
"applicant_name":itemElement.coapplicantName,
"relation":itemElement.relationship,
"mobile_no":itemElement.coapplicant_mobile_no,
@@ -204,6 +210,18 @@ export class EditPdApplicantComponent implements OnInit {
}
}, error => this.errorMessage = error);
}
+ // get title master
+ getTitleMaster() {
+ let relation ="TITLES";
+ this._pd.getAllMasterDatas(relation).subscribe(
+ data => {
+ if (data.status == 200) {
+ this.titleList=data.records.filter(val=>val.isactive==1);
+
+ }
+ }, error => this.errorMessage = error);
+
+ }
/** To Reset Popup Data */
onReset() {
if(this.data.records.length>0){
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.html
index 6dd57493a..ebbe223f5 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.html
@@ -11,7 +11,14 @@
-
+
+
+
+ {{tl.name}}
+
+
+
+