diff --git a/ng6-seed/sineedge_prod_270219.zip b/ng6-seed/sineedge_prod_270219.zip new file mode 100644 index 000000000..689fbac9d Binary files /dev/null and b/ng6-seed/sineedge_prod_270219.zip differ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts index 2f75c964a..314a966f4 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts @@ -136,22 +136,47 @@ export class CurrentLoanComponent implements OnInit { const control = this.currentLoanForm.controls['loan_details']; if (value.status == 200) { - + console.log('value.records',value.records); this.currentLoanForm.controls['existing_loan'].setValue(value.records.existing_loan); this.currentLoanForm.controls['currentloan_remarks'].setValue(value.records.currentloan_remarks); if (value.records.existing_loan == 'Yes') { - var result = Object.keys(value.records.loan_details).map(function (key) { - return value.records.loan_details[key]; + console.log('value.records.loan_details',); + let loandetails = value.records.loan_details + + var result = Object.keys(loandetails).map(function (key) { + return loandetails[key]; }); + + const control = this.currentLoanForm.controls['loan_details']; if (result.length > 0) { result.forEach((val,index) => { this.amtInwords[index] = this._pd.convertNumberToWords(val.loan_amount); this.emiAmtInwords[index] = this._pd.convertNumberToWords(val.emi); this.selectedfrequency(val.frequency,index); //this.selectedLoanTakenBy(val.loan_taken_by,index); + + let objs = { + 'label': val.loan_amount, + 'loan_amount': val.loan_amount, + 'frequency':val.frequency, + 'other_frequency':val.other_frequency, + 'emi': val.emi, + 'loan_type': val.loan_type, + 'others_loan_type': val.others_loan_type, + 'loan_taken_by':val.loan_taken_by, + 'others_loan_taken':val.others_loan_taken, + 'lender': val.lender, + 'others_lender':val.others_lender, + 'original_tenure': val.original_tenure, + 'current_balance_tenure': val.current_balance_tenure, + 'elapsed_tenure':val.elapsed_tenure + } + control.push(this.createLoanDetail(objs)); + }); - this.currentLoanForm.controls['loan_details'].setValue(result); + + // this.currentLoanForm.controls['loan_details'].setValue(result_data); } else { // control.push(this.createLoanDetail()); } @@ -424,19 +449,19 @@ export class CurrentLoanComponent implements OnInit { createLoanDetail(data) { return this.fb.group({ label: data == null ? [''] : [data.label], - loan_amount: [''], - frequency:[''], - other_frequency:[''], - emi: [''], - loan_type: [''], - others_loan_type: [''], - loan_taken_by:[''], - others_loan_taken:[''], - lender: [''], - others_lender:[''], - original_tenure: [''], - current_balance_tenure: [''], - elapsed_tenure:[''] + loan_amount: null ? [''] : [data.loan_amount], + frequency:null ? [''] : [data.frequency], + other_frequency:null ? [''] : [data.other_frequency], + emi: null ? [''] : [data.emi], + loan_type: null ? [''] : [data.loan_type], + others_loan_type: null ? [''] : [data.others_loan_type], + loan_taken_by:null ? [''] : [data.loan_taken_by], + others_loan_taken:null ? [''] : [data.others_loan_taken], + lender: null ? [''] : [data.lender], + others_lender:null ? [''] : [data.others_lender], + original_tenure: null ? [''] : [data.original_tenure], + current_balance_tenure: null ? [''] : [data.current_balance_tenure], + elapsed_tenure:null ? [''] : [data.elapsed_tenure] }); } 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 9073a7e12..555a7e7d0 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 @@ -1,20 +1,18 @@ -
-

-
- {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
- {{pageTitle}} -
-
- - -
+
+ {{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
+ {{pageTitle}} +
+
+ +

- - - +
@@ -22,596 +20,579 @@ -

Data as Per Financial Statements

 -
- - - - Yes - No - - - + + + Yes + No + +
-
Enter year from which financials provided - - Invalid year format - - - + + Invalid year format + - +
- - -
- -
- - - Financial Year : {{details.get('financial_year').value}} +
+
+ + Financial Year : + {{details.get('financial_year').value}}
- -
+

- - - - - {{"₹"}} {{FY_annualSalesInwords[i]}} Only - - - - - - - - No difference in Sales in FY {{details.get('financial_year').value}} over Sales in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} - - - Increase in Sales in FY {{details.get('financial_year').value}} over Sales in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} {{details.get('financial_annualsales_variation').value}} % - - - Decrease in Sales in FY {{details.get('financial_year').value}} over Sales in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} {{(details.get('financial_annualsales_variation').value).replace('-', '')}} % - - - - - -
- -
- - - - Net Profit - Net Loss - - - - - - - {{"₹"}} {{FY_netProfitAmtInwords[i]}} Only - - - - - - - - - - {{"₹"}} {{FY_netLossAmtInwords[i]}} Only - - - - - -
- + + + {{"₹"}} + {{FY_annualSalesInwords[i]}} Only + - - - - - No difference in Profit in FY {{details.get('financial_year').value}} over Profit in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} + + + + + No difference in Sales in FY + {{details.get('financial_year').value}} over + Sales in FY + {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} + - - Increase in Profit in FY {{details.get('financial_year').value}} over Profit in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} {{details.get('financial_variation').value}} % + + Increase in Sales in FY + {{details.get('financial_year').value}} over + Sales in FY + {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} + + {{details.get('financial_annualsales_variation').value}} + % - - Decrease in Profit in FY {{details.get('financial_year').value}} over Profit in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} {{(details.get('financial_variation').value).replace('-', '')}} % + + Decrease in Sales in FY + {{details.get('financial_year').value}} over + Sales in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} + + {{(details.get('financial_annualsales_variation').value).replace('-', + '')}} % - - - - - - - - No difference in Profit sales % in FY {{details.get('financial_year').value}} over Profit sales % in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} - - - Increase in Profit sales % in FY {{details.get('financial_year').value}} over Profit sales % in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} {{details.get('financial_profit_to_sale_variation').value}} % - - - Decrease in Profit sales % in FY {{details.get('financial_year').value}} over Profit sales % in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} {{(details.get('financial_profit_to_sale_variation').value).replace('-', '')}} % - - - - - - - -
+ +
+
+ + + + Net Profit + Net Loss + + + + + + {{"₹"}} + {{FY_netProfitAmtInwords[i]}} Only + + + + + + + + + {{"₹"}} + {{FY_netLossAmtInwords[i]}} Only + + + + + +
+ + + + + + No difference in Profit in FY + {{details.get('financial_year').value}} over + Profit in FY + {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} + + + + Increase in Profit in FY + {{details.get('financial_year').value}} over + Profit in FY + {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} + {{details.get('financial_variation').value}} % + + + Decrease in Profit in FY + {{details.get('financial_year').value}} over + Profit in FY + {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} + + {{(details.get('financial_variation').value).replace('-', + '')}} % + + + + + + + + + No difference in Profit sales % in FY + {{details.get('financial_year').value}} over + Profit sales % in FY + {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} + + + + Increase in Profit sales % in FY + {{details.get('financial_year').value}} over + Profit sales % in FY + {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} + + {{details.get('financial_profit_to_sale_variation').value}} + % + + + Decrease in Profit sales % in FY + {{details.get('financial_year').value}} over + Profit sales % in FY + {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} + + {{(details.get('financial_profit_to_sale_variation').value).replace('-', + '')}} % + + + + +
- - - - - - - -
-
-
-
- - - -

Financial as per Customer

 - - - - - Yes - No - - - -
-
- - - - - - -
- - - - - {{"₹"}} {{AV_SalesFrmInwords[i]}} Only - - - - - {{"₹"}} {{AV_SalesToInwords[i]}} Only - - - - - {{"₹"}} {{AV_SalesInwords[i]}} Only - - -
- - -
- - - - - Net Profit - Net Loss - - - - - - Yes - No - - - - - - -
- - - - - - - - - - - - - {{"₹"}} {{AV_marginProfitAmtInwords[i]}} Only - -
-
- - - {{"₹"}} {{AV_netProfitAmtFrmInwords[i]}} Only - - - - {{"₹"}} {{AV_netProfitAmtToInwords[i]}} Only - - - - - - - {{"₹"}} {{AV_netProfitAmtInwords[i]}} Only - - -
- -
- Working Capital Details - - - - - - - - - - - - Yes - No - - - - - {{a.name}} - - - - - -
- - -
- - - - - - - - - - - - - - {{"₹"}} {{AV_marginLossAmtInwords[i]}} Only - -
-
- - - {{"₹"}} {{AV_netLossAmtFrmInwords[i]}} Only - - - - {{"₹"}} {{AV_netLossAmtToInwords[i]}} Only - - - - - - - {{"₹"}} {{AV_netLossAmtInwords[i]}} Only - - - -
-
- - - -
- - -
- - - - - - - -
-
- - -
-
- - - - - - - - - - + + + + + + +
+ +
+
+ + + +

Financial as per Customer

+ + + + + Yes + No + + +
+
+ +
+ + + {{"₹"}} + {{AV_SalesFrmInwords[i]}} Only + + + + {{"₹"}} + {{AV_SalesToInwords[i]}} Only + + + + {{"₹"}} + {{AV_SalesInwords[i]}} Only + +
+
+ + + Net Profit + Net Loss + + + + + Yes + No + + +
+ + + + + + + + + + + + + + {{"₹"}} {{AV_marginProfitAmtInwords[i]}} Only + + +
+
+ + + {{"₹"}} + {{AV_netProfitAmtFrmInwords[i]}} Only + + + + {{"₹"}} + {{AV_netProfitAmtToInwords[i]}} Only + + + + + + + {{"₹"}} + {{AV_netProfitAmtInwords[i]}} Only + +
+
+ + + + + + + + + + + + {{"₹"}} + {{AV_marginLossAmtInwords[i]}} Only + +
+
+ + + {{"₹"}} + {{AV_netLossAmtFrmInwords[i]}} Only + + + + {{"₹"}} + {{AV_netLossAmtToInwords[i]}} Only + + + + + + + {{"₹"}} + {{AV_netLossAmtInwords[i]}} Only + +
+
+ + + +
+
+ +
+
+ +
+
+
+
+ + + +

Working Capital Details

+ + + + + + + + + + + + + + + + Yes + No + + + + + + {{a.name}} + + + + + + + +
+
+ + + + + + + + -
- - Remarks - - -
-
- +
+ + Remarks + + +
+
+
- - - - - - - - \ 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/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 79d3f45d4..56682ff74 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 @@ -211,6 +211,18 @@ export class FinancialInfoComponent implements OnInit { financial_no_of_year : [''], financial_reason: [''], financial_customer:[''], + // estimate_receive_the_money_in_days:[value.estimate_receive_the_money_in_days], + // estimate_pay_the_money_in_days:[value.estimate_pay_the_money_in_days], + // estimate_unsold_stock_lies_in_days:[value.estimate_unsold_stock_lies_in_days], + // is_there_working_capital_available:[value.is_there_working_capital_available], + // estimate_working_capital_facilities_availed:[value.estimate_working_capital_facilities_availed], + // reason_for_working_capital_facilities_availed:[value.reason_for_working_capital_facilities_availed] + receive_the_money_in_days:[''], + pay_the_money_in_days:[''], + unsold_stock_lies_in_days:[''], + is_there_working_capital_available:[''], + working_capital_facilities_availed:[''], + reason_for_working_capital_facilities_availed:[''], // same_as_financial_statements:[''], date_per_financial: this.fb.array([]), estimated_value: this.fb.array([]) @@ -310,12 +322,6 @@ export class FinancialInfoComponent implements OnInit { estimate_net_loss_percent:[value.estimate_net_loss_percent], estimate_net_loss:[value.estimate_net_loss], estimate_reason_for_loss:[value.estimate_reason_for_loss], - estimate_receive_the_money_in_days:[value.estimate_receive_the_money_in_days], - estimate_pay_the_money_in_days:[value.estimate_pay_the_money_in_days], - estimate_unsold_stock_lies_in_days:[value.estimate_unsold_stock_lies_in_days], - is_there_working_capital_available:[value.is_there_working_capital_available], - estimate_working_capital_facilities_availed:[value.estimate_working_capital_facilities_availed], - reason_for_working_capital_facilities_availed:[value.reason_for_working_capital_facilities_availed] }); } @@ -388,7 +394,6 @@ export class FinancialInfoComponent implements OnInit { this.isDisplay = false; this.financialForm.controls['is_financial_customer'].setValue('no'); - this.selectedFinancialCustomer('no'); const statementControl = this.financialForm.controls['date_per_financial']; 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 284274ae3..bfe71ce2f 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 @@ -249,7 +249,7 @@ export class NeighbourHoodComponent implements OnInit { // neighbourhoodControl.controls['do_know'].setValidators([Validators.required]); // neighbourhoodControl.controls['do_know'].updateValueAndValidity(); - return; + // return; }