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 f11f84f0a..5969ccc44 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 @@ -34,14 +34,14 @@ {{frq.name}} - + {{"₹"}} {{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 f678e6e5d..49dcb4214 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 @@ -19,4 +19,8 @@ .item-margin { margin-left:4%; margin-top:2%; +} + +.item-product-margin{ + 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-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 6e4636b35..301abb8f8 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 @@ -34,7 +34,7 @@
- + {{"₹"}} {{childItem.value.sales_value | numberToWords}} Only @@ -63,11 +63,11 @@ {{frq.name}} - + {{"₹"}} {{childItem.value.frequency_value | numberToWords}} Only - + {{"₹"}} {{childItem.value.sales_value | numberToWords}} Only @@ -84,13 +84,13 @@ - + {{"₹"}} {{sales.value.margin_value | numberToWords}} Only
- + 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.scss 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.scss index b884adf57..3286c8cbe 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.scss +++ 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.scss @@ -20,6 +20,9 @@ margin-left:4%; margin-top:2%; } +.item-product-margin{ + margin-top:2%; +} .example-radio-group { display: flex; flex-direction: row; 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 abcc2c7f8..73f44e19c 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 @@ -235,7 +235,7 @@ salesCalculation(indexVal: number,values: any): void { changeOptions(indexVal: any,event: any): void{ let control: any = this.salesItemForm.controls['sales_product']; let innercontrol: any = control.controls[indexVal].get('child') as FormArray; - if(event.value==1){ + if(event.value=="1"){ for (let i = 0; i < innercontrol.value.length-1; i++) { innercontrol.removeAt(i); } @@ -256,7 +256,7 @@ changeOptions(indexVal: any,event: any): void{ control.controls[indexVal].controls['comments'].clearValidators(); control.controls[indexVal].controls['comments'].updateValueAndValidity(); } - else if(event.value==2){ + else if(event.value=="2"){ for (let i = 0; i < innercontrol.value.length-1; i++) { innercontrol.removeAt(i); } @@ -264,9 +264,11 @@ changeOptions(indexVal: any,event: any): void{ innercontrol.controls[innercontrol.value.length-1].controls['sales_date'].clearValidators(); innercontrol.controls[innercontrol.value.length-1].controls['sales_date'].updateValueAndValidity(); + innercontrol.controls[innercontrol.value.length-1].controls['fk_frequency_id'].setValue(""); innercontrol.controls[innercontrol.value.length-1].controls['fk_frequency_id'].setValidators([Validators.required]); innercontrol.controls[innercontrol.value.length-1].controls['fk_frequency_id'].updateValueAndValidity(); + innercontrol.controls[innercontrol.value.length-1].controls['frequency_value'].setValue(""); innercontrol.controls[innercontrol.value.length-1].controls['frequency_value'].setValidators([Validators.required]); innercontrol.controls[innercontrol.value.length-1].controls['frequency_value'].updateValueAndValidity(); 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.html 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.html index 326c8cd8e..91f8a9e0f 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.html +++ 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.html @@ -31,14 +31,14 @@ {{frq.name}} - + {{"₹"}} {{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 f678e6e5d..49dcb4214 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 @@ -19,4 +19,8 @@ .item-margin { margin-left:4%; margin-top:2%; +} + +.item-product-margin{ + 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.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 18306ade2..b6b9f18b4 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 @@ -33,15 +33,15 @@ {{frq.name}}
- + {{"₹"}} {{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 f678e6e5d..49dcb4214 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 @@ -19,4 +19,8 @@ .item-margin { margin-left:4%; margin-top:2%; +} + +.item-product-margin{ + 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.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 ab18ac93a..1898762c9 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 @@ -30,7 +30,7 @@ {{uom.name}}
- + @@ -47,14 +47,14 @@ {{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 f678e6e5d..49dcb4214 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 @@ -19,4 +19,8 @@ .item-margin { margin-left:4%; margin-top:2%; +} + +.item-product-margin{ + 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-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 29d385f15..217633517 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 @@ -36,7 +36,7 @@ {{uom.name}}
- + @@ -54,7 +54,7 @@ {{frq.name}} - + {{"₹"}} {{sales.value.annual_sale_value | numberToWords}} Only @@ -71,7 +71,7 @@ {{"₹"}} {{sales.value.rate_per_unit | numberToWords}} Only - + {{"₹"}} {{sales.value.annual_sale_value | numberToWords}} Only @@ -81,7 +81,7 @@ -
+
@@ -89,13 +89,13 @@ {{"₹"}} {{sales.value.margin_per_uom | numberToWords}} 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 dfbb6890a..ee8fc8d87 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 @@ -21,6 +21,10 @@ margin-top:2%; } +.item-product-margin{ + margin-top:2%; +} + .example-radio-group { display: flex; flex-direction: row; 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 4f186fcf0..d8e0e00e6 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 @@ -162,7 +162,7 @@ generateOtherUOM(index: number, values: any): void { // change options for either Quantity and Rate Information / Value Information changeOptions(indexVal: any,event: any): void{ let control: any = this.salesItemForm.controls['salesCalItemwise']; - if(event.value==1){ + if(event.value=="1"){ control.controls[indexVal].controls['sales_qty'].setValidators([Validators.required]); control.controls[indexVal].controls['sales_qty'].updateValueAndValidity(); @@ -170,7 +170,7 @@ let control: any = this.salesItemForm.controls['salesCalItemwise']; control.controls[indexVal].controls['fk_uom_id'].updateValueAndValidity(); this.salesCalculation(indexVal,control.controls[indexVal].value); } - else if(event.value==2){ + else if(event.value=="2"){ control.controls[indexVal].controls['sales_qty'].setValue(""); control.controls[indexVal].controls['sales_qty'].clearValidators(); control.controls[indexVal].controls['sales_qty'].updateValueAndValidity();