-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ {{ ins_type.name }}
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
-
+
+
+
- Is there a loan?
-
-
+
+
+ Yes
+ No
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
+
+
+
\ No newline at end of file
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
index 03138ffeb..f111a2091 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts
@@ -33,123 +33,131 @@ export class AssetsInfoComponent implements OnInit {
public _assetsQuesFrom: FormGroup;
public submitted = false;
+ public m_assets_type = [];
+ // public m_assets_type = [
+ // {
+ // 'id': "1",
+ // 'name': "Property"
+ // },
+ // {
+ // 'id': "2",
+ // 'name': "Four Wheeler"
+ // },
+ // {
+ // 'id': "3",
+ // 'name': "Two Wheeler"
+ // },
+ // {
+ // 'id': "4",
+ // 'name': "Jewellery"
+ // },
+ // {
+ // 'id': "5",
+ // 'name': "Consumer Durable"
+ // },
+ // {
+ // 'id': "6",
+ // 'name': "Insurance"
+ // },
+ // {
+ // 'id': "7",
+ // 'name': "Investments"
+ // },
+ // {
+ // 'id': "8",
+ // 'name': "Others"
+ // }
+ // ]
- public m_assets_type = [
- {
- 'id': "1",
- 'name': "Property"
- },
- {
- 'id': "2",
- 'name': "Four Wheeler"
- },
- {
- 'id': "3",
- 'name': "Two Wheeler"
- },
- {
- 'id': "4",
- 'name': "Jewellery"
- },
- {
- 'id': "5",
- 'name': "Consumer Durable"
- },
- {
- 'id': "6",
- 'name': "Insurance"
- },
- {
- 'id': "7",
- 'name': "Investments"
- },
- {
- 'id': "8",
- 'name': "Others"
- }
- ]
+public m_propertyType = [];
- public m_propertyType = [
- {
- 'id': "1",
- 'name': 'Residential'
- },
- {
- 'id': "2",
- 'name': 'Commercial'
- },
- {
- 'id': "3",
- 'name': 'Industrial'
- },
- {
- 'id': "4",
- 'name': 'Land'
- }
- ];
+ // public m_propertyType = [
+ // {
+ // 'id': "1",
+ // 'name': 'Residential'
+ // },
+ // {
+ // 'id': "2",
+ // 'name': 'Commercial'
+ // },
+ // {
+ // 'id': "3",
+ // 'name': 'Industrial'
+ // },
+ // {
+ // 'id': "4",
+ // 'name': 'Land'
+ // }
+ // ];
- public m_insuranceType = [{
- 'id': "1",
- 'name': 'Life'
- }, {
- 'id': "2",
- 'name': 'Health'
- }]
+public m_insuranceType = [];
- public m_investmentType = [{
- 'id': "1",
- 'name': 'FD'
- }, {
- 'id': "2",
- 'name': 'RD'
- }, {
- 'id': "3",
- 'name': 'Mutual Funds'
- }, {
- 'id': "4",
- 'name': 'PPF'
- }, {
- 'id': "5",
- 'name': 'Shares'
- }, {
- 'id': "6",
- 'name': 'Others'
- }]
+ // public m_insuranceType = [{
+ // 'id': "1",
+ // 'name': 'Life'
+ // }, {
+ // 'id': "2",
+ // 'name': 'Health'
+ // }]
- public m_freqOfPurchase = [
- {
- 'id': "1",
- 'name': 'Daily'
- },
- {
- 'id': "2",
- 'name': 'Weekly'
- },
- {
- 'id': "3",
- 'name': 'Monthly'
- },
- {
- 'id': "4",
- 'name': 'Every 3 months'
- },
- {
- 'id': "5",
- 'name': 'Half yearly'
- },
- {
- 'id': "6",
- 'name': 'Yearly'
- },
- {
- 'id': "7",
- 'name': 'As and when required'
- },
- {
- 'id': "8",
- 'name': 'Others'
- }
- ]
+public m_investmentType = [];
+
+ // public m_investmentType = [{
+ // 'id': "1",
+ // 'name': 'FD'
+ // }, {
+ // 'id': "2",
+ // 'name': 'RD'
+ // }, {
+ // 'id': "3",
+ // 'name': 'Mutual Funds'
+ // }, {
+ // 'id': "4",
+ // 'name': 'PPF'
+ // }, {
+ // 'id': "5",
+ // 'name': 'Shares'
+ // }, {
+ // 'id': "6",
+ // 'name': 'Others'
+ // }]
+
+ public m_freqOfPurchase = [];
+
+ // public m_freqOfPurchase = [
+ // {
+ // 'id': "1",
+ // 'name': 'Daily'
+ // },
+ // {
+ // 'id': "2",
+ // 'name': 'Weekly'
+ // },
+ // {
+ // 'id': "3",
+ // 'name': 'Monthly'
+ // },
+ // {
+ // 'id': "4",
+ // 'name': 'Every 3 months'
+ // },
+ // {
+ // 'id': "5",
+ // 'name': 'Half yearly'
+ // },
+ // {
+ // 'id': "6",
+ // 'name': 'Yearly'
+ // },
+ // {
+ // 'id': "7",
+ // 'name': 'As and when required'
+ // },
+ // {
+ // 'id': "8",
+ // 'name': 'Others'
+ // }
+ // ]
private notifier: NotifierService;
constructor(
@@ -162,7 +170,78 @@ export class AssetsInfoComponent implements OnInit {
ngOnInit() {
this.getPdSupplierFormDetails();
+
+ this.getM_Assets_Type();
+ this.getM_PropertyType();
+ this.getM_InvestmentType();
+ this.getM_FreqOfPurchase();
+ this.getM_InsuranceType();
}
+
+// ======================
+
+ getM_Assets_Type() {
+ this.pdTrigerService.getAllMasterDatas('ASSETTYPE').subscribe(
+ data => {
+ this.m_assets_type = data.records.filter(data => data.isactive == 1);
+ },
+ error => {
+ this.notifier.notify('warning', 'No Category Records Found.!');
+ // this.m_assets_type = "No Category Records Found.";
+ }
+ )
+ }
+
+ getM_PropertyType() {
+ this.pdTrigerService.getAllMasterDatas('PROPERTIES').subscribe(
+ data => {
+ this.m_propertyType = data.records.filter(data => data.isactive == 1);
+ },
+ error => {
+ this.notifier.notify('warning', 'No Category Records Found.!');
+ // this.m_assets_type = "No Category Records Found.";
+ }
+ )
+ }
+
+ getM_InvestmentType() {
+ this.pdTrigerService.getAllMasterDatas('INVESTMENTTYPE').subscribe(
+ data => {
+ this.m_investmentType = data.records.filter(data => data.isactive == 1);
+ },
+ error => {
+ this.notifier.notify('warning', 'No Category Records Found.!');
+ // this.m_assets_type = "No Category Records Found.";
+ }
+ )
+ }
+
+ getM_FreqOfPurchase() {
+ this.pdTrigerService.getAllMasterDatas('FREQUENCY').subscribe(
+ data => {
+ this.m_freqOfPurchase = data.records.filter(data => data.isactive == 1);
+ },
+ error => {
+ this.notifier.notify('warning', 'No Category Records Found.!');
+ // this.m_assets_type = "No Category Records Found.";
+ }
+ )
+ }
+
+ getM_InsuranceType() {
+ this.pdTrigerService.getAllMasterDatas('INSURANCETYPE').subscribe(
+ data => {
+ this.m_insuranceType = data.records.filter(data => data.isactive == 1);
+ },
+ error => {
+ this.notifier.notify('warning', 'No Category Records Found.!');
+ // this.m_assets_type = "No Category Records Found.";
+ }
+ )
+ }
+
+// =============================
+
apiLoadFinish: boolean = false;
getPdSupplierFormDetails() {
this.pdTrigerService.getPDFormDetailsWithID(this.pdid, '4').subscribe(
@@ -218,9 +297,10 @@ export class AssetsInfoComponent implements OnInit {
return this._formBuilder.group({
assets_mode: ['', Validators.compose([Validators.required])],
details: this._formBuilder.array([]),
- approximate_market_value: ['', Validators.compose([Validators.required])],
- name_of_the_owner: ['', Validators.compose([Validators.required])],
- year_of_purchase: ['', Validators.compose([Validators.required])],
+ approximate_market_value: ['', Validators.compose([])],
+ name_of_the_owner: ['', Validators.compose([])],
+ purchase_year: ['', Validators.compose([])],
+ purchase_month: ['', Validators.compose([])],
emi: [''],
emi_paid: [''],
elapsed_tenure: [''],
@@ -243,12 +323,12 @@ export class AssetsInfoComponent implements OnInit {
}
case '2': {
const control = (
this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray;
- control.push(this.load_Two_Four_Weeler());
+ control.push(this.load_Four_Weeler());
break;
}
case '3': {
const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray;
- control.push(this.load_Two_Four_Weeler());
+ control.push(this.load_Two_Weeler());
break;
}
case '4': {
@@ -291,7 +371,7 @@ export class AssetsInfoComponent implements OnInit {
loadJwellDescription() {
return this._formBuilder.group({
- jwell_description: ['', Validators.compose([Validators.required])]
+ jwell_description: ['', Validators.compose([])]
});
}
@@ -325,9 +405,15 @@ export class AssetsInfoComponent implements OnInit {
});
}
- load_Two_Four_Weeler() {
+ load_Four_Weeler() {
return this._formBuilder.group({
- manufacturer_model: ['', Validators.compose([Validators.required])]
+ manufacturer_model_four_weeler: ['', Validators.compose([Validators.required])]
+ });
+ }
+
+ load_Two_Weeler() {
+ return this._formBuilder.group({
+ manufacturer_model_two_weeler: ['', Validators.compose([Validators.required])]
});
}
@@ -375,20 +461,28 @@ export class AssetsInfoComponent implements OnInit {
});
}
- load_Two_Four_WeelerWithData(data) {
+ load_Four_WeelerWithData(data) {
return this._formBuilder.group({
- manufacturer_model: [data.manufacturer_model, Validators.compose([Validators.required])]
+ manufacturer_model_four_weeler: [data.manufacturer_model_four_weeler, Validators.compose([Validators.required])]
});
}
+ load_Two_WeelerWithData(data) {
+ return this._formBuilder.group({
+ manufacturer_model_two_weeler: [data.manufacturer_model_two_weeler, Validators.compose([Validators.required])]
+ });
+ }
+
+
initDetailsWithdata(data) {
return this._formBuilder.group({
assets_mode: [data.assets_mode, Validators.compose([Validators.required])],
details: this._formBuilder.array([]),
- approximate_market_value: [data.approximate_market_value, Validators.compose([Validators.required])],
- name_of_the_owner: [data.name_of_the_owner, Validators.compose([Validators.required])],
- year_of_purchase: [data.year_of_purchase, Validators.compose([Validators.required])],
+ approximate_market_value: [data.approximate_market_value, Validators.compose([])],
+ name_of_the_owner: [data.name_of_the_owner, Validators.compose([])],
+ purchase_year: [data.purchase_year, Validators.compose([])],
+ purchase_month: [data.purchase_month, Validators.compose([])],
emi: [data.emi || 0],
emi_paid: [data.emi_paid || ''],
elapsed_tenure: [data.elapsed_tenure || ''],
@@ -406,7 +500,8 @@ export class AssetsInfoComponent implements OnInit {
assets_mode: val.assets_mode,
approximate_market_value: val.approximate_market_value,
name_of_the_owner: val.name_of_the_owner,
- year_of_purchase: val.year_of_purchase,
+ purchase_year: val.purchase_year,
+ purchase_month: val.purchase_month,
emi: val.emi,
emi_paid: val.emi_paid,
elapsed_tenure: val.elapsed_tenure,
@@ -437,12 +532,12 @@ export class AssetsInfoComponent implements OnInit {
}
case '2': {
const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray;
- control.push(this.load_Two_Four_WeelerWithData(data));
+ control.push(this.load_Four_WeelerWithData(data));
break;
}
case '3': {
const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray;
- control.push(this.load_Two_Four_WeelerWithData(data));
+ control.push(this.load_Two_WeelerWithData(data));
break;
}
case '4': {
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
index 622f281b1..910aa3602 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
@@ -92,14 +92,17 @@
-
+ {{ prop.name }}
+
+
@@ -129,8 +132,8 @@
delete
-
-
Designation
-
+
-
@@ -65,12 +65,12 @@
-
+ formControlName="family_members_involved" (selectionChange)="relationChanged($event)">
{{member.name}}
@@ -85,7 +85,7 @@
Partners / Directors / Shareholders
-
+
-
-
@@ -122,7 +122,7 @@
Employees As per applicant
-
+
@@ -142,7 +142,7 @@
As per PD Officer
-
+
@@ -162,15 +162,15 @@
Investments
-
+
-
-
@@ -178,9 +178,9 @@
Location
-
+
-
+
Business Setup
-
+
-
+
-
self owned
Rented
@@ -208,11 +208,11 @@
-
-
@@ -220,7 +220,7 @@
Is the below documents seen and photo captured ?
-
+
@@ -231,28 +231,28 @@
-
Yes
No
-
Yes
No
-
Yes
No
-
Yes
No
@@ -273,7 +273,7 @@
-
Yes
No
@@ -282,17 +282,17 @@
@@ -306,6 +306,9 @@
-
+
+
+
\ No newline at end of file
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss
index 3be75d28c..c1a248bc2 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.scss
@@ -8,13 +8,19 @@
width: 100%;
}
.matcard > * {
- width: 80%;
+ width: 98%;
}
.card mat-form-field {
margin: 0 2%;
+ width: 40%;
}
.matcard mat-form-field {
margin: 0 2%;
+ width: 40%;
+}
+.matcards mat-form-field {
+ margin: 0 2%;
+ width: 98%;
}
.address .button {
float: right;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
index 624cb0caf..732af4e74 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts
@@ -75,13 +75,19 @@ export class BusinessInfoComponent implements OnInit {
return data.records.family_members_involved[key];
});
let enduse: any = [];
+ let existRelative: any =[];
selectedMembers.forEach(val => {
enduse.push(val.member);
+ existRelative.push(val);
});
+ this.relativeNames = existRelative;
if (DesgnArray.length == 0) {
Desgn.push(this.createDesignation());
} else {
+ DesgnArray.forEach(datas => {
Desgn.push(this.createDesignation());
+ });
+
}
if (PartnrArray.length == 0) {
Partnr.push(this.createPartners());
@@ -90,7 +96,7 @@ export class BusinessInfoComponent implements OnInit {
Partnr.push(this.createPartners());
});
}
- if (data.other_documents == 'yes') {
+ if (data.records.other_documents == 'yes') {
DocArray = Object.keys(data.records.documents).map(function (key) {
return data.records.documents[key];
});
@@ -114,7 +120,6 @@ export class BusinessInfoComponent implements OnInit {
businessVal.designation = DesgnArray;
businessVal.partners = PartnrArray;
businessVal.documents = DocArray;
- console.log('businessVal', businessVal);
this.businessForm.setValue(businessVal);
} else {
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
index 2582904d1..8a7c5933b 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html
@@ -1,14 +1,14 @@
-
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html
index 163347dd9..1623f9e05 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html
@@ -1,4 +1,6 @@
-
@@ -126,8 +133,9 @@
-
+
+
\ No newline at end of file
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts
index 7f83ff4c8..4faf03284 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts
@@ -11,9 +11,12 @@ import { Key } from 'protractor';
})
export class PersonalInfoComponent implements OnInit {
- qualifications:any=["Graduate","Under Graduate","Post Graduate","Professional"];
- earningStatus:any=["Earning Member","House Wife","Student","Retired","Pensioner","Other Non earning member"];
+ //qualifications:any=["Graduate","Under Graduate","Post Graduate","Professional"];
+ //earningStatus:any=["Earning Member","House Wife","Student","Retired","Pensioner","Other Non earning member"];
+ earningStatus:any=[];
+ qualifications:any=[];
relationShipList:any=[];
+
@Input() pdid : string;
@Input() pd_all_details:any;
form_id:number;
@@ -38,9 +41,10 @@ export class PersonalInfoComponent implements OnInit {
}
ngOnInit() {
-
this.loadPDDetails(this.pdid,this.form_id);
- this.getRelationMaster();
+ this.getMasterDetails('RELATIONSHIPS',1);
+ this.getMasterDetails('EARNINGMEMBERSSTATUS',2);
+ this.getMasterDetails('EDUQUALIFICATION',3);
this.mainApplicantDetails = this.pd_all_details.pdapplicants_detials.filter(item => item.applicant_type == 1);
// console.log(this.mainApplicantDetails)
this.coApplicantDetails = this.pd_all_details.pdapplicants_detials.filter(item => item.applicant_type == 0);
@@ -74,7 +78,7 @@ loadFormWithIDData(data) {
let mainApplicantGroup = new FormArray(main_result.map((item,key) => new FormGroup({
name_ans:new FormControl(item.name_ans, Validators.required),
- age_ans:new FormControl(item.age_ans, Validators.required),
+ age_ans:new FormControl(item.age_ans, Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])),
entity_ans:new FormControl(item.entity_ans, Validators.required),
qualification_ans:new FormControl(item.qualification_ans, Validators.required),
earning_ans:new FormControl(item.earning_ans, Validators.required),
@@ -88,7 +92,7 @@ loadFormWithIDData(data) {
coApplicantGroup = new FormArray(co_result.map((item,key) => new FormGroup({
name_ans:new FormControl(item.name_ans, Validators.required),
- age_ans:new FormControl(item.age_ans, Validators.required),
+ age_ans:new FormControl(item.age_ans, Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])),
entity_ans:new FormControl(item.entity_ans, Validators.required),
qualification_ans:new FormControl(item.qualification_ans, Validators.required),
earning_ans:new FormControl(item.earning_ans, Validators.required),
@@ -103,10 +107,10 @@ loadFormWithIDData(data) {
name_id:new FormControl(0),
age_ques:new FormControl(this.coApplicantQuestions[1]),
age_id:new FormControl(1),
- age_ans:new FormControl(null, Validators.required),
+ age_ans:new FormControl(null, Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])),
entity_ques: new FormControl(this.coApplicantQuestions[2]),
entity_id: new FormControl(2),
- entity_ans:new FormControl(this.pd_all_details.pdmaster_details.customer_segment_abbr==='SP' ? 'Individual' : this.pd_all_details.pdmaster_details.customer_segment_abbr==='SNP' ? 'Individual' : '', Validators.required),
+ entity_ans:new FormControl(this.pd_all_details.pdmaster_details.customer_segment_abbr.substring(0,3).toUpperCase()==='SAL' ? 'Individual' : '', Validators.required),
qualification_ques: new FormControl(this.coApplicantQuestions[3]),
qualification_id: new FormControl(3),
qualification_ans:new FormControl(null, Validators.required),
@@ -131,6 +135,7 @@ loadFormWithIDData(data) {
});
//console.log(this._personalForm);
this.loadDataStatus = true;
+
}
loadFormData(){
@@ -142,10 +147,10 @@ loadFormWithIDData(data) {
name_id:new FormControl(0),
age_ques:new FormControl(this.mainApplicantQuestions[1]),
age_id:new FormControl(1),
- age_ans:new FormControl(null, Validators.required),
+ age_ans:new FormControl(null, Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])),
entity_ques: new FormControl(this.mainApplicantQuestions[2]),
entity_id: new FormControl(2),
- entity_ans:new FormControl(this.pd_all_details.pdmaster_details.customer_segment_abbr==='SP' ? 'Individual' : this.pd_all_details.pdmaster_details.customer_segment_abbr==='SNP' ? 'Individual' : '', Validators.required),
+ entity_ans:new FormControl(this.pd_all_details.pdmaster_details.customer_segment_abbr.substring(0,3).toUpperCase()==='SAL' ? 'Individual' : '', Validators.required),
qualification_ques: new FormControl(this.mainApplicantQuestions[3]),
qualification_id: new FormControl(3),
qualification_ans:new FormControl(null, Validators.required),
@@ -161,10 +166,10 @@ loadFormWithIDData(data) {
name_id:new FormControl(0),
age_ques:new FormControl(this.coApplicantQuestions[1]),
age_id:new FormControl(1),
- age_ans:new FormControl(null, Validators.required),
+ age_ans:new FormControl(null, Validators.compose([Validators.required,Validators.minLength(1),Validators.maxLength(3),Validators.required,Validators.pattern('^[0-9]*$')])),
entity_ques: new FormControl(this.coApplicantQuestions[2]),
entity_id: new FormControl(2),
- entity_ans:new FormControl(this.pd_all_details.pdmaster_details.customer_segment_abbr==='SP' ? 'Individual' : this.pd_all_details.pdmaster_details.customer_segment_abbr==='SNP' ? 'Individual' : '', Validators.required),
+ entity_ans:new FormControl(this.pd_all_details.pdmaster_details.customer_segment_abbr.substring(0,3).toUpperCase()==='SAL' ? 'Individual' : '', Validators.required),
qualification_ques: new FormControl(this.coApplicantQuestions[3]),
qualification_id: new FormControl(3),
qualification_ans:new FormControl(null, Validators.required),
@@ -186,6 +191,7 @@ loadFormWithIDData(data) {
});
//console.log(this._personalForm);
this.loadDataStatus = true;
+
}
//get pd main applicant array values
@@ -194,21 +200,35 @@ this.loadDataStatus = true;
// get pd co applicant array values
get pdCoapplicant() {return this._personalForm.get('coItem') as FormArray;}
- // get relation master details
- getRelationMaster(){
- let relation ="RELATIONSHIPS";
- this._pd.getAllMasterDatas(relation).subscribe(
+ // get all master details
+ getMasterDetails(table:string,type:number){
+ this._pd.getAllMasterDatas(table).subscribe(
data => {
if (data.status == 200) {
- this.relationShipList=data.records;
+ if(type==1){
+ this.relationShipList=data.records.filter(item => item.isactive == 1);
+ }
+ else if(type==2){
+ this.earningStatus=data.records.filter(item => item.isactive == 1);
+ }
+ else if(type==3){
+ this.qualifications=data.records.filter(item => item.isactive == 1);
+ }
+
}
}, error => this.errorMessage =
error);
}
-
// submit forms details
submitPersonalForm(formData:any) {
- if(this._personalForm.valid){
+ if (this._personalForm.invalid) {
+ this.validateAllFormFields(this._personalForm);
+
+ // this.notifier.notify('warning', 'All Fields Are Required.!');
+
+ return;
+ }
+ else{
let main_applicantDetails:any=[];
let co_applicantDetails:any=[];
@@ -257,5 +277,20 @@ submitPersonalForm(formData:any) {
}
}
+// validate all form group and form array fields
+validateAllFormFields(formGroup: any) {
+ Object.keys(formGroup.controls).forEach(field => {
+ const control = formGroup.get(field);
+
+ if (control instanceof FormControl) {
+ control.markAsTouched({ onlySelf: true });
+ } else if (control instanceof FormGroup) {
+ this.validateAllFormFields(control);
+ } else if (control instanceof FormArray) {
+ this.validateAllFormFields(control);
+ }
+ });
+}
+
}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
index 3a55530a2..d293f4b58 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html
@@ -1,4 +1,5 @@
+Stock Details