From 3e721b512c8a23145f225b9c0afb9806b1308380 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 7 Mar 2019 15:45:50 +0530 Subject: [PATCH 1/4] AI changes --- .../assessed-income.component.html | 192 ++++-------------- .../assessed-income.component.scss | 99 ++++++--- .../assessed-income.component.ts | 157 +++++++++++--- .../sales-calculation.component.html | 2 +- 4 files changed, 243 insertions(+), 207 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html index 48ddc273b..f27e3f116 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html @@ -23,159 +23,51 @@ Complete - - - - - -
-

a) Cost of Goods Sold

-
-
-

{{sumary_details.sales_revenue ? sumary_details.sales_revenue : 0}}

-
- - - -
-

{{subDetails.sales_item}}

-
-
-

{{subDetails.annual_sale_value ? subDetails.annual_sale_value : 0}}

-
- - - + + - - - -
-

b) Purchases

-
-
-

{{sumary_details.purchase ? sumary_details.purchase : 0}}

-
- - - -
-

{{subDetails.purchase_item}}

-
-
-

{{subDetails.annual_purchase_value ? subDetails.annual_purchase_value : 0}}

-
- - - - - - -
-

c) Gross Profit (a-b)

-
-
-

{{sumary_details.gross_profit ? sumary_details.gross_profit : 0}}

-
- - - +
+ - - - -
-

d) Other Income

-
-
-

{{sumary_details.other_business_income ? sumary_details.other_business_income : 0 }}

-
- - - -
-

{{subDetails.business_income_item}}

-
-
-

{{subDetails.annual_income_value ? subDetails.annual_income_value : 0}}

-
+ + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - -
-

e) Other Expenses

-
-
-

{{sumary_details.business_expense ? sumary_details.business_expense : 0}}

-
- - - -
-

{{subDetails.expense_item}}

-
-
-

{{subDetails.annual_expenses_value ? subDetails.annual_expenses_value : 0}}

-
- - - - - - -
-

f) Net Profit (c+d-e)

- -
-
-

{{sumary_details.net_profit ? sumary_details.net_profit : 0}}

-
- - - - - - - -
-

g) Household Expenses

- -
-
-

{{sumary_details.household_expenses ? sumary_details.household_expenses : 0}}

-
- - - -
-

{{subDetails.expense_item}}

-
-
-

{{subDetails.annual_expense_value ? subDetails.annual_expense_value : 0}}

-
- - - - - - -
-

h) Net Disposable Income (f-g)

- - -
-
-

{{sumary_details.net_disable_income_value ? sumary_details.net_disable_income_value : 0}}

-
- - - - - - + + + +
Summary {{element.sno}}{{element.label}} Declared_by_customer {{element.declared_by_customer}} As Derived from Item Wise Sales {{element.derived_item_wise}} As Derived from Kuchha Sales Book/Bills {{element.derived_sales_book}}
+
+ + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss index 1cfc15b89..8f0e25006 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss @@ -1,7 +1,10 @@ .example-container { - max-height: 500px; - overflow: auto; -} + // height: 400px; + // width: 550px; + max-height: 300px; + overflow: auto; + margin: 1% 2%; + } ::ng-deep .cdk-global-overlay-wrapper{ @@ -13,7 +16,7 @@ } .complete-button button { - margin-top: 10px; + margin: 1% 2%; } .paragraph_change { @@ -104,34 +107,6 @@ } - -// table, th, td { -// border: 1px solid rgba(0, 0, 0, 0.12); -// border-collapse: collapse; -// } -// td { -// padding: 5px; -// text-align: left; -// } -// th { -// padding: 5px; -// text-align: center; -// } - -.row_border { - display: flex; - border:1px solid rgba(0, 0, 0, 0.12); -} - -// mat-list-item:nth-child(3) { -// background-color: #f5f5f5; -// } -// mat-list-item:nth-child(6) { -// background-color: #f5f5f5; -// } -// mat-list-item:nth-child(8) { -// background-color: #f5f5f5; -// } mat-list-item:not(:first-child) { cursor: auto; .sub_item{ @@ -153,5 +128,65 @@ text-align: right; } + table { + width: 100%; + } + th.mat-column-position_2 , th.mat-column-position_3, th.mat-column-position_4 { + //padding-left: 1%; + //padding-left: 1%; + width: 30%; + text-align:center; + white-space: wrap; + + } + td.mat-column-position_2 , td.mat-column-position_3, td.mat-column-position_4 { + // padding-right: 1%; + text-align:center; + white-space: nowrap; + } + th.mat-column-position_1 { + white-space: nowrap; + } + td.mat-column-position_1{ + text-align:left; + white-space: nowrap; + width: 35%; + //color:#e00201; + } + td.mat-column-position_5 { + width: 5%; + padding-right: 8px; + } + + .mat-header-row{ + background-color:whitesmoke; + } + .mat-table-sticky:first-child { + border-right: 1px solid #e0e0e0; + } + + .mat-row:nth-child(3){ + background-color:rgb(253, 221, 160); + } + .mat-row:nth-child(5){ + background-color:rgb(253, 221, 160); + } + .mat-row:nth-child(9){ + background-color:rgb(253, 221, 160); + } + .mat-row:nth-child(10){ + background-color:rgb(253, 221, 160); + } + .mat-row:nth-child(11){ + background-color:rgb(253, 221, 160);; + } + + + + + // .mat-table-sticky:last-child { + // border-left: 1px solid #e0e0e0; + // } + \ No newline at end of file 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 521e4b88c..99f697a91 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 @@ -1,10 +1,6 @@ import {Component,OnInit,Inject,Input, ViewChild } from '@angular/core'; import { NotifierService } from 'angular-notifier'; -import { - MatDialog, - MatDialogRef, - MAT_DIALOG_DATA -} from '@angular/material'; +import {MatDialog,MatDialogRef,MAT_DIALOG_DATA, MatTableDataSource} from '@angular/material'; /** Service */ import { PdTrigerService } from '../../../../../pd-service/pd-triger.service'; import { ActivatedRoute, Router } from "@angular/router"; @@ -15,6 +11,8 @@ import { ConfirmAiDetailsComponent } from "./confirm-ai-details/confirm-ai-detai styleUrls: ['./assessed-income.component.scss'] }) export class AssessedIncomeComponent implements OnInit { + displayedSummaryColumns: any =[]; + summaryItemSource:any = []; customer_segment_abbr: any; subproduct_abbr: any; lender_applicant_id: any; @@ -58,11 +56,6 @@ public getCustomValues:any = { UOMList: this.UOMList,frequencyList: this.frequen this.company_id = this.pd_all_details.company_id; this.notifier = notifier; this.form_id = 16; - this.loadAIDetails(); - this.getAIMaster('UOM',1); - this.getAIMaster('FREQUENCY',2); - this.getAIMaster('BUSINESSEXPENSES',3); - this.getAIMaster('BUSINESSINCOME',4); this.getCustomValues.pdid = this.pd_all_details.pdmaster_details.pd_id; this.getCustomValues.company_id = this.pd_all_details.company_id; this.main_applicant = this.pd_all_details.pdmaster_details.main_applicant; @@ -91,7 +84,11 @@ public viewerOptions: any = { } }; ngOnInit() { - + this.loadAIDetails(); + this.getAIMaster('UOM',1); + this.getAIMaster('FREQUENCY',2); + this.getAIMaster('BUSINESSEXPENSES',3); + this.getAIMaster('BUSINESSINCOME',4); } // load ai details loadAIDetails(): void{ @@ -151,20 +148,132 @@ public viewerOptions: any = { this.otherBusinessIncome = value.records.othre_business_income; } + // set sumary table headers if(value.records.final_data.length >0){ - this.sumary_details.sales_revenue = value.records.final_data[0].sales_revenue; - this.sumary_details.sales_revenue_details = value.records.final_data[0].sales_revenue_details; - this.sumary_details.purchase = value.records.final_data[0].purchase; - this.sumary_details.purchase_details = value.records.final_data[0].purchase_details; - this.sumary_details.gross_profit = value.records.final_data[0].gross_profit; - this.sumary_details.other_business_income= value.records.final_data[0].other_business_income; - this.sumary_details.other_business_income_details = value.records.final_data[0].other_business_income_details; - this.sumary_details.business_expense = value.records.final_data[0].business_expense; - this.sumary_details.business_expense_details = value.records.final_data[0].business_expense_details; - this.sumary_details.net_profit = value.records.final_data[0].net_profit !='' && value.records.final_data[0].net_profit!=null ? value.records.final_data[0].net_profit : 0; - this.sumary_details.household_expenses = value.records.final_data[0].household_expenses; - this.sumary_details.house_hold_expense_details = value.records.final_data[0].house_hold_expense_details !='' && value.records.final_data[0].house_hold_expense_details !=null ? value.records.final_data[0].house_hold_expense_details : 0; - this.sumary_details.net_disable_income_value = Number(this.sumary_details.net_profit) - Number(this.sumary_details.household_expenses); + //set column name + (value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? this.displayedSummaryColumns.push("position_1","position_2","position_3","position_4") + : (value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? this.displayedSummaryColumns.push("position_1","position_2","position_3") + : (value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? this.displayedSummaryColumns.push("position_1","position_2","position_4") + : (value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? this.displayedSummaryColumns.push("position_1","position_3","position_4") + : (value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? this.displayedSummaryColumns.push("position_1","position_2") + : (value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? this.displayedSummaryColumns.push("position_1","position_3") + : (value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? this.displayedSummaryColumns.push("position_1","position_4") + :this.displayedSummaryColumns.push("position_1"); + } + else { + this.displayedSummaryColumns.push("position_1"); + } + + if(value.records.final_data.length >0 && (value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.cost_of_goods_sold) || (value.records.final_data[0].sales_calculated_by_itemwise &&value.records.final_data[0].sales_calculated_by_itemwise.cost_of_goods_sold)|| (value.records.final_data[0].sales_calculated_by_monthwise &&value.records.final_data[0].sales_calculated_by_monthwise.cost_of_goods_sold) ){ + let get_sumary: any=[]; + // set sales and revenue + get_sumary.push({"sno":'a. ',"label":'Sales Revenue ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.sales_revenue) ? value.records.final_data[0].sales_declared_by_customer.sales_revenue:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.sales_revenue) ? value.records.final_data[0].sales_calculated_by_itemwise.sales_revenue:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.sales_revenue) ? value.records.final_data[0].sales_calculated_by_monthwise.sales_revenue:0 }); + //set cost of goods sold + get_sumary.push({"sno":'b. ',"label":'Cost of Goods Sold ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.cost_of_goods_sold) ? value.records.final_data[0].sales_declared_by_customer.cost_of_goods_sold:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.cost_of_goods_sold) ? value.records.final_data[0].sales_calculated_by_itemwise.cost_of_goods_sold:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.cost_of_goods_sold) ? value.records.final_data[0].sales_calculated_by_monthwise.cost_of_goods_sold:0 }); + //set gross profit + get_sumary.push({"sno":'c. ',"label":'Gross Profit / Loss(a-b) ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.grossprofit) ? value.records.final_data[0].sales_declared_by_customer.grossprofit:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.grossprofit) ? value.records.final_data[0].sales_calculated_by_itemwise.grossprofit:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.grossprofit) ? value.records.final_data[0].sales_calculated_by_monthwise.grossprofit:0 }); + // set business expense + get_sumary.push({"sno":'d. ',"label":'Business Expenses ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.business_expenses) ? value.records.final_data[0].sales_declared_by_customer.business_expenses:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.business_expenses) ? value.records.final_data[0].sales_calculated_by_itemwise.business_expenses:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.business_expenses) ? value.records.final_data[0].sales_calculated_by_monthwise.business_expenses:0 }); + // set net profit / loss + get_sumary.push({"sno":'e. ',"label":'Net Profit / Loss(c-d) ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.netprofit) ? value.records.final_data[0].sales_declared_by_customer.netprofit:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.netprofit) ? value.records.final_data[0].sales_calculated_by_itemwise.netprofit:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.netprofit) ? value.records.final_data[0].sales_calculated_by_monthwise.netprofit:0 }); + // set household expenses + get_sumary.push({"sno":'f. ',"label":'Household Expenses ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.house_hold_expenses) ? value.records.final_data[0].sales_declared_by_customer.house_hold_expenses:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.house_hold_expenses) ? value.records.final_data[0].sales_calculated_by_itemwise.house_hold_expenses:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.house_hold_expenses) ? value.records.final_data[0].sales_calculated_by_monthwise.house_hold_expenses:0 }); + //set disposable income + get_sumary.push({"sno":'g. ',"label":'Disposable Income ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.disposable_income) ? value.records.final_data[0].sales_declared_by_customer.disposable_income:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.disposable_income) ? value.records.final_data[0].sales_calculated_by_itemwise.disposable_income:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.disposable_income) ? value.records.final_data[0].sales_calculated_by_monthwise.disposable_income:0 }); + //set net margin + get_sumary.push({"sno":'h. ',"label":'Net Margin',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.netmargin) ? value.records.final_data[0].sales_declared_by_customer.netmargin:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.netmargin) ? value.records.final_data[0].sales_calculated_by_itemwise.netmargin:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.netmargin) ? value.records.final_data[0].sales_calculated_by_monthwise.netmargin:0 }); + + // get conslidate sales / revenue details + (value.records.final_data[0].consolidated_report && value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_sales_revenue, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_sales_revenue, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_sales_revenue, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_sales_revenue ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_sales_revenue, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_sales_revenue ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":'', "derived_item_wise":'' ,"derived_sales_book":value.records.final_data[0].consolidated_report.consolidated_sales_revenue }) + :''; + // get conslidate net margin details + (value.records.final_data[0].consolidated_report && value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_nermagin ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_nermagin ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":'', "derived_item_wise":'' ,"derived_sales_book":value.records.final_data[0].consolidated_report.consolidated_nermagin }) + :''; + // get conslidate net profit details + (value.records.final_data[0].consolidated_report && value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nerprofit, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nerprofit, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nerprofit, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_nerprofit ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nerprofit, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_nerprofit ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":'', "derived_item_wise":'' ,"derived_sales_book":value.records.final_data[0].consolidated_report.consolidated_nerprofit }) + :''; + + this.summaryItemSource=get_sumary; + // this.sumary_details.sales_revenue = value.records.final_data[0].sales_revenue; + // this.sumary_details.sales_revenue_details = value.records.final_data[0].sales_revenue_details; + // this.sumary_details.purchase = value.records.final_data[0].purchase; + // this.sumary_details.purchase_details = value.records.final_data[0].purchase_details; + // this.sumary_details.gross_profit = value.records.final_data[0].gross_profit; + // this.sumary_details.other_business_income= value.records.final_data[0].other_business_income; + // this.sumary_details.other_business_income_details = value.records.final_data[0].other_business_income_details; + // this.sumary_details.business_expense = value.records.final_data[0].business_expense; + // this.sumary_details.business_expense_details = value.records.final_data[0].business_expense_details; + // this.sumary_details.net_profit = value.records.final_data[0].net_profit !='' && value.records.final_data[0].net_profit!=null ? value.records.final_data[0].net_profit : 0; + // this.sumary_details.household_expenses = value.records.final_data[0].household_expenses; + // this.sumary_details.house_hold_expense_details = value.records.final_data[0].house_hold_expense_details !='' && value.records.final_data[0].house_hold_expense_details !=null ? value.records.final_data[0].house_hold_expense_details : 0; + // this.sumary_details.net_disable_income_value = Number(this.sumary_details.net_profit) - Number(this.sumary_details.household_expenses); + } + else if(value.records.final_data.length >0 && (value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.purchases) || (value.records.final_data[0].sales_calculated_by_itemwise &&value.records.final_data[0].sales_calculated_by_itemwise.purchases)|| (value.records.final_data[0].sales_calculated_by_monthwise &&value.records.final_data[0].sales_calculated_by_monthwise.purchases)){ + let get_sumary: any=[]; + // set sales and revenue + get_sumary.push({"sno":'a. ',"label":'Sales Revenue ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.sales_revenue) ? value.records.final_data[0].sales_declared_by_customer.sales_revenue:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.sales_revenue) ? value.records.final_data[0].sales_calculated_by_itemwise.sales_revenue:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.sales_revenue) ? value.records.final_data[0].sales_calculated_by_monthwise.sales_revenue:0 }); + //set purchase + get_sumary.push({"sno":'b. ',"label":'Purchases ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.purchases) ? value.records.final_data[0].sales_declared_by_customer.purchases:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.purchases) ? value.records.final_data[0].sales_calculated_by_itemwise.purchases:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.purchases) ? value.records.final_data[0].sales_calculated_by_monthwise.purchases:0 }); + //set gross profit + get_sumary.push({"sno":'c. ',"label":'Gross Profit / Loss(a-b) ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.grossprofit) ? value.records.final_data[0].sales_declared_by_customer.grossprofit:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.grossprofit) ? value.records.final_data[0].sales_calculated_by_itemwise.grossprofit:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.grossprofit) ? value.records.final_data[0].sales_calculated_by_monthwise.grossprofit:0 }); + // set business expense + get_sumary.push({"sno":'d. ',"label":'Business Expenses ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.business_expenses) ? value.records.final_data[0].sales_declared_by_customer.business_expenses:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.business_expenses) ? value.records.final_data[0].sales_calculated_by_itemwise.business_expenses:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.business_expenses) ? value.records.final_data[0].sales_calculated_by_monthwise.business_expenses:0 }); + // set net profit / loss + get_sumary.push({"sno":'e. ',"label":'Net Profit / Loss(c-d) ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.netprofit) ? value.records.final_data[0].sales_declared_by_customer.netprofit:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.netprofit) ? value.records.final_data[0].sales_calculated_by_itemwise.netprofit:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.netprofit) ? value.records.final_data[0].sales_calculated_by_monthwise.netprofit:0 }); + // set household expenses + get_sumary.push({"sno":'f. ',"label":'Household Expenses ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.house_hold_expenses) ? value.records.final_data[0].sales_declared_by_customer.house_hold_expenses:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.house_hold_expenses) ? value.records.final_data[0].sales_calculated_by_itemwise.house_hold_expenses:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.house_hold_expenses) ? value.records.final_data[0].sales_calculated_by_monthwise.house_hold_expenses:0 }); + //set disposable income + get_sumary.push({"sno":'g. ',"label":'Disposable Income ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.disposable_income) ? value.records.final_data[0].sales_declared_by_customer.disposable_income:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.disposable_income) ? value.records.final_data[0].sales_calculated_by_itemwise.disposable_income:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.disposable_income) ? value.records.final_data[0].sales_calculated_by_monthwise.disposable_income:0 }); + //set net margin + get_sumary.push({"sno":'h. ',"label":'Net Margin ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.netmargin) ? value.records.final_data[0].sales_declared_by_customer.netmargin:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.netmargin) ? value.records.final_data[0].sales_calculated_by_itemwise.netmargin:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.netmargin) ? value.records.final_data[0].sales_calculated_by_monthwise.netmargin:0 }); + + // get conslidate sales / revenue details + (value.records.final_data[0].consolidated_report && value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_sales_revenue, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_sales_revenue, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_sales_revenue, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_sales_revenue ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_sales_revenue, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_sales_revenue ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Sales / Revenue ',"declared_by_customer":'', "derived_item_wise":'' ,"derived_sales_book":value.records.final_data[0].consolidated_report.consolidated_sales_revenue }) + :''; + // get conslidate net margin details + (value.records.final_data[0].consolidated_report && value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_nermagin ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_nermagin ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":'', "derived_item_wise":'' ,"derived_sales_book":value.records.final_data[0].consolidated_report.consolidated_nermagin }) + :''; + // get conslidate net profit details + (value.records.final_data[0].consolidated_report && value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nerprofit, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nerprofit, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nerprofit, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_nerprofit ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nerprofit, "derived_item_wise":'' ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_nerprofit ,"derived_sales_book":'' }) + : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":'', "derived_item_wise":'' ,"derived_sales_book":value.records.final_data[0].consolidated_report.consolidated_nerprofit }) + :''; + this.summaryItemSource=get_sumary; + } } 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 19c2839e9..2566a4a81 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 @@ -3,7 +3,7 @@ Sales Calculation - {{activateMariginCalculation}} + From eda5ed08462a529bce25078ba80406797dc5255d Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 7 Mar 2019 15:46:45 +0530 Subject: [PATCH 2/4] merge : kms --- .../list-pd/add-pd/add-pd.component.html | 9 +- .../list-pd/add-pd/add-pd.component.ts | 65 +++++--- .../list-pd/all-pd/all-pd.component.html | 4 +- .../completed-pd/completed-pd.component.html | 4 +- .../edit-pd-master.component.html | 3 +- .../edit-pd-master.component.ts | 20 ++- .../inprogress-pd.component.html | 4 +- .../qc-completed-pd.component.html | 4 +- .../scheduled-pd/scheduled-pd.component.html | 4 +- .../forms/address/address.component.html | 4 +- .../forms/address/address.component.ts | 10 -- .../assets-info/assets-info.component.html | 27 ++- .../assets-info/assets-info.component.ts | 37 ++--- .../banking-details.component.html | 6 +- .../banking-details.component.ts | 9 - .../business-assets-info.component.html | 20 +-- .../business-assets-info.component.ts | 15 +- .../business-banking-details.component.html | 6 +- .../business-banking-details.component.ts | 10 -- .../business-info.component.html | 12 +- .../business-info/business-info.component.ts | 87 +++++----- .../client-info/client-info.component.html | 14 +- .../client-info/client-info.component.ts | 10 -- .../current-loan/current-loan.component.html | 10 +- .../current-loan/current-loan.component.ts | 60 ++----- .../other-applicant-details.component.html | 2 +- .../other-applicant-details.component.ts | 10 -- .../employment-info.component.html | 27 ++- .../employment-info.component.ts | 48 ++++++ .../family-details.component.html | 6 +- .../family-details.component.ts | 10 -- .../financial-info.component.html | 52 +++--- .../financial-info.component.ts | 11 -- .../general-info/general-info.component.html | 6 +- .../general-info/general-info.component.ts | 10 -- .../loan-details/loan-details.component.html | 14 +- .../loan-details/loan-details.component.ts | 10 -- .../neighbour-hood.component.html | 18 +- .../neighbour-hood.component.ts | 10 -- .../other-income/other-income.component.html | 6 +- .../other-income/other-income.component.ts | 11 +- .../personal-info.component.html | 6 +- .../personal-info/personal-info.component.ts | 11 -- .../start-pd/forms/stock/stock.component.html | 154 ++++------------- .../start-pd/forms/stock/stock.component.ts | 155 +++++++----------- .../supplier-info.component.html | 18 +- .../supplier-info/supplier-info.component.ts | 12 +- 47 files changed, 427 insertions(+), 634 deletions(-) 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 1e1b622f6..f7df7d64c 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 @@ -75,16 +75,13 @@ - + - - Select - + Select {{SPL.subproduct_name}} - - + 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 7bd0368f0..b49203d34 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 @@ -32,6 +32,7 @@ export class AddPdComponent implements OnInit, OnDestroy { subProductList: any; lenderList: any; lenderBranchList: any; + customerSegmentAllList: any; customerSegmentList: any; stateList: any = []; cityList: any = []; @@ -136,7 +137,7 @@ export class AddPdComponent implements OnInit, OnDestroy { this._pd.getCustomersDetails().subscribe( data => { if (data.status == 200) { - this.customerSegmentList = data.records + this.customerSegmentAllList = data.records } }, error => this.errorMessage = error); } @@ -164,9 +165,12 @@ export class AddPdComponent implements OnInit, OnDestroy { //get sub product list based on prokduct id getSubproductList(productID: string) { + console.log('productID',productID); this.subProductList = this.productList.filter(item => item.product_id == productID); this.subProductList = this.subProductList[0].subproducts; this.subProductList = this.subProductList.filter(item => item.is_others == 0); + this.customerSegmentList = (productID != '4')?this.customerSegmentAllList:this.customerSegmentAllList.filter(s => (s.customer_segment).includes('Self')); + if(productID != '4'){this._PDtriggerForm.controls['fk_subproduct_id'].setValue('')} } @@ -253,7 +257,7 @@ export class AddPdComponent implements OnInit, OnDestroy { coapplicant_name: [null, Validators.compose([Validators.required])], coapplicant_mobile_no: [null,Validators.compose([Validators.minLength(10),Validators.maxLength(10)])], coapplicant_stdcode:[null, Validators.compose([Validators.minLength(3), Validators.maxLength(5), Validators.pattern('^[0-9]*$')])], - coapplicant_landline : [null,Validators.compose([Validators.minLength(12),Validators.maxLength(13)])], + coapplicant_landline: [null, Validators.compose([Validators.minLength(6), Validators.maxLength(8), Validators.pattern('^[0-9]*$')])], company_name:[null], relationship: [null], }); @@ -340,9 +344,14 @@ export class AddPdComponent implements OnInit, OnDestroy { this._PDtriggerForm.controls['fk_product_id'].setValidators([Validators.required]); this._PDtriggerForm.controls['fk_product_id'].updateValueAndValidity(); - - this._PDtriggerForm.controls['fk_subproduct_id'].setValidators([Validators.required]); - this._PDtriggerForm.controls['fk_subproduct_id'].updateValueAndValidity(); + + if(formValue.fk_product_id != '4'){ + this._PDtriggerForm.controls['fk_subproduct_id'].setValidators([Validators.required]); + this._PDtriggerForm.controls['fk_subproduct_id'].updateValueAndValidity(); + } + else{ + this._PDtriggerForm.controls['fk_subproduct_id'].setValue(''); + } this._PDtriggerForm.controls['fk_pd_type'].setValidators([Validators.required]); this._PDtriggerForm.controls['fk_pd_type'].updateValueAndValidity(); @@ -386,8 +395,13 @@ export class AddPdComponent implements OnInit, OnDestroy { this._PDtriggerForm.controls['fk_product_id'].clearValidators(); this._PDtriggerForm.controls['fk_product_id'].updateValueAndValidity(); - this._PDtriggerForm.controls['fk_subproduct_id'].clearValidators(); - this._PDtriggerForm.controls['fk_subproduct_id'].updateValueAndValidity(); + if(this._PDtriggerForm.controls.fk_product_id.value != '4'){ + this._PDtriggerForm.controls['fk_subproduct_id'].clearValidators(); + this._PDtriggerForm.controls['fk_subproduct_id'].updateValueAndValidity(); + } + else{ + this._PDtriggerForm.controls['fk_subproduct_id'].setValue(''); + } this._PDtriggerForm.controls['fk_pd_type'].clearValidators(); this._PDtriggerForm.controls['fk_pd_type'].updateValueAndValidity(); @@ -473,7 +487,7 @@ export class AddPdComponent implements OnInit, OnDestroy { "pd_contact_mobileno": formValue.lender_contact_mobile, "pd_contact_landline": lender_landline_no, "fk_product_id": formValue.fk_product_id, - "fk_subproduct_id": formValue.fk_subproduct_id, + "fk_subproduct_id": formValue.fk_product_id != 4 ? formValue.fk_subproduct_id : '', "fk_pd_type": formValue.fk_pd_type, "fk_customer_segment": formValue.fk_customer_segment, "loan_amount": formValue.loan_amount, @@ -489,6 +503,7 @@ export class AddPdComponent implements OnInit, OnDestroy { var pd_applicant_details: any = []; + var addresses_details: any = []; if (formValue.applicant_name) { pd_applicant_details.push({ "applicant_name": formValue.applicant_name, @@ -529,6 +544,20 @@ export class AddPdComponent implements OnInit, OnDestroy { pd_applicant_details.push(obj1) }); + if (formValue.addresses.length > 0) { + formValue.addresses.forEach((addressElement, itemIndex) => { + let addressobj = { + "addressline1": addressElement.addressline1.toUpperCase(), + "fk_city": addressElement.fk_city, + "fk_state": addressElement.fk_state, + "pincode": addressElement.pincode, + "other_pincode": addressElement.other_pincode, + } + addresses_details.push(addressobj); + }); + } + + // docs details let pd_form: FormData = new FormData(); @@ -544,31 +573,21 @@ export class AddPdComponent implements OnInit, OnDestroy { AllFilesObj.push(element.doc_name); }); pd_form.append("pd_details", JSON.stringify(pd_details)) + if (pd_applicant_details.length > 0) { pd_form.append("pd_applicant_details", JSON.stringify(pd_applicant_details)) } + if(addresses_details.length>0){ + pd_form.append("addresses", JSON.stringify(addresses_details)); + } + pd_form.append("pd_document_titles", JSON.stringify(AllFilesObj)) if (formValue.addtional_requirements.length > 0) { pd_form.append("addtional_requirements", JSON.stringify(formValue.addtional_requirements)) } - // formValue.addresses.forEach((addressElement, itemIndex) => { - // let addressobj = { - // "addressline": addressElement.addressline.toUpperCase(), - // "fk_city": addressElement.fk_city, - // "fk_state": addressElement.fk_state, - // "pincode": addressElement.pincode, - // "other_pincode": addressElement.other_pincode, - // } - - // }); - - if (formValue.addresses.length > 0) { - pd_form.append("addresses", JSON.stringify(formValue.addresses)) - } - this._pd.addPdDetails(pd_form).subscribe(result => { if (result.status == 200) { this.disableAfterSubmit = false; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html index 952abdbd1..9b5e92a98 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html @@ -82,9 +82,9 @@ - {{details.lender_full_name}} + {{details.lender_short_name}}
- {{details.product_abbr}}/{{details.subproduct_abbr}} + {{details.product_abbr}}/{{details.subproduct_abbr}}
{{details.loan_amount}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html index 9f6dac593..ae95eb38f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html @@ -78,8 +78,8 @@ - {{details.lender_full_name}}
- {{details.product_abbr}}/{{details.subproduct_abbr}}
+ {{details.lender_short_name}}
+ {{details.product_abbr}}/{{details.subproduct_abbr}}
{{details.loan_amount}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html index d6e682141..f661a0258 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html @@ -86,7 +86,8 @@ - + + Select 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 b7578d5a9..776528167 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 @@ -17,6 +17,7 @@ export class EditPdMasterComponent implements OnInit { productList:any; subProductList:any; lenderList:any; + customerSegmentAllList:any; customerSegmentList:any; stateList:any; cityList:any = []; @@ -100,7 +101,6 @@ export class EditPdMasterComponent implements OnInit { if(this.data.records.fk_product_id){ this.getSubproductList(this.data.records.fk_product_id); } - } }, error => this.errorMessage = error); } @@ -108,7 +108,7 @@ export class EditPdMasterComponent implements OnInit { this._pd.getCustomersDetails().subscribe( data => { if (data.status == 200) { - this.customerSegmentList=data.records + this.customerSegmentAllList=data.records } }, error => this.errorMessage = error); } @@ -158,7 +158,6 @@ export class EditPdMasterComponent implements OnInit { } } - // let getpincodeid = this.data.records.pincode != '' ? this.data.records.pincode != null ? (this.pincodeList.filter(data => data.pincode == this.data.records.pincode).pincode_id) // : this.data.records.pincode // : this.data.records.pincode; @@ -205,14 +204,19 @@ export class EditPdMasterComponent implements OnInit { } this.getCityList(val.fk_state,index); this.getPincode(val.pincode_id,index); + + console.log('this.addressesList.length',this.addressesList.length); + this.addressesDeactivited[this.addressesList.length] = true; addressesArray.push(this.createAddresses(obj)); }); } else{ + this.addressesDeactivited[0] = true; addressesArray.push(this.createAddresses(null)); } } else{ + this.addressesDeactivited[0] = true; addressesArray.push(this.createAddresses(null)); } }); @@ -225,6 +229,10 @@ export class EditPdMasterComponent implements OnInit { this.subProductList= this.productList.filter(item => item.product_id == productID); this.subProductList=this.subProductList[0].subproducts; + this.customerSegmentList=(productID != '4')?this.customerSegmentAllList:this.customerSegmentAllList.filter(s => (s.customer_segment).includes('Self')); + + // this.customerSegmentList = (productID != '4')?this.customerSegmentAllList:(this.customerSegmentAllList.filter(s => (s.customer_segment).includes('Self')),this._EditPDtriggerForm.controls['fk_subproduct_id'].setValue('')); + } // //get city list details based on state id @@ -272,12 +280,8 @@ export class EditPdMasterComponent implements OnInit { } }; addAddresses(index) { - console.log(index); - this.addressesDeactivited[index] = true; - console.log('this.addressesDeactivited[index]',this.addressesDeactivited[index]); this.addresses = this._EditPDtriggerForm.get('addresses') as FormArray; this.addresses.push(this.createAddresses(null)); - } removeAddresses(index: number,strflag : any) { @@ -439,7 +443,7 @@ export class EditPdMasterComponent implements OnInit { "pd_contact_mobileno": my_array.pd_contact_mobileno, "pd_contact_landline": concat_landline, "fk_product_id": my_array.fk_product_id, - "fk_subproduct_id": my_array.fk_subproduct_id, + "fk_subproduct_id": my_array.fk_product_id != '4' ? my_array.fk_subproduct_id : '', "fk_pd_type": my_array.fk_pd_type, "fk_customer_segment": my_array.fk_customer_segment, "loan_amount": my_array.loan_amount, diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html index 2b210d292..ec36e21ec 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html @@ -75,8 +75,8 @@ - {{details.lender_full_name}}
- {{details.product_abbr}}/{{details.subproduct_abbr}}
+ {{details.lender_short_name}}
+ {{details.product_abbr}}/{{details.subproduct_abbr}}
{{details.loan_amount}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html index 04626951e..61fb3c35e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html @@ -77,8 +77,8 @@ - {{details.lender_full_name}}
- {{details.product_abbr}}/{{details.subproduct_abbr}}
+ {{details.lender_short_name}}
+ {{details.product_abbr}}/{{details.subproduct_abbr}}
{{details.loan_amount}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html index bf3ad7162..e246206ab 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html @@ -76,8 +76,8 @@ - {{details.lender_full_name}}
- {{details.product_abbr}}/{{details.subproduct_abbr}}
+ {{details.lender_short_name}}
+ {{details.product_abbr}}/{{details.subproduct_abbr}}
{{details.loan_amount}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html index f1971d12f..25299b839 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html @@ -61,7 +61,7 @@ + formControlName="pincode_others" OnlyNumber type="text"> @@ -139,7 +139,7 @@
+ OnlyNumber type="text"> diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts index ea09b4586..8c0141199 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts @@ -518,16 +518,6 @@ createAddresses(AddressDetails): FormGroup { }); } - /** On Key Press Event For Numbers */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } - /** For DOCS Tab */ public viewerOptions: any = { navbar: false, diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html index 4572e9cad..b09397b92 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html @@ -158,8 +158,9 @@
- + {{"₹"}} {{OtherPremiumPaidInwords[s]}} Only + @@ -174,7 +175,7 @@
- + {{"₹"}} {{OtherSumAssuredInwords[s]}} Only @@ -210,7 +211,7 @@ - + @@ -254,7 +255,7 @@
- + {{"₹"}} {{OtherAppxMarketAmtInwords[i]}} Only @@ -279,14 +280,22 @@ - {{val.name}} - + --> + + + + {{val.name}} + + + @@ -309,14 +318,14 @@ Age of Asset in Years - + Purchase Year - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts index 2066a1bad..cf2dbe496 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts @@ -279,7 +279,7 @@ export class AssetsInfoComponent implements OnInit { // this.initDetails(), ]), // business_assets_details : this._formBuilder.array([]), - assets_form_remark:[value.assets_form_remark || 'check'] + assets_form_remark:[value.assets_form_remark] }); this.addAssetsDetailsWithData(value.assets_details); // this.addBusinessAssetsDetailsWithData(value.business_assets_details); @@ -611,17 +611,20 @@ export class AssetsInfoComponent implements OnInit { }; const control = this._assetsQuesFrom.controls['assets_details']; - // let Avaliablity = 1; - // val.name_of_the_owner.forEach(option => { - // if(option.id == 0 && option.group_id == 2){ - // Avaliablity = option.id; - // } - // }); - // this.isOtherOwner = Avaliablity == 0 ? true : false; + control.push(this.initDetailsWithdata(vals)); this.setAssetsDetailsWithData(vals.assets_mode, val.details, control.length - 1) } result.forEach((datas,index) => { + // let Avaliablity = 1; + // if(datas.name_of_the_owner.length>0){ + // datas.name_of_the_owner.forEach(option => { + // if(option.id == 0 && option.group_id == 2){ + // Avaliablity = option.id; + // } + // }); + // } + // this.isOtherOwner[index] = Avaliablity == 0 ? true : false; this.OtherAppxMarketAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.approximate_market_value); this.setRequiredValidation(datas.name_of_the_owner,index,'',4); }); @@ -840,16 +843,6 @@ export class AssetsInfoComponent implements OnInit { // this.getPdSupplierFormDetails(); // } - /** On Key Press Event For Number only Accepting */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } - /** To calculating Loan Elapsed Tenure both "Other Asset" And "Business Asset" using Flag */ loanTenureCalc(details ,flag) { @@ -872,7 +865,7 @@ export class AssetsInfoComponent implements OnInit { } setRequiredValidation(value,ParInx,ChdInx,flag) { - // console.log('value',value,'ParInx',ParInx,'ChdInx',ChdInx,'flag',flag); + console.log('value',value,'ParInx',ParInx,'ChdInx',ChdInx,'flag',flag); let ParCtrls = this._assetsQuesFrom.controls.assets_details; // console.log('ParCtrls',ParCtrls); let ChdCtrls:any = ParCtrls.controls[ParInx]; @@ -905,19 +898,21 @@ export class AssetsInfoComponent implements OnInit { if (flag == 4) { let Avaliablity = 1; // console.log('val',value); + if(value.length>0){ value.forEach(option => { if(option.id == 0 && option.group_id == 2){ Avaliablity = option.id; } }); + } if(Avaliablity == 0){ - // console.log('if Avaliablity',Avaliablity); + console.log('if Avaliablity',Avaliablity); // console.log('if this.isOtherOwner[ParInx]',this.isOtherOwner[ParInx]); ChdCtrls.controls.other_owner.setValidators([Validators.required]); this.isOtherOwner[ParInx] = true; // console.log('if this.isOtherOwner[ParInx]',this.isOtherOwner[ParInx]); }else if(Avaliablity == 1){ - // console.log('else Avaliablity',Avaliablity); + console.log('else Avaliablity',Avaliablity); // console.log('esle this.isOtherOwner[ParInx]',this.isOtherOwner[ParInx]); ChdCtrls.controls.other_owner.setValue(''); ChdCtrls.controls.other_owner.clearValidators(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html index 8f1d2edd7..c48fae6ce 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html @@ -147,7 +147,7 @@ + formControlName="limit" OnlyNumber type="text" (keyup)="inWords($event,i,1)"> {{"₹"}} {{amtInwords[i]}} Only
@@ -156,10 +156,10 @@
- + - +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts index 85969821f..1152b35b6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts @@ -357,13 +357,4 @@ export class BankingDetailsComponent implements OnInit { } } - /** On Key Press Event For Numbers */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html index c4a49beca..6d7073527 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html @@ -44,14 +44,14 @@ + (change)="checkWithExistBusinessYear($event.target.value,i)" OnlyNumber type="text"> {{yearErrorMessage[i]}} + OnlyNumber type="text" (change)="ConvertMonthintoYear($event.target.value,i)"> {{monthErrorMessage[i]}} @@ -90,7 +90,7 @@ + OnlyNumber type="text" (keyup)="inWords($event,i,9)"> {{"₹"}} {{RentAmtInwordsForAddress[i]}} Only Monthly Rent Amount Required @@ -101,7 +101,7 @@ + OnlyNumber type="text" autocomplete="off" (keyup)="inWords($event,i,10)"> {{"₹"}} {{appxMarketAmtInwordsForAddress[i]}} Only @@ -126,14 +126,14 @@ Approx Vintage + minlength="1" maxlength="3" OnlyNumber type="text" (keyup)="calculateVintagePurchase($event.target.value,i,3)"> Purchase Year + minlength="4" maxlength="4" OnlyNumber type="text" (keyup)="calculateVintagePurchase($event.target.value,i,4)">
@@ -288,7 +288,7 @@ + OnlyNumber type="text" (keyup)="inWords($event,i,8)"> {{"₹"}} {{RentAmtInwords[i]}} Only Monthly Rent Amount Required @@ -298,7 +298,7 @@
+ OnlyNumber type="text" autocomplete="off" (keyup)="inWords($event,i,1)"> {{"₹"}} {{appxMarketAmtInwords[i]}} Only @@ -323,14 +323,14 @@ Approx Vintage + minlength="1" maxlength="3" OnlyNumber type="text" (keyup)="calculateVintagePurchase($event.target.value,i,1)"> Purchase Year + minlength="4" maxlength="4" OnlyNumber type="text" (keyup)="calculateVintagePurchase($event.target.value,i,2)">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts index d2415150f..15938b197 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts @@ -608,12 +608,14 @@ export class BusinessAssetsInfoComponent implements OnInit { this.appxMarketAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.business_approximate_market_value); this.RentAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.business_monthly_rented_amt); let Avaliablity = 1; - + console.log('datas.business_name_of_the_owner.length',datas.business_name_of_the_owner.length); + if(datas.business_name_of_the_owner.length > 0){ datas.business_name_of_the_owner.forEach(option => { if(option.id == 0 && option.group_id == 2){ Avaliablity = option.id; } }); + } this.isOtherOwner[index] = Avaliablity == 0 ? true : false; }); @@ -777,17 +779,6 @@ export class BusinessAssetsInfoComponent implements OnInit { } } - /** On Key Press Event For Number only Accepting */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } - - /** To Convert Month into Year */ ConvertMonthintoYear(e,i) { // const address_control = this._EditPDtriggerForm.controls['addresses']; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html index 3fe220cc1..fce0202d3 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html @@ -82,7 +82,7 @@ + formControlName="limit" OnlyNumber type="text" (keyup)="inWords($event,i,1)"> {{"₹"}} {{amtInwords[i]}} Only
@@ -91,10 +91,10 @@
- + - +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts index 4206e8787..0be70f0f9 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts @@ -330,16 +330,6 @@ export class BusinessBankingDetailsComponent implements OnInit { } } - /** On Key Press Event For Numbers */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } - setRequiredValidation(value,item,flag) { if(flag == 1){ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html index a74cb1ed0..a4d93c429 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html @@ -52,7 +52,7 @@
- @@ -69,16 +69,16 @@
- + {{yearErrorMessage[i]}} - + {{monthErrorMessage[i]}} + formControlName="total_business_experiance" OnlyNumber type="text" (keyup)="getWorkExperience(members.value,i)" autocomplete="off" required (change)="checkWithExistTotalWorkExperience($event.target.value,i,members)"> {{errorMessageForExistTotalWorkExperience[i]}}
@@ -1158,7 +1158,7 @@ - + Export Sale As a % Total Sales diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts index e6c418c2a..3f7db69fb 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts @@ -166,7 +166,7 @@ export class BusinessInfoComponent implements OnInit { const retailControl: any = this.businessForm.controls['retail_trading_activity_details']; const wholesaleControl: any = this.businessForm.controls['wholesale_trading_activity_details']; const serviceProviderControl: any = this.businessForm.controls['service_provider_activity_details']; - const othersControl: any = this.businessForm.controls['others_activity_details']; + // const othersControl: any = this.businessForm.controls['others_activity_details']; if (data.status == 200) { let DocArray: any; @@ -553,25 +553,26 @@ export class BusinessInfoComponent implements OnInit { businessVal.service_provider_activity_details=[]; } - if(data.records.others_activity_details){ + //others type of Activity_details comment + // if(data.records.others_activity_details){ - // update others activity details - let selectedOthers = Object.keys(data.records.others_activity_details).map(function (key) { - return data.records.others_activity_details[key]; - }); - if(selectedOthers.length > 0) { - selectedOthers.forEach((element,index)=>{ - othersControl.push(this.createOthersActivity()); - }); - businessVal.others_activity_details=selectedOthers; - } - else{ - businessVal.others_activity_details=[]; - } - } - else { - businessVal.others_activity_details=[]; - } + // // update others activity details + // let selectedOthers = Object.keys(data.records.others_activity_details).map(function (key) { + // return data.records.others_activity_details[key]; + // }); + // if(selectedOthers.length > 0) { + // selectedOthers.forEach((element,index)=>{ + // othersControl.push(this.createOthersActivity()); + // }); + // businessVal.others_activity_details=selectedOthers; + // } + // else{ + // businessVal.others_activity_details=[]; + // } + // } + // else { + // businessVal.others_activity_details=[]; + // } if(businessVal.applicant_use_pos_machines == 'yes'){ this.businessForm.controls.no_of_pos_machines.setValue(businessVal.no_of_pos_machines); const posControl: any = this.businessForm.controls['pos_machines_details']; @@ -660,7 +661,7 @@ export class BusinessInfoComponent implements OnInit { retail_trading_activity_details: this.fb.array([]), wholesale_trading_activity_details: this.fb.array([]), service_provider_activity_details: this.fb.array([]), - others_activity_details: this.fb.array([]), + // others_activity_details: this.fb.array([]), }); } @@ -724,15 +725,15 @@ export class BusinessInfoComponent implements OnInit { serviceControl.push(this.createServiceActivity()); } - if(event.value.exist_status==true && event.value.type_of_activity_id==1){ - let othersControl = this.businessForm.controls['others_activity_details']; - othersControl.controls = []; - othersControl.setValue([]); - } - else if(event.value.exist_status==false && event.value.type_of_activity_id==1){ - let othersControl = this.businessForm.controls['others_activity_details']; - othersControl.push(this.createOthersActivity()); - } + // if(event.value.exist_status==true && event.value.type_of_activity_id==1){ + // let othersControl = this.businessForm.controls['others_activity_details']; + // othersControl.controls = []; + // othersControl.setValue([]); + // } + // else if(event.value.exist_status==false && event.value.type_of_activity_id==1){ + // let othersControl = this.businessForm.controls['others_activity_details']; + // othersControl.push(this.createOthersActivity()); + // } // check activity type for make dosument sighted filed dynamically this.businessForm.value.manufacturing_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl(this.businessForm.value.export_import_cert, Validators.required)) : this.businessForm.removeControl('export_import_cert'); this.businessForm.value.manufacturing_activity_details.length > 0 ? this.businessForm.addControl('factory_cert', new FormControl(this.businessForm.value.factory_cert, Validators.required)) : this.businessForm.removeControl('factory_cert'); @@ -1208,7 +1209,7 @@ export class BusinessInfoComponent implements OnInit { this._pd.getAllMasterDatas(master_name).subscribe(data => { data.records.forEach(val => { let entityTypeControl = this.businessForm.controls['select_business_activity_type']; - if (val.isactive == 1) { + if (val.isactive == 1 && val.type_of_activity_id != 1) { this.activityData.push(val); } }) @@ -1325,15 +1326,15 @@ export class BusinessInfoComponent implements OnInit { } // add more others details - addMoreOthersActivity() { - let othersControl = this.businessForm.controls['others_activity_details']; - othersControl.push(this.createOthersActivity()); - } + // addMoreOthersActivity() { + // let othersControl = this.businessForm.controls['others_activity_details']; + // othersControl.push(this.createOthersActivity()); + // } - deleteOthersActivity(index) { - let othersControl = this.businessForm.controls['others_activity_details']; - othersControl.removeAt(index); - } + // deleteOthersActivity(index) { + // let othersControl = this.businessForm.controls['others_activity_details']; + // othersControl.removeAt(index); + // } // update partner group other form control changePartnerGroup(value,key) { @@ -1657,16 +1658,6 @@ export class BusinessInfoComponent implements OnInit { return []; } } - - /** On Key Press Event For Amount */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } /** To Convert Amount into Words */ // inWords(e){ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html index a0140fec6..c2eb30ada 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html @@ -65,11 +65,11 @@ Enter Valid Mobile Number. - + Enter Valid STD Code Number.   -   - + Enter Valid LandLine Number.
@@ -177,15 +177,15 @@
- + Enter Valid Mobile Number. - + Enter Valid STD Code Number.   -   - + Enter Valid LandLine Number.
@@ -299,11 +299,11 @@ Enter Valid Mobile Number. - + Enter Valid STD Code Number.   -   - + Enter Valid LandLine Number. diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts index 94b2c1134..a453b926f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts @@ -676,16 +676,6 @@ export class ClientInfoComponent implements OnInit { // this._addQuesFrom.reset(); } - /** On Key Press Event For Mobile Number */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } - selectedPersonDesignation(items,e,flag){ if(flag == 1){ e==1 ? items.controls['other_person_designation'].setValidators([Validators.required]) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html index 0b36181b6..4398ec76f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html @@ -54,7 +54,7 @@ - + {{"₹"}} {{amtInwords[i]}} Only @@ -96,8 +96,8 @@ - - + + {{"₹"}} {{emiAmtInwords[i]}} Only + + Select + {{ cl.company_name }} +

- + - +
@@ -42,10 +46,23 @@
- + + + Select + + {{person.applicant_name | titlecase}} + + +
@@ -83,7 +100,7 @@
- + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts index 8b799ce04..c7d4c40e7 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.ts @@ -43,6 +43,11 @@ export class EmploymentInfoComponent implements OnInit { private notifier: NotifierService; public pd_cus_segment:string; public frequency_data:any[]; + public company_list:any[]; + public person_met_list:any[]; + public company_related_applicants_list:any[]; + public company_relationship_list:any[]; + public filtered_company_relationship_list:any[]; constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, private router: Router, @@ -78,11 +83,26 @@ export class EmploymentInfoComponent implements OnInit { } }; ngOnInit() { + console.log('clear'); + console.clear(); this.pd_cus_segment=this.pd_all_details.pdmaster_details.customer_segment_abbr.toUpperCase(); this.initemploymentForm(); let params: any = {}; params.pd_id = this.pdid; params.pd_form_id = this.form_id; + console.log('abcd'); + let param: any = {}; + param.pd_id = this.pdid; + param.pd_form_id = '18'; + this._pd.retriveForm(param).subscribe(data => { + if(data.dataStatus) { + console.log(data.records); + this.company_list = data.records.companies.filter(com=>com.is_active == true ); + this.person_met_list = data.records.individuals.filter(app=>app.is_person_met == true && app.is_active == true); + this.company_related_applicants_list = data.records.company_with_relationships; + } + }); + this._pd.retriveForm(params).subscribe(value => { if (value.status == 200) { this.employmentForm.controls['employer_name'].setValue(value.records.employer_name); @@ -120,7 +140,17 @@ export class EmploymentInfoComponent implements OnInit { this.frequency_data = this.frequency_data.filter(freq=>freq.isactive == 1 ); } }); + + this._pd.getAllMasterDatas('COMPANYRELATIONSHIPS').subscribe( + data => { + if (data.status == 200) { + this.company_relationship_list = data.records.filter(item => item.isactive == 1); + this.company_relationship_list = data.records.filter(item => item.name != 'Others'); + this.company_relationship_list.push({'company_relationship_id':0,'name':'Not Applicable'}); + } + }); } + public initemploymentForm(): void { this.employmentForm = this.fb.group({ employer_name: ['', Validators.compose([Validators.required])], @@ -141,10 +171,28 @@ export class EmploymentInfoComponent implements OnInit { bonus_type: [''], bonus_type_other: [''], any_delays: ['', Validators.compose([Validators.required])], + // employment_details: this.fb.array([]), employment_remarks: ['', Validators.compose([Validators.required])], }); } + filtercompanyrelationship(companyid,applicantid){ + var array = companyid.split("-"); + // console.log(array[0]); + // console.log('companyid',companyid); + // console.log('applicantid',applicantid); + let data = this.company_related_applicants_list.filter(freq=>freq.relation_to_company == array[0] &&freq.applicant_name == applicantid); + + if(data.length>0){ + + this.filtered_company_relationship_list = this.company_relationship_list.filter(freq=>freq.company_relationship_id == data[0].company_relationship ); + this.employmentForm.controls['designation_person_met'].setValue(this.filtered_company_relationship_list[0]['name'] +' '+array[1]); + } + else{ + this.employmentForm.controls['designation_person_met'].setValue(''); + } + } + ConvertMonthintoYear(e){ let how_long_year = this.employmentForm.controls.how_long_year.value; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html index e508f58cb..4dd6f72fb 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html @@ -74,7 +74,7 @@ --> - + @@ -91,7 +91,7 @@ - + {{"₹"}} {{RentAmount[i]}} Only
@@ -146,7 +146,7 @@ - + {{"₹"}} {{IncomePerMonth[i]}} Only diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts index fadbf148e..47a10bbf4 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts @@ -568,16 +568,6 @@ removeFamilyMembers(inx,i) { // }); // } - /** On Key Press Event For Age */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } - /** To Convert Amount into Words */ inWords(e,flag:number,i){ switch(flag){ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html index 080e1b084..0841a8fe4 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html @@ -36,13 +36,13 @@ Enter year from which financials provided + OnlyNumber type="text" [readonly]="isReadOnly"> Invalid year format + OnlyNumber type="text" [readonly]="isReadOnly">
@@ -57,7 +57,7 @@ + OnlyNumber type="text" (keyup)="inWords($event,i,1)"> {{"₹"}} {{FY_annualSalesInwords[i]}} Only @@ -65,7 +65,7 @@ + OnlyNumber type="text" readonly> No difference in Sales in FY @@ -99,7 +99,7 @@
- + Net Profit @@ -110,13 +110,13 @@ + OnlyNumber type="text" (keyup)="inWords($event,i,2)"> {{"₹"}} {{FY_netProfitAmtInwords[i]}} Only @@ -124,13 +124,13 @@ + OnlyNumber type="text" (keyup)="inWords($event,i,3)"> {{"₹"}} {{FY_netLossAmtInwords[i]}} Only @@ -139,7 +139,7 @@ @@ -174,7 +174,7 @@ + OnlyNumber type="text" readonly> No difference in Profit sales % in FY @@ -277,17 +277,17 @@
@@ -302,14 +302,14 @@
{{"₹"}} {{AV_netProfitAmtFrmInwords[i]}} Only {{"₹"}} {{AV_netProfitAmtToInwords[i]}} Only @@ -320,7 +320,7 @@ {{"₹"}} {{AV_netProfitAmtInwords[i]}} Only @@ -330,16 +330,16 @@ + OnlyNumber type="text" (change)="calculateMarginLoss( i, details);"> + OnlyNumber type="text" (change)="calculateMarginLoss( i, details);"> @@ -352,14 +352,14 @@
{{"₹"}} {{AV_netLossAmtFrmInwords[i]}} Only {{"₹"}} {{AV_netLossAmtToInwords[i]}} Only @@ -370,7 +370,7 @@ + formControlName="estimate_net_loss" OnlyNumber type="text" readonly> {{"₹"}} {{AV_netLossAmtInwords[i]}} Only @@ -400,15 +400,15 @@ + formControlName="receive_the_money_in_days" OnlyNumber type="text"> + formControlName="pay_the_money_in_days" OnlyNumber type="text"> + formControlName="unsold_stock_lies_in_days" OnlyNumber type="text"> diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts index 0d6adea81..90f55cd0e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts @@ -1693,17 +1693,6 @@ export class FinancialInfoComponent implements OnInit { }); } - /** On Key Press Event For Input Field */ - keyPress(event: any) { - //const pattern = /[0-9\-\.\ ]/; - const pattern = /[0-9\.]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } - /** To Convert Amount into Words */ inWords(e,i,flag:number){ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html index cba606396..d4f878cd9 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html @@ -49,7 +49,7 @@ Age + OnlyNumber type="text" autocomplete="off"> @@ -126,12 +126,12 @@

Number of Years For Which The Business Has Been Running

+ autocomplete="off" OnlyNumber type="text"> Please Enter Correct Year + autocomplete="off" OnlyNumber type="text" (change)="ConvertMonthintoYearforBusiness($event.target.value,c)"> {{"₹"}} {{loanAmtInWords}} Only Loan Tenure applied for? - @@ -59,7 +59,7 @@ {{"₹"}} {{balTxrfAmtInWords}} Only @@ -80,7 +80,7 @@ - {{"₹"}} @@ -106,7 +106,7 @@ {{"₹"}} {{ownContributionInWords}} Only @@ -134,7 +134,7 @@ + OnlyNumber type="text" (keyup)="inWords($event,6)" autocomplete="off"> {{"₹"}} {{emiAmtInWords}} Only @@ -204,7 +204,7 @@ {{"₹"}} {{emvAmtInWords}} Only diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts index eb7badb24..57763bc9c 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts @@ -524,16 +524,6 @@ export class LoanDetailsComponent implements OnInit { } - /** On Key Press Event For Amount */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } - /** To Convert Amount into Words */ inWords(e, flag: number) { switch (flag) { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html index 4f23b10b7..ace8290ba 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html @@ -43,17 +43,17 @@ - +
- + - +
@@ -134,15 +134,15 @@ - + Enter Valid Mobile Number. - + Enter Valid STD Code. - - + Enter Valid Landline Number. @@ -162,13 +162,13 @@

Period of Relationship

- + - + - + {{"₹"}} {{amtInwords[r]}} Only diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts index 2a8551fcb..cd1edeaae 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts @@ -222,16 +222,6 @@ export class NeighbourHoodComponent implements OnInit { remove_control.removeAt(renoveIndex) } - /** On Key Press Event For Mobile Number */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } - //save heighbourhood forms saveNeighbourhood(formData:any){ let resultMessage:string=''; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html index aaef973c2..0e39034b8 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html @@ -59,7 +59,7 @@ - + Rental Info Details @@ -78,7 +78,7 @@ - + {{"₹"}} {{amtInwords[i]}} Only @@ -333,7 +333,7 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts index 193103930..46af33780 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts @@ -237,22 +237,13 @@ public viewerOptions: any = { }); } - /** On Key Press Event For Amount */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } /** Amount InWords */ inWords(e,i){ this.amtInwords[i] = this._pd.convertNumberToWords(e.target.value); } Toview(){ - alert('Rental Info '); + // alert('Rental Info '); // const dialogRef = this.dialog.open(RentalInfoComponent, { // data: {} // }); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html index a3459ae4f..e9e4c39a5 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html @@ -39,7 +39,7 @@ - + Enter Valid Age. @@ -69,7 +69,7 @@ - + Enter Valid Vintage. @@ -155,7 +155,7 @@ - + Enter Valid Vintage. diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts index c06d1da6a..e5a386855 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts @@ -193,17 +193,6 @@ public viewerOptions: any = { }, error => this.errorMessage = error); } - -/** On Key Press Event For Mobile Number */ -keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } -} - // init form details public initFormDetails(): void { this._personalForm = this._fb.group({ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html index b6e4a311c..f1ecb659f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html @@ -9,7 +9,6 @@
-
@@ -18,9 +17,6 @@
-
Manufacturing Stock Details
@@ -33,8 +29,7 @@ - - + Select Add Stock Details No Stock Observed @@ -42,7 +37,7 @@ - + - - {{"₹"}} {{M_rawValueInWords[a]}} Only + + {{"₹"}} {{mrm.get('raw_value').value | numberToWords}} Only - @@ -81,18 +73,19 @@
- - - Select - Yes - No - - - - Please comment on the stock level observed? - - - + + + + Select + Yes + No + + + + Please comment on the stock level observed? + + +
@@ -104,8 +97,7 @@ - - + Select Add Stock Details No Stock Observed @@ -113,7 +105,7 @@ - + - - {{"₹"}} {{M_goodsValueInWords[b]}} Only + + {{"₹"}} {{mfg.get('goods_value').value | numberToWords}} Only - - -
@@ -154,10 +136,6 @@ Add More Finished Goods
-
@@ -167,10 +145,6 @@ - -
Retail Trading Details
@@ -183,7 +157,7 @@ - + Select Add Stock Details No Stock Observed @@ -191,7 +165,7 @@ - + - - {{"₹"}} {{R_tradedGoodsValueInWords[e]}} Only + + {{"₹"}} {{item.get('estimated_traded_goods_value').value | numberToWords}} Only - - -
@@ -256,11 +206,6 @@ - - -
Wholesale Trading Details
@@ -274,7 +219,7 @@ - + Select Add Stock Details No stock observed @@ -282,7 +227,7 @@ - + Select {{uom.name}} - - + + - - {{"₹"}} {{T_tradedGoodsValueInWords[g]}} Only + + {{"₹"}} {{tradetg.get('estimated_traded_goods_value').value | numberToWords}} Only - - - - -
@@ -347,7 +267,7 @@ -
+

@@ -494,12 +414,4 @@ {{ errorMessage }}
Fill Business Form First! / No Company Found at this ID {{company_id}}! ....
- - - - - \ No newline at end of file + \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts index 42ac54c0c..0f49afc58 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts @@ -41,25 +41,9 @@ export class StockComponent implements OnInit { form_id: number; company_id: string; - // rawmaterial : any; + RMCommentCard: boolean = false; + TGCommentCard: boolean = false - M_rawValueInWords : any = []; - M_goodsValueInWords : any = []; - R_tradedGoodsValueInWords : any = []; - T_tradedGoodsValueInWords : any = []; - - - // rawMaterialAccess: Boolean = false; - // finishedGoodsAccess: Boolean = false; - // tradeConcernAccess: Boolean = false; - // serviceAccess: Boolean = false; - - mrmCommentFlag: boolean = false; - finishedAndTradedGoodsCommentCard : boolean; - mfgCommentFlag:any=[]; - rtrdCommentFlag:any=[]; - wtrdCommentFlag:any=[]; - serviceProviderForm: Boolean = false; suppliers_raw_materials : any = []; suppliers_retail_trade_details : any = []; @@ -189,7 +173,6 @@ export class StockComponent implements OnInit { if (val.type_of_activity_id == 2) { if(val.products){ - if(dataForm.manufacturing_details[0].manufacturing_finished_goods ){this.finishedAndTradedGoodsCommentCard = true;} let manufacturing_temparr = []; manufacturing_temparr['manufacturing_raw_materials'] = dataForm.manufacturing_details[0].manufacturing_raw_materials; this.stockForms.controls['manufacturing_details']['controls'][0].controls['is_sufficiant_raw'].setValue(dataForm.manufacturing_details[0].is_sufficiant_raw), @@ -201,7 +184,6 @@ export class StockComponent implements OnInit { } if (val.type_of_activity_id == 3) { if(val.products){ - this.finishedAndTradedGoodsCommentCard = true; let retail_temparr = []; retail_temparr['retail_traded_goods'] = dataForm.retail_details[0].retail_traded_goods; this.initRetailDetails(retail_temparr); @@ -209,7 +191,6 @@ export class StockComponent implements OnInit { } if (val.type_of_activity_id == 4) { if(val.products){ - this.finishedAndTradedGoodsCommentCard = true; let trading_temparr = []; trading_temparr['trading_traded_goods'] = dataForm.trade_details[0].trading_traded_goods; this.initTradingDetails(trading_temparr); @@ -243,7 +224,6 @@ export class StockComponent implements OnInit { api.forEach(val => { if (val.type_of_activity_id == 2) { if(val.products){ - if(val.products){this.finishedAndTradedGoodsCommentCard = true;} this.suppliers_raw_materials = rm_api; this.suppliers_finished_goods = val.products; this.initManufacturingDetails(null); @@ -253,14 +233,12 @@ export class StockComponent implements OnInit { } if (val.type_of_activity_id == 3) { if(val.products){ - this.finishedAndTradedGoodsCommentCard = true; this.suppliers_retail_trade_details = val.products; this.initRetailDetails(null); } } if (val.type_of_activity_id == 4) { if(val.products){ - this.finishedAndTradedGoodsCommentCard = true; this.suppliers_wholesale_trade_details =val.products; this.initTradingDetails(null); } @@ -294,7 +272,6 @@ export class StockComponent implements OnInit { api.forEach(val => { if (val.type_of_activity_id == 2) { if(val.products){ - if(val.products){this.finishedAndTradedGoodsCommentCard = true;} this.suppliers_finished_goods = val.products; this.suppliers_raw_materials = rm_api; this.initManufacturingDetails(null); @@ -305,13 +282,11 @@ export class StockComponent implements OnInit { if (val.type_of_activity_id == 3) { if(val.products){ this.suppliers_retail_trade_details= val.products; - this.finishedAndTradedGoodsCommentCard = true; this.initRetailDetails(null); } } if (val.type_of_activity_id == 4) { if(val.products){ - this.finishedAndTradedGoodsCommentCard = true; this.suppliers_wholesale_trade_details = val.products; this.initTradingDetails(null); } @@ -428,9 +403,7 @@ tradingFormCreation(val) { if(datas.manufacturing_raw_materials != undefined){ // for (let val of datas.manufacturing_raw_materials) { datas.manufacturing_raw_materials.forEach((val,index) => { - if(val.raw_value){ - this.inWords(val.raw_value,1,index); - } + this.checkComments(val.stock_observed,1,index); // this.checkComments(val.is_sufficiant_raw,1,index); rawMaterial.push(this.createRawmaterial(val)); }); @@ -441,13 +414,8 @@ tradingFormCreation(val) { if(datas.manufacturing_finished_goods != undefined){ // for (let val of datas.manufacturing_finished_goods) { datas.manufacturing_finished_goods.forEach((val,index) => { - - if(val.goods_value){ - this.inWords(val.goods_value,2,index); - } - + this.checkComments(val.goods_observed,2,index); finishedGoods.push(this.createGoods(val)); - }); } else{ @@ -483,7 +451,7 @@ tradingFormCreation(val) { }) } } - + initRetailDetails(datas) { const tradedGoods = this.stockForms.controls['retail_details']['controls'][0].controls['retail_traded_goods']; @@ -512,13 +480,8 @@ tradingFormCreation(val) { if(datas.retail_traded_goods !== undefined){ // for (let val of datas.retail_traded_goods) { datas.retail_traded_goods.forEach((val,index) => { - - if(val.estimated_traded_goods_value){ - this.inWords(val.estimated_traded_goods_value,3,index); - } - + this.checkComments(val.traded_goods_observed,3,index); tradedGoods.push(this.createTradedGoods(val)); - }); } else{ @@ -607,10 +570,7 @@ tradingFormCreation(val) { { // for (let val of datas.trading_traded_goods) { datas.trading_traded_goods.forEach((val,index) => { - - if(val.estimated_traded_goods_value){ - this.inWords(val.estimated_traded_goods_value,4,index); - } + this.checkComments(val.traded_goods_observed,4,index); tradedGoods.push(this.createTradedGoods(val)); }); } @@ -777,7 +737,7 @@ tradingFormCreation(val) { this._pd.getAllMasterDatas('UOM').subscribe(data => { data.records.forEach(val => { - if (val.isactive == 1) { + if (val.isactive == 1 && val.is_land_uom == 0 || val.is_land_uom == 2) { this.uomData.push(val); } }) @@ -794,53 +754,58 @@ tradingFormCreation(val) { } } - /** To Convert Amount into Words */ - inWords(e,flag:number,i){ +ManufacturingCounterArray: any = []; +FinishedCounterArray: any = []; +RetailCounterArray: any = []; +WholeSaleCounterArray: any = []; - switch(flag){ - case 1 : - this.M_rawValueInWords[i] = this._pd.convertNumberToWords(e); - break; - case 2 : - this.M_goodsValueInWords[i] = this._pd.convertNumberToWords(e); - break; - case 3 : - this.R_tradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e); - break; - case 4 : - this.T_tradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e); - break; - default: - break; - } - } +checkComments(value,flag,index){ + // console.log(value,flag,index); + if(flag == 1){ + this.ManufacturingCounterArray[index] = value == "yes" ? 1 : 0 + let RMOverallCount = this.ManufacturingCounterArray.reduce((sum, val) => sum + +val, 0); + this.RMCommentCard = RMOverallCount > 0 ? true : false ; + } + if(flag == 2){ + this.FinishedCounterArray[index] = value == "yes" ? 1 : 0 + } + if(flag == 3){ + this.RetailCounterArray[index] = value == "yes" ? 1 : 0 + } + if(flag == 4){ + this.WholeSaleCounterArray[index] = value == "yes" ? 1 : 0 + } + let FGOverallCount = this.FinishedCounterArray.reduce((sum, val) => sum + +val, 0); + let RTGOverallCount = this.RetailCounterArray.reduce((sum, val) => sum + +val, 0); + let WTGOverallCount = this.WholeSaleCounterArray.reduce((sum, val) => sum + +val, 0); + let TGOverallCount = FGOverallCount + RTGOverallCount + WTGOverallCount; + this.TGCommentCard = TGOverallCount > 0 ? true : false ; +} - - checkComments(e,flag,index){ - - if(flag == 1 && e=='no'){ - this.mrmCommentFlag = true; - } - else if(flag == 1 && e!='no'){ - this.mrmCommentFlag = false; - } - if(flag == 2 && e=='no'){ - this.mfgCommentFlag[index] = true; - } - else if(flag == 2 && e!='no'){ - this.mfgCommentFlag[index] = false; - } - if(flag == 3 && e=='no'){ - this.rtrdCommentFlag[index] = true; - } - else if(flag == 3 && e!='no'){ - this.rtrdCommentFlag[index] = false; - } - if(flag == 4 && e=='no'){ - this.wtrdCommentFlag[index] = true; - } - else if(flag == 4 && e!='no'){ - this.wtrdCommentFlag[index] = false; - } - } + // checkComments(e,flag,index){ + // if(flag == 1 && e=='no'){ + // this.mrmCommentFlag = true; + // } + // else if(flag == 1 && e!='no'){ + // this.mrmCommentFlag = false; + // } + // if(flag == 2 && e=='no'){ + // this.mfgCommentFlag[index] = true; + // } + // else if(flag == 2 && e!='no'){ + // this.mfgCommentFlag[index] = false; + // } + // if(flag == 3 && e=='no'){ + // this.rtrdCommentFlag[index] = true; + // } + // else if(flag == 3 && e!='no'){ + // this.rtrdCommentFlag[index] = false; + // } + // if(flag == 4 && e=='no'){ + // this.wtrdCommentFlag[index] = true; + // } + // else if(flag == 4 && e!='no'){ + // this.wtrdCommentFlag[index] = false; + // } + // } } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html index 209226420..b15d9e11c 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html @@ -55,15 +55,15 @@
- + Enter Valid Mobile Number. - + Enter Valid STD Code Number.   -   - + Enter Valid LandLine Number.
@@ -117,7 +117,7 @@
+ type="number" autocomplete="off" OnlyNumber type="text" maxlength="3">
@@ -172,16 +172,16 @@
- + Enter Valid Mobile Number. - + Enter Valid STD Code Number.   -   - + Enter Valid LandLine Number.
@@ -205,7 +205,7 @@
No.of days of Credit Provided by Supplier @@ -233,7 +233,7 @@
-
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts index abf5bb447..842a1a255 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts @@ -516,17 +516,7 @@ export class SupplierInfoComponent implements OnInit { /** To Reset Popup Data */ onReset() { // this._addQuesFrom.reset(); - } - - /** On Key Press Event For Mobile Number */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } + } selectedPersonDesignation(items,e,flag){ if(flag == 1){ From 6e83bc6c6b15c81ebef00668ed02bfd82dec14c8 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 7 Mar 2019 17:16:50 +0530 Subject: [PATCH 3/4] ai changes --- .../forms/assessed-income/assessed-income.component.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss index 8f0e25006..44718edc9 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.scss @@ -178,7 +178,7 @@ background-color:rgb(253, 221, 160); } .mat-row:nth-child(11){ - background-color:rgb(253, 221, 160);; + background-color:rgb(253, 221, 160); } From 94b0e0deea98b093b9db84908a411798a7aa1f54 Mon Sep 17 00:00:00 2001 From: gandhimathi Date: Thu, 7 Mar 2019 19:34:33 +0530 Subject: [PATCH 4/4] ai changes --- .../start-pd/forms/assessed-income/assessed-income.component.ts | 2 ++ 1 file changed, 2 insertions(+) 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 99f697a91..cde318935 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 @@ -149,6 +149,8 @@ public viewerOptions: any = { } // set sumary table headers + this.displayedSummaryColumns=[]; + this.summaryItemSource=[]; if(value.records.final_data.length >0){ //set column name (value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? this.displayedSummaryColumns.push("position_1","position_2","position_3","position_4")