diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.html index e37c49bb8..705309795 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.html @@ -19,7 +19,7 @@ Applicant - + {{appt.applicant_name | titlecase}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.ts index 3140f311b..a0e9b4a43 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/initiate-additional-pd/initiate-additional-pd.component.ts @@ -34,7 +34,7 @@ export class InitiateAdditionalPdComponent implements OnInit { if(this.data.applicant_id){ this.additionalPDForm.controls['pd_co_applicant_id'].setValue(this.data.applicant_id); - this.getMobileNo(this.data.applicant_id); + this.toGetMobileNo(this.data.applicant_id); // this.additionalPDForm.controls['pd_co_applicant_id'].disable(); } // else { this.additionalPDForm.controls['pd_co_applicant_id'].enable(); } @@ -53,8 +53,8 @@ export class InitiateAdditionalPdComponent implements OnInit { /** To Get City And Pincode Data For Address Form * Param 'stateID' -> selected StateId */ - getMobileNo(applicantID: string) { - let mobile = this.applicantList.filter(val=>val.pd_co_applicant_id == this.data.applicant_id).map(val=>val.mobile_no)[0] + toGetMobileNo(applicantID) { + let mobile = this.applicantList.filter(val=>val.pd_co_applicant_id == applicantID).map(val=>val.mobile_no)[0] if(mobile != '' && mobile != null){ this.additionalPDForm.controls['mobile_no'].setValue(mobile); } 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 2fd271f1e..ad857b53d 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 @@ -364,7 +364,7 @@ export class BusinessAssetsInfoComponent implements OnInit { address_label: [''], business_years: [''], business_month: [''], - business_address_availability: [''], + business_address_availability: ['',Validators.compose([Validators.required])], business_is_pd_visited: [''], business_pd_visited_remark: [''], // this.createBusinessAssetsForAddress() @@ -963,19 +963,40 @@ if(datas.business_name_of_the_owner !== null){ if (flag == 1) { if (value == 'yes') { item.controls.business_years.setValidators([Validators.required]); - item.controls.business_address_availability.setValidators([Validators.required]); item.controls.business_is_pd_visited.setValidators([Validators.required]); item.controls.business_pd_visited_remark.setValidators([Validators.required]); item.controls.business_ownership_type.setValidators([Validators.required]); } else { + item.controls.business_years.setValue(''); + item.controls.business_month.setValue(''); + item.controls.business_is_pd_visited.setValue(''); + item.controls.business_pd_visited_remark.setValue(''); + item.controls.business_ownership_type.setValue(''); + item.controls.business_years.clearValidators(); - item.controls.business_address_availability.clearValidators(); item.controls.business_is_pd_visited.clearValidators(); item.controls.business_pd_visited_remark.clearValidators(); item.controls.business_ownership_type.clearValidators(); + item.controls.business_monthly_rented_amt.setValue(''); + item.controls.business_approximate_market_value.setValue(''); + item.controls.business_name_of_the_owner.setValue(''); + item.controls.business_name_of_the_other_owner.setValue(''); + item.controls.business_vintage.setValue(''); + item.controls.business_purchase_year.setValue(''); + item.controls.business_emi.setValue(''); + + item.controls.business_month.updateValueAndValidity(); + item.controls.business_monthly_rented_amt.updateValueAndValidity(); + item.controls.business_approximate_market_value.updateValueAndValidity(); + item.controls.business_name_of_the_owner.updateValueAndValidity(); + item.controls.business_name_of_the_other_owner.updateValueAndValidity(); + item.controls.business_vintage.updateValueAndValidity(); + item.controls.business_purchase_year.updateValueAndValidity(); + item.controls.business_emi.updateValueAndValidity(); + } item.controls.business_years.updateValueAndValidity(); item.controls.business_address_availability.updateValueAndValidity(); 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 87ebeb455..294f8f8d6 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 @@ -489,6 +489,7 @@ + Yes No 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 e1d97c6b3..36a0a56c1 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 @@ -125,7 +125,7 @@ export class FinancialInfoComponent implements OnInit { ngOnInit() { this.initstockForm(); - const businessActivityControl = this.financialForm.controls['select_working_capital_facilities_availed']; + const workingCptlControl = this.financialForm.controls['select_working_capital_facilities_availed']; let params: any = {}; params.parent_pdid = this.parent_pdid; params.pd_id = this.pdid; @@ -138,30 +138,31 @@ export class FinancialInfoComponent implements OnInit { if (value.status == 200) { let retriveData = value.records; - let activityData = this.av.map(item => ({ name: item.name, id: item.id })) - let exist_activity_data: any = []; + + let avData = this.av.map(item => ({ name: item.name, id: item.id })) + let exist_av_data: any = []; if (retriveData.select_working_capital_facilities_availed) { - exist_activity_data = Object.keys(retriveData.select_working_capital_facilities_availed).map(function (key) { + exist_av_data = Object.keys(retriveData.select_working_capital_facilities_availed).map(function (key) { return retriveData.select_working_capital_facilities_availed[key].id; }); } - let actual_businees_activity = activityData.map(item => item.id); - let check_exist_businees_activity = actual_businees_activity.map((id, index) => { - if (exist_activity_data.indexOf(id) < 0) { - activityData[index].exist_status = 0; - return activityData[index]; + let actual_av = avData.map(item => item.id); + let check_exist_av = actual_av.map((id, index) => { + if (exist_av_data.indexOf(id) < 0) { + avData[index].exist_status = 0; + return avData[index]; } else { - activityData[index].exist_status = 1; - return activityData[index]; + avData[index].exist_status = 1; + return avData[index]; } }).filter(item => item != undefined); - if (check_exist_businees_activity.length > 0) { - check_exist_businees_activity.forEach(val => { - businessActivityControl.push(this.createEntityType(val)); + if (check_exist_av.length > 0) { + check_exist_av.forEach(val => { + workingCptlControl.push(this.createEntityType(val)); if (val.exist_status == 1 && val.id == 2) { this.financialForm.addControl('bank_guarantee', new FormControl('', Validators.required)); @@ -187,8 +188,8 @@ export class FinancialInfoComponent implements OnInit { } console.log(val); }); - console.log('check_exist_businees_activity',check_exist_businees_activity); - retriveData.select_working_capital_facilities_availed = check_exist_businees_activity; + console.log('check_exist_businees_activity',check_exist_av); + retriveData.select_working_capital_facilities_availed = check_exist_av; } @@ -239,7 +240,11 @@ export class FinancialInfoComponent implements OnInit { }); retriveData.estimated_value = result_val; } else { - estimated_val.push(this.createValue('')); + + if(retriveData.is_financial_customer == 'no'){ + estimated_val.push(this.createValue('')); + } + } } else @@ -249,35 +254,29 @@ export class FinancialInfoComponent implements OnInit { retriveData.formid = this.form_id; retriveData.company_id = this.company_id; retriveData.fk_createdby = this.pdid; - this.financialForm.patchValue(retriveData); - + this.financialForm.setValue(retriveData); + // this.financialForm.patchValue(retriveData); } else { - let activityData = this.av.map(item => ({ name: item.name, id: item.id })) - let exist_activity_data: any = []; - // if (data.records.select_working_capital_facilities_availed) { - // exist_activity_data = Object.keys(data.records.select_working_capital_facilities_availed).map(function (key) { - // return data.records.select_working_capital_facilities_availed[key].id; - // }); - // } - - let actual_businees_activity = activityData.map(item => item.id); - let check_exist_businees_activity = actual_businees_activity.map((id, index) => { - if (exist_activity_data.indexOf(id) < 0) { - activityData[index].exist_status = 0; - return activityData[index]; + let avData = this.av.map(item => ({ name: item.name, id: item.id })) + let exist_av_data: any = []; + + let actual_av = avData.map(item => item.id); + let check_exist_av = actual_av.map((id, index) => { + if (exist_av_data.indexOf(id) < 0) { + avData[index].exist_status = 0; + return avData[index]; } else { - activityData[index].exist_status = 1; - return activityData[index]; + avData[index].exist_status = 1; + return avData[index]; } }).filter(item => item != undefined); - if (check_exist_businees_activity.length > 0) { - check_exist_businees_activity.forEach(val => { - businessActivityControl.push(this.createEntityType(val)); + if (check_exist_av.length > 0) { + check_exist_av.forEach(val => { + workingCptlControl.push(this.createEntityType(val)); }); - // businessVal.select_working_capital_facilities_availed = check_exist_businees_activity; } //financial_date.push(this.createDate()); //estimated_val.push(this.createValue('')); @@ -539,6 +538,53 @@ export class FinancialInfoComponent implements OnInit { } } + selectedWorkkingCptl(e){ + console.log(e); + const workingCptlControl = this.financialForm.controls['select_working_capital_facilities_availed']; + let CtrlLength = workingCptlControl.controls.length; + if (CtrlLength > 0) { + let cnt = 0; + while(cnt < CtrlLength){ + let ChildCtrl : any = workingCptlControl.controls[cnt] + if(ChildCtrl.controls.exist_status.value == 1 && ChildCtrl.controls.id.value == 2){ + ChildCtrl.controls['exist_status'].setValue(0); + ChildCtrl.controls['exist_status'].updateValueAndValidity(); + this.financialForm.removeControl('bank_guarantee'); + } + if(ChildCtrl.controls.exist_status.value == 1 && ChildCtrl.controls.id.value == 3){ + ChildCtrl.controls['exist_status'].setValue(0); + ChildCtrl.controls['exist_status'].updateValueAndValidity(); + this.financialForm.removeControl('cash_credit_limit'); + } + if(ChildCtrl.controls.exist_status.value == 1 && ChildCtrl.controls.id.value == 4){ + ChildCtrl.controls['exist_status'].setValue(0); + ChildCtrl.controls['exist_status'].updateValueAndValidity(); + this.financialForm.removeControl('factoring'); + } + if(ChildCtrl.controls.exist_status.value == 1 && ChildCtrl.controls.id.value == 5){ + ChildCtrl.controls['exist_status'].setValue(0); + ChildCtrl.controls['exist_status'].updateValueAndValidity(); + this.financialForm.removeControl('forfaiting'); + } + if(ChildCtrl.controls.exist_status.value == 1 && ChildCtrl.controls.id.value == 6){ + ChildCtrl.controls['exist_status'].setValue(0); + ChildCtrl.controls['exist_status'].updateValueAndValidity(); + this.financialForm.removeControl('letter_of_credit'); + } + if(ChildCtrl.controls.exist_status.value == 1 && ChildCtrl.controls.id.value == 7){ + ChildCtrl.controls['exist_status'].setValue(0); + ChildCtrl.controls['exist_status'].updateValueAndValidity(); + this.financialForm.removeControl('od_limit'); + } + if(ChildCtrl.controls.exist_status.value == 1 && ChildCtrl.controls.id.value == 1){ + ChildCtrl.controls['exist_status'].setValue(0); + ChildCtrl.controls['exist_status'].updateValueAndValidity(); + this.financialForm.removeControl('other_reason_for_working_capital_facilities_availed'); + this.financialForm.removeControl('reason_for_working_capital_facilities_availed'); + } + } + } + } /** For Auto-generating FinYear */ dynamicalFinYear(){ @@ -1891,53 +1937,4 @@ export class FinancialInfoComponent implements OnInit { } }); } - - /** To Convert Amount into Words */ -// inWords(e,i,flag:number){ - -// switch(flag){ -// case 1 : -// this.FY_annualSalesInwords[i] = this._pd.convertNumberToWords(e.target.value); -// // this.placeholderName[i] = 'Weekly Instalment Amount'; break; -// break; -// case 2 : -// this.FY_netProfitAmtInwords[i] = this._pd.convertNumberToWords(e.target.value); -// //alert('Fin net Profit'+this.FY_netProfitAmtInwords[i]); -// break; -// case 3 : -// this.FY_netLossAmtInwords[i] = this._pd.convertNumberToWords(e.target.value); -// // alert('Fin net Loss'+this.FY_netLossAmtInwords[i]); -// break; -// case 4 : -// this.AV_annualSalesInwords[i] = this._pd.convertNumberToWords(e.target.value); -// break; -// case 5 : -// this.AV_netProfitAmtInwords[i] = this._pd.convertNumberToWords(e.target.value); -// break; -// case 6 : -// this.AV_netLossAmtInwords[i] = this._pd.convertNumberToWords(e.target.value); -// break; -// case 7 : -// this.AV_netProfitAmtFrmInwords[i] = this._pd.convertNumberToWords(e.target.value); -// break; -// case 8 : -// this.AV_netProfitAmtToInwords[i] = this._pd.convertNumberToWords(e.target.value); -// break; -// case 9 : -// this.AV_netLossAmtFrmInwords[i] = this._pd.convertNumberToWords(e.target.value); -// break; -// case 10 : -// this.AV_netLossAmtToInwords[i] = this._pd.convertNumberToWords(e.target.value); -// break; -// case 11 : -// this.AV_SalesFrmInwords[i] = this._pd.convertNumberToWords(e.target.value); -// break; -// case 12 : -// this.AV_SalesToInwords[i] = this._pd.convertNumberToWords(e.target.value); -// break; -// default: -// break; -// } -// } - -} +} \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html index 6b6c1be0c..40455da19 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.html @@ -56,23 +56,23 @@ -
+
Loan Amount
- {{master.loan_amount}} + {{master.loan_amount}}
-
-
-
- {{master.loan_amount | numberToWords}} -
-
-
+ + + +
+
{{master.loan_amount | numberToWords}} Only
+ +