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.html 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.html index 744b10e4a..f11f84f0a 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.html +++ 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.html @@ -11,22 +11,23 @@ -
+
{{expense.expense_item}} -
- - {{"₹"}} {{Amount[s]}} Only + + {{"₹"}} {{item.value.expense_value | numberToWords}} Only + @@ -35,8 +36,15 @@ + {{"₹"}} {{item.value.annual_expenses_value | numberToWords}} Only +
+
+ + + +
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.scss 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.scss index 3f33ba147..f678e6e5d 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.scss +++ 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.scss @@ -17,5 +17,6 @@ } .item-margin { - margin-left: 2%; + margin-left:4%; + margin-top:2%; } \ No newline at end of file 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 f2905e828..e7cecd4b2 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 @@ -49,6 +49,7 @@ export class ManageBusinesExpenseComponent implements OnInit { expense_value:['',Validators.compose([Validators.required])], fk_frequency_id:['',Validators.compose([Validators.required])], annual_expenses_value:['',Validators.compose([Validators.required])], + comments:[''], }); } @@ -62,6 +63,7 @@ createBusinessItemWithData(values: any) { expense_value:[values.expense_value,Validators.compose([Validators.required])], fk_frequency_id:[values.fk_frequency_id,Validators.compose([Validators.required])], annual_expenses_value:[values.annual_expenses_value,Validators.compose([Validators.required])], + comments:[values.comments], }); } @@ -125,15 +127,4 @@ submitDetails(records) { }); } - -/** Amount InWords */ - inWords(e,i,flag){ - switch(flag){ - case 1 : - this.Amount[i] = this._pd.convertNumberToWords(e); - break; - default: - break; - } - } } 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.html 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.html index 976ce3781..ad769393e 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.html +++ 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.html @@ -19,33 +19,38 @@ - + - {{"₹"}} {{marginAmtInwords[s]}} Only - - + + +
- + - - - {{"₹"}} {{Value[c]}} Only - -
+ +
- - {{"₹"}} {{Amount[s]}} Only - + + {{"₹"}} {{item.value.expense_value | numberToWords}} Only + {{frq.name}} @@ -33,8 +33,15 @@ + {{"₹"}} {{item.value.annual_expense_value | numberToWords}} Only +
+
+ + + +
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.scss 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.scss index 3f33ba147..f678e6e5d 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.scss +++ 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.scss @@ -17,5 +17,6 @@ } .item-margin { - margin-left: 2%; + margin-left:4%; + margin-top:2%; } \ No newline at end of file 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 b2a1fc074..06336f63a 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 @@ -45,7 +45,8 @@ export class ManageHouseHoldComponent implements OnInit { expense_item: ['',Validators.compose([Validators.required])], expense_value: ['',Validators.compose([Validators.required])], fk_frequency_id: ['',Validators.compose([Validators.required])], - annual_expense_value: ['',Validators.compose([Validators.required])], + annual_expense_value: ['',Validators.compose([Validators.required])], + comments:[], }); } @@ -58,7 +59,8 @@ createHouseholdItemWithData(values: any) { expense_item: [values.expense_item,Validators.compose([Validators.required])], expense_value: [values.expense_value,Validators.compose([Validators.required])], fk_frequency_id: [values.fk_frequency_id,Validators.compose([Validators.required])], - annual_expense_value: [values.annual_expense_value,Validators.compose([Validators.required])], + annual_expense_value: [values.annual_expense_value,Validators.compose([Validators.required])], + comments:[values.comments], }); } @@ -121,12 +123,6 @@ submitDetails(records) { } }); } -inWords(e,s,flag){ - switch(flag){ - case 1 : - this.Amount[s] = this._pd.convertNumberToWords(e); - break; - } - } + } 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.html 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.html index 9178af5b1..18306ade2 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.html +++ 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.html @@ -11,22 +11,22 @@ -
+
{{income.business_income_item}} -
- - {{"₹"}} {{Amount[s]}} Only + + {{"₹"}} {{item.value.income_value | numberToWords}} Only @@ -35,8 +35,16 @@ + + {{"₹"}} {{item.value.annual_income_value | numberToWords}} Only +
+
+ + + +
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.scss 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.scss index 3f33ba147..f678e6e5d 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.scss +++ 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.scss @@ -17,5 +17,6 @@ } .item-margin { - margin-left: 2%; + margin-left:4%; + margin-top:2%; } \ No newline at end of file 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 a9195bbf7..1959d8e8c 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 @@ -49,6 +49,7 @@ export class ManageOtherBusinessIncomeComponent implements OnInit { income_value:['',Validators.compose([Validators.required])], fk_frequency_id:['',Validators.compose([Validators.required])], annual_income_value:['',Validators.compose([Validators.required])], + comments:[], }); } @@ -62,6 +63,7 @@ createBusinessIncomeItemWithData(values: any) { income_value:[values.income_value,Validators.compose([Validators.required])], fk_frequency_id:[values.fk_frequency_id,Validators.compose([Validators.required])], annual_income_value:[values.annual_income_value,Validators.compose([Validators.required])], + comments:[values.comments], }); } @@ -124,14 +126,4 @@ submitDetails(records) { } }); } - - - - inWords(e,s,flag){ - switch(flag){ - case 1 : - this.Amount[s] = this._pd.convertNumberToWords(e); - break; - } - } } 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.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.html index 207693020..ab18ac93a 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.html @@ -11,12 +11,12 @@ -
+
- @@ -26,25 +26,37 @@ - + {{uom.name}} - - - {{"₹"}} {{RateUnitofPurchase[s]}} Only - + + + +
- +
+ + + {{"₹"}} {{item.value.rate_per_unit | numberToWords}} Only + + {{frq.name}} - + - + {{"₹"}} {{item.value.annual_purchase_value | numberToWords}} Only + + +
+
+ + +
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.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.scss index 3f33ba147..f678e6e5d 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.scss @@ -17,5 +17,6 @@ } .item-margin { - margin-left: 2%; + margin-left:4%; + margin-top:2%; } \ No newline at end of file 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 2eac83aad..6708851f2 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 @@ -28,6 +28,8 @@ export class ManagePurchaseComponent implements OnInit { this.purchaseItemForm = this._fb.group({ purchase: this._fb.array([this.createPurchaseItemWithData(this.data.editData)]), }); + let control: any = this.purchaseItemForm.controls['purchase']; + this.data.editData.fk_uom_id=="1" ? control.controls[0].addControl('uom_other', new FormControl(this.data.editData.uom_other ? this.data.editData.uom_other : '', Validators.required)) : control.controls[0].removeControl('uom_other'); } else{ this.purchaseItemForm = this._fb.group({ @@ -50,6 +52,8 @@ export class ManagePurchaseComponent implements OnInit { rate_per_unit:['',Validators.compose([Validators.required])], fk_frequency_id:['',Validators.compose([Validators.required])], annual_purchase_value:['',Validators.compose([Validators.required])], + comments:[], + }); } @@ -65,6 +69,8 @@ createPurchaseItemWithData(values: any) { rate_per_unit:[values.rate_per_unit,Validators.compose([Validators.required])], fk_frequency_id:[values.fk_frequency_id,Validators.compose([Validators.required])], annual_purchase_value:[values.annual_purchase_value,Validators.compose([Validators.required])], + comments:[values.comments], + }); } @@ -96,6 +102,11 @@ removeItem(indexVal: number) : void { control.removeAt(indexVal); } +// generate other UOM +generateOtherUOM(index: number, values: any): void { + let control: any = this.purchaseItemForm.controls['purchase']; + values.fk_uom_id=="1" ? control.controls[index].addControl('uom_other', new FormControl('', Validators.required)) : control.controls[index].removeControl('uom_other'); +} // save purchase details submitDetails(records) { @@ -128,13 +139,4 @@ submitDetails(records) { }); } - - inWords(e,s,flag){ - switch(flag){ - case 1 : - this.RateUnitofPurchase[s] = this._pd.convertNumberToWords(e); - break; - } - } - } 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.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.html index 978ca07a5..185eaa1e8 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.html @@ -11,12 +11,12 @@ -
+
- + - @@ -26,25 +26,29 @@ - + {{uom.name}} - - - {{"₹"}} {{ratePerUnitAmtInwords[s]}} Only + + +
+ + + {{"₹"}} {{sales.value.rate_per_unit | numberToWords}} Only + {{frq.name}} - + - {{"₹"}} {{annualSaleAmtInwords[s]}} Only + {{"₹"}} {{sales.value.annual_sale_value | numberToWords}} Only
@@ -53,11 +57,16 @@ - {{"₹"}} {{marginAmtInwords[s]}} Only - + {{"₹"}} {{sales.value.margin_per_uom | numberToWords}} Only + - {{"₹"}} {{marginFinalAmtInwords[s]}} Only + {{"₹"}} {{sales.value.margin_final_value | numberToWords}} Only + +
+
+ +
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.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.scss index 5e737ca3c..76e439914 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.scss @@ -17,6 +17,7 @@ } .item-margin { - margin-left: 2%; + margin-left:4%; + margin-top:2%; } 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 9e85d5ed8..0c98ea39d 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 @@ -35,19 +35,8 @@ export class ManageSalesComponent implements OnInit { this.salesItemForm = this._fb.group({ salesCalItemwise: this._fb.array([this.createSalesItemWithData(this.data.editData)]), }); - - let indexforedit = 0 - this.inWords(this.data.editData.annual_sale_value,indexforedit,1); - this.inWords(this.data.editData.margin_per_uom,indexforedit,2); - this.inWords(this.data.editData.margin_final_value,indexforedit,3); - this.inWords(this.data.editData.rate_per_unit,indexforedit,4); - - // this.data.editData.forEach((val,index) => { - // this.inWords(val.annual_sale_value,index,1); - // this.inWords(val.margin_per_uom,index,2); - // this.inWords(val.margin_final_value,index,3); - // this.inWords(val.rate_per_unit,index,4); - // }); + let control: any = this.salesItemForm.controls['salesCalItemwise']; + this.data.editData.fk_uom_id=="1" ? control.controls[0].addControl('uom_other', new FormControl(this.data.editData.uom_other ? this.data.editData.uom_other : '', Validators.required)) : control.controls[0].removeControl('uom_other'); } else{ @@ -74,6 +63,7 @@ export class ManageSalesComponent implements OnInit { margin_per:[''], margin_per_uom:[''], margin_final_value:[''], + comments:[], }); } @@ -92,6 +82,8 @@ createSalesItemWithData(values: any) { margin_per:[this.data.margin_calculation_status===true ? values.margin_per : ''], margin_per_uom:[this.data.margin_calculation_status===true ? values.margin_per_uom :''], margin_final_value:[this.data.margin_calculation_status===true ? values.margin_final_value: ''], + comments:[values.comments], + }); } @@ -108,15 +100,10 @@ closeDialogue(){ salesCalculation(indexVal: number,values: any): void { let control:any = this.salesItemForm.controls['salesCalItemwise']; - if(values.rate_per_unit!=''){ - this.inWords(values.rate_per_unit,indexVal,4) - } if(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); let AnnualSalesValue = parseInt(values.sales_qty) * parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor) control.controls[indexVal].controls['annual_sale_value'].setValue(parseInt(values.sales_qty) * parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); - this.inWords(AnnualSalesValue,indexVal,1) - } else { control.controls[indexVal].controls['annual_sale_value'].setValue(''); @@ -130,7 +117,6 @@ salesMarginPerCalculation(indexVal: number,values: any): void { control.controls[indexVal].controls['margin_per_uom'].setValue(''); if(values.margin_per!='' && values.annual_sale_value!='') { control.controls[indexVal].controls['margin_final_value'].setValue(parseInt(values.annual_sale_value) * (parseInt(values.margin_per)/100)); - this.inWords(parseInt(values.annual_sale_value) * (parseInt(values.margin_per)/100),indexVal,3) } else { control.controls[indexVal].controls['margin_final_value'].setValue(''); @@ -139,14 +125,11 @@ salesMarginPerCalculation(indexVal: number,values: any): void { salesMarginAmtCalculation(indexVal: number,values: any): void { let control:any = this.salesItemForm.controls['salesCalItemwise']; control.controls[indexVal].controls['margin_per'].setValue(''); - if(values.margin_per_uom!=''){ - this.inWords(values.margin_per_uom,indexVal,2) - } + if(values.margin_per_uom!='' && values.sales_qty!='') { let MarginFinalValue = parseInt(values.sales_qty) * parseInt(values.margin_per_uom); control.controls[indexVal].controls['margin_final_value'].setValue(parseInt(values.sales_qty) * parseInt(values.margin_per_uom)); - this.inWords(MarginFinalValue,indexVal,3) } else { control.controls[indexVal].controls['margin_final_value'].setValue(''); @@ -175,6 +158,11 @@ submitDetails(records) { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); }); } +// generate other UOM +generateOtherUOM(index: number, values: any): void { + let control: any = this.salesItemForm.controls['salesCalItemwise']; + values.fk_uom_id=="1" ? control.controls[index].addControl('uom_other', new FormControl('', Validators.required)) : control.controls[index].removeControl('uom_other'); +} // validate all form group and form array fields validateAllFormFields(formGroup: any) { @@ -189,21 +177,4 @@ submitDetails(records) { } }); } - - inWords(value,inx,flag){ - switch(flag){ - case 1 : - this.annualSaleAmtInwords[inx] = this._pd.convertNumberToWords(value); - break; - case 2 : - this.marginAmtInwords[inx] = this._pd.convertNumberToWords(value); - break; - case 3 : - this.marginFinalAmtInwords[inx] = this._pd.convertNumberToWords(value); - break; - case 4 : - this.ratePerUnitAmtInwords[inx] = this._pd.convertNumberToWords(value); - break; - default:break;} - } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts index 595b8371a..49b95e006 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts @@ -132,7 +132,7 @@ public viewerOptions: any = { // message: ' Yearly ' + itemElement.sales_item + ' Sales Arrived', // value: calculateAllItemsTotal * convertYear, // }) - this.salesMonthWiseExpandedItems.push({sim_id:itemElement.sim_id,salesItem:itemElement.sales_item,margin_per:itemElement.margin_per,margin_value:itemElement.margin_value, expandElements:expandBodyContent, footerMessage: footerMessage}); + this.salesMonthWiseExpandedItems.push({sim_id:itemElement.sim_id,salesItem:itemElement.sales_item,comments:itemElement.comments,margin_per:itemElement.margin_per,margin_value:itemElement.margin_value, expandElements:expandBodyContent, footerMessage: footerMessage}); }); } if(value.records.purchase_details){ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.html index 9bc834f22..f92984e6d 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.html @@ -41,6 +41,13 @@ {{getTotalCost(businessItemSource.data)}} + + Remarks + {{element.comments}} + + + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.scss index 9f9eb0eeb..714a52559 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.scss @@ -9,26 +9,31 @@ width: 100%; } - td{ - padding-right: 2%; - padding-left: 2%; - white-space: nowrap; - } - - th { - padding-left: 2%; - padding-right: 2%; + .mat-header-cell { + padding: 0 10px 0 10px; white-space: nowrap; } + +.mat-cell { + padding: 0 10px 0 10px; + white-space: nowrap; +} .mat-table-sticky:first-child { border-right: 1px solid #e0e0e0; } .mat-table-sticky:last-child { + width: 5% !important; border-left: 1px solid #e0e0e0; + padding: 10px 0 0 15px; } .mat-footer-cell { font-weight: bold; font-size: 1.2rem !important; + padding: 0 10px 0 10px; + } + td.mat-column-comments{ + white-space: pre; + width: 35%; } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.ts index 0014bf099..3109e8554 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/business-expense-details/business-expense-details.component.ts @@ -11,7 +11,7 @@ import { NotifierService } from 'angular-notifier'; }) export class BusinessExpenseDetailsComponent implements OnInit { - displayedColumns = ['buiness_expense','expense_value','frequency','annual_expenses','action']; + displayedColumns = ['buiness_expense','expense_value','frequency','annual_expenses','comments','action']; public businessItemSource= new MatTableDataSource(); @Input() parentData: any; @Input() masterData: { UOMList: any; frequencyList: any;businessExpenseList:any; pdid:number,company_id:number}; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-sales-details/daily-sales-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-sales-details/daily-sales-details.component.html index 4fa675d08..12dc5ca30 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-sales-details/daily-sales-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-sales-details/daily-sales-details.component.html @@ -22,7 +22,7 @@  ( Margin Percentage : {{expandDetails.margin_per}} %   Margin Value : {{expandDetails.margin_value}} ) - +
{{footer.month_message}}   {{footer.year_message}}
@@ -54,13 +54,21 @@
- - - + + +
+ {{expandDetails.comments}} +
+
+ + + +
+ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-sales-details/daily-sales-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-sales-details/daily-sales-details.component.ts index 3dc461c65..861744e94 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-sales-details/daily-sales-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-sales-details/daily-sales-details.component.ts @@ -59,6 +59,7 @@ editSalesItem(value:any) { "fk_pd_id":this.masterData.pdid, "sim_id":value.sim_id, "salesItem":value.salesItem, + "comments":value.comments, "margin_value":value.margin_value, "margin_per":value.margin_per, "values":transformData diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.html index e1986a043..90acf6882 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.html @@ -41,6 +41,13 @@ {{getTotalCost(houseItemSource.data)}} + + Remarks + {{element.comments}} + + + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.scss index 9f9eb0eeb..714a52559 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.scss @@ -9,26 +9,31 @@ width: 100%; } - td{ - padding-right: 2%; - padding-left: 2%; - white-space: nowrap; - } - - th { - padding-left: 2%; - padding-right: 2%; + .mat-header-cell { + padding: 0 10px 0 10px; white-space: nowrap; } + +.mat-cell { + padding: 0 10px 0 10px; + white-space: nowrap; +} .mat-table-sticky:first-child { border-right: 1px solid #e0e0e0; } .mat-table-sticky:last-child { + width: 5% !important; border-left: 1px solid #e0e0e0; + padding: 10px 0 0 15px; } .mat-footer-cell { font-weight: bold; font-size: 1.2rem !important; + padding: 0 10px 0 10px; + } + td.mat-column-comments{ + white-space: pre; + width: 35%; } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.ts index 2819e2885..eb3b41ac4 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/house-hold-details/house-hold-details.component.ts @@ -12,7 +12,7 @@ import { NotifierService } from 'angular-notifier'; }) export class HouseHoldDetailsComponent implements OnInit { - displayedColumns = ['buiness_particulars','expense_value','frequency','annual_expenses','action']; + displayedColumns = ['buiness_particulars','expense_value','frequency','annual_expenses','comments','action']; public houseItemSource= new MatTableDataSource(); @Input() parentData: any; @Input() masterData: { UOMList: any; frequencyList: any;businessExpenseList:any; pdid:number,company_id:number}; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.html index 5a0e24d62..17bf7c77a 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.html @@ -41,6 +41,13 @@ {{getTotalCost(businessIncomeItemSource.data)}} + + Remarks + {{element.comments}} + + + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.scss index 9f9eb0eeb..714a52559 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.scss @@ -9,26 +9,31 @@ width: 100%; } - td{ - padding-right: 2%; - padding-left: 2%; - white-space: nowrap; - } - - th { - padding-left: 2%; - padding-right: 2%; + .mat-header-cell { + padding: 0 10px 0 10px; white-space: nowrap; } + +.mat-cell { + padding: 0 10px 0 10px; + white-space: nowrap; +} .mat-table-sticky:first-child { border-right: 1px solid #e0e0e0; } .mat-table-sticky:last-child { + width: 5% !important; border-left: 1px solid #e0e0e0; + padding: 10px 0 0 15px; } .mat-footer-cell { font-weight: bold; font-size: 1.2rem !important; + padding: 0 10px 0 10px; + } + td.mat-column-comments{ + white-space: pre; + width: 35%; } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.ts index a8995b5e6..09718a16a 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/other-business-income-details/other-business-income-details.component.ts @@ -11,7 +11,7 @@ import { NotifierService } from 'angular-notifier'; }) export class OtherBusinessIncomeDetailsComponent implements OnInit { - displayedColumns = ['buiness_income','income_value','frequency','annual_income','action']; + displayedColumns = ['buiness_income','income_value','frequency','annual_income','comments','action']; public businessIncomeItemSource= new MatTableDataSource(); @Input() parentData: any; @Input() masterData: { UOMList: any; frequencyList: any;businessExpenseList:any; pdid:number,company_id:number}; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.html index ec327a7ba..b2a2c141f 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.html @@ -30,7 +30,7 @@ UOM - {{element.uom_name}} + {{element.fk_uom_id==1 ? element.uom_other : element.uom_name}} @@ -56,6 +56,14 @@ {{getTotalCost(purchaseItemSource.data)}} + + Remarks + {{element.comments}} + + + + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.scss index 9f9eb0eeb..714a52559 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.scss @@ -9,26 +9,31 @@ width: 100%; } - td{ - padding-right: 2%; - padding-left: 2%; - white-space: nowrap; - } - - th { - padding-left: 2%; - padding-right: 2%; + .mat-header-cell { + padding: 0 10px 0 10px; white-space: nowrap; } + +.mat-cell { + padding: 0 10px 0 10px; + white-space: nowrap; +} .mat-table-sticky:first-child { border-right: 1px solid #e0e0e0; } .mat-table-sticky:last-child { + width: 5% !important; border-left: 1px solid #e0e0e0; + padding: 10px 0 0 15px; } .mat-footer-cell { font-weight: bold; font-size: 1.2rem !important; + padding: 0 10px 0 10px; + } + td.mat-column-comments{ + white-space: pre; + width: 35%; } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.ts index d0a4aa0fd..5af15cf6c 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.ts @@ -10,7 +10,7 @@ import { NotifierService } from 'angular-notifier'; styleUrls: ['./purchase-details.component.scss'] }) export class PurchaseDetailsComponent implements OnInit, DoCheck { - displayedColumns = ['raw_material','purchase_quantity','UOM','rate_per_unit_purchase','frequency','annual_purchase','action']; + displayedColumns = ['raw_material','purchase_quantity','UOM','rate_per_unit_purchase','frequency','annual_purchase','comments','action']; public purchaseItemSource= new MatTableDataSource(); activateMariginCalculation:boolean; private notifier: NotifierService; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-calculation/sales-calculation.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-calculation/sales-calculation.component.html index 2566a4a81..e260c2766 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-calculation/sales-calculation.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-calculation/sales-calculation.component.html @@ -15,8 +15,11 @@ - {{"₹"}} {{marginAmtInwords}} Only + {{"₹"}} {{salesCalculationForm.value.margin_value | numberToWords}} Only + + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-calculation/sales-calculation.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-calculation/sales-calculation.component.ts index 2860eec0b..f8f1986ae 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-calculation/sales-calculation.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-calculation/sales-calculation.component.ts @@ -16,7 +16,6 @@ export class SalesCalculationComponent implements OnInit, OnChanges, DoCheck { activateMariginCalculation: boolean; private notifier: NotifierService; SaleAmtInwords : any; - marginAmtInwords: any; constructor(notifier:NotifierService,private _fb: FormBuilder, private _pd: PdTrigerService) { this.activateMariginCalculation=false; this.notifier = notifier; @@ -30,7 +29,6 @@ export class SalesCalculationComponent implements OnInit, OnChanges, DoCheck { { this.salesCalculationForm.controls['margin_value'].setValue(values.sales_declared_by_customer * (values.margin_per/100)); - this.marginAmtInwords = this._pd.convertNumberToWords(values.sales_declared_by_customer * (values.margin_per/100)); } } // save sales calculations details @@ -89,7 +87,6 @@ ngOnChanges(changes: SimpleChanges) { if(changes.parentData){ if(changes.parentData.currentValue.length>0){ this.SaleAmtInwords = this._pd.convertNumberToWords(changes.parentData.currentValue[changes.parentData.currentValue.length-1].sales_declared_by_customer); - this.marginAmtInwords = this._pd.convertNumberToWords(changes.parentData.currentValue[changes.parentData.currentValue.length-1].margin_value); this.salesCalculationForm = this._fb.group({ sdc_id:[changes.parentData.currentValue[changes.parentData.currentValue.length-1].sdc_id], sales_declared_by_customer:[changes.parentData.currentValue[changes.parentData.currentValue.length-1].sales_declared_by_customer, Validators.compose([Validators.required])], @@ -97,6 +94,7 @@ ngOnChanges(changes: SimpleChanges) { company_id:[this.masterData.company_id], margin_per:[this.activateMariginCalculation===false ? '' : changes.parentData.currentValue[changes.parentData.currentValue.length-1].margin_per,this.activateMariginCalculation===true ? Validators.required: Validators.nullValidator], margin_value:[this.activateMariginCalculation==false ? '' : changes.parentData.currentValue[changes.parentData.currentValue.length-1].margin_value], + comments:[changes.parentData.currentValue[changes.parentData.currentValue.length-1].comments] }); } else { @@ -107,6 +105,8 @@ ngOnChanges(changes: SimpleChanges) { company_id:[this.masterData.company_id], margin_per:['',this.activateMariginCalculation===true ? Validators.required: Validators.nullValidator], margin_value:[''], + comments:[''] + }); } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.html index 57c1e733a..fe0338f2d 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.html @@ -32,7 +32,7 @@ UOM - {{element.uom_name}} + {{element.fk_uom_id==1 ? element.uom_other : element.uom_name}} @@ -79,6 +79,14 @@ + + Remarks + {{element.comments}} + + + + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.scss index 172fb36bd..6be8f46ff 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.scss @@ -9,27 +9,32 @@ width: 100%; } - td{ - padding-right: 2%; - padding-left: 2%; - white-space: nowrap; - } - - th { - padding-left: 2%; - padding-right: 2%; + .mat-header-cell { + padding: 0 10px 0 10px; white-space: nowrap; } + +.mat-cell { + padding: 0 10px 0 10px; + white-space: nowrap; +} .mat-table-sticky:first-child { border-right: 1px solid #e0e0e0; } .mat-table-sticky:last-child { + width: 5% !important; border-left: 1px solid #e0e0e0; + padding: 10px 0 0 15px; } .mat-footer-cell { font-weight: bold; font-size: 1.2rem !important; + padding: 0 10px 0 10px; + } + td.mat-column-comments{ + white-space: pre; + width: 35%; } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.ts index 405610974..57eba3097 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-details/sales-details.component.ts @@ -10,7 +10,7 @@ import { NotifierService } from 'angular-notifier'; styleUrls: ['./sales-details.component.scss'] }) export class SalesDetailsComponent implements OnInit, DoCheck { - displayedColumns = ['product_services','sale_quantity','UOM','rate_per_unit_sale','frequency','annual_sales','action']; + displayedColumns = ['product_services','sale_quantity','UOM','rate_per_unit_sale','frequency','annual_sales','comments','action']; public salesItemSource= new MatTableDataSource(); @Input() parentData: any; @Input() masterData: { UOMList: any; frequencyList: any;businessExpenseList:any,businessIncomeList: any, pdid:number,company_id:number, grossProfitTypeList:any}; @@ -92,10 +92,10 @@ ngDoCheck() { if(this.masterData.grossProfitTypeList.length>0){ this.activateMariginCalculation = this.masterData.grossProfitTypeList[this.masterData.grossProfitTypeList.length-1].margin==2 && this.masterData.grossProfitTypeList[this.masterData.grossProfitTypeList.length-1].mode==2 ? true : false; if(this.activateMariginCalculation===true){ - this.displayedColumns = ['product_services','sale_quantity','UOM','rate_per_unit_sale','frequency','annual_sales','margin_percentage','margin_amount','final_value','action']; + this.displayedColumns = ['product_services','sale_quantity','UOM','rate_per_unit_sale','frequency','annual_sales','margin_percentage','margin_amount','final_value','comments','action']; } else { - this.displayedColumns = ['product_services','sale_quantity','UOM','rate_per_unit_sale','frequency','annual_sales','action']; + this.displayedColumns = ['product_services','sale_quantity','UOM','rate_per_unit_sale','frequency','annual_sales','comments','action']; } }