diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html index 62516d7cb..a52057c6b 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html @@ -42,7 +42,7 @@
- + {{ prop.name }} @@ -63,7 +63,7 @@
- +
@@ -77,7 +77,7 @@
- +
@@ -91,7 +91,7 @@
- +
@@ -106,26 +106,26 @@
- +
- + {{ freqn.name }}
- +
- +
@@ -141,7 +141,7 @@
- + {{ ins_type.name }} @@ -153,12 +153,12 @@
- +
- +
@@ -174,16 +174,16 @@
- + - + - + - + Yes No NA @@ -215,7 +215,7 @@
- +
@@ -223,7 +223,7 @@ + formControlName="business_name_of_the_owner" > {{owner.applicant_name}} @@ -238,7 +238,7 @@
- + {{relations.name}} @@ -343,7 +343,7 @@
- + {{ prop.name }} @@ -364,7 +364,7 @@
- +
@@ -378,7 +378,7 @@
- +
@@ -406,7 +406,7 @@
- +
@@ -421,33 +421,33 @@
- +
- + {{ freqn.name }}
- +
- +
@@ -463,7 +463,7 @@
- + {{ ins_type.name }} @@ -477,14 +477,14 @@
- +
- +
@@ -499,14 +499,14 @@
- + - + + formControlName="name_of_the_owner" > {{owner.applicant_name}} @@ -520,7 +520,7 @@
- + {{relations.name}} @@ -529,10 +529,10 @@
- + - + Yes No NA @@ -569,7 +569,7 @@
+ formControlName="name_of_the_owner" > {{owner.applicant_name}} @@ -584,7 +584,7 @@
- + {{relations.name}} 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 b4d11a7e7..90c350611 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 @@ -345,14 +345,14 @@ public m_investmentType = []; // Dynamic Form field creation Functionality : START ===> initDetails() { return this._formBuilder.group({ - assets_mode: ['', Validators.compose([Validators.required])], + assets_mode: [''], details: this._formBuilder.array([]), - approximate_market_value: ['', Validators.compose([])], - name_of_the_owner: ['', Validators.compose([])], + approximate_market_value: [''], + name_of_the_owner: [''], other_owner:[''], relation: [''], - // purchase_year: ['', Validators.compose([])], - //purchase_month: ['', Validators.compose([])], + // purchase_year: [''], + //purchase_month: [''], emi: [''], emi_paid: [''], original_loan_tenure: [''], @@ -363,14 +363,14 @@ public m_investmentType = []; initBusinessDetails(data) { return this._formBuilder.group({ - business_assets_mode: ['', Validators.compose([Validators.required])], + business_assets_mode: [''], business_details: this._formBuilder.array([]), - business_approximate_market_value: ['', Validators.compose([])], + business_approximate_market_value: [''], business_name_of_the_owner: [data], // other_owner:[''], // relation:[''], - // purchase_year: ['', Validators.compose([])], - //purchase_month: ['', Validators.compose([])], + // purchase_year: [''], + //purchase_month: [''], business_emi: [''], business_emi_paid: [''], business_original_loan_tenure: [''], @@ -458,26 +458,26 @@ public m_investmentType = []; loadProperty() { return this._formBuilder.group({ - property_type: ['', Validators.compose([Validators.required])], + property_type: [''], other_property_type: [''] }); } loadJwellDescription() { return this._formBuilder.group({ - jwell_description: ['', Validators.compose([])] + jwell_description: [''] }); } loadConsumerDurableDescription() { return this._formBuilder.group({ - consumer_durable_description: ['', Validators.compose([Validators.required])] + consumer_durable_description: [''] }); } otherAssetsDescription() { return this._formBuilder.group({ - any_other_assets: ['', Validators.compose([Validators.required])], + any_other_assets: [''], name_of_the_owner:[''], other_owner:[''], relation:[''], @@ -490,7 +490,7 @@ public m_investmentType = []; otherBusinessAssetsDescription() { return this._formBuilder.group({ - any_other_assets: ['', Validators.compose([Validators.required])], + any_other_assets: [''], any_other_asset_value : [''], any_other_asset_loan : [''], other_asset_emi_amt : [''] @@ -500,32 +500,32 @@ public m_investmentType = []; loadInsuranceDescription() { return this._formBuilder.group({ - //insurance_type: ['', Validators.compose([Validators.required])], - premium_paid: ['', Validators.compose([])], - frequency_mode: ['', Validators.compose([])], - sum_assured: ['', Validators.compose([])], - members_coverd: ['', Validators.compose([])] + //insurance_type: [''], + premium_paid: [''], + frequency_mode: [''], + sum_assured: [''], + members_coverd: [''] }); } loadInvestDescription() { return this._formBuilder.group({ - investments_type: ['', Validators.compose([])], + investments_type: [''], other_investments_type:[''], - amount_of_invest: ['', Validators.compose([])], - bank_name: ['', Validators.compose([])] + amount_of_invest: [''], + bank_name: [''] }); } load_Four_Weeler() { return this._formBuilder.group({ - manufacturer_model_four_weeler: ['', Validators.compose([])] + manufacturer_model_four_weeler: [''] }); } load_Two_Weeler() { return this._formBuilder.group({ - manufacturer_model_two_weeler: ['', Validators.compose([Validators.required])] + manufacturer_model_two_weeler: [''] }); } @@ -533,26 +533,26 @@ public m_investmentType = []; loadPropertyWithData(data) { return this._formBuilder.group({ - property_type: [data.property_type, Validators.compose([Validators.required])] + property_type: [data.property_type] //property_type:[''] }); } loadJwellDescriptionWithData(data) { return this._formBuilder.group({ - jwell_description: [data.jwell_description, Validators.compose([Validators.required])] + jwell_description: [data.jwell_description] }); } loadConsumerDurableDescriptionWithData(data) { return this._formBuilder.group({ - consumer_durable_description: [data.consumer_durable_description, Validators.compose([Validators.required])] + consumer_durable_description: [data.consumer_durable_description] }); } otherAssetsDescriptionWithData(data) { return this._formBuilder.group({ - any_other_assets: [data.any_other_assets, Validators.compose([Validators.required])], + any_other_assets: [data.any_other_assets], name_of_the_owner:[data.name_of_the_owner], other_owner:[data.other_owner], relation:[data.relation], @@ -564,7 +564,7 @@ public m_investmentType = []; otherBusinessAssetsDescriptionWithData(data) { return this._formBuilder.group({ - any_other_assets: [data.any_other_assets, Validators.compose([Validators.required])], + 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] @@ -575,32 +575,32 @@ public m_investmentType = []; loadInsuranceDescriptionWithData(data) { return this._formBuilder.group({ - //insurance_type: [data.insurance_type, Validators.compose([Validators.required])], - premium_paid: [data.premium_paid, Validators.compose([Validators.required])], - frequency_mode: [data.frequency_mode, Validators.compose([Validators.required])], - sum_assured: [data.sum_assured, Validators.compose([Validators.required])], - members_coverd: [data.members_coverd, Validators.compose([Validators.required])] + //insurance_type: [data.insurance_type], + premium_paid: [data.premium_paid], + frequency_mode: [data.frequency_mode], + sum_assured: [data.sum_assured], + members_coverd: [data.members_coverd] }); } loadInvestDescriptionWithData(data) { return this._formBuilder.group({ - investments_type: [data.investments_type, Validators.compose([Validators.required])], + investments_type: [data.investments_type], other_investments_type : [data.other_investments_type], - amount_of_invest: [data.amount_of_invest, Validators.compose([Validators.required])], - bank_name: [data.bank_name, Validators.compose([Validators.required])] + amount_of_invest: [data.amount_of_invest], + bank_name: [data.bank_name] }); } load_Four_WeelerWithData(data) { return this._formBuilder.group({ - manufacturer_model_four_weeler: [data.manufacturer_model_four_weeler, Validators.compose([Validators.required])] + manufacturer_model_four_weeler: [data.manufacturer_model_four_weeler] }); } load_Two_WeelerWithData(data) { return this._formBuilder.group({ - manufacturer_model_two_weeler: [data.manufacturer_model_two_weeler, Validators.compose([Validators.required])] + manufacturer_model_two_weeler: [data.manufacturer_model_two_weeler] }); } @@ -608,14 +608,14 @@ public m_investmentType = []; initDetailsWithdata(data) { return this._formBuilder.group({ - assets_mode: [data.assets_mode, Validators.compose([Validators.required])], + assets_mode: [data.assets_mode], details: this._formBuilder.array([]), - approximate_market_value: [data.approximate_market_value, Validators.compose([])], - name_of_the_owner: [data.name_of_the_owner, Validators.compose([])], + 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, Validators.compose([])], - // purchase_month: [data.purchase_month, Validators.compose([])], + // purchase_year: [data.purchase_year], + // purchase_month: [data.purchase_month], emi: [data.emi || 0], emi_paid: [data.emi_paid || ''], original_loan_tenure: [data.original_loan_tenure || ''], @@ -625,14 +625,14 @@ public m_investmentType = []; } initBusinessDetailsWithdata(data) { return this._formBuilder.group({ - business_assets_mode: [data.business_assets_mode, Validators.compose([Validators.required])], + business_assets_mode: [data.business_assets_mode], business_details: this._formBuilder.array([]), - business_approximate_market_value: [data.business_approximate_market_value, Validators.compose([])], - business_name_of_the_owner: [data.business_name_of_the_owner, Validators.compose([])], + business_approximate_market_value: [data.business_approximate_market_value], + business_name_of_the_owner: [data.business_name_of_the_owner], // other_owner:[data.other_owner || ''], // relation: [data.relation || ''], - // purchase_year: [data.purchase_year, Validators.compose([])], - // purchase_month: [data.purchase_month, Validators.compose([])], + // purchase_year: [data.purchase_year], + // 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 || ''], diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html index b4154fdeb..cd2bf8ef3 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html @@ -22,7 +22,7 @@ + formControlName="existing_loan" > Yes No @@ -38,45 +38,51 @@ - + + formControlName="frequency" > {{freq.name}} - + - + + {{types.loan_type_name}} + + + + + - + {{owner.applicant_name}} - Others + - - + + - + {{ btLen.lender_name }} - + - + - +