From 47aba2af71dc2904ec769b9780e653071b1da8fe Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 15 Dec 2018 18:21:56 +0530 Subject: [PATCH] Asset Details : ps --- .../assets-info/assets-info.component.html | 473 ++++++++++++++---- .../assets-info/assets-info.component.ts | 223 ++++++++- 2 files changed, 579 insertions(+), 117 deletions(-) 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 092096a10..d4645df51 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 @@ -14,7 +14,7 @@ - +
@@ -29,7 +29,7 @@
- + {{ asset.name }} @@ -50,7 +50,7 @@
- +
@@ -64,7 +64,7 @@
- +
@@ -78,7 +78,7 @@
- +
@@ -92,7 +92,7 @@
- +
@@ -128,7 +128,7 @@
-->
- +
@@ -140,14 +140,14 @@
- +
- +
@@ -170,17 +170,17 @@ - +
- +
- +
@@ -195,10 +195,10 @@
- + - + @@ -209,10 +209,12 @@ No NAN + - - - .00 + + + +
@@ -225,7 +227,7 @@
- +
@@ -233,7 +235,7 @@
- +
@@ -261,24 +263,30 @@
- +
- +
- +
- +
+ + + + +
+
- +
@@ -292,10 +300,7 @@
- - - + class="mr-1 mb-1 hover-icon" (click)="addSupplierDetails($event,1); false">add
@@ -306,83 +311,285 @@
- - - -
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - -
- -
-
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - + + + +
+
+ + +
+
+
+ + +
+
+ + + {{ asset.name }} + + +
+ +
+ +
+
+
+
+
+ + + {{ prop.name }} + +
- +
+ + + +
+
+
-
-
-
-
-
-
- -
-
-
-
- Nivi SKM - + +
+
+
+
+
+ + + +
+
+
+
+
+ +
+
+
+
+
+ + + +
+
+
+
+
+ +
+
+
+
+
+ + + +
+
+
+
+
+ +
+
+
+
+
+
+ + + +
+
+ + + {{ freqn.name }} + + +
+
+ + + +
+
+
+
+ + + +
+
+
+
+
+
+ +
+
+
+
+
+
+ + + {{ ins_type.name }} + +
- + + + + + +
+ + + +
+
+ + + +
+
+
+
+ + +
+
+
+
+
+ + + + + + + + + + + + Yes + No + NAN + + + + + + + +
+
+
+
-
+ +
+ + +
+
+
+ + + +
+
+
+ +
+ + + +
+
+
+
+
+
+ + + Yes + No + +
-
+
+ + + +
+
+ + + +
+
+ + + +
+ + + +
+
+ + + +
+
+ + + +
+
+
+ + +
+
+
+ +
+ +
+ + + + + + +
+
+ + + + +
+
-
+
@@ -412,11 +619,79 @@
- -
+
+
+
- - +
+
+
+
+ Nivi SKM + +
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+ Nivi SKM + +
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+ Nivi SKM + +
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+ Nivi SKM + +
+ +
+
+
+
+
+ +
+ + + @@ -424,7 +699,7 @@
Remarks - +
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 47119531b..38fabb3d4 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 @@ -35,6 +35,7 @@ export class AssetsInfoComponent implements OnInit { public _assetsQuesFrom: FormGroup; public submitted = false; public m_assets_type = []; + // public m_assets_type = [ // { // 'id': "1", @@ -274,9 +275,11 @@ public m_investmentType = []; assets_details: this._formBuilder.array([ // this.initDetails(), ]), + business_assets_details : this._formBuilder.array([]), assets_form_remark:[value.assets_form_remark || 'check'] }); this.addAssetsDetailsWithData(value.assets_details); + this.addAssetsDetailsWithData2(value.business_assets_details); } else { this._assetsQuesFrom = this._formBuilder.group({ pdid: [this.pdid], @@ -284,6 +287,9 @@ public m_investmentType = []; assets_details: this._formBuilder.array([ this.initDetails(), ]), + business_assets_details : this._formBuilder.array([ + this.initnewDetails(), + ]), assets_form_remark:[''] }); } @@ -308,56 +314,90 @@ public m_investmentType = []; //purchase_month: ['', Validators.compose([])], emi: [''], emi_paid: [''], + original_loan_tenure: [''], + balance_tenure: [''], elapsed_tenure: [''], - balance_tenure: [''] }); } + initnewDetails() { + return this._formBuilder.group({ + business_assets_mode: ['', Validators.compose([Validators.required])], + business_details: this._formBuilder.array([]), + business_approximate_market_value: ['', Validators.compose([])], + business_name_of_the_owner: ['', Validators.compose([])], + // purchase_year: ['', Validators.compose([])], + //purchase_month: ['', Validators.compose([])], + business_emi: [''], + business_emi_paid: [''], + business_original_loan_tenure: [''], + business_balance_tenure: [''], + business_elapsed_tenure: [''], + }); + } show: boolean; - selectedAssetsType(e: any, i: any): void { + selectedAssetsType(e: any, i: any,flag : any): void { + console.log(e); + console.log(i); + console.log(flag); let val = i; - const arr = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; - arr.controls.splice(0); + if(flag == 1){ + const arr = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + arr.controls.splice(0); + } + else if(flag == 2){ + const arr = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray; + arr.controls.splice(0); + } + switch (e.value) { case '1': { let val = i; - const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + 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.loadProperty()); break; } case '2': { - const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + 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_Four_Weeler()); break; } case '3': { - const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + 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()); break; } case '4': { - const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + 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.loadJwellDescription()); break; } case '5': { - const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + 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.loadConsumerDurableDescription()); break; } case '6': { - const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + 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.loadInsuranceDescription()); break; } case '7': { - const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + 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.loadInvestDescription()); break; } case '8': { - const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; + const control = (flag == 1) ? (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray + : (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('details') as FormArray ; control.push(this.otherAssetsDescription()); break; } @@ -410,7 +450,7 @@ public m_investmentType = []; loadInvestDescription() { return this._formBuilder.group({ investments_type: ['', Validators.compose([Validators.required])], - other_investment_type:[''], + other_investments_type:[''], amount_of_invest: ['', Validators.compose([Validators.required])], bank_name: ['', Validators.compose([Validators.required])] }); @@ -433,6 +473,14 @@ public m_investmentType = []; loadPropertyWithData(data) { return this._formBuilder.group({ property_type: [data.property_type, Validators.compose([Validators.required])] + //property_type:[''] + }); + } + + loadPropertyWithData2(data) { + return this._formBuilder.group({ + property_type: [data.property_type, Validators.compose([Validators.required])] + //property_type:[''] }); } @@ -500,12 +548,29 @@ public m_investmentType = []; // purchase_month: [data.purchase_month, Validators.compose([])], emi: [data.emi || 0], emi_paid: [data.emi_paid || ''], - elapsed_tenure: [data.elapsed_tenure || ''], - balance_tenure: [data.balance_tenure || ''] + original_loan_tenure: [data.original_loan_tenure || ''], + balance_tenure: [data.balance_tenure || ''], + elapsed_tenure: [data.elapsed_tenure || ''] + }); + } + initnewDetailsWithdata(data) { + return this._formBuilder.group({ + business_assets_mode: [data.business_assets_mode, Validators.compose([Validators.required])], + 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([])], + // purchase_year: [data.purchase_year, Validators.compose([])], + // purchase_month: [data.purchase_month, Validators.compose([])], + 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 || ''] }); } loadDetails: boolean; addAssetsDetailsWithData(supp_data) { + console.log(supp_data); var result = Object.keys(supp_data).map(function (key) { return supp_data[key]; }); @@ -519,6 +584,7 @@ public m_investmentType = []; // 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 }; @@ -530,6 +596,39 @@ public m_investmentType = []; this.loadDetails = true; } + addAssetsDetailsWithData2(supp_data) { + + console.log(supp_data); + + var result = Object.keys(supp_data).map(function (key) { + return supp_data[key]; + }); + if (result.length > 0) { + for (let val of result) { + let vals = { + business_assets_mode: val.business_assets_mode, + business_approximate_market_value: val.business_approximate_market_value, + business_name_of_the_owner: val.business_name_of_the_owner, + // purchase_year: val.purchase_year, + // 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['assets_details']; + // control.push(this.initDetailsWithdata(vals)); + // this.setAssetsDetailsWithData(vals.business_assets_mode, val.details, control.length - 1) + + const control = this._assetsQuesFrom.controls['business_assets_details']; + control.push(this.initnewDetailsWithdata(vals)); + this.setAssetsDetailsWithData2(vals.business_assets_mode, val.business_details, control.length - 1) + } + } + //this.loadDetails = true; + } + setAssetsDetailsWithData(assets_details_mode: any, datas: any, i: any): void { let val = i; // var data = Object.keys(datas).map(function (key) { @@ -539,6 +638,7 @@ public m_investmentType = []; 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': { const control = (this._assetsQuesFrom.controls['assets_details']).at(val).get('details') as FormArray; @@ -586,13 +686,76 @@ public m_investmentType = []; } } - addSupplierDetails(e) { + setAssetsDetailsWithData2(assets_details_mode: any, datas: any, i: any): void { + 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': { + const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; + control.push(this.loadPropertyWithData2(data)); + break; + } + case '2': { + const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; + control.push(this.load_Four_WeelerWithData(data)); + break; + } + case '3': { + const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; + control.push(this.load_Two_WeelerWithData(data)); + break; + } + case '4': { + break; + } + case '5': { + const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; + control.push(this.loadConsumerDurableDescriptionWithData(data)); + break; + } + case '6': { + const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; + control.push(this.loadInsuranceDescriptionWithData(data)); + break; + } + case '7': { + const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; + control.push(this.loadInvestDescriptionWithData(data)); + break; + } + case '8': { + const control = (this._assetsQuesFrom.controls['business_assets_details']).at(val).get('business_details') as FormArray ; + control.push(this.otherAssetsDescriptionWithData(data)); + break; + } + default: { + break; + } + } + } + + addSupplierDetails(e,flag) { + console.log(flag); + console.log(e); + if(flag == 1){ const control = this._assetsQuesFrom.controls['assets_details']; control.push(this.initDetails()); + }else if(flag == 2){ + const control = this._assetsQuesFrom.controls['business_assets_details']; + control.push(this.initnewDetails()); + } } - removeLanguage(i: number) { + removeLanguage(i: number,flag) { + if(flag == 1){ const control = this._assetsQuesFrom.controls['assets_details']; control.removeAt(i); + }else if(flag == 2){ + const control = this._assetsQuesFrom.controls['business_assets_details']; + control.removeAt(i); + } } public paymentModeTextBox: number; @@ -621,8 +784,19 @@ public m_investmentType = []; answerFormValues.assets_details.map(val => { if (val.emi == '0') { val.emi_paid = ''; - val.elapsed_tenure = ''; + 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 = ''; } }); @@ -664,6 +838,19 @@ public m_investmentType = []; event.preventDefault(); } } + + loanCalc(details) + { + //console.log(details.value); + let ElapsedValues; + + if(details.value.original_loan_tenure != null && details.value.original_loan_tenure != '' && details.value.balance_tenure != null && details.value.balance_tenure != ''){ + ElapsedValues = details.value.original_loan_tenure - details.value.balance_tenure ; + details.controls['elapsed_tenure'].setValue(ElapsedValues); + } + + } + // { // 'main_raw_materials': 'sdkjfal', // 'supplier_details' ; [