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 13292690e..92481ac0c 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 @@ -26,7 +26,7 @@
- + {{ prop.name }} @@ -97,13 +97,13 @@
-
+
@@ -116,13 +116,13 @@
-
-
+
+
@@ -194,7 +194,7 @@
-
+
- - + + Yes No
- - + +
- +
-
+
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 b529da169..c357bb07f 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 @@ -90,7 +90,7 @@ public m_propertyType = []; // } // ]; -public m_insuranceType = []; +//public m_insuranceType = []; // public m_insuranceType = [{ // 'id': "1", @@ -175,7 +175,7 @@ public m_investmentType = []; this.getM_PropertyType(); this.getM_InvestmentType(); this.getM_FreqOfPurchase(); - this.getM_InsuranceType(); + //this.getM_InsuranceType(); } // ====================== @@ -228,17 +228,17 @@ public m_investmentType = []; ) } - 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.!'); + // 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."; - } - ) - } + // } + // ) + //} // ============================= @@ -299,8 +299,8 @@ public m_investmentType = []; details: this._formBuilder.array([]), approximate_market_value: ['', Validators.compose([])], name_of_the_owner: ['', Validators.compose([])], - purchase_year: ['', Validators.compose([])], - purchase_month: ['', Validators.compose([])], + // purchase_year: ['', Validators.compose([])], + //purchase_month: ['', Validators.compose([])], emi: [''], emi_paid: [''], elapsed_tenure: [''], @@ -389,7 +389,7 @@ public m_investmentType = []; loadInsuranceDescription() { return this._formBuilder.group({ - insurance_type: ['', Validators.compose([Validators.required])], + //insurance_type: ['', Validators.compose([Validators.required])], premium_paid: ['', Validators.compose([Validators.required])], frequency_mode: ['', Validators.compose([Validators.required])], sum_assured: ['', Validators.compose([Validators.required])], @@ -439,13 +439,13 @@ public m_investmentType = []; otherAssetsDescriptionWithData(data) { return this._formBuilder.group({ - any_other_assets: [data.any_other_assets, Validators.compose([Validators.required])] + any_other_assets: [data.any_other_assets, Validators.compose([Validators.required])], }); } loadInsuranceDescriptionWithData(data) { return this._formBuilder.group({ - insurance_type: [data.insurance_type, Validators.compose([Validators.required])], + //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])], @@ -481,8 +481,8 @@ public m_investmentType = []; details: this._formBuilder.array([]), 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([])], + // 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 || ''], @@ -500,8 +500,8 @@ public m_investmentType = []; assets_mode: val.assets_mode, approximate_market_value: val.approximate_market_value, name_of_the_owner: val.name_of_the_owner, - purchase_year: val.purchase_year, - purchase_month: val.purchase_month, + // purchase_year: val.purchase_year, + // purchase_month: val.purchase_month, emi: val.emi, emi_paid: val.emi_paid, elapsed_tenure: val.elapsed_tenure, 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 f6a5614f5..c74ef8afa 100755 --- 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 @@ -129,7 +129,7 @@ formControlName="vintage" required> -->
- +
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 9dbbffb9d..45285438b 100755 --- 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 @@ -14,16 +14,16 @@ - + - + - +