diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html index e6b357766..5d708ab4e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.html @@ -98,6 +98,7 @@ + @@ -200,8 +201,8 @@ - - + + @@ -241,7 +242,7 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts index 345197b0f..aa7cf174b 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts @@ -447,9 +447,11 @@ export class AddPdComponent implements OnInit, OnDestroy { this.notifier.notify('warning', 'Either Mobile or Landline Need.!'); return; } - else if (formValue.mobile_no.length != 10) { + else if (formValue.mobile_no != null){ + if (formValue.mobile_no.length != 10){ this.notifier.notify('warning', 'Please Check Applicant Mobile Number.!'); return; + } } else { this.disableAfterSubmit = true; @@ -604,21 +606,21 @@ export class AddPdComponent implements OnInit, OnDestroy { if (formValue.addtional_requirements.length > 0) { pd_form.append("addtional_requirements", JSON.stringify(formValue.addtional_requirements)) } -alert('commanded') - // this._pd.addPdDetails(pd_form).subscribe(result => { - // if (result.status == 200) { - // this.disableAfterSubmit = false; - // this.notifier.notify('success', 'PD Saved.'); - // this.loadPdListCompoent(true); - // } - // else { - // this.disableAfterSubmit = false; - // this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); - // } - // }, error => { - // this.disableAfterSubmit = false; - // this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); - // }); + + this._pd.addPdDetails(pd_form).subscribe(result => { + if (result.status == 200) { + this.disableAfterSubmit = false; + this.notifier.notify('success', 'PD Saved.'); + this.loadPdListCompoent(true); + } + else { + this.disableAfterSubmit = false; + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + } + }, error => { + this.disableAfterSubmit = false; + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + }); } } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html index c133f2c1f..600e8b43d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html @@ -29,7 +29,7 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts index 28b29155b..cf5291c52 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts @@ -21,13 +21,16 @@ export class EditPdApplicantComponent implements OnInit { emptyData:any; relationShipList:any; titleList: any; + CSAbbr:any; constructor(private _fb: FormBuilder, private _pd: PdTrigerService, notifier: NotifierService, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any) { + console.log('Dialog Data',data); this.notifier=notifier } ngOnInit() { + this.CSAbbr = this.data.SegmentAbbr != '' ? this.data.SegmentAbbr != null ? this.data.SegmentAbbr : '' :'' ; if(this.data.records.length>0){ this.mainApplicantData= this.data.records.filter(item => item.applicant_type == 1); this.coApplicantData= this.data.records.filter(item => item.applicant_type == 0); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts index 8577828eb..3764c2cad 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts @@ -76,8 +76,11 @@ export class EditPdMasterComponent implements OnInit { data => { if (data.status == 200) { this.lenderList=data.records; + console.log('this.data.records.fk_lender_id',this.data.records.fk_lender_id); + if(this.data.records.fk_lender_id != null){ let x = this.lenderList.filter(item => item.entity_id == this.data.records.fk_lender_id) this.lenderBranchList = x[0]['branches']; + } } }, error => this.errorMessage = error); } @@ -186,13 +189,15 @@ export class EditPdMasterComponent implements OnInit { data => { if (data.status == 200) { this.addressesList = data.records.filter(item => item.isactive == 1); + console.log('this.addressesList',this.addressesList); if (this.addressesList.length > 0) { this.addressesList.forEach((val,index)=>{ this.addressesDeactivited[index] = true; let obj = { pd_address_id:val.pd_address_id, - addressline1: val.addressline1.toUpperCase(), + // addressline1: val.addressline1.toUpperCase(), + addressline1: val.addressline1 != null ? val.addressline1.toUpperCase() : val.addressline1, fk_city: val.fk_city, fk_state: val.fk_state,   pincode: val.pincode_id, @@ -267,7 +272,7 @@ export class EditPdMasterComponent implements OnInit { return this._fb.group({ fk_pd_id:[this.pdid], pd_address_id:[data.pd_address_id], -   addressline1: [data.addressline1.toUpperCase()], +   addressline1: [data.addressline1 != null ? data.addressline1.toUpperCase() : null], fk_city: [data.fk_city], fk_state: [data.fk_state],   pincode : [data.pincode], @@ -443,7 +448,7 @@ export class EditPdMasterComponent implements OnInit { "fk_pd_type": my_array.fk_pd_type, "fk_customer_segment": my_array.fk_customer_segment, "loan_amount": my_array.loan_amount, -   "addressline1": filteredAddressesdata[0].addressline1.toUpperCase(), +   "addressline1": filteredAddressesdata[0].addressline1 != null ? filteredAddressesdata[0].addressline1.toUpperCase() : null, "fk_city": filteredAddressesdata[0].fk_city, "fk_state": filteredAddressesdata[0].fk_state,   "pincode": filteredAddressesdata[0].pincode, diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-busines-expense/manage-busines-expense.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-busines-expense/manage-busines-expense.component.ts index e7cecd4b2..b11ed0359 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-busines-expense/manage-busines-expense.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-busines-expense/manage-busines-expense.component.ts @@ -82,7 +82,8 @@ businessCalculation(indexVal: number,values: any): void { let control:any = this.businessItemForm.controls['busExpense']; if(values.expense_value!='' && values.fk_frequency_id!='') { let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); - control.controls[indexVal].controls['annual_expenses_value'].setValue(parseInt(values.expense_value) * parseInt(filterFrequencyValue[0].mutiple_factor)); + let CalculatedVal = parseFloat(values.expense_value) * parseFloat(filterFrequencyValue[0].mutiple_factor); + control.controls[indexVal].controls['annual_expenses_value'].setValue(CalculatedVal.toFixed(2)); } else { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.html index 28eb66438..06874d625 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.html @@ -60,7 +60,7 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts index a3a1bbe5f..cef98f989 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts @@ -74,8 +74,8 @@ export class ManageDailyPurchaseComponent implements OnInit { }); - // control.controls[control.value.length-1].controls['comments'].setValidators([Validators.required]); - // control.controls[control.value.length-1].controls['comments'].updateValueAndValidity(); + // control.controls[control.value.length-1].controls['comments'].setValue + } else{ this.purchaseItemForm = this._fb.group({ @@ -96,7 +96,7 @@ export class ManageDailyPurchaseComponent implements OnInit { other_purchase_item:[''], annual_purchase_value: [''], child: this._fb.array([]), - comments: ['', Validators.compose([Validators.required])], + comments: [''], isactive:[true], }); } @@ -122,7 +122,7 @@ createPurchaseItemWithData(values: any) { other_purchase_item:[values.otherPurchaseItem === null ? '' : values.otherPurchaseItem ], annual_purchase_value: [values.annualPurchaseValue], child: this._fb.array([]), - comments: [values.comments, Validators.compose([Validators.required])], + comments: [values.comments], isactive:[true], }); } @@ -192,7 +192,21 @@ purchaseCalculation(indexVal: number,values: any): void { mval.custum_date = this.pipe.transform(mval.purchase_date, 'yyyy-MM'); return mval; }); +// expandBodyContent.forEach((expnadElement, expnadIndex) => { + // let calculateItems = expnadElement.value.reduce((acc, calculate) => acc + Number(calculate.sales_value), 0); + // listItems.push({items:expnadElement, itemsTotal:calculateItems}) + // }) + + // let calculateAllItemsTotal:number=listItems.reduce((racc, rcalculate) => racc + Number(rcalculate.itemsTotal), 0); + // let convertYear : number = 12 / listItems.length; + // let footerMessage: any=[]; + // footerMessage.push({ + // month_message: listItems.length + ' Month Sales : '+ calculateAllItemsTotal, + // month_value:calculateAllItemsTotal, + // year_message: ' Yearly Sales Arrived : '+ calculateAllItemsTotal * convertYear, + // year_value: calculateAllItemsTotal * convertYear, + // }) if(transformData.length>0) { // let getUniqueMonthCounts = transformData.map(val=>val.custum_date) // .filter((fVal,fIndex,fArray)=>{ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.ts index e434009bc..0c433b6a7 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.ts @@ -238,8 +238,8 @@ salesCalculation(indexVal: number,values: any): void { return fIndex === fArray.indexOf(fVal); }); let getTotalValueCounts = transformData.map(val=>val.sales_value) - .reduce((sum, curr) => parseInt(sum) + parseInt(curr)); - let calculatedValue = parseInt(getTotalValueCounts) * (parseInt(values.margin_per)/100) * (12 / parseInt(getUniqueMonthCounts.length)); + .reduce((sum, curr) =>parseFloat(sum) +parseFloat(curr)); + let calculatedValue =parseFloat(getTotalValueCounts) * (parseFloat(values.margin_per)/100) * (12 /parseFloat(getUniqueMonthCounts.length)); control.controls[indexVal].controls['margin_value'].setValue(calculatedValue.toFixed(2)); } else{ @@ -258,10 +258,10 @@ salesCalculation(indexVal: number,values: any): void { if(values.child[values.child.length-1].fk_frequency_id!='' && values.child[values.child.length-1].frequency_value!=''){ let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.child[values.child.length-1].fk_frequency_id); - innercontrol.controls[innercontrol.value.length-1].controls['sales_value'].setValue(parseInt(filterFrequencyValue[0].mutiple_factor) * parseInt(values.child[values.child.length-1].frequency_value)); + innercontrol.controls[innercontrol.value.length-1].controls['sales_value'].setValue(parseFloat(filterFrequencyValue[0].mutiple_factor) *parseFloat(values.child[values.child.length-1].frequency_value)); - let getTotalValueCounts =parseInt(filterFrequencyValue[0].mutiple_factor) * parseInt(values.child[values.child.length-1].frequency_value) - let CalculatedVal = getTotalValueCounts * (parseInt(values.margin_per)/100); + let getTotalValueCounts =parseFloat(filterFrequencyValue[0].mutiple_factor) *parseFloat(values.child[values.child.length-1].frequency_value) + let CalculatedVal = getTotalValueCounts * (parseFloat(values.margin_per)/100); values.margin_per!='' ? control.controls[indexVal].controls['margin_value'].setValue( CalculatedVal.toFixed(2)) : ''; } else { @@ -276,7 +276,7 @@ salesCalculation(indexVal: number,values: any): void { if(values.child[values.child.length-1].fk_frequency_id!='' && values.child[values.child.length-1].frequency_value!=''){ let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.child[values.child.length-1].fk_frequency_id); - let marginCalculatedValue = parseInt(filterFrequencyValue[0].mutiple_factor) * parseInt(values.child[values.child.length-1].frequency_value); + let marginCalculatedValue =parseFloat(filterFrequencyValue[0].mutiple_factor) *parseFloat(values.child[values.child.length-1].frequency_value); innercontrol.controls[innercontrol.value.length-1].controls['sales_value'].setValue(marginCalculatedValue.toFixed(2)); } else { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-house-hold/manage-house-hold.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-house-hold/manage-house-hold.component.ts index 06336f63a..cb1e61b06 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-house-hold/manage-house-hold.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-house-hold/manage-house-hold.component.ts @@ -79,7 +79,8 @@ houseCalculation(indexVal: number,values: any): void { let control:any = this.houseItemForm.controls['houseExpense']; if(values.expense_value!='' && values.fk_frequency_id!='') { let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); - control.controls[indexVal].controls['annual_expense_value'].setValue(parseInt(values.expense_value) * parseInt(filterFrequencyValue[0].mutiple_factor)); + let CalculatedValue = parseFloat(values.expense_value) * parseFloat(filterFrequencyValue[0].mutiple_factor); + control.controls[indexVal].controls['annual_expense_value'].setValue(CalculatedValue.toFixed(2)); } else { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-other-business-income/manage-other-business-income.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-other-business-income/manage-other-business-income.component.ts index 1959d8e8c..c4399d79c 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-other-business-income/manage-other-business-income.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-other-business-income/manage-other-business-income.component.ts @@ -82,7 +82,8 @@ businessCalculation(indexVal: number,values: any): void { let control:any = this.businessIncomeItemForm.controls['busIncome']; if(values.income_value!='' && values.fk_frequency_id!='') { let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); - control.controls[indexVal].controls['annual_income_value'].setValue(parseInt(values.income_value) * parseInt(filterFrequencyValue[0].mutiple_factor)); + let CalculatedValue = parseFloat(values.income_value) * parseFloat(filterFrequencyValue[0].mutiple_factor); + control.controls[indexVal].controls['annual_income_value'].setValue(CalculatedValue.toFixed(2)); } else { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts index 15abb995e..9c2818b02 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts @@ -145,12 +145,14 @@ purchaseCalculation(indexVal: number,values: any): void { if(values.purchase_type=="1" &&values.purchase_qty!='' && values.rate_per_unit!='' && values.fk_frequency_id!='') { let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); - control.controls[indexVal].controls['annual_purchase_value'].setValue(parseInt(values.purchase_qty) * parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); + let Type1CalculatedValue = parseFloat(values.purchase_qty) * parseFloat(values.rate_per_unit) * parseFloat(filterFrequencyValue[0].mutiple_factor); + control.controls[indexVal].controls['annual_purchase_value'].setValue(Type1CalculatedValue.toFixed(2)); } else if(values.purchase_type=="2" && values.rate_per_unit!='' && values.fk_frequency_id!='') { let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); - control.controls[indexVal].controls['annual_purchase_value'].setValue(parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); + let Type2CaluculatedValue = parseFloat(values.rate_per_unit) * parseFloat(filterFrequencyValue[0].mutiple_factor); + control.controls[indexVal].controls['annual_purchase_value'].setValue(Type2CaluculatedValue.toFixed(2)); } else { control.controls[indexVal].controls['annual_purchase_value'].setValue(''); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.ts index ca3662268..bb06b8c90 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.ts @@ -159,11 +159,13 @@ salesCalculation(indexVal: number,values: any): void { let control:any = this.salesItemForm.controls['salesCalItemwise']; if(values.sales_type=="1" && values.sales_qty!='' && values.rate_per_unit!='' && values.fk_frequency_id!='') { let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); - control.controls[indexVal].controls['annual_sale_value'].setValue(parseInt(values.sales_qty) * parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); + let Type1CalculatedValue = parseFloat(values.sales_qty) * parseFloat(values.rate_per_unit) * parseFloat(filterFrequencyValue[0].mutiple_factor); + control.controls[indexVal].controls['annual_sale_value'].setValue(Type1CalculatedValue.toFixed(2)); } else if(values.sales_type=="2" && values.rate_per_unit!='' && values.fk_frequency_id!='') { let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); - control.controls[indexVal].controls['annual_sale_value'].setValue(parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); + let Type2CalculatedValue = parseFloat(values.rate_per_unit) * parseFloat(filterFrequencyValue[0].mutiple_factor) + control.controls[indexVal].controls['annual_sale_value'].setValue(Type2CalculatedValue.toFixed(2)); } else { control.controls[indexVal].controls['annual_sale_value'].setValue(''); @@ -176,7 +178,7 @@ salesMarginPerCalculation(indexVal: number,values: any): void { let control:any = this.salesItemForm.controls['salesCalItemwise']; control.controls[indexVal].controls['margin_per_uom'].setValue(''); if(values.margin_per!='' && values.annual_sale_value!='') { - let calculatedValue = parseInt(values.annual_sale_value) * (parseInt(values.margin_per)/100); + let calculatedValue = parseFloat(values.annual_sale_value) * (parseFloat(values.margin_per)/100); control.controls[indexVal].controls['margin_final_value'].setValue(calculatedValue.toFixed(2)); } else { @@ -189,10 +191,12 @@ salesMarginAmtCalculation(indexVal: number,values: any): void { if(values.sales_type=="1" && values.margin_per_uom!='' && values.sales_qty!='' && values.fk_frequency_id!='') { let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); - control.controls[indexVal].controls['margin_final_value'].setValue(parseInt(values.sales_qty) * parseInt(values.margin_per_uom) * parseInt(filterFrequencyValue[0].mutiple_factor)); + let Type1CalculatedValue = parseFloat(values.sales_qty) * parseFloat(values.margin_per_uom) * parseFloat(filterFrequencyValue[0].mutiple_factor); + control.controls[indexVal].controls['margin_final_value'].setValue(Type1CalculatedValue.toFixed(2)); } else if(values.sales_type=="2" && values.margin_per_uom!='' && values.rate_per_unit!='') { - control.controls[indexVal].controls['margin_final_value'].setValue(parseInt(values.rate_per_unit) * parseInt(values.margin_per_uom)); + let Type2CalculatedValue = parseFloat(values.rate_per_unit) * parseFloat(values.margin_per_uom); + control.controls[indexVal].controls['margin_final_value'].setValue(Type2CalculatedValue.toFixed(2)); } else { control.controls[indexVal].controls['margin_final_value'].setValue(''); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index 182b5f0d0..a52122f0e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -177,7 +177,7 @@ Applicants
- +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts index c4d1d4cd6..3207e5e67 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts @@ -47,22 +47,23 @@ export class ViewPdComponent implements OnInit, OnDestroy { { 'backEnd_FieldName': "fk_pd_type", 'frontEnd_FieldName': "PD Type" }, { 'backEnd_FieldName': "fk_customer_segment", 'frontEnd_FieldName': "Customer Segment" }, { 'backEnd_FieldName': "loan_amount", 'frontEnd_FieldName': "Loan Amount" }, - { 'backEnd_FieldName': "addressline1", 'frontEnd_FieldName': "Address at which PD is to be done" }, - { 'backEnd_FieldName': "fk_city", 'frontEnd_FieldName': "City" }, - { 'backEnd_FieldName': "fk_state", 'frontEnd_FieldName': "State" }, - { 'backEnd_FieldName': "pincode", 'frontEnd_FieldName': "Pincode" }, { 'backEnd_FieldName': "pd_contact_person", 'frontEnd_FieldName': "Lender Contact Person" }, { 'backEnd_FieldName': "pd_contact_mobileno", 'frontEnd_FieldName': "Lender's Mobile Number" }, { 'backEnd_FieldName': "pd_branch_id", 'frontEnd_FieldName': "Branch" }, { 'backEnd_FieldName': "pd_contact_landline", 'frontEnd_FieldName': "Lender's Landline Number" }, { 'backEnd_FieldName': "main_applicant", 'frontEnd_FieldName': "Applicant Master" }]; - + // localAddressMandortyField: any = [ + // { 'backEnd_FieldName': "addressline1", 'frontEnd_FieldName': "Address at which PD is to be done" }, + // { 'backEnd_FieldName': "fk_city", 'frontEnd_FieldName': "City" }, + // { 'backEnd_FieldName': "fk_state", 'frontEnd_FieldName': "State" }, + // { 'backEnd_FieldName': "pincode", 'frontEnd_FieldName': "Pincode" } + // ]; viewID: string; viewParams: any; destroyType: number = 1; currentPDStatus: string; enableStartPD: boolean; - + CustomerSegmentAbbr:string; // create values for status check pdStatusCheck: any = { "DRAFT": 'DRAFT', @@ -105,6 +106,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { this.pd_QC_Rating = Number(this.pdMasterData.qc_rating); this.pdApplicantData = data.records.applicants_details; this.pdApplicantData = this.pdApplicantData.filter(appt => appt.applicant_type != 2); + this.CustomerSegmentAbbr = this.pdMasterData[0].customer_segment_abbr; this.pdDocumentsData = data.records.pd_documnets; this.masterPdLogsData = Object.keys(data.records.pd_logs.master).map(function (key) { return data.records.pd_logs.master[key]; @@ -203,6 +205,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { .subscribe(dataresult => { if (flag == 1) { let ffd: any = []; + console.log('this.FilteredFieldNames',this.FilteredFieldNames); this.FilteredFieldNames.forEach(field => { ffd.push(field.frontEnd_FieldName); }); @@ -227,10 +230,11 @@ export class ViewPdComponent implements OnInit, OnDestroy { this.viewPdDetails(this.viewID) }); } - editPdApplicant(applicantData: any) { + editPdApplicant(applicantData: any,CSAbbr : any) { let setPdDetails = { "pdID": this.viewID, - "records": applicantData + "records": applicantData, + "SegmentAbbr":CSAbbr, } const dialogApplicant = this.dialog.open(EditPdApplicantComponent, { data: setPdDetails, @@ -389,6 +393,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { let pdid = masterdetail.pd_id; let getValues = data.filter(val => val).map(Val => Val); + console.log('getValues',getValues); this.FilteredFieldNames = getValues.map(x => { let findIndex = this.localMandatoryFields.map(val => val.backEnd_FieldName).indexOf(x); return this.localMandatoryFields[findIndex];