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 cf5291c52..16ae01953 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 @@ -25,7 +25,7 @@ export class EditPdApplicantComponent implements OnInit { 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 } 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 3764c2cad..ea8523f7c 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,7 +76,6 @@ 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']; @@ -189,7 +188,7 @@ 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)=>{ @@ -297,9 +296,7 @@ export class EditPdMasterComponent implements OnInit { this.addressesDeactivited[index] = true; } - // console.log('address_control',address_control); - // console.log('address_control.controls[index]',address_control.controls[index]); - // console.log('address_control.controls[index][controls]',address_control.controls[index]['controls']); + // address_control.controls[index]['controls'].showHide(); // isactive.setValue(0); @@ -313,7 +310,7 @@ export class EditPdMasterComponent implements OnInit { // } // address_control.controls[index].disable(); - // console.log('address_control',address_control); + // address_control.removeAt(index); } 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 cef98f989..a6512497b 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 @@ -191,31 +191,15 @@ purchaseCalculation(indexVal: number,values: any): void { let transformData = values.child.filter(val=>val.purchase_date!='' && val.purchase_date!=null && val.purchase_date!=undefined && val.purchase_value!='' && val.isactive===true).map(mval=>{ 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)=>{ - // return fIndex === fArray.indexOf(fVal); - // }); - + let TotalAnnualValue = transformData.map(val=>val.purchase_value) - .reduce((sum, curr) => parseInt(sum) + parseInt(curr)); - control.controls[indexVal].controls['annual_purchase_value'].setValue(TotalAnnualValue); + .reduce((sum, curr) => parseFloat(sum) + parseFloat(curr)); + + let Months : number = 12 / values.child.length; + + control.controls[indexVal].controls['annual_purchase_value'].setValue(TotalAnnualValue*Months); } else{ control.controls[indexVal].controls['annual_purchase_value'].setValue("");