From 1aedea482afca18141523b38e0e538c585755ea2 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 25 Jan 2019 17:36:28 +0530 Subject: [PATCH] fail status : ps --- .../list-pd/add-pd/add-pd.component.html | 4 +- .../list-pd/add-pd/add-pd.component.scss | 6 +- .../edit-pd-master.component.html | 6 +- .../edit-pd-master.component.scss | 6 +- .../forms/address/address.component.ts | 8 +- .../assets-info/assets-info.component.ts | 24 ++-- .../banking-details.component.ts | 26 +++- .../business-assets-info.component.ts | 15 +- .../business-banking-details.component.ts | 8 ++ .../business-info.component.html | 16 --- .../business-info/business-info.component.ts | 2 +- .../current-loan/current-loan.component.html | 9 +- .../current-loan/current-loan.component.ts | 129 +++++++----------- .../final-remarks.component.html | 16 +++ .../final-remarks/final-remarks.component.ts | 4 +- .../financial-info.component.ts | 18 +-- .../loan-details/loan-details.component.html | 31 +++-- .../loan-details/loan-details.component.ts | 100 ++++++-------- .../start-pd/forms/stock/stock.component.html | 81 ++++++----- .../list-pd/view-pd/view-pd.component.html | 2 +- 20 files changed, 254 insertions(+), 257 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 04a1deb12..63fa86d57 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 @@ -39,7 +39,7 @@ - + @@ -121,7 +121,7 @@ - {{"₹"}} {{loanAmtInWords}} Only + {{"₹"}} {{loanAmtInWords}} Only Enter valid amount. diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.scss index b559b3c47..aab0f0fad 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.scss @@ -1,3 +1,7 @@ mat-form-field { margin: 0 2%; - } \ No newline at end of file + } +.mat-form-field-appearance-legacy .mat-hint{ + color:rgba(0, 0, 0, 0.8) !important; +} + \ No newline at end of file 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 74244878b..b7a2efc1a 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 @@ -32,7 +32,7 @@ - + @@ -109,7 +109,7 @@ - {{"₹"}} {{loanAmtInWords}} Only + {{"₹"}} {{loanAmtInWords}} Only Enter valid amount. @@ -123,7 +123,7 @@ Select - {{SL.state_name}} + {{SL.name}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.scss index d03494e25..e592fb882 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.scss @@ -11,4 +11,8 @@ mat-form-field { } mat-dialog-actions{ border-top: 2px solid #e00201; - } \ No newline at end of file + } + +.mat-form-field-appearance-legacy .mat-hint{ + color:rgba(0, 0, 0, 0.8) !important; +} 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 c5a5eadb9..2b7d33f9a 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 @@ -295,11 +295,11 @@ export class AddressComponent implements OnInit { if(this.CustSegAbbr == 'SENP' || this.CustSegAbbr == 'SEP'){ console.log(this.CustSegAbbr); console.log('inside if',this.addressData); + this.addressData.filter(element =>element.address_type == 'Residence'); + this.addressData.filter(element =>element.address_type == 'Residence cum Office'); + console.log('inside if 2',this.addressData); } - // if(this.CustSegAbbr == 'SENP' || this.CustSegAbbr == 'SEP'){ - // this.addressData.splice(this.addressData.indexOf('Residence'), 1); - // this.addressData.splice(this.addressData.indexOf('Residence cum Office'), 1); - // } + console.log('aftrval',this.addressData); } 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 ac7fc409e..a68e5175a 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 @@ -107,20 +107,20 @@ export class AssetsInfoComponent implements OnInit { // this.pdTrigerService.getTypeofActivityForSuppliedInfoForm(this.pdid,'').subscribe(data => { // this.businessProfessionName = (data.status == 200) ? data.records.profession_name : '' ; // }); - // this.pdTrigerService.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{ - // if(data.dataStatus){ - // this.existCompanyList = data.records.filter(val =>val.is_active===true && val.is_company_applicant===true); - // } + this.pdTrigerService.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{ + if(data.dataStatus){ + this.existCompanyList = data.records.filter(val =>val.is_active===true && val.is_company_applicant===true); + } - // let modifyCompanyList : any=[]; - // if(this.existCompanyList.length>0){ - // modifyCompanyList = this.existCompanyList.map(element => { - // return {id:element.company_order_id.toString(),name:element.company_name,group_id:1}; - // }); - // this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList}) - // } + let modifyCompanyList : any=[]; + if(this.existCompanyList.length>0){ + modifyCompanyList = this.existCompanyList.map(element => { + return {id:element.company_order_id.toString(),name:element.company_name,group_id:1}; + }); + this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList}) + } - // }) + }) // get applicant list let modifyApplicantList: any=[]; if(this.applicants.length > 0){ 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 e8721a0d7..1e201b1b2 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 @@ -35,6 +35,7 @@ export class BankingDetailsComponent implements OnInit { private notifier: NotifierService; public pd_cus_segment:string; public applicants: any; + public companies: any; m_accountType= []; m_btLenderList = []; salaryField : boolean; @@ -56,8 +57,8 @@ export class BankingDetailsComponent implements OnInit { this.pd_cus_segment = this.pd_cus_segment.substring(0,3); this.applicants = this.pd_all_details.pdapplicants_detials; this.applicants = this.applicants.filter(val=>val.applicant_type==0 || val.applicant_type==1) - this.applicants.push({'pd_co_applicant_id':'0','applicant_name':'Others'}); + this.companies = this.pd_all_details.pdapplicants_detials.filter(val=>val.applicant_type==2) this.notifier = notifier; } @@ -85,7 +86,22 @@ export class BankingDetailsComponent implements OnInit { ngOnInit() { this.step = 0; this.initBankingForm(); + this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{ + if(data.dataStatus){ + this.existCompanyList = data.records.filter(val =>val.is_active===true); + } + + let modifyCompanyList : any=[]; + if(this.existCompanyList.length>0){ + modifyCompanyList = this.existCompanyList.map(element => { + return {id:element.company_order_id.toString(),name:element.company_name,group_id:1}; + }); + this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList}) + } + + }); let modifyApplicantList: any=[]; + if(this.applicants.length > 0){ modifyApplicantList = this.applicants.map(element => { return {id:element.pd_co_applicant_id,name:element.applicant_name,group_id:2}; @@ -93,6 +109,14 @@ export class BankingDetailsComponent implements OnInit { this.mergeCompanyApplicant.push({groupName:'APPLICANTS',groupValues:modifyApplicantList}) } + // let modifyCompanyList : any=[]; + // if(this.companies.length>0){ + // modifyCompanyList = this.companies.map(element => { + // return {id:element.pd_co_applicant_id,name:element.applicant_name,group_id:1}; + // }); + // this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList}) + + // } this.getM_AccountType(); this.getM_BTLenderList(); 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 247cade65..bf87eb34d 100644 --- 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 @@ -72,6 +72,7 @@ export class BusinessAssetsInfoComponent implements OnInit { @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.applicants = this.pd_all_details.pdapplicants_detials; + this.applicants = this.applicants.filter(appt=>appt.applicant_type != 2) this.applicants.push({'pd_co_applicant_id':'0','applicant_name':'Others'}); this.company_id =this.pd_all_details.company_id; this.notifier = notifier; @@ -95,14 +96,14 @@ export class BusinessAssetsInfoComponent implements OnInit { }); this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList}) } - // let modifyApplicantList: any=[]; - // if(this.applicants.length > 0){ - // modifyApplicantList = this.applicants.map(element => { - // return {id:element.pd_co_applicant_id,name:element.applicant_name,group_id:2}; - // }); - // this.mergeCompanyApplicant.push({groupName:'APPLICANTS',groupValues:modifyApplicantList}) + let modifyApplicantList: any=[]; + if(this.applicants.length > 0){ + modifyApplicantList = this.applicants.map(element => { + return {id:element.pd_co_applicant_id,name:element.applicant_name,group_id:2}; + }); + this.mergeCompanyApplicant.push({groupName:'APPLICANTS',groupValues:modifyApplicantList}) - // } + } }) this.getPdSupplierFormDetails(); 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 d69fbe2de..41f75395a 100644 --- 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 @@ -57,6 +57,7 @@ export class BusinessBankingDetailsComponent implements OnInit { this.pd_cus_segment = this.pd_all_details.pdmaster_details.customer_segment_abbr.toUpperCase(); this.pd_cus_segment = this.pd_cus_segment.substring(0,3); this.applicants = this.pd_all_details.pdapplicants_detials; + this.applicants = this.applicants.filter(appt=>appt.applicant_type != 2) this.applicants.push({'pd_co_applicant_id':'0','applicant_name':'Others'}); this.notifier = notifier; this.company_id = this.pd_all_details.company_id; @@ -99,6 +100,13 @@ export class BusinessBankingDetailsComponent implements OnInit { this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList}) } + let modifyApplicantList: any=[]; + if(this.applicants.length > 0){ + modifyApplicantList = this.applicants.map(element => { + return {id:element.pd_co_applicant_id,name:element.applicant_name,group_id:2}; + }); + this.mergeCompanyApplicant.push({groupName:'APPLICANTS',groupValues:modifyApplicantList}) + } }) this.getM_AccountType(); 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 4d181b847..0579547bd 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 @@ -1336,22 +1336,6 @@ - - - Location - - - - - Well Suited. - Fairly Suited - Not Suited - - - - 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 56a8e8296..0c4f75f72 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 @@ -584,7 +584,7 @@ export class BusinessInfoComponent implements OnInit { // officer_permanent: ['', Validators.compose([Validators.required])], // officer_temporary: ['', Validators.compose([Validators.required])], //working_capital: ['', Validators.compose([Validators.required])], - is_service_provided: ['', Validators.compose([Validators.required])], + // is_service_provided: ['', Validators.compose([Validators.required])], // ownership_setup: ['', Validators.compose([Validators.required])], // ownership_others: [''], // rent_paid: [''], 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 3e7247664..d775926f5 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 @@ -21,7 +21,7 @@ - Yes No @@ -29,12 +29,13 @@ - -

Loan Details

 - +
+ +

Loan Details : {{details.get('label').value}}

 + 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 590987ec2..da792df83 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 @@ -46,6 +46,7 @@ export class CurrentLoanComponent implements OnInit { IDXval : any; OtherFlag : any = []; amtInwords : any = []; + labelArr : any = []; emiAmtInwords : any = []; dataFromAssets : any = []; existCompanyList: any =[]; @@ -83,6 +84,7 @@ export class CurrentLoanComponent implements OnInit { } }; ngOnInit() { + console.clear(); this.getMasterDetails('BTLENDERLIST',1); this.getMasterDetails('FREQUENCY',2); this.getMasterDetails('EXISTINGLOANTYPES',3); @@ -92,39 +94,19 @@ export class CurrentLoanComponent implements OnInit { // console.log(data); if(data.dataStatus == true){ - console.log(data.record); + // console.log(data.record); this.dataFromAssets = data.record; - if(this.dataFromAssets.length > 0){ - console.log('if condition'); - // this.selectedLoanChanges('Yes'); - this.currentLoanForm.controls['existing_loan'].setValue('Yes'); - const control = this.currentLoanForm.controls['loan_details']; - console.log(this.dataFromAssets); - -// "4" -// business_assets_mode_name -// : -// "Equipments and machinaries" -// business_details -// : -// Array(1) -// 0 -// : -// {equipment_manufacturing_description: "Clearner Machine"} -// length -// : -// 1 - + if(this.dataFromAssets.length > 0){ let labelarray : any = []; - + this.dataFromAssets.forEach((val,index) => { if(val.business_assets_mode == 1){ let data; val.business_details.forEach((v,index) => { - data = v.equipment_manufacturing_description; + + data = v.any_other_assets; }); - labelarray[index] = val.business_name_of_the_owner +' - '+ data; } if(val.business_assets_mode == 2){ @@ -144,46 +126,45 @@ export class CurrentLoanComponent implements OnInit { if(val.business_assets_mode == 4){ let data; val.business_details.forEach((v,index) => { - data = v.any_other_assets; + data = v.equipment_manufacturing_description; }); labelarray[index] = val.business_name_of_the_owner +' - '+ data; } }); - console.log('labelarray',labelarray); - // control.push(this.createLoanDetail(null)); - - - + const control = this.currentLoanForm.controls['loan_details']; + this.labelArr = labelarray; + let arr : any = []; + if(this.labelArr.length > 0){ + this.currentLoanForm.controls['existing_loan'].setValue('Yes'); + this.labelArr.forEach((v,index) => { + arr = { + 'label': v, + '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':'' + } + control.push(this.createLoanDetail(arr)); + }); + // this.currentLoanForm.controls['existing_loan'].setValue(arr); } - } - - // api.forEach(val => { - // if (val.type_of_activity_id == 2) { - // this.suppliers_raw_materials = val.products; - // console.log(this.suppliers_raw_materials); - // } - // if (val.type_of_activity_id == 3) { - // this.suppliers_finished_goods = val.products; - // console.log(this.suppliers_finished_goods); - // } - // if (val.type_of_activity_id == 4) { - // this.suppliers_trade_details = val.products; - // console.log(this.suppliers_trade_details); - // } - // if (val.type_of_activity_id == 5) { - // this.suppliers_service_product = val.products; - // console.log(this.suppliers_service_product); - // } - // tempcount++; - // }); - + } }); this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{ if(data.dataStatus){ - this.existCompanyList = data.records.filter(val =>val.is_active===true && val.is_company_applicant===true); + this.existCompanyList = data.records.filter(val =>val.is_active===true); } let modifyCompanyList : any=[]; @@ -236,6 +217,7 @@ export class CurrentLoanComponent implements OnInit { } } else { // console.log('overall else'); + // control.push(this.createLoanDetail()); } }) @@ -277,11 +259,12 @@ export class CurrentLoanComponent implements OnInit { selectedLoanChanges(e): void { // console.log(e); - if (e.value == 'Yes') { + if (e == 'Yes') { // console.log('if()'); const control = this.currentLoanForm.controls['loan_details']; control.push(this.createLoanDetail(null)); - } else if (e.value == 'No') { + + } else if (e == 'No') { // console.log('else()'); const arr = this.currentLoanForm.controls.loan_details; arr.removeAt(0); @@ -300,20 +283,19 @@ export class CurrentLoanComponent implements OnInit { switch(+e){ case 1: this.placeholderName[i] = 'Instalment Amount'; break; - case 2: this.placeholderName[i] = 'Monthly Instalment Amount'; break; - case 3: this.placeholderName[i] = 'Annual Instalment Amount'; break; - case 4: this.placeholderName[i] = 'Halfyearly Instalment Amount'; break; - case 5: this.placeholderName[i] = 'Fortnightly Instalment Amount'; break; - case 6: this.placeholderName[i] = 'Daily Instalment Amount'; break; - case 7: this.placeholderName[i] = 'Quarterly Instalment Amount'; break; + case 2: this.placeholderName[i] = 'Annual Instalment Amount'; break; + case 3: this.placeholderName[i] = 'Halfyearly Instalment Amount'; break; + case 4: this.placeholderName[i] = 'Fortnightly Instalment Amount'; break; + case 5: this.placeholderName[i] = 'Daily Instalment Amount'; break; + case 6: this.placeholderName[i] = 'Quarterly Instalment Amount'; break; + case 7: this.placeholderName[i] = 'Monthly Instalment Amount'; break; default: this.placeholderName[i] = 'Instalment Amount'; break; } } createLoanDetail(data) { - if(data == null){ return this.fb.group({ - label:[''], + label: data == null ? [''] : [data.label], loan_amount: [''], frequency:[''], other_frequency:[''], @@ -329,25 +311,6 @@ export class CurrentLoanComponent implements OnInit { elapsed_tenure:[''] }); } - else{ - return this.fb.group({ - label:[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:[''] - }); - } - } // compare objects for merge two master table details compareObjects(o1: any, o2: any) { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html index 1adb8ff8b..4bcdc8fd2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html @@ -15,6 +15,22 @@ + + + Location + + + + + Well Suited. + Fairly Suited + Not Suited + + + +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts index 457a884c8..3fdbe4f16 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts @@ -56,6 +56,7 @@ export class FinalRemarksComponent implements OnInit { pdid: [this.pdid], formid: ['20'], final_custormer_remark_type : [], + is_service_provided: ['', Validators.required], final_form_remarks: ['',Validators.required] }); this.getM_Type(); @@ -85,6 +86,7 @@ export class FinalRemarksComponent implements OnInit { this.pdTrigerService.getPDFormDetailsWithID(this.pdid, '20').subscribe(data=>{ if(data.dataStatus){ this._finalRemarkForm.controls.final_custormer_remark_type.setValue(data.records.final_custormer_remark_type); + this._finalRemarkForm.controls.is_service_provided.setValue(data.records.is_service_provided); this._finalRemarkForm.controls.final_form_remarks.setValue(data.records.final_form_remarks); this.noRecordsFound = true; } else { @@ -108,7 +110,7 @@ export class FinalRemarksComponent implements OnInit { } - // ================== + // ================== /** To Save/Edited Popup Data */ onSubmit() { 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 219d5f36b..a4a03cf83 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 @@ -141,13 +141,13 @@ export class FinancialInfoComponent implements OnInit { if (result_val.length > 0) { result_val.forEach((val,index) => { - console.log(val); - console.log('val.estimate_sales_average',val.estimate_sales_average); - if(isNaN(val.estimate_sales_average)){ - alert(val.estimate_sales_average + " is not a number
"); - }else{ - alert(val.estimate_sales_average + " is a number
"); - } + // console.log(val); + // console.log('val.estimate_sales_average',val.estimate_sales_average); + // if(isNaN(val.estimate_sales_average)){ + // alert(val.estimate_sales_average + " is not a number
"); + // }else{ + // alert(val.estimate_sales_average + " is a number
"); + // } //console.log('dedrf',val.estimate_annual_sale); // this.AV_annualSalesInwords[index] = this._pd.convertNumberToWords(val.estimate_annual_sale); // this.AV_netProfitAmtInwords[index] = this._pd.convertNumberToWords(val.estimate_net_profit); @@ -493,12 +493,12 @@ export class FinancialInfoComponent implements OnInit { control.removeAt(0); } - alert((new Date()).getFullYear()); + // alert((new Date()).getFullYear()); let year1 = (new Date()).getFullYear(); let year2 = ((new Date()).getFullYear() - 1); let Year = year2 +'-'+ year1; - alert(Year); + // alert(Year); control.push(this.createValue(Year)); } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html index afccb1b77..439542d43 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html @@ -5,7 +5,6 @@
-
@@ -45,13 +44,13 @@ {{"₹"}} {{balTxrfAmtInWords}} Only - + @@ -68,9 +67,9 @@ {{"₹"}} {{topUpAmtInWords}} Only - + @@ -117,16 +116,26 @@ - + + + {{val.name}} + + + + + + - + - + - + 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 9b5a0522f..4064169bb 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 @@ -60,7 +60,9 @@ export class LoanDetailsComponent implements OnInit { CompanyApplicantGroupList: any=[]; CompanyApplicantGroupList2: any=[]; - + mergeCompanyApplicant:any=[]; + existCompanyList:any=[]; + companies:any=[]; loanAmtInWords : any; balTxrfAmtInWords : any; valAsPerAgmtInWords : any; @@ -84,52 +86,31 @@ export class LoanDetailsComponent implements OnInit { @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { this.applicants = this.pd_all_details.pdapplicants_detials; + this.applicants = this.applicants.filter(appt=>appt.applicant_type != 2) + this.companies = this.pd_all_details.pdapplicants_detials.filter(appt=>appt.applicant_type == 2 ) - // console.log(this.applicants); - let CompanyList : any=[]; - let ApplicantList : any=[]; + let modifyApplicantList: any=[]; + if(this.applicants.length > 0){ + modifyApplicantList = this.applicants.map(element => { + return {id:element.pd_co_applicant_id,name:element.applicant_name,group_id:2}; + }); + this.mergeCompanyApplicant.push({groupName:'APPLICANTS',groupValues:modifyApplicantList}) + } - // this.applicants.forEach(val => { - // if(val.applicant_type == 0){ - // this.CompanyApplicantGroupList.push({groupName:'APPLICANTS',groupValues:{id:val.pd_co_applicant_id,name:val.applicant_name,group_id:2}}) - // } - // if(val.applicant_type == 1){ - // this.CompanyApplicantGroupList.push({groupName:'APPLICANTS',groupValues:{id:val.pd_co_applicant_id,name:val.applicant_name,group_id:2}}) - // } - // if(val.applicant_type == 2){ - // this.CompanyApplicantGroupList.push({groupName:'COMPANIES',groupValues:{id:val.pd_co_applicant_id.toString(),name:val.applicant_name,group_id:1}}) - // } - // }); - - // console.log(this.CompanyApplicantGroupList); - - - - this.applicants.forEach(val => { - if(val.applicant_type == 0){ - ApplicantList = {id:val.pd_co_applicant_id,name:val.applicant_name,group_id:2}; - this.CompanyApplicantGroupList2.push({groupName:'APPLICANTS',groupValues:ApplicantList}) - } - if(val.applicant_type == 1){ - ApplicantList = {id:val.pd_co_applicant_id,name:val.applicant_name,group_id:2}; - this.CompanyApplicantGroupList2.push({groupName:'APPLICANTS',groupValues:ApplicantList}) - } + this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{ + if(data.dataStatus){ + this.existCompanyList = data.records.filter(val =>val.is_active===true); + } + + let modifyCompanyList : any=[]; + if(this.existCompanyList.length>0){ + modifyCompanyList = this.existCompanyList.map(element => { + return {id:element.company_order_id.toString(),name:element.company_name,group_id:1}; + }); + this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList}) + } + }); - this.applicants.forEach(val => { - if(val.applicant_type == 2){ - CompanyList = {id:val.pd_co_applicant_id,name:val.applicant_name,group_id:2}; - this.CompanyApplicantGroupList2.push({groupName:'COMPANIES',groupValues:CompanyList}); - } - }); - - // console.log(this.CompanyApplicantGroupList2); - - // let cal = Object.keys(this.CompanyApplicantGroupList2).map(function(key) { - // return this.CompanyApplicantGroupList2[key]; - // }); - - // console.log(cal); - this.productAbbr = this.pd_all_details.pdmaster_details.product_abbr; this.productID = this.pd_all_details.pdmaster_details.fk_product_id; @@ -160,7 +141,8 @@ export class LoanDetailsComponent implements OnInit { } }; ngOnInit() { - // console.clear(); + console.clear(); + console.log('this.applicants',this.applicants); this.initloanDetailsForm(); this.getM_EndUseofLoad(); this.getM_EndUseForLoan(this.pdid); @@ -240,7 +222,7 @@ export class LoanDetailsComponent implements OnInit { this.loanDetailsForm.controls['end_use_other'].setValue(value.records.end_use_other); } this.loanDetailsForm.controls['is_transfer'].setValue(value.records.is_transfer); - this.loanDetailsForm.controls['is_topup'].setValue(value.records.is_topup); + // this.loanDetailsForm.controls['is_topup'].setValue(value.records.is_topup); if (value.records.balance_transfer_amount) { this.loanDetailsForm.controls['balance_transfer_amount'].setValue(value.records.balance_transfer_amount); this.balTxrfAmtInWords = this._pd.convertNumberToWords(value.records.balance_transfer_amount); @@ -250,7 +232,7 @@ export class LoanDetailsComponent implements OnInit { this.topUpAmtInWords = this._pd.convertNumberToWords(value.records.topup_amount); } - this.loanDetailsForm.controls['end_use_topup'].setValue(value.records.end_use_topup); + // this.loanDetailsForm.controls['end_use_topup'].setValue(value.records.end_use_topup); if (value.records.lender) { this.loanDetailsForm.controls['lender'].setValue(value.records.lender); @@ -478,10 +460,9 @@ getM_sourceofamount() { end_use_other: [''], is_transfer: [''], //is_topup: [''], - is_topup: [''], balance_transfer_amount: [''], topup_amount: [''], - end_use_topup:[''], + // end_use_topup:[''], lender: [''], other_bt_lender : [''], own_contribution: [''], @@ -590,7 +571,7 @@ getM_sourceofamount() { }else{ records.end_use_other = null ;} records.is_transfer = this.loanDetailsForm.controls['is_transfer'].value; - records.is_topup = this.loanDetailsForm.controls['is_topup'].value; + // records.is_topup = this.loanDetailsForm.controls['is_topup'].value; if (this.loanDetailsForm.controls['is_transfer'].value == 'yes') { records.balance_transfer_amount = this.loanDetailsForm.controls['balance_transfer_amount'].value; @@ -616,14 +597,15 @@ getM_sourceofamount() { // if (this.loanDetailsForm.controls['is_topup'].value == 'yes') { records.topup_amount = this.loanDetailsForm.controls['topup_amount'].value; // } - records.end_use_topup = this.loanDetailsForm.controls['end_use_topup'].value; + // records.end_use_topup = this.loanDetailsForm.controls['end_use_topup'].value; - if (this.loanDetailsForm.controls['is_topup'].value == 'yes' || this.loanDetailsForm.controls['is_transfer'].value == 'yes') { + if (this.loanDetailsForm.controls['is_transfer'].value == 'yes') { //this.loanDetailsForm.controls['is_topup'].value == 'yes' || records.lender = this.loanDetailsForm.controls['lender'].value; + if(this.loanDetailsForm.controls['lender'].value == 1){ + records.other_bt_lender = this.loanDetailsForm.controls['other_bt_lender'].value; + } } - if(this.loanDetailsForm.controls['lender'].value == 3){ - records.other_bt_lender = this.loanDetailsForm.controls['other_bt_lender'].value; - } + records.emi_level = this.loanDetailsForm.controls['emi_level'].value; if(this.mortageCardAccess == true){ @@ -693,8 +675,8 @@ getM_sourceofamount() { // console.log('First Time',event); // console.log('First Time Value',event.value); if(event.value == 'no') { - this.loanDetailsForm.controls['is_topup'].clearValidators(); - this.loanDetailsForm.controls['is_topup'].updateValueAndValidity(); + // this.loanDetailsForm.controls['is_topup'].clearValidators(); + // this.loanDetailsForm.controls['is_topup'].updateValueAndValidity(); // console.log('no',event.value); this.loanDetailsForm.controls['source'].setValidators([Validators.required]); this.loanDetailsForm.controls['source'].updateValueAndValidity(); @@ -703,8 +685,8 @@ getM_sourceofamount() { this.loanDetailsForm.controls['own_contribution'].updateValueAndValidity(); } else if(event.value == 'yes'){ - this.loanDetailsForm.controls['is_topup'].setValidators([Validators.required]); - this.loanDetailsForm.controls['is_topup'].updateValueAndValidity(); + // this.loanDetailsForm.controls['is_topup'].setValidators([Validators.required]); + // this.loanDetailsForm.controls['is_topup'].updateValueAndValidity(); this.loanDetailsForm.controls['source'].clearValidators(); this.loanDetailsForm.controls['source'].updateValueAndValidity(); 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 4e8de11ac..c253d9559 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 @@ -71,16 +71,16 @@ - + - - + +
@@ -219,15 +219,15 @@ --> - + - + @@ -303,16 +303,16 @@ delete --> - + - - + + @@ -375,16 +375,16 @@ --> - + - - + + @@ -461,17 +461,16 @@ --> - + - + - @@ -534,15 +533,15 @@ --> - + - + 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 e99dc07ec..66a036cf2 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 @@ -95,7 +95,7 @@
- +
{{master.addressline1}},
{{master.city_name}},
{{master.state_name}}-{{master.pincode}}