From 783b037277f73f9fee62849eedfd1fd46d853741 Mon Sep 17 00:00:00 2001 From: dineshkumarkannan Date: Fri, 9 Nov 2018 11:53:54 +0530 Subject: [PATCH] address, assets , banking , family form remarks fields added : kdk --- .../forms/address/address.component.html | 9 +++++++++ .../start-pd/forms/address/address.component.ts | 5 ++++- .../assets-info/assets-info.component.html | 17 ++++++++++++----- .../forms/assets-info/assets-info.component.ts | 6 ++++-- .../banking-details.component.html | 8 ++++++++ .../banking-details.component.ts | 5 +++++ .../family-details.component.html | 8 ++++++++ .../family-details/family-details.component.ts | 6 +++++- .../personal-info/personal-info.component.html | 9 +++++++++ .../personal-info/personal-info.component.ts | 5 ++++- 10 files changed, 68 insertions(+), 10 deletions(-) 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 02e9156ce..aa57f1efa 100644 --- 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 @@ -101,6 +101,15 @@ + +
+
+ + Remarks + + +
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts index f3af75f2c..0ea3bafc5 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts @@ -72,6 +72,7 @@ export class AddressComponent implements OnInit { this.addressForm.controls.comment_locality.setValue(data.records.comment_locality); this.addressForm.controls.customer_behaviour.setValue(data.records.customer_behaviour); this.addressForm.controls.locality.setValue(data.records.locality); + this.addressForm.controls.address_form_remark.setValue(data.records.address_form_remark); if (data.records.locality_others) { this.addressForm.controls.locality_others.setValue(data.records.locality_others); } @@ -98,7 +99,8 @@ export class AddressComponent implements OnInit { pd_location: ['', Validators.compose([Validators.required])], comment_locality: ['', Validators.compose([Validators.required])], customer_behaviour: ['', Validators.compose([Validators.required])], - neighbourhood: this.fb.array([]) + neighbourhood: this.fb.array([]), + address_form_remark:[''] }); this.address = this.addressForm.controls['address']; this.addressType = this.addressForm.controls['address_type']; @@ -175,6 +177,7 @@ export class AddressComponent implements OnInit { records.comment_locality = this.commentlocality.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.pdid = this.pdid; records.formid = '5'; // records.fk_createdby = '250'; 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 b55e5fa2d..85d5d098a 100644 --- 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 @@ -5,7 +5,7 @@
-
+
@@ -194,20 +194,19 @@
- EMI + EMI
-
+
-
+
@@ -227,6 +226,14 @@ class="mr-1 mb-1 hover-icon" (click)="addSupplierDetails($event); false">add
+
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 204344fbb..03138ffeb 100644 --- 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 @@ -189,7 +189,8 @@ export class AssetsInfoComponent implements OnInit { formid: ['4'], assets_details: this._formBuilder.array([ // this.initDetails(), - ]) + ]), + // assets_form_remark:[value.assets_form_remark || 'check'] }); this.addAssetsDetailsWithData(value.assets_details); } else { @@ -198,7 +199,8 @@ export class AssetsInfoComponent implements OnInit { formid: ['4'], assets_details: this._formBuilder.array([ this.initDetails(), - ]) + ]), + // assets_form_remark:[''] }); } this.loadDetails = true; 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 ca4287117..04b8d59e8 100644 --- 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 @@ -59,6 +59,14 @@ +
+
+
+ + Remarks + + +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts index c249a5801..063a5d1bd 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts @@ -49,6 +49,9 @@ export class BankingDetailsComponent implements OnInit { console.log('data', data); const control = this.bankingForm.controls['itemRows']; if( data.status == 200) { + + this.bankingForm.controls.banking_form_remark.setValue(data.records.banking_form_remark); + var result = Object.keys(data.records.banking_details).map(function (key) { return data.records.banking_details[key]; }); @@ -67,6 +70,7 @@ export class BankingDetailsComponent implements OnInit { } public initBankingForm(): void { this.bankingForm = this.fb.group({ + banking_form_remark: [''], itemRows: this.fb.array([]) }); } @@ -99,6 +103,7 @@ export class BankingDetailsComponent implements OnInit { let records: any = {}; records.pdid = this.pdid; records.formid = '7'; + records.banking_form_remark = this.bankingForm.controls.banking_form_remark.value; // records.fk_createdby = '252'; records.banking_details = this.bankingForm.controls['itemRows'].value; console.log('data', records); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html index 943685535..7013edcb8 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html @@ -130,6 +130,14 @@ +
+
+ + Remarks + + +
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts index a097ac841..9844b67fb 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts @@ -83,6 +83,8 @@ export class FamilyDetailsComponent implements OnInit { this.familyForm.controls.members.setValue(data.records.family_members); this.familyForm.controls.years.setValue(data.records.no_of_years); this.familyForm.controls.ownership.setValue(data.records.ownership); + this.familyForm.controls.family_details_form_remark.setValue(data.records.family_details_form_remark); + if (data.records.ownership_others) { this.familyForm.controls.ownershipOther.setValue(data.records.ownership_others); } @@ -121,7 +123,8 @@ export class FamilyDetailsComponent implements OnInit { ownershipOther: [''], rent: [''], earningMembers: this.fb.array([]), - nonEarningMembers: this.fb.array([]) + nonEarningMembers: this.fb.array([]), + family_details_form_remark: [''] }); this.person = this.familyForm.controls['person']; this.personOther = this.familyForm.controls['personOther']; @@ -211,6 +214,7 @@ export class FamilyDetailsComponent implements OnInit { records.family_members = this.members.value; records.earning_members = this.familyForm.controls['earningMembers'].value; records.non_earning_members = this.familyForm.controls['nonEarningMembers'].value; + records.family_details_form_remark = this.familyForm.controls['family_details_form_remark'].value; records.pdid = this.pdid; records.formid = '6'; // records.fk_createdby = '251'; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html index 36b5e52f7..515b14f49 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html @@ -112,6 +112,15 @@
+ +
+
+ + Remarks + + +
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts index 9dad2e46c..e4e50d7f4 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts @@ -123,6 +123,7 @@ var co_result = Object.keys(data.co_applicant_details).map(function(key) { form_id:null, mainItem: mainApplicantGroup, coItem: coApplicantGroup, + personal_info_form_remark: [data.personal_info_form_remark] }); //console.log(this._personalForm); this.loadDataStatus = true; @@ -178,6 +179,7 @@ var co_result = Object.keys(data.co_applicant_details).map(function(key) { form_id:null, mainItem: mainApplicantGroup, coItem: coApplicantGroup, + personal_info_form_remark:null }); //console.log(this._personalForm); this.loadDataStatus = true; @@ -236,7 +238,8 @@ submitPersonalForm(formData:any) { "pdid": this.pdid, "formid": this.form_id, "main_applicant_details":main_applicantDetails, - "co_applicant_details":co_applicantDetails + "co_applicant_details":co_applicantDetails, + "personal_info_form_remark": this._personalForm.get('personal_info_form_remark').value }; this._pd.savePDFormDetailsWithID(save_details).subscribe(result => { if (result.status == 200) {