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 6029de96c..2f58cb25f 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
@@ -844,7 +844,7 @@
- What is the average no of days for which stock lies unsold during the year Required
+
@@ -852,7 +852,7 @@
Yes
No
- Is there Facilities Required
+
- Reason For {{lender_short_name == 'CFPL' ? 'Total Banking Facilities' :'Working Capital Facilities'}} Availed Required
+
- Bank Guarantee Required
+
- Cash Credit Limit Required
+
- Factoring Required
+
@@ -920,44 +920,44 @@
- Forfaiting Required
+
- OD Limit Required
+
- Name of the Lender Required
+
- Loan Amount Required
+
- Loan Type Required
+
- Loan Tenor Required
+
- Loan start date Required
+
- Monthly obligation-Interest/EMI Required
+
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 892aefe2b..d5b53ac25 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
@@ -258,52 +258,52 @@ export class FinancialInfoComponent implements OnInit {
workingCptlControl.push(this.workingCptl(val));
if (val.exist_status == 1 && val.id == 2) {
- this.financialForm.addControl('bank_guarantee', new FormControl('', Validators.required));
+ this.financialForm.addControl('bank_guarantee', new FormControl(''));
}
if (val.exist_status == 1 && val.id == 3) {
- this.financialForm.addControl('cash_credit_limit', new FormControl('', Validators.required));
+ this.financialForm.addControl('cash_credit_limit', new FormControl(''));
console.log("retrivedata",retriveData)
!retriveData.hasOwnProperty('cash_credit_limit')? retriveData.cash_credit_limit='' : retriveData.cash_credit_limit
}
if (val.exist_status == 1 && val.id == 4) {
- this.financialForm.addControl('factoring', new FormControl('', Validators.required));
+ this.financialForm.addControl('factoring', new FormControl(''));
}
if (val.exist_status == 1 && val.id == 5) {
- this.financialForm.addControl('forfaiting', new FormControl('', Validators.required));
+ this.financialForm.addControl('forfaiting', new FormControl(''));
}
if (val.exist_status == 1 && val.id == 6) {
- this.financialForm.addControl('letter_of_credit', new FormControl('', Validators.required));
+ this.financialForm.addControl('letter_of_credit', new FormControl(''));
}
if (val.exist_status == 1 && val.id == 7) {
- this.financialForm.addControl('od_limit', new FormControl('', Validators.required));
+ this.financialForm.addControl('od_limit', new FormControl(''));
}
if (val.exist_status == 1 && val.id == 1) {
- this.financialForm.addControl('other_reason_for_working_capital_facilities_availed', new FormControl('', Validators.required));
- this.financialForm.addControl('reason_for_working_capital_facilities_availed', new FormControl('', Validators.required));
+ this.financialForm.addControl('other_reason_for_working_capital_facilities_availed', new FormControl(''));
+ this.financialForm.addControl('reason_for_working_capital_facilities_availed', new FormControl(''));
}
if (val.exist_status == 1 && val.id == 8) {
- this.financialForm.addControl('lender_name', new FormControl('', Validators.required));
+ this.financialForm.addControl('lender_name', new FormControl(''));
}
if (val.exist_status == 1 && val.id == 9) {
- this.financialForm.addControl('loan_amount', new FormControl('', Validators.required));
+ this.financialForm.addControl('loan_amount', new FormControl(''));
}
if (val.exist_status == 1 && val.id == 10) {
- this.financialForm.addControl('loan_type', new FormControl('', Validators.required));
+ this.financialForm.addControl('loan_type', new FormControl(''));
}
if (val.exist_status == 1 && val.id == 11) {
- this.financialForm.addControl('loan_tenor', new FormControl('', Validators.required));
+ this.financialForm.addControl('loan_tenor', new FormControl(''));
}
if (val.exist_status == 1 && val.id == 12) {
- this.financialForm.addControl('loan_start_date', new FormControl('', Validators.required));
+ this.financialForm.addControl('loan_start_date', new FormControl(''));
}
if (val.exist_status == 1 && val.id == 13) {
- this.financialForm.addControl('monthly_emi', new FormControl('', Validators.required));
+ this.financialForm.addControl('monthly_emi', new FormControl(''));
}
@@ -464,8 +464,8 @@ export class FinancialInfoComponent implements OnInit {
// reason_for_working_capital_facilities_availed:[value.reason_for_working_capital_facilities_availed]
receive_the_money_in_days:['', Validators.compose([Validators.required])],
pay_the_money_in_days:['', Validators.compose([Validators.required])],
- unsold_stock_lies_in_days:['', Validators.compose([Validators.required])],
- is_there_working_capital_available:['', Validators.compose([Validators.required])],
+ unsold_stock_lies_in_days:[''],
+ is_there_working_capital_available:[''],
working_capital_facilities_availed:[''],
// reason_for_working_capital_facilities_availed:[''],
// same_as_financial_statements:[''],
@@ -510,81 +510,81 @@ export class FinancialInfoComponent implements OnInit {
this.financialForm.removeControl('bank_guarantee');
}
else if (event.value.exist_status == false && event.value.id == 2) {
- this.financialForm.addControl('bank_guarantee', new FormControl('', Validators.required));
+ this.financialForm.addControl('bank_guarantee', new FormControl(''));
}
if (event.value.exist_status == true && event.value.id == 3) {
this.financialForm.removeControl('cash_credit_limit');
}
else if (event.value.exist_status == false && event.value.id == 3) {
- this.financialForm.addControl('cash_credit_limit', new FormControl('', Validators.required));
+ this.financialForm.addControl('cash_credit_limit', new FormControl(''));
}
if (event.value.exist_status == true && event.value.id == 4) {
this.financialForm.removeControl('factoring');
}
else if (event.value.exist_status == false && event.value.id == 4) {
- this.financialForm.addControl('factoring', new FormControl('', Validators.required));
+ this.financialForm.addControl('factoring', new FormControl(''));
}
if (event.value.exist_status == true && event.value.id == 5) {
this.financialForm.removeControl('forfaiting');
}
else if (event.value.exist_status == false && event.value.id == 5) {
- this.financialForm.addControl('forfaiting', new FormControl('', Validators.required));
+ this.financialForm.addControl('forfaiting', new FormControl(''));
}
if (event.value.exist_status == true && event.value.id == 6) {
this.financialForm.removeControl('letter_of_credit');
}
else if (event.value.exist_status == false && event.value.id == 6) {
- this.financialForm.addControl('letter_of_credit', new FormControl('', Validators.required));
+ this.financialForm.addControl('letter_of_credit', new FormControl(''));
}
if (event.value.exist_status == true && event.value.id == 7) {
this.financialForm.removeControl('od_limit');
}
else if (event.value.exist_status == false && event.value.id == 7) {
- this.financialForm.addControl('od_limit', new FormControl('', Validators.required));
+ this.financialForm.addControl('od_limit', new FormControl(''));
}
if (event.value.exist_status == true && event.value.id == 1) {
this.financialForm.removeControl('other_reason_for_working_capital_facilities_availed');
this.financialForm.removeControl('reason_for_working_capital_facilities_availed');
}
else if (event.value.exist_status == false && event.value.id == 1) {
- this.financialForm.addControl('other_reason_for_working_capital_facilities_availed', new FormControl('', Validators.required));
- this.financialForm.addControl('reason_for_working_capital_facilities_availed', new FormControl('', Validators.required));
+ this.financialForm.addControl('other_reason_for_working_capital_facilities_availed', new FormControl(''));
+ this.financialForm.addControl('reason_for_working_capital_facilities_availed', new FormControl(''));
}
if (event.value.exist_status == true && event.value.id == 8) {
this.financialForm.removeControl('lender_name');
}
else if (event.value.exist_status == false && event.value.id == 8) {
- this.financialForm.addControl('lender_name', new FormControl('', Validators.required));
+ this.financialForm.addControl('lender_name', new FormControl(''));
}
if (event.value.exist_status == true && event.value.id == 9) {
this.financialForm.removeControl('loan_amount');
}
else if (event.value.exist_status == false && event.value.id == 9) {
- this.financialForm.addControl('loan_amount', new FormControl('', Validators.required));
+ this.financialForm.addControl('loan_amount', new FormControl(''));
}
if (event.value.exist_status == true && event.value.id == 10) {
this.financialForm.removeControl('loan_type');
}
else if (event.value.exist_status == false && event.value.id == 10) {
- this.financialForm.addControl('loan_type', new FormControl('', Validators.required));
+ this.financialForm.addControl('loan_type', new FormControl(''));
}
if (event.value.exist_status == true && event.value.id == 11) {
this.financialForm.removeControl('loan_tenor');
}
else if (event.value.exist_status == false && event.value.id == 11) {
- this.financialForm.addControl('loan_tenor', new FormControl('', Validators.required));
+ this.financialForm.addControl('loan_tenor', new FormControl(''));
}
if (event.value.exist_status == true && event.value.id == 12) {
this.financialForm.removeControl('loan_start_date');
}
else if (event.value.exist_status == false && event.value.id == 12) {
- this.financialForm.addControl('loan_start_date', new FormControl('', Validators.required));
+ this.financialForm.addControl('loan_start_date', new FormControl(''));
}
if (event.value.exist_status == true && event.value.id == 13) {
this.financialForm.removeControl('monthly_emi');
}
else if (event.value.exist_status == false && event.value.id == 13) {
- this.financialForm.addControl('monthly_emi', new FormControl('', Validators.required));
+ this.financialForm.addControl('monthly_emi', new FormControl(''));
}