From 05d55de7ec0da4bc33a28b25022369a218f07498 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 11 Feb 2019 19:14:56 +0530 Subject: [PATCH] UI Changes --- .../manage-busines-expense.component.html | 3 ++- .../manage-busines-expense.component.ts | 14 +++++++++++++- .../manage-daily-sales.component.html | 5 +++-- .../manage-daily-sales.component.ts | 8 ++++++++ .../manage-house-hold.component.html | 3 ++- .../manage-house-hold.component.ts | 10 +++++++++- .../manage-other-business-income.component.html | 3 ++- .../manage-other-business-income.component.ts | 10 ++++++++++ .../manage-purchase/manage-purchase.component.html | 3 ++- .../manage-purchase/manage-purchase.component.ts | 13 +++++++++++-- .../manage-sales/manage-sales.component.html | 3 ++- .../manage-sales/manage-sales.component.ts | 11 ++++++++++- 12 files changed, 74 insertions(+), 12 deletions(-) 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 d24d79dd8..4e1bcf9b6 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 @@ -25,7 +25,8 @@
- + + {{"₹"}} {{Amount[s]}} 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.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 85e9d8501..b1185fb61 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 @@ -10,7 +10,8 @@ import { NotifierService } from 'angular-notifier'; styleUrls: ['./manage-busines-expense.component.scss'] }) export class ManageBusinesExpenseComponent implements OnInit { - + Amount: any = []; + pageTitle:string; businessItemForm:FormGroup; frequencyData: any[]=[]; @@ -122,4 +123,15 @@ 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 e75308643..3606a00bf 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 @@ -35,8 +35,9 @@ - - + + {{"₹"}} {{Value[c]}} Only +
- + + {{"₹"}} {{Amount[s]}} 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.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 09ca82366..f74707bd1 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 @@ -10,7 +10,8 @@ import { NotifierService } from 'angular-notifier'; styleUrls: ['./manage-house-hold.component.scss'] }) export class ManageHouseHoldComponent implements OnInit { - pageTitle:string; + Amount: any[]=[]; + pageTitle: string; houseItemForm:FormGroup; frequencyData: any[]=[]; private notifier: NotifierService; @@ -118,5 +119,12 @@ 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 6f5c5e89b..4ae1e94d8 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 @@ -25,7 +25,8 @@
- + + {{"₹"}} {{Amount[s]}} 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.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 d3eb35298..58e14ecb7 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 @@ -10,6 +10,7 @@ import { NotifierService } from 'angular-notifier'; styleUrls: ['./manage-other-business-income.component.scss'] }) export class ManageOtherBusinessIncomeComponent implements OnInit { + Amount: any[]=[]; pageTitle:string; businessIncomeItemForm:FormGroup; @@ -122,4 +123,13 @@ 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 672c66b24..207693020 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 @@ -31,7 +31,8 @@ - + + {{"₹"}} {{RateUnitofPurchase[s]}} 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.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 2ba3bfe63..778d69cf3 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 @@ -10,8 +10,8 @@ import { NotifierService } from 'angular-notifier'; styleUrls: ['./manage-purchase.component.scss'] }) export class ManagePurchaseComponent implements OnInit { - - pageTitle:string; + RateUnitofPurchase: any[]=[]; + pageTitle: string; purchaseItemForm:FormGroup; UOMData: any[]=[]; frequencyData: any[]=[]; @@ -126,4 +126,13 @@ 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 8511f63d1..ca25ca51e 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 @@ -23,7 +23,8 @@
- + + {{"₹"}} {{Sale_Quantity[s]}} 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.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 384ee80a2..a027ab9c8 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 @@ -10,7 +10,8 @@ import { NotifierService } from 'angular-notifier'; styleUrls: ['./manage-sales.component.scss'] }) export class ManageSalesComponent implements OnInit { - pageTitle:string; + Sale_Quantity: any[]=[]; + pageTitle: string; salesItemForm:FormGroup; UOMData: any[]=[]; frequencyData: any[]=[]; @@ -154,4 +155,12 @@ submitDetails(records) { }); } + inWords(e,s,flag){ + switch(flag){ + case 1 : + this.Sale_Quantity[s] = this._pd.convertNumberToWords(e); + break; + } + } + }