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 6a788532c..a3aea72e1 100755
--- 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
@@ -37,7 +37,7 @@ export class AssetsInfoComponent implements OnInit {
public _assetsQuesFrom: FormGroup;
public submitted = false;
public m_assets_type = [];
- public m_relation = [];
+ //public m_relation = [];
public applicants: any;
otherEmiamtFlag : boolean = false;
businessEmiAmtFlag : boolean = false;
@@ -186,7 +186,7 @@ public m_investmentType = [];
private notifier: NotifierService;
existCompanyList: any =[];
mergeCompanyApplicant: any=[];
-
+ currentYear:any=new Date().getFullYear();
constructor(
notifier: NotifierService,
private _formBuilder: FormBuilder,
@@ -225,7 +225,7 @@ public m_investmentType = [];
// });
this.pdTrigerService.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{
if(data.dataStatus){
- this.existCompanyList = data.records.filter(val =>val.is_active);
+ this.existCompanyList = data.records.filter(val =>val.is_active===true && val.is_company_applicant===true);
}
let modifyCompanyList : any=[];
@@ -234,9 +234,7 @@ public m_investmentType = [];
return {id:element.company_order_id.toString(),name:element.company_name,group_id:1};
});
this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList})
-
}
-
let modifyApplicantList: any=[];
if(this.applicants.length > 0){
modifyApplicantList = this.applicants.map(element => {
@@ -252,7 +250,7 @@ public m_investmentType = [];
this.getM_PropertyType();
this.getM_InvestmentType();
this.getM_FreqOfPurchase();
- this.getM_Relation();
+ //this.getM_Relation();
//this.getM_InsuranceType();
}
@@ -295,16 +293,16 @@ public m_investmentType = [];
)
}
- getM_Relation() {
- this.pdTrigerService.getAllMasterDatas('RELATIONSHIPS').subscribe(
- data => {
- this.m_relation = data.records.filter(data => data.isactive == 1);
- },
- error => {
- this.notifier.notify('warning', 'No Category Records Found.!');
- }
- )
- }
+ // getM_Relation() {
+ // this.pdTrigerService.getAllMasterDatas('RELATIONSHIPS').subscribe(
+ // data => {
+ // this.m_relation = data.records.filter(data => data.isactive == 1);
+ // },
+ // error => {
+ // this.notifier.notify('warning', 'No Category Records Found.!');
+ // }
+ // )
+ // }
getM_FreqOfPurchase() {
this.pdTrigerService.getAllMasterDatas('FREQUENCY').subscribe(
@@ -395,14 +393,11 @@ public m_investmentType = [];
approximate_market_value: [''],
name_of_the_owner: [''],
other_owner:[''],
- relation: [''],
- purchase_year: ['',Validators.compose([Validators.minLength(4),Validators.maxLength(4)])],
+ // relation: [''],
+ vintage_personal : [''],
+ purchase_year: ['',Validators.compose([Validators.pattern("[1-9]{1}[0-9]{3}")])],
//purchase_month: [''],
emi: [''],
- emi_paid: [''],
- original_loan_tenure: [''],
- balance_tenure: [''],
- elapsed_tenure: [''],
});
}
@@ -415,13 +410,10 @@ public m_investmentType = [];
business_name_of_the_other_owner: [],
//other_owner:[''],
//relation:[''],
- business_purchase_year: ['',Validators.compose([Validators.minLength(4),Validators.maxLength(4)])],
+ business_vintage: [''],
+ business_purchase_year: ['',Validators.compose([Validators.pattern("[1-9]{1}[0-9]{3}")])],
//purchase_month: [''],
business_emi: [''],
- business_emi_paid: [''],
- business_original_loan_tenure: [''],
- business_balance_tenure: [''],
- business_elapsed_tenure: [''],
});
}
@@ -454,7 +446,7 @@ public m_investmentType = [];
case '3': {
const control = (flag == 1) ? (
this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray
: (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ;
- control.push(this.load_Two_Weeler());
+ control.push(this.loadEquipmentManufacturingDescription());
break;
}
case '4': {
@@ -518,15 +510,20 @@ public m_investmentType = [];
});
}
+ loadEquipmentManufacturingDescription() {
+ return this._formBuilder.group({
+ equipment_manufacturing_description: ['']
+ });
+ }
+
otherAssetsDescription() {
return this._formBuilder.group({
any_other_assets: [''],
name_of_the_owner:[''],
other_owner:[''],
- relation:[''],
+ //relation:[''],
any_other_asset_value : [''],
any_other_asset_loan : [''],
- other_asset_emi_amt : ['']
});
}
@@ -535,9 +532,7 @@ public m_investmentType = [];
return this._formBuilder.group({
any_other_assets: [''],
any_other_asset_value : [''],
- any_other_asset_loan : [''],
- other_asset_emi_amt : ['']
-
+ any_other_asset_loan : [''],
});
}
@@ -556,20 +551,20 @@ public m_investmentType = [];
return this._formBuilder.group({
investments_type: [''],
other_investments_type:[''],
- amount_of_invest: [''],
+ amount_of_invest: [],
bank_name: ['']
});
}
load_Four_Weeler() {
return this._formBuilder.group({
- manufacturer_model_four_weeler: ['']
+ manufacturer_model_vehicle: ['']
});
}
load_Two_Weeler() {
return this._formBuilder.group({
- manufacturer_model_two_weeler: ['']
+ manufacturer_model_vehicle: ['']
});
}
@@ -592,16 +587,20 @@ public m_investmentType = [];
consumer_durable_description: [data.consumer_durable_description]
});
}
+ loadEquipmentManufacturingDescriptionWithData(data) {
+ return this._formBuilder.group({
+ equipment_manufacturing_description: [data.equipment_manufacturing_description]
+ });
+ }
otherAssetsDescriptionWithData(data) {
return this._formBuilder.group({
any_other_assets: [data.any_other_assets],
name_of_the_owner:[data.name_of_the_owner],
other_owner:[data.other_owner],
- relation:[data.relation],
+ // relation:[data.relation],
any_other_asset_value : [data.any_other_asset_value],
any_other_asset_loan : [data.any_other_asset_loan],
- other_asset_emi_amt : [data.other_asset_emi_amt]
});
}
@@ -610,7 +609,6 @@ public m_investmentType = [];
any_other_assets: [data.any_other_assets],
any_other_asset_value : [data.any_other_asset_value],
any_other_asset_loan : [data.any_other_asset_loan],
- other_asset_emi_amt : [data.other_asset_emi_amt]
});
}
@@ -638,13 +636,13 @@ public m_investmentType = [];
load_Four_WeelerWithData(data) {
return this._formBuilder.group({
- manufacturer_model_four_weeler: [data.manufacturer_model_four_weeler]
+ manufacturer_model_vehicle: [data.manufacturer_model_vehicle]
});
}
load_Two_WeelerWithData(data) {
return this._formBuilder.group({
- manufacturer_model_two_weeler: [data.manufacturer_model_two_weeler]
+ manufacturer_model_vehicle: [data.manufacturer_model_vehicle]
});
}
@@ -657,34 +655,29 @@ public m_investmentType = [];
approximate_market_value: [data.approximate_market_value],
name_of_the_owner: [data.name_of_the_owner],
other_owner:[data.other_owner || ''],
- relation: [data.relation || ''],
- purchase_year: [data.purchase_year],
+ //relation: [data.relation || ''],
+ vintage_personal : [data. vintage_personal],
+ purchase_year: [data. purchase_year,Validators.compose([Validators.pattern("[1-9]{1}[0-9]{3}")])],
// purchase_month: [data.purchase_month],
emi: [data.emi || 0],
- emi_paid: [data.emi_paid || ''],
- original_loan_tenure: [data.original_loan_tenure || ''],
- balance_tenure: [data.balance_tenure || ''],
- elapsed_tenure: [data.elapsed_tenure || '']
});
}
initBusinessDetailsWithdata(data) {
- return this._formBuilder.group({
+ let formGroup= this._formBuilder.group({
business_assets_mode: [data.business_assets_mode],
business_details: this._formBuilder.array([]),
business_approximate_market_value: [data.business_approximate_market_value],
business_name_of_the_owner: [data.business_name_of_the_owner],
business_name_of_the_other_owner:[data.business_name_of_the_other_owner || ''],
// relation: [data.relation || ''],
- business_purchase_year: [data. business_purchase_year],
+ business_vintage: [data. business_vintage],
+ business_purchase_year: [data. business_purchase_year,Validators.compose([Validators.pattern("[1-9]{1}[0-9]{3}")])],
// purchase_month: [data.purchase_month],
business_emi: [data.business_emi || 0],
- business_emi_paid: [data.business_emi_paid || ''],
- business_original_loan_tenure: [data.business_original_loan_tenure || ''],
- business_balance_tenure: [data.business_balance_tenure || ''],
- business_elapsed_tenure: [data.business_elapsed_tenure || '']
});
+ return formGroup;
}
loadDetails: boolean;
@@ -695,7 +688,6 @@ public m_investmentType = [];
result.forEach((datas,index) => {
this.OtherAppxMarketAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.approximate_market_value);
- this.OtherEmiAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.emi_paid);
});
if (result.length > 0) {
@@ -705,14 +697,11 @@ public m_investmentType = [];
approximate_market_value: val.approximate_market_value,
name_of_the_owner: val.name_of_the_owner,
other_owner:val.other_owner,
- relation: val.relation,
+ // relation: val.relation,
+ vintage_personal: val.vintage_personal,
purchase_year: val.purchase_year,
// purchase_month: val.purchase_month,
emi: val.emi,
- emi_paid: val.emi_paid,
- original_loan_tenure: val.original_loan_tenure,
- elapsed_tenure: val.elapsed_tenure,
- balance_tenure: val.balance_tenure
};
const control = this._assetsQuesFrom.controls['assets_details'];
control.push(this.initDetailsWithdata(vals));
@@ -731,7 +720,6 @@ public m_investmentType = [];
if (result.length > 0) {
result.forEach((datas,index) => {
this.appxMarketAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.business_approximate_market_value);
- this.emiAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.business_emi_paid);
});
for (let val of result) {
@@ -742,12 +730,9 @@ public m_investmentType = [];
business_name_of_the_other_owner: val.business_name_of_the_other_owner,
// relation : val.relation,
business_purchase_year: val. business_purchase_year,
+ business_vintage : val.business_vintage,
// purchase_month: val.purchase_month,
business_emi: val.business_emi,
- business_emi_paid: val.business_emi_paid,
- business_original_loan_tenure: val.business_original_loan_tenure,
- business_elapsed_tenure: val.business_elapsed_tenure,
- business_balance_tenure: val.business_balance_tenure
};
const control = this._assetsQuesFrom.controls['business_assets_details'];
@@ -782,7 +767,7 @@ public m_investmentType = [];
case '2': {
let array_data : any;
data.forEach((datas,i) => {
- array_data = { 'manufacturer_model_four_weeler': datas.manufacturer_model_four_weeler };
+ array_data = { 'manufacturer_model_vehicle': datas.manufacturer_model_vehicle };
});
const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray;
control.push(this.load_Four_WeelerWithData(array_data));
@@ -791,10 +776,10 @@ public m_investmentType = [];
case '3': {
let array_data : any;
data.forEach((datas,i) => {
- array_data = { 'manufacturer_model_two_weeler': datas.manufacturer_model_two_weeler };
+ array_data = { 'equipment_manufacturing_description': datas.equipment_manufacturing_description };
});
const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray;
- control.push(this.load_Two_WeelerWithData(array_data));
+ control.push(this.loadEquipmentManufacturingDescriptionWithData(array_data));
break;
}
case '4': {
@@ -847,13 +832,11 @@ public m_investmentType = [];
array_data = { 'any_other_assets': datas.any_other_assets,
'name_of_the_owner':datas.name_of_the_owner,
'other_owner':datas.other_owner,
- 'relation':datas.relation,
+ //'relation':datas.relation,
'any_other_asset_value' : datas.any_other_asset_value,
'any_other_asset_loan' : datas.any_other_asset_loan,
- 'other_asset_emi_amt' : datas.other_asset_emi_amt
};
this.OtherAssetValueInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.any_other_asset_value);
- this.O_emiAmtInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.other_asset_emi_amt);
});
const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray;
control.push(this.otherAssetsDescriptionWithData(array_data));
@@ -886,19 +869,19 @@ public m_investmentType = [];
case '2': {
let business_Four_Weeler_datas : any;
data.forEach((datas,i) => {
- business_Four_Weeler_datas = { 'manufacturer_model_four_weeler': datas.manufacturer_model_four_weeler };
+ business_Four_Weeler_datas = { 'manufacturer_model_vehicle': datas.manufacturer_model_vehicle };
});
const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ;
control.push(this.load_Four_WeelerWithData(business_Four_Weeler_datas));
break;
}
case '3': {
- let business_Two_Weeler_datas : any;
+ let equipment_manufacturing_description_datas : any;
data.forEach((datas,i) => {
- business_Two_Weeler_datas = { 'manufacturer_model_two_weeler': datas.manufacturer_model_two_weeler };
+ equipment_manufacturing_description_datas= { 'equipment_manufacturing_description': datas.equipment_manufacturing_description };
});
const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ;
- control.push(this.load_Two_WeelerWithData(business_Two_Weeler_datas));
+ control.push(this.loadEquipmentManufacturingDescriptionWithData(equipment_manufacturing_description_datas));
break;
}
case '4': {
@@ -947,12 +930,10 @@ public m_investmentType = [];
let array_datas : any;
data.forEach((datas,i) => {
this.AssetValueInwords[i] = this.pdTrigerService.convertNumberToWords(+data.any_other_asset_value);
- this.B_emiAmtInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.other_asset_emi_amt);
array_datas = {
'any_other_assets': datas.any_other_assets,
'any_other_asset_value' : datas.any_other_asset_value,
'any_other_asset_loan' : datas.any_other_asset_loan,
- 'other_asset_emi_amt' : datas.other_asset_emi_amt
};
});
const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ;
@@ -997,19 +978,6 @@ public m_investmentType = [];
selectedFreqPurchase(e) {
this.freqPurchaseTextBox = e.value;
}
-
- /** Show/hide EMI amount Field using Flag Both "other Asset" and "business"
- * REF = "Other Asset type at last Field"
- **/
- selectedAssetLoanType(e: any,flag): void {
- if(flag == 1){
- this.otherEmiamtFlag = (e == 'yes') ? true : false;
- }
- else if(flag == 2){
- this.businessEmiAmtFlag = (e == 'yes') ? true : false;
- }
- }
-
// compare objects for merge two master table details
compareObjects(o1: any, o2: any) {
if(o1.id == o2.id && o1.group_id == o2.group_id)
@@ -1028,6 +996,29 @@ public m_investmentType = [];
}
+ // calculate vintage and purchase {}
+ calculateVintagePurchase(value: any, controlKey: any,type: number){
+ if(type==1){
+ let control: any = this._assetsQuesFrom.controls['business_assets_details'];
+ control.controls[controlKey].controls['business_purchase_year'].setValue(value!='' ? parseInt(this.currentYear)-parseInt(value) : '');
+ }
+ else if(type==2) {
+ let control: any = this._assetsQuesFrom.controls['business_assets_details'];
+ value!='' && value<=this.currentYear ? control.controls[controlKey].controls['business_purchase_year'].setValue(value) : control.controls[controlKey].controls['business_purchase_year'].setValue('');
+ value!='' && value<=this.currentYear ? control.controls[controlKey].controls['business_vintage'].setValue(parseInt(this.currentYear)-parseInt(value)) : control.controls[controlKey].controls['business_vintage'].setValue('')
+ }
+ else if(type==3){
+ let control: any = this._assetsQuesFrom.controls['assets_details'];
+ control.controls[controlKey].controls['purchase_year'].setValue(value!='' ? parseInt(this.currentYear)-parseInt(value) : '');
+ }
+ else if(type==4) {
+ let control: any = this._assetsQuesFrom.controls['assets_details'];
+ value!='' && value<=this.currentYear ? control.controls[controlKey].controls['purchase_year'].setValue(value) : control.controls[controlKey].controls['purchase_year'].setValue('');
+ value!='' && value<=this.currentYear ? control.controls[controlKey].controls['vintage_personal'].setValue(parseInt(this.currentYear)-parseInt(value)) : control.controls[controlKey].controls['vintage_personal'].setValue('')
+ }
+
+ }
+
/** To Save/Edited Popup Data */
onSubmit() {
this.submitted = true;
@@ -1040,24 +1031,6 @@ public m_investmentType = [];
//To Remove The "Null" With Key also
Object.keys(answerFormValues).forEach((key) => (answerFormValues[key] == null) && delete answerFormValues[key]);
- answerFormValues.assets_details.map(val => {
- if (val.emi == '0') {
- val.emi_paid = '';
- val.original_loan_tenure = '';
- val.balance_tenure = '';
- val.elapsed_tenure = '';
- }
- });
-
- //To Remove The "Null" With Key also
- answerFormValues.business_assets_details.map(val => {
- if (val.business_emi == '0') {
- val.business_emi_paid = '';
- val.business_original_loan_tenure = '';
- val.business_balance_tenure = '';
- val.business_elapsed_tenure = '';
- }
- });
// Save the data with help of Service
this.pdTrigerService.savePDFormDetailsWithID(answerFormValues).subscribe(
dataresult => {
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
index 7fe38bc59..b2a1c3961 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html
@@ -63,11 +63,12 @@
-
+
-
-