-
+
@@ -419,6 +419,20 @@
+
+
+
+
+
+
+
+
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 07c0cacc7..6b9701baf 100755
--- 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
@@ -303,6 +303,7 @@ export class FamilyDetailsComponent implements OnInit {
private notifier: NotifierService;
public familyForm: FormGroup;
public selectPerson;
+ public apiFamilyMembers : any = [];
// selectPerson = [{
// name : 'person 1',
// id : 111
@@ -353,10 +354,60 @@ export class FamilyDetailsComponent implements OnInit {
this.getMasterDetails('STATE', 6);
// this.getMasterDetails('CITY', 7);
// this.getMasterDetails('PINCODE', 8);
+
+ this._pd.getFamilyDetails(this.pdid).subscribe(data=>{
+ console.clear();
+ console.log('data',data);
+ if(data.dataStatus == true){
+
+ let Temparr : any = [];
+
+ // console.log('from_business_form',data.record.from_business_form);
+ // console.log('from_general_form',data.record.from_general_form);
+
+ if(data.record.from_general_form.length > 0){
+ let familyMembersGeneralForm = Object.keys(data.record.from_general_form).map(function (key) {
+ return data.record.from_general_form[key];
+ });
+
+ let datas = familyMembersGeneralForm.map(element => {
+ return {id:element.pd_co_applicant_id.toString(),
+ name:element.applicant_name,
+ relationship:element.relationship,
+ relation_to:element.relation_to,
+ data_gets_from:'GeneralForm'};
+ });
+ // console.log('familyMembersGeneralForm',familyMembersGeneralForm);
+ Temparr.push(datas);
+
+ }
+
+ if(data.record.from_business_form.length > 0){
+ let familyMembersBusinessForm = Object.keys(data.record.from_business_form).map(function (key) {
+ return data.record.from_business_form[key];
+ });
+ let datas = familyMembersBusinessForm.map(element => {
+ return {id:element.other_family_relationship_id.toString(),
+ name:element.family_member_name,
+ relationship:element.other_family_relationship_id,
+ relation_to:element.relation_to_id,
+ data_gets_from:'BusinessForm'};
+ });
+ // console.log('familyMembersGeneralForm',familyMembersBusinessForm);
+ Temparr.push(datas);
+ }
+ this.apiFamilyMembers = [].concat.apply([],Temparr);
+ console.log(this.apiFamilyMembers);
+ }
+ })
+
this.initFamilyFormDetails();
let params: any = {};
params.pd_id = this.pdid;
params.pd_form_id = '6';
+
+ // - { "pd_id":"104"}
+
this._pd.retriveForm(params).subscribe(data => {
const control =
this.familyForm.controls['nonEarningMembers'];
const value = this.familyForm.controls['earningMembers'];
@@ -375,29 +426,7 @@ export class FamilyDetailsComponent implements OnInit {
this.familyForm.controls.family_details_form_remark.setValue(data.records.family_details_form_remark);
// this.generateFamilyMembersDetailsGetData(data.records.family_members_details);
} else {
-
- this.selectPerson.forEach((val,index) => {
- let formData: FormGroup = this.fb.group({
- selected_person: [val.applicant_name],
- residence_place: [null],
- residence_city: [null],
- residence_state: [null],
- residence_pin: [null],
- residence_No_of_years: [null],
- residence_ownership: [null],
- ownershipOther: [null],
- rent: [null],
- total_number_of_family_members: [null],
- family_members_details: this.fb.array([]),
- });
- const control = this.familyForm.controls['family_details'];
- control.push(formData);
- });
-
- // this.selectPerson.forEach((val,index) => {
- // this.initFamilyForm(val.pd_co_applicant_id);
- // });
- // this.initFamilyForm(null);
+ this.initFamilyForm(null);
}
});
}
@@ -525,7 +554,7 @@ export class FamilyDetailsComponent implements OnInit {
residence_ownership: ['', Validators.compose([])],
ownershipOther: [''],
rent: [''],
- total_number_of_family_members: ['', Validators.compose([Validators.min(1), Validators.max(20)])],
+ // total_number_of_family_members: ['', Validators.compose([Validators.min(1), Validators.max(20)])],
family_members_details: this.fb.array([]),
});
const control = this.familyForm.controls['family_details'];
@@ -544,7 +573,7 @@ export class FamilyDetailsComponent implements OnInit {
residence_ownership: [val.residence_ownership, Validators.compose([])],
ownershipOther: [val.ownershipOther || null],
rent: [val.rent || null],
- total_number_of_family_members: [val.total_number_of_family_members, Validators.compose([Validators.min(1), Validators.max(20)])],
+ // total_number_of_family_members: [val.total_number_of_family_members, Validators.compose([Validators.min(1), Validators.max(20)])],
family_members_details: this.fb.array([]),
});
const control = this.familyForm.controls['family_details'];
@@ -587,31 +616,80 @@ export class FamilyDetailsComponent implements OnInit {
e.stopPropagation();
this.initFamilyForm('chck');
}
+ selectedPerson(e,inx){
+ // console.log(e);
+ // console.log(this.apiFamilyMembers);
+ // return;
- getNumberOfFamilyMemberDetails(inx) {
- // alert(inx);
- let formData = this.familyForm.controls['family_details']['controls'][inx].controls;
- // alert(formData['total_number_of_family_members'].value);
- // alert(this.familyForm.controls.total_number_of_family_members.valid);
- if (formData['total_number_of_family_members'].valid) {
- let totalMem = formData['total_number_of_family_members'].value;
- const control = this.familyForm.controls['family_details']['controls'][inx].controls.family_members_details;
- if (totalMem > control.length) {
- let len = totalMem - control.length;
- for (let i = 0; i < len; i++) {
- control.push(this.generateFamilyMembersDetailsGet());
- }
- } else if (totalMem < control.length) {
- // control.controls.slice(0, totalMem);
- control.controls = [];
- for (let i = 0; i < totalMem; i++) {
- control.push(this.generateFamilyMembersDetailsGet());
- }
+ const control = this.familyForm.controls['family_details']['controls'][inx].controls.family_members_details;
+
+ if(this.apiFamilyMembers.length>0){
+ let arraydata : any;
+ let data = this.apiFamilyMembers.filter(item => item.relation_to == e);
+ if(data.length > 0){
+ data.forEach(val => {
+ arraydata = {
+ 'family_member_name' : val.name,
+ 'family_member_relationship' : val.relationship,
+ 'family_member_age' : '',
+ 'family_member_earning_status': '',
+ 'earning_segment': '',
+ 'earning_gross_income_per_month': '',
+ 'earning_name_of_the_employer_or_business': '',
+ 'earning_number_of_years_in_employment_or_business': '',
+ 'non_earning_occupation': '',
+ 'non_earning_if_others': '',
+ 'non_earning_if_retired_from': '',
+ 'non_earning_if_schoolorcollege': ''
+ }
+
+ });
+ control.push(this.initgenerateFamilyMembersDetailsGet(arraydata));
+ }
+ else{
+ control.push(this.generateFamilyMembersDetailsGet());
}
- } else {
-
}
- }
+ else{
+ control.push(this.generateFamilyMembersDetailsGet());
+ }
+}
+
+addFamilyMembers(inx) {
+ const control = this.familyForm.controls['family_details']['controls'][inx].controls.family_members_details;
+ control.push(this.generateFamilyMembersDetailsGet());
+}
+
+removeFamilyMembers(index) {
+ const control = this.familyForm.controls['family_details']['controls'][index].controls.family_members_details;
+ control.removeAt(index);
+}
+
+
+ // getNumberOfFamilyMemberDetails(inx) {
+ // // alert(inx);
+ // let formData = this.familyForm.controls['family_details']['controls'][inx].controls;
+ // // alert(formData['total_number_of_family_members'].value);
+ // // alert(this.familyForm.controls.total_number_of_family_members.valid);
+ // if (formData['total_number_of_family_members'].valid) {
+ // let totalMem = formData['total_number_of_family_members'].value;
+ // const control = this.familyForm.controls['family_details']['controls'][inx].controls.family_members_details;
+ // if (totalMem > control.length) {
+ // let len = totalMem - control.length;
+ // for (let i = 0; i < len; i++) {
+ // control.push(this.generateFamilyMembersDetailsGet());
+ // }
+ // } else if (totalMem < control.length) {
+ // // control.controls.slice(0, totalMem);
+ // control.controls = [];
+ // for (let i = 0; i < totalMem; i++) {
+ // control.push(this.generateFamilyMembersDetailsGet());
+ // }
+ // }
+ // } else {
+
+ // }
+ // }
generateFamilyMembersDetailsGet(): FormGroup {
return this.fb.group({
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
index 1adb8ff8b..4bcdc8fd2 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
@@ -15,6 +15,22 @@
+
+
+ Location
+
+
+
+
+ Well Suited.
+ Fairly Suited
+ Not Suited
+
+
+
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts
index 457a884c8..3fdbe4f16 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts
@@ -56,6 +56,7 @@ export class FinalRemarksComponent implements OnInit {
pdid: [this.pdid],
formid: ['20'],
final_custormer_remark_type : [],
+ is_service_provided: ['', Validators.required],
final_form_remarks: ['',Validators.required]
});
this.getM_Type();
@@ -85,6 +86,7 @@ export class FinalRemarksComponent implements OnInit {
this.pdTrigerService.getPDFormDetailsWithID(this.pdid, '20').subscribe(data=>{
if(data.dataStatus){
this._finalRemarkForm.controls.final_custormer_remark_type.setValue(data.records.final_custormer_remark_type);
+ this._finalRemarkForm.controls.is_service_provided.setValue(data.records.is_service_provided);
this._finalRemarkForm.controls.final_form_remarks.setValue(data.records.final_form_remarks);
this.noRecordsFound = true;
} else {
@@ -108,7 +110,7 @@ export class FinalRemarksComponent implements OnInit {
}
- // ==================
+ // ==================
/** To Save/Edited Popup Data */
onSubmit() {
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts
index 219d5f36b..a4a03cf83 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts
@@ -141,13 +141,13 @@ export class FinancialInfoComponent implements OnInit {
if (result_val.length > 0) {
result_val.forEach((val,index) => {
- console.log(val);
- console.log('val.estimate_sales_average',val.estimate_sales_average);
- if(isNaN(val.estimate_sales_average)){
- alert(val.estimate_sales_average + " is not a number
");
- }else{
- alert(val.estimate_sales_average + " is a number
");
- }
+ // console.log(val);
+ // console.log('val.estimate_sales_average',val.estimate_sales_average);
+ // if(isNaN(val.estimate_sales_average)){
+ // alert(val.estimate_sales_average + " is not a number
");
+ // }else{
+ // alert(val.estimate_sales_average + " is a number
");
+ // }
//console.log('dedrf',val.estimate_annual_sale);
// this.AV_annualSalesInwords[index] = this._pd.convertNumberToWords(val.estimate_annual_sale);
// this.AV_netProfitAmtInwords[index] = this._pd.convertNumberToWords(val.estimate_net_profit);
@@ -493,12 +493,12 @@ export class FinancialInfoComponent implements OnInit {
control.removeAt(0);
}
- alert((new Date()).getFullYear());
+ // alert((new Date()).getFullYear());
let year1 = (new Date()).getFullYear();
let year2 = ((new Date()).getFullYear() - 1);
let Year = year2 +'-'+ year1;
- alert(Year);
+ // alert(Year);
control.push(this.createValue(Year));
}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
index afccb1b77..439542d43 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
@@ -5,7 +5,6 @@
-
@@ -45,13 +44,13 @@
{{"₹"}} {{balTxrfAmtInWords}} Only
-
+
@@ -68,9 +67,9 @@
{{"₹"}} {{topUpAmtInWords}} Only
-
+
@@ -117,16 +116,26 @@
-
+
+
+ {{val.name}}
+
+
+
+
+
+
-
+
-
+
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
index 9b5a0522f..4064169bb 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
@@ -60,7 +60,9 @@ export class LoanDetailsComponent implements OnInit {
CompanyApplicantGroupList: any=[];
CompanyApplicantGroupList2: any=[];
-
+ mergeCompanyApplicant:any=[];
+ existCompanyList:any=[];
+ companies:any=[];
loanAmtInWords : any;
balTxrfAmtInWords : any;
valAsPerAgmtInWords : any;
@@ -84,52 +86,31 @@ export class LoanDetailsComponent implements OnInit {
@Inject(MAT_DIALOG_DATA) public pd_all_details: any) {
this.applicants = this.pd_all_details.pdapplicants_detials;
+ this.applicants = this.applicants.filter(appt=>appt.applicant_type != 2)
+ this.companies = this.pd_all_details.pdapplicants_detials.filter(appt=>appt.applicant_type == 2 )
- // console.log(this.applicants);
- let CompanyList : any=[];
- let ApplicantList : any=[];
+ let modifyApplicantList: any=[];
+ if(this.applicants.length > 0){
+ modifyApplicantList = this.applicants.map(element => {
+ return {id:element.pd_co_applicant_id,name:element.applicant_name,group_id:2};
+ });
+ this.mergeCompanyApplicant.push({groupName:'APPLICANTS',groupValues:modifyApplicantList})
+ }
- // this.applicants.forEach(val => {
- // if(val.applicant_type == 0){
- // this.CompanyApplicantGroupList.push({groupName:'APPLICANTS',groupValues:{id:val.pd_co_applicant_id,name:val.applicant_name,group_id:2}})
- // }
- // if(val.applicant_type == 1){
- // this.CompanyApplicantGroupList.push({groupName:'APPLICANTS',groupValues:{id:val.pd_co_applicant_id,name:val.applicant_name,group_id:2}})
- // }
- // if(val.applicant_type == 2){
- // this.CompanyApplicantGroupList.push({groupName:'COMPANIES',groupValues:{id:val.pd_co_applicant_id.toString(),name:val.applicant_name,group_id:1}})
- // }
- // });
-
- // console.log(this.CompanyApplicantGroupList);
-
-
-
- this.applicants.forEach(val => {
- if(val.applicant_type == 0){
- ApplicantList = {id:val.pd_co_applicant_id,name:val.applicant_name,group_id:2};
- this.CompanyApplicantGroupList2.push({groupName:'APPLICANTS',groupValues:ApplicantList})
- }
- if(val.applicant_type == 1){
- ApplicantList = {id:val.pd_co_applicant_id,name:val.applicant_name,group_id:2};
- this.CompanyApplicantGroupList2.push({groupName:'APPLICANTS',groupValues:ApplicantList})
- }
+ this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{
+ if(data.dataStatus){
+ this.existCompanyList = data.records.filter(val =>val.is_active===true);
+ }
+
+ let modifyCompanyList : any=[];
+ if(this.existCompanyList.length>0){
+ modifyCompanyList = this.existCompanyList.map(element => {
+ return {id:element.company_order_id.toString(),name:element.company_name,group_id:1};
+ });
+ this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList})
+ }
+
});
- this.applicants.forEach(val => {
- if(val.applicant_type == 2){
- CompanyList = {id:val.pd_co_applicant_id,name:val.applicant_name,group_id:2};
- this.CompanyApplicantGroupList2.push({groupName:'COMPANIES',groupValues:CompanyList});
- }
- });
-
- // console.log(this.CompanyApplicantGroupList2);
-
- // let cal = Object.keys(this.CompanyApplicantGroupList2).map(function(key) {
- // return this.CompanyApplicantGroupList2[key];
- // });
-
- // console.log(cal);
-
this.productAbbr = this.pd_all_details.pdmaster_details.product_abbr;
this.productID = this.pd_all_details.pdmaster_details.fk_product_id;
@@ -160,7 +141,8 @@ export class LoanDetailsComponent implements OnInit {
}
};
ngOnInit() {
- // console.clear();
+ console.clear();
+ console.log('this.applicants',this.applicants);
this.initloanDetailsForm();
this.getM_EndUseofLoad();
this.getM_EndUseForLoan(this.pdid);
@@ -240,7 +222,7 @@ export class LoanDetailsComponent implements OnInit {
this.loanDetailsForm.controls['end_use_other'].setValue(value.records.end_use_other);
}
this.loanDetailsForm.controls['is_transfer'].setValue(value.records.is_transfer);
- this.loanDetailsForm.controls['is_topup'].setValue(value.records.is_topup);
+ // this.loanDetailsForm.controls['is_topup'].setValue(value.records.is_topup);
if (value.records.balance_transfer_amount) {
this.loanDetailsForm.controls['balance_transfer_amount'].setValue(value.records.balance_transfer_amount);
this.balTxrfAmtInWords = this._pd.convertNumberToWords(value.records.balance_transfer_amount);
@@ -250,7 +232,7 @@ export class LoanDetailsComponent implements OnInit {
this.topUpAmtInWords = this._pd.convertNumberToWords(value.records.topup_amount);
}
- this.loanDetailsForm.controls['end_use_topup'].setValue(value.records.end_use_topup);
+ // this.loanDetailsForm.controls['end_use_topup'].setValue(value.records.end_use_topup);
if (value.records.lender) {
this.loanDetailsForm.controls['lender'].setValue(value.records.lender);
@@ -478,10 +460,9 @@ getM_sourceofamount() {
end_use_other: [''],
is_transfer: [''],
//is_topup: [''],
- is_topup: [''],
balance_transfer_amount: [''],
topup_amount: [''],
- end_use_topup:[''],
+ // end_use_topup:[''],
lender: [''],
other_bt_lender : [''],
own_contribution: [''],
@@ -590,7 +571,7 @@ getM_sourceofamount() {
}else{ records.end_use_other = null ;}
records.is_transfer = this.loanDetailsForm.controls['is_transfer'].value;
- records.is_topup = this.loanDetailsForm.controls['is_topup'].value;
+ // records.is_topup = this.loanDetailsForm.controls['is_topup'].value;
if (this.loanDetailsForm.controls['is_transfer'].value == 'yes') {
records.balance_transfer_amount = this.loanDetailsForm.controls['balance_transfer_amount'].value;
@@ -616,14 +597,15 @@ getM_sourceofamount() {
// if (this.loanDetailsForm.controls['is_topup'].value == 'yes') {
records.topup_amount = this.loanDetailsForm.controls['topup_amount'].value;
// }
- records.end_use_topup = this.loanDetailsForm.controls['end_use_topup'].value;
+ // records.end_use_topup = this.loanDetailsForm.controls['end_use_topup'].value;
- if (this.loanDetailsForm.controls['is_topup'].value == 'yes' || this.loanDetailsForm.controls['is_transfer'].value == 'yes') {
+ if (this.loanDetailsForm.controls['is_transfer'].value == 'yes') { //this.loanDetailsForm.controls['is_topup'].value == 'yes' ||
records.lender = this.loanDetailsForm.controls['lender'].value;
+ if(this.loanDetailsForm.controls['lender'].value == 1){
+ records.other_bt_lender = this.loanDetailsForm.controls['other_bt_lender'].value;
+ }
}
- if(this.loanDetailsForm.controls['lender'].value == 3){
- records.other_bt_lender = this.loanDetailsForm.controls['other_bt_lender'].value;
- }
+
records.emi_level = this.loanDetailsForm.controls['emi_level'].value;
if(this.mortageCardAccess == true){
@@ -693,8 +675,8 @@ getM_sourceofamount() {
// console.log('First Time',event);
// console.log('First Time Value',event.value);
if(event.value == 'no') {
- this.loanDetailsForm.controls['is_topup'].clearValidators();
- this.loanDetailsForm.controls['is_topup'].updateValueAndValidity();
+ // this.loanDetailsForm.controls['is_topup'].clearValidators();
+ // this.loanDetailsForm.controls['is_topup'].updateValueAndValidity();
// console.log('no',event.value);
this.loanDetailsForm.controls['source'].setValidators([Validators.required]);
this.loanDetailsForm.controls['source'].updateValueAndValidity();
@@ -703,8 +685,8 @@ getM_sourceofamount() {
this.loanDetailsForm.controls['own_contribution'].updateValueAndValidity();
}
else if(event.value == 'yes'){
- this.loanDetailsForm.controls['is_topup'].setValidators([Validators.required]);
- this.loanDetailsForm.controls['is_topup'].updateValueAndValidity();
+ // this.loanDetailsForm.controls['is_topup'].setValidators([Validators.required]);
+ // this.loanDetailsForm.controls['is_topup'].updateValueAndValidity();
this.loanDetailsForm.controls['source'].clearValidators();
this.loanDetailsForm.controls['source'].updateValueAndValidity();
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
index f020154a8..ef0521e21 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
@@ -56,11 +56,16 @@
-
- {{person.applicant_name}}
+
+ {{person}}
+ Others
-
+
+
+
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts
index 24288ded8..d7e421085 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts
@@ -46,6 +46,8 @@ export class OtherIncomeComponent implements OnInit {
sourceData : any = [];
amtInwords : any = [];
applicants : any = [];
+ incomeEarnedBy : any = [];
+ // stringArr = [];
constructor(notifier: NotifierService,
private fb: FormBuilder,
@@ -59,7 +61,8 @@ export class OtherIncomeComponent implements OnInit {
this.applicants = this.pd_all_details.pdapplicants_detials;
this.form_id = 9;
this.notifier = notifier;
- }
+ }
+
public viewerOptions: any = {
navbar: false,
toolbar: {
@@ -84,6 +87,14 @@ public viewerOptions: any = {
this.getFrequency();
this.getSourceOtherIncome();
this.initOtherincomeForm();
+ this._pd.getAllPersonsName(this.pdid).subscribe(data => {
+ // console.log(data);
+
+ if(data.dataStatus == true){
+ this.incomeEarnedBy = data.record;
+ }
+ // console.log(this.incomeEarnedBy);
+ });
let params: any = {};
params.pd_id = this.pdid;
params.pd_form_id = this.form_id;
@@ -136,6 +147,7 @@ public viewerOptions: any = {
source: [''],
others_source : [''],
income_earned_by:[''],
+ others_income_earned_by:[''],
amount: [''],
frequency: [''],
others_frequency : ['']
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 4e8de11ac..c253d9559 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
@@ -71,16 +71,16 @@
-
+
-
-
+
+