+
-
+
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 @@
+
+
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 @@
+
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 @@