diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html index bf2770284..76ae7e05c 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html @@ -32,7 +32,7 @@
- + {{m_addressType.address_type}} @@ -42,7 +42,7 @@
- +
@@ -83,6 +83,12 @@
+
+ + + +
+
@@ -95,7 +101,6 @@
- @@ -103,7 +108,8 @@
- + + {{"₹"}} {{rentAmtInwords}} Only
@@ -119,17 +125,36 @@
+ + +
+
+ + + Yes + No + + +
+
+ + + +
+
+ +
- - - + + + Yes No
-
+ @@ -209,7 +234,8 @@ - + + {{"₹"}} {{premisesRentAmtInwords[i]}} Only + { + console.log(item); + console.log(index); + //this.premisesRentAmtInwords[index] = this._pd.convertNumberToWords(item.premises_rent_amt); + }); + this.selectedValue(this.bussiness_address_type,this.additional_premises); if (data.records.locality_others) { this.addressForm.controls.locality_others.setValue(data.records.locality_others); @@ -181,12 +207,15 @@ export class AddressComponent implements OnInit { locality_others: [''], pd_location: ['', Validators.compose([Validators.required])], comment_locality: ['', Validators.compose([Validators.required])], + other_comment_locality : [''], //customer_behaviour: ['', Validators.compose([Validators.required])], //neighbourhood: this.fb.array([]), address_form_remark:[''], address_ownership:[''], other_ownership:[''], rent_amt:[''], + other_premises_bussiness_activity : [''], + bussiness_activity_remark:[''], bussiness_activity:[''], business_years:[''], business_month:[''], @@ -199,10 +228,13 @@ export class AddressComponent implements OnInit { this.locality = this.addressForm.controls['locality']; this.pdLocation = this.addressForm.controls['pd_location']; this.commentlocality = this.addressForm.controls['comment_locality']; + this.other_comment_locality = this.addressForm.controls['other_comment_locality']; //this.customerBehaviour = this.addressForm.controls['customer_behaviour']; this.ownership = this.addressForm.controls['address_ownership']; this.other_ownership = this.addressForm.controls['other_ownership']; this.rent_amt = this.addressForm.controls['rent_amt']; + this.other_premises_bussiness_activity = this.addressForm.controls['other_premises_bussiness_activity'], + this.bussiness_activity_remark = this.addressForm.controls['bussiness_activity_remark'], this.bussinessActivity = this.addressForm.controls['bussiness_activity']; this.business_years = this.addressForm.controls['business_years']; this.business_month = this.addressForm.controls['business_month']; @@ -303,12 +335,15 @@ export class AddressComponent implements OnInit { } records.pd_location = this.pdLocation.value; records.comment_locality = this.commentlocality.value; + records.other_comment_locality = this.other_comment_locality.value; //records.customer_behaviour = this.commentlocality.value; //records.neighbourhood = this.addressForm.controls.neighbourhood.value; records.address_form_remark = this.addressForm.controls.address_form_remark.value; records.address_ownership = this.ownership.value; records.other_ownership = this.other_ownership.value; records.rent_amt = this.rent_amt.value; + records.other_premises_bussiness_activity = this.other_premises_bussiness_activity.value; + records.bussiness_activity_remark = this.bussiness_activity_remark.value; records.bussiness_activity = this.bussinessActivity.value; records.business_years = this.business_years.value; records.business_month = this.business_month.value; @@ -323,7 +358,7 @@ export class AddressComponent implements OnInit { } } - console.log('this.addressForm.controls.additional_premises.value',this.addressForm.controls.additional_premises.value); + // console.log('this.addressForm.controls.additional_premises.value',this.addressForm.controls.additional_premises.value); this.addressForm.controls.additional_premises.value.forEach((val,index)=> { @@ -348,7 +383,7 @@ export class AddressComponent implements OnInit { records.formid = '5'; // records.fk_createdby = '250'; - console.log(JSON.stringify(records)); + // console.log(JSON.stringify(records)); this._pd.saveForm(records).subscribe(data => { @@ -364,6 +399,10 @@ export class AddressComponent implements OnInit { // this.formPremisesCityArray.push({city: option}); // }); // } + selectedAddressType(e: any){ + // console.log(e); + this.placeholderName = 'Was any business activity seen at the '+e+' during PD visit?'; + } SelectedPremises($event){ let premisesData = $event.source.value; @@ -516,4 +555,15 @@ export class AddressComponent implements OnInit { event.preventDefault(); } } + + inWords(e,i){ + console.log(e); + console.log(i); + if(i != ''){ + this.premisesRentAmtInwords[i] = this._pd.convertNumberToWords(e.target.value); + } + else if(i == '' ){ + this.rentAmtInwords = this._pd.convertNumberToWords(e.target.value); + } + } } \ 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 40db78e79..858caabfa 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 @@ -551,11 +551,10 @@ public m_investmentType = []; }); } - - - loadPropertyWithData(data) { + loadPropertyWithData(data) { return this._formBuilder.group({ - property_type: [data.property_type] + property_type: [data.property_type], + other_property_type: [data.other_property_type] //property_type:[''] }); } @@ -740,28 +739,41 @@ public m_investmentType = []; setAssetsDetailsWithData(assets_details_mode: any, datas: any, i: any): void { let val = i; - // var data = Object.keys(datas).map(function (key) { + // let data = Object.keys(datas).map(function (key) { // return datas[key]; // }); - // alert(JSON.stringify(datas)); + //alert('JSON Other Asset'+JSON.stringify(datas)); let data = datas; + const arr = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; arr.controls.splice(0); switch (assets_details_mode) { case '1': { + let array_data : any; + data.forEach((datas,i) => { + array_data = { 'property_type':datas.property_type,'other_property_type':datas.other_property_type }; + }); const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; - control.push(this.loadPropertyWithData(data)); + control.push(this.loadPropertyWithData(array_data)); break; } case '2': { + let array_data : any; + data.forEach((datas,i) => { + array_data = { 'manufacturer_model_four_weeler': datas.manufacturer_model_four_weeler }; + }); const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; - control.push(this.load_Four_WeelerWithData(data)); + control.push(this.load_Four_WeelerWithData(array_data)); break; } case '3': { + let array_data : any; + data.forEach((datas,i) => { + array_data = { 'manufacturer_model_two_weeler': datas.manufacturer_model_two_weeler }; + }); const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; - control.push(this.load_Two_WeelerWithData(data)); + control.push(this.load_Two_WeelerWithData(array_data)); break; } case '4': { @@ -770,34 +782,60 @@ public m_investmentType = []; break; } case '5': { + let array_data : any; + data.forEach((datas,i) => { + array_data = { 'consumer_durable_description': datas.consumer_durable_description }; + }); const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; - control.push(this.loadConsumerDurableDescriptionWithData(data)); + control.push(this.loadConsumerDurableDescriptionWithData(array_data)); break; } case '6': { + let array_data : any; data.forEach((datas,i) => { this.OtherPremiumPaidInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.premium_paid); this.OtherSumAssuredInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.sum_assured); + array_data = { + 'premium_paid': datas.premium_paid, + 'frequency_mode': datas.frequency_mode, + 'other_frequency_mode':datas.other_frequency_mode, + 'sum_assured': datas.sum_assured, + 'members_coverd': datas.members_coverd + }; }); const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; - control.push(this.loadInsuranceDescriptionWithData(data)); + control.push(this.loadInsuranceDescriptionWithData(array_data)); break; } case '7': { + let array_data : any; data.forEach((datas,i) => { this.OtherAmtInvestInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.amount_of_invest); + array_data = { 'investments_type': datas.investments_type, + 'other_investments_type' : datas.other_investments_type, + 'amount_of_invest': datas.amount_of_invest, + 'bank_name': datas.bank_name }; }); const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; - control.push(this.loadInvestDescriptionWithData(data)); + control.push(this.loadInvestDescriptionWithData(array_data)); break; } case '8': { + let array_data : any; data.forEach((datas,i) => { - this.OtherAssetValueInwords[i] = this.pdTrigerService.convertNumberToWords(+data.any_other_asset_value); + 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, + '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(data)); + control.push(this.otherAssetsDescriptionWithData(array_data)); break; } default: { @@ -807,60 +845,97 @@ public m_investmentType = []; } setBusinessAssetsDetailsWithData(assets_details_mode: any, datas: any, i: any): void { - console.log(datas); + let val = i; let data = datas; + const arr = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; arr.controls.splice(0); switch (assets_details_mode) { case '1': { + let business_property_datas : any; + data.forEach((datas,i) => { + business_property_datas = { 'property_type':datas.property_type,'other_property_type':datas.other_property_type }; + }); const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; - control.push(this.loadPropertyWithData(data)); + control.push(this.loadPropertyWithData(business_property_datas)); break; } 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 }; + }); const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; - control.push(this.load_Four_WeelerWithData(data)); + control.push(this.load_Four_WeelerWithData(business_Four_Weeler_datas)); break; } case '3': { + let business_Two_Weeler_datas : any; + data.forEach((datas,i) => { + business_Two_Weeler_datas = { 'manufacturer_model_two_weeler': datas.manufacturer_model_two_weeler }; + }); const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; - control.push(this.load_Two_WeelerWithData(data)); + control.push(this.load_Two_WeelerWithData(business_Two_Weeler_datas)); break; } case '4': { break; } case '5': { + let business_ConsumerDurableDescription_datas : any; + data.forEach((datas,i) => { + business_ConsumerDurableDescription_datas = { 'consumer_durable_description': datas.consumer_durable_description }; + }); const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; - control.push(this.loadConsumerDurableDescriptionWithData(data)); + control.push(this.loadConsumerDurableDescriptionWithData(business_ConsumerDurableDescription_datas)); break; } case '6': { + let business_InsuranceDescription_datas : any; data.forEach((datas,i) => { this.PremiumPaidInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.premium_paid); this.SumAssuredInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.sum_assured); + business_InsuranceDescription_datas = { + 'premium_paid': datas.premium_paid, + 'frequency_mode': datas.frequency_mode, + 'other_frequency_mode':datas.other_frequency_mode, + 'sum_assured': datas.sum_assured, + 'members_coverd': datas.members_coverd + }; }); const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; - control.push(this.loadInsuranceDescriptionWithData(data)); + control.push(this.loadInsuranceDescriptionWithData(business_InsuranceDescription_datas)); break; } case '7': { + let business_InvestDescription_datas : any; data.forEach((datas,i) => { this.AmtInvestInwords[i] = this.pdTrigerService.convertNumberToWords(+datas.amount_of_invest); + business_InvestDescription_datas = { 'investments_type': datas.investments_type, + 'other_investments_type' : datas.other_investments_type, + 'amount_of_invest': datas.amount_of_invest, + 'bank_name': datas.bank_name }; }); const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; - control.push(this.loadInvestDescriptionWithData(data)); + control.push(this.loadInvestDescriptionWithData(business_InvestDescription_datas)); break; } case '8': { + 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 ; - control.push(this.otherBusinessAssetsDescriptionWithData(data)); + control.push(this.otherBusinessAssetsDescriptionWithData(array_datas)); break; } default: {