From 6dfefdd2ed186e4c8aec3ce4bf29d01d1b4f09fc Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 27 Mar 2019 20:13:32 +0530 Subject: [PATCH 01/17] fixes : ps --- .../forms/address/address.component.html | 8 ++++---- .../forms/address/address.component.ts | 20 +++++++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) 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 c6599720c..05038c8b3 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 @@ -106,12 +106,12 @@ - + - + !-- MixUse + Required -- + --> 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 9815d902d..f99347e31 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 @@ -126,11 +126,14 @@ export class AddressComponent implements OnInit { 'address_type_others': datas.address_type_others, 'state': datas.state, 'city': datas.city, + 'citySearch':'', + 'stateSearch':'', + 'pinSearch':'', 'pincode': datas.pincode, 'pincode_others': datas.pincode_others, 'locality': datas.locality, 'locality_others': datas.locality_others, - 'locality_mixuse': datas.locality_mixuse, + // 'locality_mixuse': datas.locality_mixuse, 'pd_location': datas.pd_location, 'comment_locality': datas.comment_locality, 'estimated_area': datas.estimated_area, @@ -226,11 +229,14 @@ export class AddressComponent implements OnInit { 'address_type_others': '', 'state': val.fk_state, 'city': val.fk_city, + 'citySearch':'', + 'stateSearch':'', + 'pinSearch':'', 'pincode': val.pincode_id, 'pincode_others': val.other_pincode, 'locality': '', 'locality_others': '', - 'locality_mixuse': '', + // 'locality_mixuse': '', 'pd_location': '', 'comment_locality': '', 'estimated_area': '', @@ -291,11 +297,14 @@ export class AddressComponent implements OnInit { address_type_others: [AddressDetails.address_type_others], state: [AddressDetails.state], city: [AddressDetails.city], + citySearch:[''], + stateSearch:[''], + pinSearch:[''], pincode: [AddressDetails.pincode],/** ,Validators.compose([Validators.minLength(6),Validators.maxLength(6)]) */ pincode_others: [AddressDetails.pincode_others, Validators.compose([Validators.minLength(6), Validators.maxLength(6)])], locality: [AddressDetails.locality, Validators.compose([Validators.required])], locality_others: [AddressDetails.locality_others], - locality_mixuse: [AddressDetails.locality_mixuse], + // locality_mixuse: [AddressDetails.locality_mixuse], pd_location: [AddressDetails.pd_location, Validators.compose([Validators.required])], comment_locality: [AddressDetails.comment_locality, Validators.compose([Validators.required])], estimated_area: [AddressDetails.estimated_area], @@ -311,11 +320,14 @@ export class AddressComponent implements OnInit { address_type_others: [''], state: [''], city: [''], + citySearch:[''], + stateSearch:[''], + pinSearch:[''], pincode: [''], pincode_others: ['', Validators.compose([Validators.minLength(6), Validators.maxLength(6)])], locality: ['', Validators.compose([Validators.required])], locality_others: [''], - locality_mixuse: [''], + // locality_mixuse: [''], pd_location: ['', Validators.compose([Validators.required])], comment_locality: ['', Validators.compose([Validators.required])], estimated_area: [''], From 91af04fd8db14098d0731b66badc55c0d8283641 Mon Sep 17 00:00:00 2001 From: rajasekar Date: Fri, 29 Mar 2019 15:34:53 +0530 Subject: [PATCH 02/17] qu PDF enable link download --- .../qc-list/qc-pd-report/qc-pd-report.component.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.html index 548a0c955..77805c45e 100644 --- a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.html +++ b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.html @@ -11,6 +11,9 @@

{{ pd.doc_name }}

+

{{pd.createdby}} ({{pd.createdon}})

From 662ec3889253d1515b7553a88cabf80066953a1e Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 30 Mar 2019 10:16:21 +0530 Subject: [PATCH 03/17] fixes : ps --- .../business-info.component.html | 7 +- .../employment-info.component.html | 15 +- .../employment-info.component.ts | 146 +++++++++++++++--- .../loan-details/loan-details.component.ts | 44 ++++-- 4 files changed, 174 insertions(+), 38 deletions(-) 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 408ab90d5..57bf1b88f 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 @@ -1510,9 +1510,10 @@ - {{"₹"}} {{businessForm.controls['employees_appx_salary'].value | numberToWords}} Only + formControlName="employees_appx_salary" required type="number"> + {{"₹"}} + {{businessForm.controls['employees_appx_salary'].value | numberToWords}} + Only - + Select {{ cl.company_name }} @@ -40,17 +40,20 @@ + Higer then business vintage + Higer then business vintage - + + Total working Experience is Lower @@ -186,13 +189,15 @@ + formControlName="amount_paid_in_cash" OnlyNumber type="text" autocomplete="off" (change)="ValidateNetSalary()"> {{"₹"}} {{employmentForm.controls['amount_paid_in_cash'].value | numberToWords}} Only + Given Value is Maximum of Net Salary + formControlName="amount_paid_through_bank" OnlyNumber type="text" autocomplete="off" (change)="ValidateNetSalary()"> {{"₹"}} {{employmentForm.controls['amount_paid_through_bank'].value | numberToWords}} Only + Given Value is Maximum of Net Salary 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 c185314f2..a0b6ba751 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 @@ -52,7 +52,8 @@ export class EmploymentInfoComponent implements OnInit { public filtered_company_relationship_list: any[]; public dateonly: any = [{date:1,isdisabled:false},{date:2,isdisabled:false},{date:3,isdisabled:false},{date:4,isdisabled:false},{date:5,isdisabled:false},{date:6,isdisabled:false},{date:7,isdisabled:false},{date:8,isdisabled:false},{date:9,isdisabled:false},{date:10,isdisabled:false},{date:11,isdisabled:false},{date:12,isdisabled:false},{date:13,isdisabled:false},{date:14,isdisabled:false},{date:15,isdisabled:false},{date:16,isdisabled:false},{date:17,isdisabled:false},{date:18,isdisabled:false},{date:19,isdisabled:false},{date:20,isdisabled:false},{date:21,isdisabled:false},{date:22,isdisabled:false},{date:23,isdisabled:false},{date:24,isdisabled:false},{date:25,isdisabled:false},{date:26,isdisabled:false},{date:27,isdisabled:false},{date:28,isdisabled:false},{date:29,isdisabled:false},{date:30,isdisabled:false},{date:31,isdisabled:false}]; public todate: any[] = this.dateonly; - + generalExistBusinessYear:any; + generalExistBusinessMonth:any; constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, @@ -67,6 +68,8 @@ export class EmploymentInfoComponent implements OnInit { this.lender_applicant_id = this.pd_all_details.pdmaster_details.lender_applicant_id; this.subproduct_abbr = this.pd_all_details.pdmaster_details.subproduct_abbr; this.customer_segment_abbr = this.pd_all_details.pdmaster_details.customer_segment_abbr; + this.generalExistBusinessYear=100; + this.generalExistBusinessMonth=12; } @@ -180,7 +183,7 @@ export class EmploymentInfoComponent implements OnInit { this.employmentForm = this.fb.group({ employer_name: ['', Validators.compose([Validators.required])], employer_in_brief: ['', Validators.compose([Validators.required])], - how_long_year: ['', Validators.compose([Validators.required])], + how_long_year: ['', Validators.compose([Validators.required]),Validators.max(this.generalExistBusinessYear)], how_long_month: [''], total_business_experience: [''], total_business_previous_experience: [''], @@ -222,18 +225,106 @@ export class EmploymentInfoComponent implements OnInit { } } + checkWithExistYear(e) { + + let data1 = this.company_list.filter(c => c.company_name == e.split('-')[1])[0]; + + console.log('this.generalExistBusinessMonth',this.generalExistBusinessMonth); + console.log('this.generalExistBusinessYear',this.generalExistBusinessYear); + if(data1.business_month != null && data1.business_month != '' && data1.business_month != undefined){ + this.generalExistBusinessMonth = data1.business_month + } + if(data1.business_years){ + this.generalExistBusinessYear = data1.business_years + } + this.employmentForm.controls['how_long_year'].setValidators([Validators.max(this.generalExistBusinessYear)]); + this.employmentForm.controls['how_long_year'].updateValueAndValidity(); + + } + + // ConvertMonthintoYear(e) { + + // let how_long_year = this.employmentForm.controls.how_long_year.value; + + // let converted_month: number = e % 12; + // let converted_year: number = e / 12; + // // if (how_long_year > this.generalExistBusinessYear) { + // // this.employmentForm.controls['how_long_year'].setValidators([Validators.max(this.generalExistBusinessYear)]); + // // this.employmentForm.controls['how_long_year'].updateValueAndValidity(); + // // this.employmentForm.controls['how_long_year'].setValue(''); + // // this.employmentForm.controls['how_long_month'].setValue(''); + // // } + // // else { + // this.employmentForm.controls.how_long_year.setValue(+how_long_year + +Math.floor(converted_year)); + // this.employmentForm.controls.how_long_month.setValue(Math.floor(converted_month)); + // // } + // } + ConvertMonthintoYear(e) { let how_long_year = this.employmentForm.controls.how_long_year.value; - - let converted_month: number = e % 12; + + let converted_month: number = +e%12; let converted_year: number = e / 12; - - this.employmentForm.controls.how_long_year.setValue(+how_long_year + +Math.floor(converted_year)); - this.employmentForm.controls.how_long_month.setValue(Math.floor(converted_month)); - + + if (how_long_year > this.generalExistBusinessYear) { + this.employmentForm.controls['how_long_year'].setValidators([Validators.max(this.generalExistBusinessYear)]); + this.employmentForm.controls['how_long_year'].updateValueAndValidity(); + this.employmentForm.controls['how_long_year'].setValue(''); + this.employmentForm.controls['how_long_month'].setValue(''); + } + else { + if (how_long_year == this.generalExistBusinessYear && +converted_month > this.generalExistBusinessMonth) { + + this.employmentForm.controls['how_long_year'].setValidators([Validators.max(this.generalExistBusinessYear)]); + this.employmentForm.controls['how_long_year'].updateValueAndValidity(); + + this.employmentForm.controls['how_long_month'].setValidators([Validators.max(this.generalExistBusinessMonth)]); + this.employmentForm.controls['how_long_month'].updateValueAndValidity(); + + } else { + + this.employmentForm.controls.how_long_year.setValue(+how_long_year + +Math.floor(converted_year)); + this.employmentForm.controls.how_long_month.setValue(Math.floor(converted_month)); + + } + } } - + + ValidateNetSalary(){ + let salary = this.employmentForm.controls['net_monthly_salary'].value; + console.log('this.employmentForm.controls[amount_paid_in_cash].value',this.employmentForm.controls['amount_paid_in_cash'].value); + + if(salary != ''){ + let cash_amount = this.employmentForm.controls['amount_paid_in_cash'].value; + // let Bank_amount = this.employmentForm.controls['amount_paid_through_bank'].value; + + this.employmentForm.controls['amount_paid_in_cash'].setValidators([Validators.max(salary)]); + this.employmentForm.controls['amount_paid_in_cash'].updateValueAndValidity(); + let maxamt = salary-cash_amount + if(maxamt >= 0 ){ + this.employmentForm.controls['amount_paid_through_bank'].setValidators([Validators.max(salary-cash_amount)]); + } + else{ + this.employmentForm.controls['amount_paid_through_bank'].setValue('0'); + this.employmentForm.controls['amount_paid_through_bank'].setValidators([Validators.max(0)]); + } + this.employmentForm.controls['amount_paid_through_bank'].updateValueAndValidity(); + + } + else{ + // this.toast.pdTriggerappmessage('Net Monthly Salary Is Empty.!'); + this.notifier.notify('warning', 'Net Monthly Salary Is Empty.!'); + this.employmentForm.controls['amount_paid_in_cash'].setValue(''); + this.employmentForm.controls['amount_paid_in_cash'].updateValueAndValidity(); + this.employmentForm.controls['amount_paid_through_bank'].setValue(''); + this.employmentForm.controls['amount_paid_through_bank'].updateValueAndValidity(); + return; + } + + + } + submitDetails() { if(this.pd_cus_segment != 'SAL-CHQ'){ if(this.employmentForm.controls.was_met.value == 'no'){ @@ -394,20 +485,37 @@ export class EmploymentInfoComponent implements OnInit { }) } /** On Key Press Event For Numbers */ + // checkWorkingExperiences(){ + // // this.workExperienceErrorFlag = (+this.employmentForm.controls.total_business_experience.value ) <= (+this.employmentForm.controls.how_long_year.value) ? true : false; + // // this.workExperienceFlag = (+this.employmentForm.controls.total_business_experience.value ) < (+this.employmentForm.controls.how_long_year.value) ? false : true; + // if((+this.employmentForm.controls.total_business_experience.value ) < (+this.employmentForm.controls.how_long_year.value)){ + // console.log(+this.employmentForm.controls.total_business_experience.value , +this.employmentForm.controls.how_long_year.value); + // this.workExperienceFlag = false; + // this.workExperienceErrorFlag = true; + // } + // else{ + // this.workExperienceFlag = true; + // this.workExperienceErrorFlag = false; + // } + // } + checkWorkingExperiences(){ // this.workExperienceErrorFlag = (+this.employmentForm.controls.total_business_experience.value ) <= (+this.employmentForm.controls.how_long_year.value) ? true : false; // this.workExperienceFlag = (+this.employmentForm.controls.total_business_experience.value ) < (+this.employmentForm.controls.how_long_year.value) ? false : true; - if((+this.employmentForm.controls.total_business_experience.value ) < (+this.employmentForm.controls.how_long_year.value)){ - console.log(+this.employmentForm.controls.total_business_experience.value , +this.employmentForm.controls.how_long_year.value); - this.workExperienceFlag = false; - this.workExperienceErrorFlag = true; + + this.employmentForm.controls['total_business_experience'].setValidators([Validators.min(+this.employmentForm.controls.how_long_year.value)]); + this.employmentForm.controls['total_business_experience'].updateValueAndValidity(); + + this.workExperienceFlag = +this.employmentForm.controls.total_business_experience.value > +this.employmentForm.controls.how_long_year.value ? true : false; + + if(!this.workExperienceFlag){ + this.employmentForm.controls['total_business_previous_experience'].setValue(''); + this.employmentForm.controls['total_business_previous_experience'].updateValueAndValidity(); } - else{ - this.workExperienceFlag = true; - this.workExperienceErrorFlag = false; - } - } - + + } + + // keyPress(event: any) { // const pattern = /[0-9]/; 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 d02a1833e..71d02886d 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 @@ -334,7 +334,7 @@ export class LoanDetailsComponent implements OnInit { return data; } - else if (data.group_name == that.productAbbr && data.sub_group_name != null && data.isactive == 1) { + else if (data.group_name == that.productAbbr && data.sub_group_name == null && data.isactive == 1) { return data; } @@ -557,22 +557,44 @@ export class LoanDetailsComponent implements OnInit { } /** Using Selected Mortage Type Set validation */ - mortage_type(mortage_value) { + // mortage_type(mortage_value) { - //let mortagetypes = this.m_mortageTypeProperty.filter(mor=>mor.mortage_property_id==mortage_value)[0]; - let mortagetypes = this.m_mortageTypeProperty.filter(mor => mor.mortage_property_id == mortage_value)[0]; + // //let mortagetypes = this.m_mortageTypeProperty.filter(mor=>mor.mortage_property_id==mortage_value)[0]; + // let mortagetypes = this.m_mortageTypeProperty.filter(mor => mor.mortage_property_id == mortage_value)[0]; - if (mortagetypes.property_name == 'Others (Please Specify)') { - this.mortageAccess = true; - this.loanDetailsForm.controls['property_type_others'].setValidators([Validators.required]); - this.loanDetailsForm.controls['property_type_others'].updateValueAndValidity(); - } else { + // if (mortagetypes.property_name == 'Others (Please Specify)') { + // this.mortageAccess = true; + // this.loanDetailsForm.controls['property_type_others'].setValidators([Validators.required]); + // this.loanDetailsForm.controls['property_type_others'].updateValueAndValidity(); + // } else { + // this.mortageAccess = false; + // this.loanDetailsForm.controls['property_type_others'].setValue(''); + // this.loanDetailsForm.controls['property_type_others'].clearValidators(); + // this.loanDetailsForm.controls['property_type_others'].updateValueAndValidity(); + // } + // } + + mortage_type(mortage_value) + { + console.log('mortage_value',mortage_value); + console.log('this.m_mortageTypeProperty',this.m_mortageTypeProperty); + let mortagetypes = this.m_mortageTypeProperty.filter(mor => mor.mortage_property_id == mortage_value)[0]; + let property_name = mortagetypes.property_name.replace(/\s/g, "").toLowerCase(); + if(property_name=='others(pleasespecify)') + { + this.mortageAccess = true; + this.loanDetailsForm.controls['property_type_others'].setValidators([Validators.required]); + this.loanDetailsForm.controls['property_type_others'].updateValueAndValidity(); + }else + { this.mortageAccess = false; this.loanDetailsForm.controls['property_type_others'].setValue(''); this.loanDetailsForm.controls['property_type_others'].clearValidators(); this.loanDetailsForm.controls['property_type_others'].updateValueAndValidity(); - } - } + } + + + } /** For Loan Calculation */ loanCalc() { From 26f8e55308e93b018f0f64e6d237cc36b9588656 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Mon, 1 Apr 2019 12:35:11 +0530 Subject: [PATCH 04/17] issues fixes : ps --- .../assets-info/assets-info.component.html | 2 +- .../business-assets-info.component.scss | 2 + .../current-loan/current-loan.component.html | 2 +- .../employment-info.component.html | 8 +- .../employment-info.component.ts | 30 +-- .../family-details.component.html | 2 +- .../financial-info.component.html | 172 +++++++++--------- .../financial-info.component.scss | 1 + .../financial-info.component.ts | 38 ++-- .../start-pd/forms/stock/stock.component.html | 4 +- 10 files changed, 141 insertions(+), 120 deletions(-) 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 8237438d9..6eed489c7 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 @@ -294,7 +294,7 @@
+ style="width:45%; height: 105px !important;"> {{"₹"}} {{sup.get('approximate_market_value').value | numberToWords}} Only diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.scss index a1c689d8e..1387488cf 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.scss @@ -17,10 +17,12 @@ .matcard mat-form-field { margin: 0 2%; + height: 105px !important; } mat-form-field { margin: 0 2%; + height: 105px !important; } $base-card-box-shadow:1.5px 2.6px 24px 0 rgba(0, 35, 136, 0.08) !important; 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 6bd06ad7e..64f45ff74 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 @@ -60,7 +60,7 @@ - + {{"₹"}} {{details.get('loan_amount').value | numberToWords}} Only diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html index 59885fd22..663351abc 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html @@ -38,16 +38,16 @@
- Higer then business vintage - Higer then business vintage - + Total working Experience is Lower - + 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 a0b6ba751..ca0f0ef78 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 @@ -183,8 +183,8 @@ export class EmploymentInfoComponent implements OnInit { this.employmentForm = this.fb.group({ employer_name: ['', Validators.compose([Validators.required])], employer_in_brief: ['', Validators.compose([Validators.required])], - how_long_year: ['', Validators.compose([Validators.required]),Validators.max(this.generalExistBusinessYear)], - how_long_month: [''], + how_long_year: ['',Validators.compose([Validators.required,Validators.max(this.generalExistBusinessYear)])], + how_long_month: ['',Validators.compose([Validators.max(12)])], total_business_experience: [''], total_business_previous_experience: [''], was_met: [this.pd_cus_segment == 'SAL-CHQ' ? 'no' : '', Validators.compose([Validators.required])], @@ -231,15 +231,15 @@ export class EmploymentInfoComponent implements OnInit { console.log('this.generalExistBusinessMonth',this.generalExistBusinessMonth); console.log('this.generalExistBusinessYear',this.generalExistBusinessYear); + if(data1.business_month != null && data1.business_month != '' && data1.business_month != undefined){ this.generalExistBusinessMonth = data1.business_month } if(data1.business_years){ this.generalExistBusinessYear = data1.business_years } - this.employmentForm.controls['how_long_year'].setValidators([Validators.max(this.generalExistBusinessYear)]); + this.employmentForm.controls['how_long_year'].setValidators(Validators.compose([Validators.max(this.generalExistBusinessYear)])); this.employmentForm.controls['how_long_year'].updateValueAndValidity(); - } // ConvertMonthintoYear(e) { @@ -263,24 +263,28 @@ export class EmploymentInfoComponent implements OnInit { ConvertMonthintoYear(e) { let how_long_year = this.employmentForm.controls.how_long_year.value; - + + this.employmentForm.controls['how_long_month'].clearValidators(); + let converted_month: number = +e%12; let converted_year: number = e / 12; - + + // console.log('e',e%12); + // console.log('e',e); + // console.log('e',e/12); + if (how_long_year > this.generalExistBusinessYear) { - this.employmentForm.controls['how_long_year'].setValidators([Validators.max(this.generalExistBusinessYear)]); - this.employmentForm.controls['how_long_year'].updateValueAndValidity(); + + this.employmentForm.controls['how_long_year'].setValidators(Validators.compose([Validators.max(this.generalExistBusinessYear)])); this.employmentForm.controls['how_long_year'].setValue(''); this.employmentForm.controls['how_long_month'].setValue(''); } else { if (how_long_year == this.generalExistBusinessYear && +converted_month > this.generalExistBusinessMonth) { - this.employmentForm.controls['how_long_year'].setValidators([Validators.max(this.generalExistBusinessYear)]); - this.employmentForm.controls['how_long_year'].updateValueAndValidity(); + this.employmentForm.controls['how_long_year'].setValidators(Validators.compose([Validators.max(this.generalExistBusinessYear)])); - this.employmentForm.controls['how_long_month'].setValidators([Validators.max(this.generalExistBusinessMonth)]); - this.employmentForm.controls['how_long_month'].updateValueAndValidity(); + this.employmentForm.controls['how_long_month'].setValidators(Validators.compose([Validators.max(this.generalExistBusinessMonth)])); } else { @@ -289,6 +293,8 @@ export class EmploymentInfoComponent implements OnInit { } } + this.employmentForm.controls['how_long_year'].updateValueAndValidity(); + this.employmentForm.controls['how_long_month'].updateValueAndValidity(); } ValidateNetSalary(){ 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 dd0c2a3e9..a4b92aaf1 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 @@ -165,7 +165,7 @@ - + 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 de32ed394..c8721abcc 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 @@ -35,13 +35,13 @@
Enter year from which financials provided - - Invalid year format + Invalid year format
@@ -56,15 +56,12 @@
- {{"₹"}} {{details.get('financial_annual_sale').value | numberToWords}} Only - - + OnlyNumber type="text"> + {{"₹"}} + {{details.get('financial_annual_sale').value | numberToWords}} + Only + @@ -114,36 +111,30 @@ - {{"₹"}} {{details.get('financial_net_profit').value | numberToWords}} Only - - + OnlyNumber type="text"> + {{"₹"}} + {{details.get('financial_net_profit').value | + numberToWords}} Only + formControlName="financial_margin_of_profit" OnlyNumber + type="text" readonly> - - {{"₹"}} {{details.get('financial_net_loss').value | numberToWords}} Only - - + OnlyNumber type="text"> + {{"₹"}} + {{details.get('financial_net_loss').value | numberToWords}} + Only + + + placeholder="Variation of Profit/Loss to Sales % from Previous Year" + formControlName="financial_profit_to_sale_variation" OnlyNumber + type="text" readonly> No difference in Profit/Loss to sales % in FY {{details.get('financial_year').value}} over - Profit/Loss to sales % in FY + Profit/Loss to sales % in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} @@ -204,7 +196,7 @@ class="greenhighlight"> Increase in Profit/Loss to sales % in FY {{details.get('financial_year').value}} over - Profit/Loss to sales % in FY + Profit/Loss to sales % in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} {{details.get('financial_profit_to_sale_variation').value}} @@ -214,7 +206,7 @@ class="highlight"> Decrease in Profit/Loss to sales % in FY {{details.get('financial_year').value}} over - Profit/Loss to sales % in FY + Profit/Loss to sales % in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} {{(details.get('financial_profit_to_sale_variation').value).replace('-', @@ -258,9 +250,11 @@ - {{"₹"}} {{details.get('estimate_sales_from').value | numberToWords}} Only + formControlName="estimate_sales_from" (change)="calculateSalesAverage(i, details);" + OnlyNumber type="text"> + {{"₹"}} + {{details.get('estimate_sales_from').value | numberToWords}} + Only - {{"₹"}} {{details.get('estimate_profit_margin').value | numberToWords}} Only + formControlName="estimate_profit_margin" readonly> + {{"₹"}} + {{details.get('estimate_profit_margin').value | + numberToWords}} Only + + + {{"₹"}} + {{details.get('estimate_net_loss_to').value | + numberToWords}} Only + + - {{"₹"}} {{details.get('estimate_net_loss').value | numberToWords}} Only - + formControlName="estimate_net_loss" OnlyNumber type="text"> + {{"₹"}} + {{details.get('estimate_net_loss').value | numberToWords}} + Only + + + Select + {{ prod.name }} + Others + + + +
- + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.ts index 73f44e19c..6519c75b1 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.ts @@ -19,6 +19,7 @@ export class ManageDailySalesComponent implements OnInit { UOMData: any[]=[]; frequencyData: any[]=[]; marginAmtInwords: any[]=[]; + productandservice : any[]=[]; private notifier: NotifierService; check_type:any=[{'type_id':"1",'type_name':'Date Information'},{'type_id':"2",'type_name':'Frequency Information'}] constructor(notifier: NotifierService,private _fb: FormBuilder, private _pd: PdTrigerService, @Inject(MAT_DIALOG_DATA) public data: any, private dialogRef: MatDialogRef) { @@ -28,6 +29,46 @@ export class ManageDailySalesComponent implements OnInit { } ngOnInit() { + this._pd.getTypeofActivityForSuppliedInfoForm(this.data.masterData.pdid, this.data.masterData.company_id).subscribe(data => { + + if (data.dataStatus) { + + let datas = data.records; + + let api = Object.keys(datas.type_of_activity).map(function (key) { + return datas.type_of_activity[key]; + }); + + if (api.length > 0) { + api.forEach(val => { + if (val.type_of_activity_id == 2) { + if (val.prodcuts) { + this.productandservice.push(val.prodcuts); + } + } + + if (val.type_of_activity_id == 3) { + if (val.prodcuts) { + this.productandservice.push(val.prodcuts); + } + } + + if (val.type_of_activity_id == 4) { + if (val.prodcuts) { + this.productandservice.push(val.prodcuts); + } + } + + if (val.type_of_activity_id == 5) { + if (val.prodcuts) { + this.productandservice.push(val.prodcuts); + } + } + }); + } + this.productandservice = [].concat.apply([], this.productandservice); + } + }) if(this.data.manage_status==1){ this.salesItemForm = this._fb.group({ sales_product: this._fb.array([this.createSalesItem()]), @@ -79,6 +120,7 @@ export class ManageDailySalesComponent implements OnInit { company_id:[this.data.masterData.company_id], sim_id: [''], sales_item: ['', Validators.compose([Validators.required])], + other_sales_item:[''], child: this._fb.array([]), margin_per: [''], margin_value: [''], @@ -107,6 +149,7 @@ createSalesItemWithData(values: any) { company_id:[this.data.masterData.company_id], sim_id: [values.sim_id], sales_item: [values.salesItem, Validators.compose([Validators.required])], + other_sales_item:[values.otherSalesItem === null ? '' : values.otherSalesItem ], child: this._fb.array([]), margin_per: [this.data.margin_calculation_status===true ? values.margin_per: ''], margin_value: [this.data.margin_calculation_status===true ? values.margin_value: ''], @@ -187,7 +230,8 @@ salesCalculation(indexVal: number,values: any): void { }); let getTotalValueCounts = transformData.map(val=>val.sales_value) .reduce((sum, curr) => parseInt(sum) + parseInt(curr)); - control.controls[indexVal].controls['margin_value'].setValue(parseInt(getTotalValueCounts) * (parseInt(values.margin_per)/100) * (12 / parseInt(getUniqueMonthCounts.length))); + let calculatedValue = parseInt(getTotalValueCounts) * (parseInt(values.margin_per)/100) * (12 / parseInt(getUniqueMonthCounts.length)); + control.controls[indexVal].controls['margin_value'].setValue(calculatedValue.toFixed(2)); } else{ control.controls[indexVal].controls['margin_value'].setValue(""); @@ -208,7 +252,8 @@ salesCalculation(indexVal: number,values: any): void { innercontrol.controls[innercontrol.value.length-1].controls['sales_value'].setValue(parseInt(filterFrequencyValue[0].mutiple_factor) * parseInt(values.child[values.child.length-1].frequency_value)); let getTotalValueCounts =parseInt(filterFrequencyValue[0].mutiple_factor) * parseInt(values.child[values.child.length-1].frequency_value) - values.margin_per!='' ? control.controls[indexVal].controls['margin_value'].setValue( getTotalValueCounts * (parseInt(values.margin_per)/100)) : ''; + let CalculatedVal = getTotalValueCounts * (parseInt(values.margin_per)/100); + values.margin_per!='' ? control.controls[indexVal].controls['margin_value'].setValue( CalculatedVal.toFixed(2)) : ''; } else { innercontrol.controls[innercontrol.value.length-1].controls['sales_value'].setValue(""); @@ -222,7 +267,8 @@ salesCalculation(indexVal: number,values: any): void { if(values.child[values.child.length-1].fk_frequency_id!='' && values.child[values.child.length-1].frequency_value!=''){ let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.child[values.child.length-1].fk_frequency_id); - innercontrol.controls[innercontrol.value.length-1].controls['sales_value'].setValue(parseInt(filterFrequencyValue[0].mutiple_factor) * parseInt(values.child[values.child.length-1].frequency_value)); + let marginCalculatedValue = parseInt(filterFrequencyValue[0].mutiple_factor) * parseInt(values.child[values.child.length-1].frequency_value); + innercontrol.controls[innercontrol.value.length-1].controls['sales_value'].setValue(marginCalculatedValue.toFixed(2)); } else { innercontrol.controls[innercontrol.value.length-1].controls['sales_value'].setValue(""); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.html index 217633517..153ab60bc 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.html @@ -14,8 +14,16 @@
- + + + Select + {{ prod.name }} + Others + + + + +
+ + + + + + + + + Select + {{ prod }} + Others + + + + + + + +
+ +
+
+
+ + + + + + + + {{"₹"}} {{childItem.value.purchase_value | numberToWords}} Only + + +
+ +
+
+ +
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.scss new file mode 100644 index 000000000..3286c8cbe --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.scss @@ -0,0 +1,34 @@ +.paragraph_change { + color: #fff !important; + background-color: #e00201 !important; + } + mat-form-field { + margin: 0 2%; + } + .example-section { + height: 120px; + } + + .example-margin { + margin: 0 10px; + } + ::ng-deep .cdk-global-overlay-wrapper{ + justify-content: center !important; +} + +.item-margin { + margin-left:4%; + margin-top:2%; +} +.item-product-margin{ + margin-top:2%; +} +.example-radio-group { + display: flex; + flex-direction: row; + flex-wrap: wrap; +} +.example-radio-button { + margin: 0 2%; + color: #000 !important +} \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.spec.ts new file mode 100644 index 000000000..44cef4cf0 --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ManageDailyPurchaseComponent } from './manage-daily-purchase.component'; + +describe('ManageDailyPurchaseComponent', () => { + let component: ManageDailyPurchaseComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ManageDailyPurchaseComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ManageDailyPurchaseComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts new file mode 100644 index 000000000..4714986fd --- /dev/null +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts @@ -0,0 +1,261 @@ +import { Component, OnInit, Input, Output, Inject } from '@angular/core'; +import { FormBuilder, FormGroup, Validators, FormControl, FormArray } from '@angular/forms'; +import { MatDialog, MatDialogRef, MAT_DIALOG_DATA , DialogPosition} from '@angular/material'; +import { PdTrigerService } from './../../../../../../../pd-service/pd-triger.service'; +import { NotifierService } from 'angular-notifier'; +import { DatePipe } from '@angular/common'; +import { DeleteRecordsCountPipe } from './../../../../../../../pd-pipes/delete-records-count.pipe'; + +@Component({ + selector: 'app-manage-daily-purchase', + templateUrl: './manage-daily-purchase.component.html', + styleUrls: ['./manage-daily-purchase.component.scss'] +}) +export class ManageDailyPurchaseComponent implements OnInit { + Value: any []=[]; + pipe = new DatePipe('en-US'); + pageTitle:string; + purchaseItemForm:FormGroup; + UOMData: any[]=[]; + frequencyData: any[]=[]; + marginAmtInwords: any[]=[]; + productListData : any[]=[]; + private notifier: NotifierService; + + constructor(notifier: NotifierService,private _fb: FormBuilder, private _pd: PdTrigerService, @Inject(MAT_DIALOG_DATA) public data: any, private dialogRef: MatDialogRef) { + this.pageTitle = this.data.manage_status==1 ? 'Add Daily Purchase Item' : 'Update Daily Purchase Item'; + this.notifier = notifier; + } + + ngOnInit() { + //Business Product list for dropdown. + this._pd.getProductsFromBusinessAndSupplier(this.data.masterData.pdid, this.data.masterData.company_id).subscribe(data => { + if (data.dataStatus){ + let datas = data.record; + + let type2 = datas.from_business.filter(data => data.type_of_activity_id == 2); + if(type2[0].hasOwnProperty("products")){ + // this.productListData.push(type2[0].products); + } + let type3 = datas.from_business.filter(data => data.type_of_activity_id == 3); + if(type3[0].hasOwnProperty("products")){ + this.productListData.push(type3[0].products); + } + let type4 = datas.from_business.filter(data => data.type_of_activity_id == 4); + if(type4[0].hasOwnProperty("products")){ + this.productListData.push(type4[0].products); + } + if(datas.from_supplier.hasOwnProperty("raw_material")){ + this.productListData.push(datas.from_supplier.raw_material); + } + this.productListData = [].concat.apply([], this.productListData); + + } +}) + +//manage_status '1' for Add , '2' for edit functionalities + + if(this.data.manage_status==1){ + this.purchaseItemForm = this._fb.group({ + purchase_product: this._fb.array([this.createPurchaseItem()]), + }); + let control: any = this.purchaseItemForm.controls['purchase_product']; + control = control.controls[0].get('child') as FormArray; + control.push(this.createDailyPurchaseData('')) + } + else if(this.data.manage_status==2){ + this.purchaseItemForm = this._fb.group({ + purchase_product: this._fb.array([this.createPurchaseItemWithData(this.data.editData)]), + }); + let control: any = this.purchaseItemForm.controls['purchase_product']; + let innercontrol: any = control.controls[0].get('child') as FormArray; + this.data.editData.values.forEach((elementVal,inx) => { + innercontrol.push(this.createDailyPurchaseWithData(elementVal,this.data.editData)) + }); + + + control.controls[control.value.length-1].controls['comments'].setValidators([Validators.required]); + control.controls[control.value.length-1].controls['comments'].updateValueAndValidity(); + } + else{ + this.purchaseItemForm = this._fb.group({ + purchase_product: this._fb.array([]), + }); + + } + + } + + //create purchase product + createPurchaseItem():FormGroup { + return this._fb.group({ + fk_pd_id: [this.data.masterData.pdid], + company_id:[this.data.masterData.company_id], + pbw_id: [''], + purchase_item: ['', Validators.compose([Validators.required])], + other_purchase_item:[''], + annual_purchase_value: [''], + child: this._fb.array([]), + comments: [''], + isactive:[true], + }); +} + +// create daily list empty +createDailyPurchaseData(pbw_id: string) { + return this._fb.group({ + pbwc_id: [''], + fk_pbw_id: [pbw_id], + purchase_date: [''], + purchase_value: ['', Validators.compose([Validators.required])], + isactive:[true], + }) +} + +// create purchase product with Data +createPurchaseItemWithData(values: any) { + return this._fb.group({ + fk_pd_id: [this.data.masterData.pdid], + company_id:[this.data.masterData.company_id], + pbw_id: [values.pbw_id], + purchase_item: [values.purchaseItem, Validators.compose([Validators.required])], + other_purchase_item:[values.otherPurchaseItem === null ? '' : values.otherPurchaseItem ], + annual_purchase_value: [values.annualPurchaseValue], + child: this._fb.array([]), + comments: [values.comments], + isactive:[true], + }); +} + +// create daily purchase product with Data +createDailyPurchaseWithData(values: any, parent: any) { + return this._fb.group({ + pbwc_id: [values.pbwc_id], + fk_pbw_id: [parent.pbw_id], + purchase_date: [parent.purchase_type=='2' ? '' :new Date(this.pipe.transform(values.purchase_date, 'yyyy-MM-dd')), Validators.compose([Validators.required])], + purchase_value: [values.purchase_value, Validators.compose([Validators.required])], + isactive:[true] + }) +} + +// add more purchase products +addMore(parentIndex: number): void{ + let control = this.purchaseItemForm.controls['purchase_product']; + control.push(this.createPurchaseItem()); + control = control.controls[parentIndex].get('child') as FormArray; + control.push(this.createDailyPurchaseData('')) +} + +// add more purchase daily products +addMoreDailyPurchase(parentIndex: number,values: any): void{ + let control: any = this.purchaseItemForm.controls['purchase_product']; + control=control.controls[parentIndex].get('child') as FormArray; + control.push(this.createDailyPurchaseData(values.pbw_id)); +} + +// remove dailywise Purchase Products items +removeDailyItems(parentIndex: number,childIndex:number, childValue:any): void { + let control: any = this.purchaseItemForm.controls['purchase_product']; + control=control.controls[parentIndex].get('child') as FormArray; + if(childValue.pbwc_id=='' || childValue.pbwc_id==null){ + control.removeAt(childIndex); + let calculatControlValues: any = this.purchaseItemForm.controls['purchase_product']; + calculatControlValues = calculatControlValues.controls[parentIndex]; + this.purchaseCalculation(parentIndex,calculatControlValues.value); + } + else { + control.controls[childIndex].controls.isactive.setValue(false); + let calculatControlValues: any = this.purchaseItemForm.controls['purchase_product']; + calculatControlValues = calculatControlValues.controls[parentIndex]; + this.purchaseCalculation(parentIndex,calculatControlValues.value); + } + +} + +//To remove the Products +removeProducts(parentIndex:number){ + let control: any = this.purchaseItemForm.controls['purchase_product']; + control.removeAt(parentIndex); +} + +// close dialogue manually +closeDialogue(){ + this.dialogRef.close({update_status:false}); +} + +// this caculation for running total +purchaseCalculation(indexVal: number,values: any): void { + let control:any = this.purchaseItemForm.controls['purchase_product']; + + if(values.child.length>0){ + let transformData = values.child.filter(val=>val.purchase_date!='' && val.purchase_date!=null && val.purchase_date!=undefined && val.purchase_value!='' && val.isactive===true).map(mval=>{ + mval.custum_date = this.pipe.transform(mval.purchase_date, 'yyyy-MM'); + return mval; + }); + + if(transformData.length>0) { + // let getUniqueMonthCounts = transformData.map(val=>val.custum_date) + // .filter((fVal,fIndex,fArray)=>{ + // return fIndex === fArray.indexOf(fVal); + // }); + + let TotalAnnualValue = transformData.map(val=>val.purchase_value) + .reduce((sum, curr) => parseInt(sum) + parseInt(curr)); + control.controls[indexVal].controls['annual_purchase_value'].setValue(TotalAnnualValue); + } + else{ + control.controls[indexVal].controls['annual_purchase_value'].setValue(""); + } + + } + else { + let innercontrol: any = control.controls[indexVal].get('child') as FormArray; + innercontrol.controls[innercontrol.value.length-1].controls['purchase_value'].setValue(""); + control.controls[indexVal].controls['annual_purchase_value'].setValue(""); + } +} + +// save purchase details +submitDetails(records) { + + if (this.purchaseItemForm.invalid) { + this.validateAllFormFields(this.purchaseItemForm); + this.notifier.notify('warning',"Please Check All Manatory Fields.."); + return; + } + // this is for remove custom date key from my array values + records.purchase_product.forEach(parVal => { + parVal.child.forEach(childVal => { + if(childVal['custum_date']){ + delete childVal['custum_date']; + } + if(childVal['purchase_date']) + childVal['purchase_date']=this.pipe.transform(childVal['purchase_date'], 'yyyy-MM-dd'); + }); + }); + + this._pd.saveAssessedDetails('saveAssessedIncomePurchaseBillwise',records.purchase_product).subscribe(data => { + this.notifier.notify('success', this.data.manage_status==2 ? 'Updated Successfully.' : 'Saved Successfully.'); + setTimeout(() =>{ + this.dialogRef.close({update_status:true}); + },3000); + }, error => { + this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); + }); +} + + // validate all form group and form array fields + validateAllFormFields(formGroup: any) { + Object.keys(formGroup.controls).forEach(field => { + const control = formGroup.get(field); + if (control instanceof FormControl) { + control.markAsTouched({ onlySelf: true }); + } else if (control instanceof FormGroup) { + this.validateAllFormFields(control); + } else if (control instanceof FormArray) { + this.validateAllFormFields(control); + } + }); +} + +} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.html index 1898762c9..0483642e5 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.html @@ -13,19 +13,32 @@
- - + + + + Select + {{ prod }} + Others + + + + + +
+
+ + {{types.type_name}} +
- + - + {{uom.name}} @@ -36,7 +49,7 @@
-
+
{{"₹"}} {{item.value.rate_per_unit | numberToWords}} Only @@ -53,6 +66,22 @@
+
+ + + {{frq.name}} + + + + + {{"₹"}} {{item.value.rate_per_unit | numberToWords}} Only + + + + + {{"₹"}} {{item.value.annual_purchase_value | numberToWords}} Only + +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.scss index 49dcb4214..bb96c7726 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.scss @@ -23,4 +23,14 @@ .item-product-margin{ margin-top:2%; +} + +.example-radio-group { + display: flex; + flex-direction: column; + flex-wrap: wrap; +} +.example-radio-button { + margin: 0 2%; + color: #000 !important } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts index 6708851f2..2ceadcc9c 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts @@ -15,6 +15,9 @@ export class ManagePurchaseComponent implements OnInit { purchaseItemForm:FormGroup; UOMData: any[]=[]; frequencyData: any[]=[]; + productListData: any[]=[]; + check_type:any=[{'type_id':"1",'type_name':'Quantity and Rate Information'},{'type_id':"2",'type_name':'Value Information'}] + private notifier: NotifierService; constructor(notifier: NotifierService,private _fb: FormBuilder, private _pd: PdTrigerService, @Inject(MAT_DIALOG_DATA) public data: any, private dialogRef: MatDialogRef) { this.UOMData=this.data.masterData.UOMList; @@ -24,6 +27,30 @@ export class ManagePurchaseComponent implements OnInit { } ngOnInit() { + this._pd.getProductsFromBusinessAndSupplier(this.data.masterData.pdid, this.data.masterData.company_id).subscribe(data => { + if (data.dataStatus){ + let datas = data.record; + + let type2 = datas.from_business.filter(data => data.type_of_activity_id == 2); + if(type2[0].hasOwnProperty("products")){ + // this.productListData.push(type2[0].products); + } + let type3 = datas.from_business.filter(data => data.type_of_activity_id == 3); + if(type3[0].hasOwnProperty("products")){ + this.productListData.push(type3[0].products); + } + let type4 = datas.from_business.filter(data => data.type_of_activity_id == 4); + if(type4[0].hasOwnProperty("products")){ + this.productListData.push(type4[0].products); + } + if(datas.from_supplier.hasOwnProperty("raw_material")){ + this.productListData.push(datas.from_supplier.raw_material); + } + this.productListData = [].concat.apply([], this.productListData); + + } + }) + if(this.data.manage_status==2){ this.purchaseItemForm = this._fb.group({ purchase: this._fb.array([this.createPurchaseItemWithData(this.data.editData)]), @@ -47,6 +74,8 @@ export class ManagePurchaseComponent implements OnInit { fk_pd_id:[this.data.masterData.pdid], company_id:[this.data.masterData.company_id], purchase_item:['',Validators.compose([Validators.required])], + other_purchase_item:[''], + purchase_type:['1'], purchase_qty:['',Validators.compose([Validators.required])], fk_uom_id:['',Validators.compose([Validators.required])], rate_per_unit:['',Validators.compose([Validators.required])], @@ -64,6 +93,8 @@ createPurchaseItemWithData(values: any) { fk_pd_id:[this.data.masterData.pdid], company_id:[this.data.masterData.company_id], purchase_item:[values.purchase_item,Validators.compose([Validators.required])], + other_purchase_item:[values.other_purchase_item], + purchase_type:[values.purchase_type], purchase_qty:[values.purchase_qty,Validators.compose([Validators.required])], fk_uom_id:[values.fk_uom_id,Validators.compose([Validators.required])], rate_per_unit:[values.rate_per_unit,Validators.compose([Validators.required])], @@ -87,10 +118,15 @@ closeDialogue(){ purchaseCalculation(indexVal: number,values: any): void { let control:any = this.purchaseItemForm.controls['purchase']; - if(values.purchase_qty!='' && values.rate_per_unit!='' && values.fk_frequency_id!='') { + + if(values.purchase_type=="1" &&values.purchase_qty!='' && values.rate_per_unit!='' && values.fk_frequency_id!='') { let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); control.controls[indexVal].controls['annual_purchase_value'].setValue(parseInt(values.purchase_qty) * parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); - + } + else if(values.purchase_type=="2" && values.rate_per_unit!='' && values.fk_frequency_id!='') { + + let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); + control.controls[indexVal].controls['annual_purchase_value'].setValue(parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); } else { control.controls[indexVal].controls['annual_purchase_value'].setValue(''); @@ -108,6 +144,29 @@ generateOtherUOM(index: number, values: any): void { values.fk_uom_id=="1" ? control.controls[index].addControl('uom_other', new FormControl('', Validators.required)) : control.controls[index].removeControl('uom_other'); } +changeOptions(indexVal: any,event: any): void{ + + let control: any = this.purchaseItemForm.controls['purchase']; + if(event.value=="1"){ + control.controls[indexVal].controls['purchase_qty'].setValidators([Validators.required]); + control.controls[indexVal].controls['purchase_qty'].updateValueAndValidity(); + + control.controls[indexVal].controls['fk_uom_id'].setValidators([Validators.required]); + control.controls[indexVal].controls['fk_uom_id'].updateValueAndValidity(); + this.purchaseCalculation(indexVal,control.controls[indexVal].value); + } + else if(event.value=="2"){ + control.controls[indexVal].controls['purchase_qty'].setValue(""); + control.controls[indexVal].controls['purchase_qty'].clearValidators(); + control.controls[indexVal].controls['purchase_qty'].updateValueAndValidity(); + + control.controls[indexVal].controls['fk_uom_id'].setValue(""); + control.controls[indexVal].controls['fk_uom_id'].clearValidators(); + control.controls[indexVal].controls['fk_uom_id'].updateValueAndValidity(); + this.purchaseCalculation(indexVal,control.controls[indexVal].value); + } + } + // save purchase details submitDetails(records) { if (this.purchaseItemForm.invalid) { 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 1220d703e..7236948df 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 @@ -74,28 +74,36 @@ - - + + - - + +
+ +
+
+ +
+
+

Purchase Item is Not Available..

+
- - + + - + +
+ + + + + {{types.name}} + +
+ + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/gross-profit-calculation/gross-profit-calculation.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/gross-profit-calculation/gross-profit-calculation.component.scss index b559b3c47..332e5a872 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/gross-profit-calculation/gross-profit-calculation.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/gross-profit-calculation/gross-profit-calculation.component.scss @@ -1,3 +1,17 @@ mat-form-field { margin: 0 2%; - } \ No newline at end of file + } + + .mat-radio-button ~ .mat-radio-button { + margin-left: 16px; + } + + .example-radio-group { + display: flex; + flex-direction: row; + margin: 15px 0; + } + + // .example-radio-button { + // margin: 5px; + // } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/gross-profit-calculation/gross-profit-calculation.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/gross-profit-calculation/gross-profit-calculation.component.ts index 4e8676fbe..1f7c9ab0a 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/gross-profit-calculation/gross-profit-calculation.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/gross-profit-calculation/gross-profit-calculation.component.ts @@ -11,29 +11,49 @@ import { NotifierService } from 'angular-notifier'; export class GrossProfitCalculationComponent implements OnInit, OnChanges { @Input() masterData: { UOMList: any; frequencyList: any;businessExpenseList:any; pdid:number, company_id:number}; @Input() parentData: any; + @Input() TabLabel: any; @Output() loadAssessedForms = new EventEmitter(); public grossProfitForm: FormGroup; check__purchse_type:any=[{'id':'1','name':'Yes'},{'id':'2','name':'No'}] - check_sales_type:any=[{'id':'1','name':'Gross Margin'},{'id':'2','name':'Net Margin'}] + purchase_sub_type:any=[{'id':'1','name':'Purchase Item Wise'},{'id':'2','name':'Purchase Bill Wise'}] private notifier: NotifierService; constructor(notifier: NotifierService,private _fb: FormBuilder, private _pd: PdTrigerService) { this.notifier = notifier; } ngOnInit() { - + console.log('TabLabel',this.TabLabel); } changeOptions(values: any){ // console.log('values',values); - this.grossProfitForm.controls['margin'].setValue(''); + + if(this.TabLabel == 'Sales' && values.mode == 1){ + this.grossProfitForm.controls['margin'].setValue(''); + this.grossProfitForm.controls['purchase_type'].setValue(''); + } + else if(this.TabLabel == 'Purchase' && values.mode == 1){ + this.grossProfitForm.controls['margin'].setValue(''); + } /** if Mode Value is 'No' -> margin value is setted as netmargin and its id - 2 * Refer => check_sales_type **/ if(values.mode == 2){ - // console.log('2'); this.grossProfitForm.controls['margin'].setValue('2'); - } + this.grossProfitForm.controls['purchase_type'].setValue(''); + } + + // console.log('values',values); } + + + // if(values.mode == 2 && this.TabLabel == 'Purchase'){ + // this.grossProfitForm.controls['margin'].setValue('2'); + // this.grossProfitForm.controls['purchase_type'].setValue(null); + // } + + submitDetails(records: any){ + console.log(records); + // return; if (this.grossProfitForm.invalid) { this.validateAllFormFields(this.grossProfitForm); this.notifier.notify('warning',"Please Check All Manatory Fields.."); @@ -58,6 +78,7 @@ ngOnChanges(changes: SimpleChanges) { company_id:[this.masterData.company_id], mode:[changes.parentData.currentValue[0].mode,Validators.compose([Validators.required])], margin:[changes.parentData.currentValue[0].margin], + purchase_type:[changes.parentData.currentValue[0].purchase_type], }) } else { @@ -68,6 +89,7 @@ ngOnChanges(changes: SimpleChanges) { company_id:[this.masterData.company_id], mode:['',Validators.compose([Validators.required])], margin:[''], + purchase_type:[''], }) } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.ts index 5af15cf6c..11d8a161e 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.ts @@ -88,7 +88,7 @@ getTotalCost(getItems:any) { // do check component bases ngDoCheck() { if(this.masterData.grossProfitTypeList.length>0){ - this.activateMariginCalculation = this.masterData.grossProfitTypeList[this.masterData.grossProfitTypeList.length-1].mode==1 ? true : false; + this.activateMariginCalculation = this.masterData.grossProfitTypeList[this.masterData.grossProfitTypeList.length-1].mode==1 && this.masterData.grossProfitTypeList[this.masterData.grossProfitTypeList.length-1].purchase_type==1 ? true : false; } this.purchaseItemSource.data = this.parentData; } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html index 7d3c764cd..1bef3ad43 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/employment-info/employment-info.component.html @@ -40,12 +40,12 @@ - Higer then business vintage + Higer than business vintage - Higer then business vintage + Higer than business vintage this._rentalForm.controls['property_unit_details']; + console.log('value',value); if(type==1){ if(value && value.payment_mode.id==3){ let ChildCtrl : any = control.controls[index]; @@ -521,8 +522,8 @@ addMoreUnitDetails(){ } } } - if(type==2){ - + if(type==2 && value.payment_mode_per_met != ''){ + console.log('type,value.payment_mode_per_met',type,value.payment_mode_per_met); if(value && value.payment_mode.id==3){ let ChildCtrl : any = control.controls[index]; ChildCtrl.controls['amount_received_bank_per_met'].clearValidators(); @@ -992,10 +993,11 @@ saveRental(formData: any) { return; } else { + /** html: 'Rent as Per Tenant = '+TenantRentAmt+ '
'+'Rent as Per Applicant =' + ApplicantRentAmt , */ Swal({ title: 'Confirm The Rent Amount', type: 'info', - html: 'Rent as Per Tenant = '+TenantRentAmt+ '
'+'Rent as Per Applicant =' + ApplicantRentAmt , + html: 'Monthly Rent as Per Loan Applicant = '+ApplicantRentAmt+'
'+'Monthly Rent amount as Per Lease or Tenant met =' + TenantRentAmt , showCancelButton: true, confirmButtonColor: '#3085d6', cancelButtonColor: '#d33', 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 7c77961a1..55552ca56 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 @@ -93,7 +93,7 @@ export class StockComponent implements OnInit { ngOnInit() { - this._pd.stockFormAccess(this.pdid, this.company_id).subscribe(data => { + this._pd.getProductsFromBusinessAndSupplier(this.pdid, this.company_id).subscribe(data => { if (data.dataStatus == true) { this.initstockForms(data.record); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts index d7cc57299..399af2efa 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/manage-pd.module.ts @@ -115,6 +115,8 @@ import { ViewLocationComponent } from './../pd-directive/view-location/view-loca import { GetAnswerableFormsPipe } from './../pd-pipes/get-answerable-forms.pipe'; import { ConfirmAiDetailsComponent } from './list-pd/start-pd/forms/assessed-income/confirm-ai-details/confirm-ai-details.component'; import { RentalVerificationComponent } from './list-pd/start-pd/forms/rental-verification/rental-verification.component'; +import { ManageDailyPurchaseComponent } from './list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component'; +import { DailyPurchaseDetailsComponent } from './list-pd/start-pd/forms/assessed-income/daily-purchase-details/daily-purchase-details.component'; /** * Custom angular notifier options @@ -161,7 +163,7 @@ const pdCustomNotifierOptions: NotifierOptions = { }; @NgModule({ - declarations: [TelePdAllocationComponent, FinancialInfoComponent, BusinessInfoComponent, EmploymentInfoComponent, StockComponent, BankingDetailsComponent, ListPdComponent, FamilyDetailsComponent, AddressComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, CurrentLoanComponent, AssetsInfoComponent, LoanDetailsComponent, OtherIncomeComponent, SupplierInfoComponent, PersonalInfoComponent, LenderRepresentativeComponent, PdReportComponent, AssessedIncomeComponent, AllocationViewMoreComponent, PdRequirementComponent, GeneralInfoComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent, BusinessInfoGroupComponent, SearchRelationPipe, RupeeCurrencyFormatPipe, NumberToWordsPipe, DeleteRecordsCountPipe, BusinessAssetsInfoComponent, BusinessBankingDetailsComponent, SalesDetailsComponent, DailySalesDetailsComponent, SalesCalculationComponent, ManageSalesComponent, PurchaseDetailsComponent, BusinessExpenseDetailsComponent, HouseHoldDetailsComponent, OtherBusinessIncomeDetailsComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, GrossProfitCalculationComponent, ManageDailySalesComponent, PdStatusChangeDialogueComponent, PdLocatedMapViewDirective, ViewLocationComponent, GetAnswerableFormsPipe, ConfirmAiDetailsComponent, RentalVerificationComponent], + declarations: [TelePdAllocationComponent, FinancialInfoComponent, BusinessInfoComponent, EmploymentInfoComponent, StockComponent, BankingDetailsComponent, ListPdComponent, FamilyDetailsComponent, AddressComponent, ManagePdComponent, MapPdViewComponent, AddPdComponent, ViewPdComponent, PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, InprogressPdComponent, AllPdComponent, ScheduledPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, CurrentLoanComponent, AssetsInfoComponent, LoanDetailsComponent, OtherIncomeComponent, SupplierInfoComponent, PersonalInfoComponent, LenderRepresentativeComponent, PdReportComponent, AssessedIncomeComponent, AllocationViewMoreComponent, PdRequirementComponent, GeneralInfoComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent, BusinessInfoGroupComponent, SearchRelationPipe, RupeeCurrencyFormatPipe, NumberToWordsPipe, DeleteRecordsCountPipe, BusinessAssetsInfoComponent, BusinessBankingDetailsComponent, SalesDetailsComponent, DailySalesDetailsComponent, SalesCalculationComponent, ManageSalesComponent, PurchaseDetailsComponent, BusinessExpenseDetailsComponent, HouseHoldDetailsComponent, OtherBusinessIncomeDetailsComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, GrossProfitCalculationComponent, ManageDailySalesComponent, PdStatusChangeDialogueComponent, PdLocatedMapViewDirective, ViewLocationComponent, GetAnswerableFormsPipe, ConfirmAiDetailsComponent, RentalVerificationComponent, ManageDailyPurchaseComponent, DailyPurchaseDetailsComponent], imports: [ CommonModule, ManagePdRoutingModule, @@ -194,13 +196,13 @@ const pdCustomNotifierOptions: NotifierOptions = { AgmCoreModule.forRoot({apiKey: 'AIzaSyCXsHTus6hyIB8jYvt9ZEIbZve-2vWeQRg'}),OwlDateTimeModule, OwlNativeDateTimeModule, ], - exports: [PdAllocationComponent, SmartPdAllocationComponent, TelePdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent, AssessedIncomeComponent, AllocationViewMoreComponent, GeneralInfoComponent, PdRequirementComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, BusinessOtherFamilyMemberComponent, BusinessInfoGroupComponent,DailySalesDetailsComponent, SalesCalculationComponent, PurchaseDetailsComponent, BusinessExpenseDetailsComponent, HouseHoldDetailsComponent, OtherBusinessIncomeDetailsComponent, ManageSalesComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, GrossProfitCalculationComponent, ManageDailySalesComponent, PdStatusChangeDialogueComponent, ViewLocationComponent, ConfirmAiDetailsComponent, RentalVerificationComponent], + exports: [PdAllocationComponent, SmartPdAllocationComponent, TelePdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, StartPdComponent, CompletedPdComponent, QcCompletedPdComponent, ClientInfoComponent, SupplierInfoComponent, PersonalInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent, AssessedIncomeComponent, AllocationViewMoreComponent, GeneralInfoComponent, PdRequirementComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, BusinessOtherFamilyMemberComponent, BusinessInfoGroupComponent,DailySalesDetailsComponent,DailyPurchaseDetailsComponent, SalesCalculationComponent, PurchaseDetailsComponent, BusinessExpenseDetailsComponent, HouseHoldDetailsComponent, OtherBusinessIncomeDetailsComponent, ManageSalesComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, GrossProfitCalculationComponent, ManageDailySalesComponent,ManageDailyPurchaseComponent, PdStatusChangeDialogueComponent, ViewLocationComponent, ConfirmAiDetailsComponent, RentalVerificationComponent], providers: [PdTrigerService, GetGeometricLocationService,{provide: MAT_DATE_LOCALE, useValue: 'en-GB'}, {provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE]}, {provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS}, PdLocatedMapViewDirective], entryComponents: [PdAllocationComponent, SmartPdAllocationComponent, SchedulePdComponent, EditPdApplicantComponent, EditPdMasterComponent, TelePdAllocationComponent, AllocationViewMoreComponent, PersonalInfoComponent,BusinessAssetsInfoComponent, - ClientInfoComponent, SupplierInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent, AssessedIncomeComponent, GeneralInfoComponent, PdRequirementComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent, BusinessInfoGroupComponent,BusinessBankingDetailsComponent, ManageSalesComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, ManageDailySalesComponent,PdStatusChangeDialogueComponent, ViewLocationComponent, ConfirmAiDetailsComponent, RentalVerificationComponent], + ClientInfoComponent, SupplierInfoComponent, CurrentLoanComponent, LoanDetailsComponent, OtherIncomeComponent, AssetsInfoComponent, AddressComponent, FamilyDetailsComponent, BankingDetailsComponent, StockComponent, EmploymentInfoComponent, BusinessInfoComponent, FinancialInfoComponent, LenderRepresentativeComponent, AssessedIncomeComponent, GeneralInfoComponent, PdRequirementComponent, ModelEditPdReportComponent, OtherApplicantDetailsComponent, NeighbourHoodComponent, DialogChangeCurrentVenrsion, FinalRemarksComponent, BusinessOtherFamilyMemberComponent, QcReviewComponent, BusinessInfoGroupComponent,BusinessBankingDetailsComponent, ManageSalesComponent, ManagePurchaseComponent, ManageBusinesExpenseComponent, ManageHouseHoldComponent, ManageOtherBusinessIncomeComponent, ManageDailySalesComponent, ManageDailyPurchaseComponent, PdStatusChangeDialogueComponent, ViewLocationComponent, ConfirmAiDetailsComponent, RentalVerificationComponent], }) export class ManagePdModule { diff --git a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts index 4220f0963..42c29cfaa 100755 --- a/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts +++ b/ng6-seed/src/app/personal-discussion/pd-service/pd-triger.service.ts @@ -353,6 +353,11 @@ export class PdTrigerService { ) } + /* To get TypeofActivity's Product And Service From About Business, + * Used In 1) SupplierForm + * 2) ClientForm + * 3) AI - Sales Tab - Sales DailyWise & Sales ItemWise + */ getTypeofActivityForSuppliedInfoForm(pd_id: any,company_id:any): Observable { return this._http.post(this.apiUrl + "getTypeOfActivetyFromBusinessForm", { "records": { "pd_id": pd_id,"company_id":company_id } }) .pipe( @@ -486,10 +491,13 @@ export class PdTrigerService { ) } - /** For Stock Details - * To Get The Products With TypeofActivity From Business - **/ - stockFormAccess(pdid: any,companyid: any): Observable { + + /* To get TypeofActivity's Product From About Business, + * To get RawMaterial's From Supplier Form, + * Used In 1) StockForm + * 2) AI - Purchase Tab + */ + getProductsFromBusinessAndSupplier(pdid: any,companyid: any): Observable { // { "pd_id":"104","company_id":"1"} return this._http.post(this.apiUrl + "getProductsFromBusiness", { "pd_id" : pdid , "company_id":companyid }) .pipe( From 007cd49551cc6534b8f4d9dfbb7dd46755742147 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Thu, 4 Apr 2019 20:01:14 +0530 Subject: [PATCH 09/17] issues fixes :ps --- .../daily-purchase-details.component.html | 2 +- .../daily-sales-details.component.html | 6 ++- .../purchase-details.component.html | 2 +- .../sales-details.component.html | 2 +- .../loan-details/loan-details.component.html | 2 +- .../loan-details/loan-details.component.ts | 35 ++++++++++++----- .../rental-verification.component.html | 5 +-- .../rental-verification.component.ts | 38 +++++++++++-------- 8 files changed, 58 insertions(+), 34 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-purchase-details/daily-purchase-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-purchase-details/daily-purchase-details.component.html index e5ce6628d..434b1343f 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-purchase-details/daily-purchase-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-purchase-details/daily-purchase-details.component.html @@ -15,7 +15,7 @@
- expandDetails.purchaseItem + {{expandDetails.purchaseItem == 'Others' ? expandDetails.purchaseItem + ' ( ' + expandDetails.otherPurchaseItem + ' )' : expandDetails.purchaseItem}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-sales-details/daily-sales-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-sales-details/daily-sales-details.component.html index 5d16057d5..b09dea133 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-sales-details/daily-sales-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-sales-details/daily-sales-details.component.html @@ -21,7 +21,8 @@
- {{expandDetails.salesItem}} + + {{expandDetails.salesItem == 'Others' ? expandDetails.salesItem +' ( '+ expandDetails.otherSalesItem +' )' : expandDetails.salesItem}}  ( Gross Margin : {{expandDetails.margin_per}} %   Gross Profit : {{expandDetails.margin_value}} ) @@ -62,7 +63,8 @@
- {{expandDetails.salesItem}} + + {{expandDetails.salesItem == 'Others' ? expandDetails.salesItem +' ( '+ expandDetails.otherSalesItem +' )' : expandDetails.salesItem}}  ( Gross Margin : {{expandDetails.margin_per}} %   Gross Profit : {{expandDetails.margin_value}} ) - + What is the Reason for Difference in Rent Amount diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.ts index 0436619ed..db012e129 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.ts @@ -367,7 +367,7 @@ loadFormData(){ element.amount_received_cash_per_met ? control.controls[index].addControl('amount_received_cash_per_met', new FormControl('')) : control.controls[index].removeControl('amount_received_cash_per_met'); element.amount_received_bank_per_met ? control.controls[index].addControl('amount_received_bank_per_met', new FormControl('')) : control.controls[index].removeControl('amount_received_bank_per_met'); element.payment_received_reason_per_met ? control.controls[index].addControl('payment_received_reason_per_met', new FormControl('', Validators.required)) : control.controls[index].removeControl('payment_received_reason_per_met'); - element.payment_difference_per_met ? control.controls[index].addControl('payment_difference_per_met', new FormControl('')) : control.controls[index].removeControl('payment_difference_per_met'); + (element.met_tenant_lessees_options=="1") ? control.controls[index].addControl('payment_difference_per_met', new FormControl('')) : control.controls[index].removeControl('payment_difference_per_met'); if(element.payment_mode_per_met){ @@ -467,7 +467,7 @@ addMoreUnitDetails(){ control.controls[index].addControl('amount_received_cash_per_met', new FormControl(value.amount_received_cash_per_met ? value.amount_received_cash_per_met : '', [Validators.required,Validators.max(paidmonthlyrentamt),Validators.min(paidmonthlyrentamt)])); control.controls[index].removeControl('amount_received_bank_per_met'); control.controls[index].removeControl('payment_received_reason_per_met'); - } + } else if(value && value.payment_mode_per_met.id==2){ control.controls[index].addControl('amount_received_bank_per_met', new FormControl(value.amount_received_bank_per_met ? value.amount_received_bank_per_met : '', [Validators.required,Validators.max(paidmonthlyrentamt),Validators.min(paidmonthlyrentamt)])); control.controls[index].removeControl('amount_received_cash_per_met'); @@ -483,24 +483,31 @@ addMoreUnitDetails(){ control.controls[index].removeControl('amount_received_bank_per_met'); control.controls[index].removeControl('payment_received_reason_per_met'); } - control.controls[index].payment_difference_per_met.setValue(''); - control.controls[index].payment_difference_per_met.updateValueAndValidity(); + + if(control.controls[index].payment_difference_per_met){ + console.log('control.controls[index].payment_difference_per_met);',control.controls[index].payment_difference_per_met); + control.controls[index].payment_difference_per_met.setValue(''); + control.controls[index].payment_difference_per_met.updateValueAndValidity(); + } + else{ + console.log('There is NO Control'); + } + } } + ValidatedRentAmount(value:any,index:number,type: number){ let control: any = this._rentalForm.controls['property_unit_details']; - console.log('value',value); if(type==1){ + let monthlyrentamt : any = value.monthly_rent_amount ; if(value && value.payment_mode.id==3){ let ChildCtrl : any = control.controls[index]; ChildCtrl.controls['amount_received_bank'].clearValidators(); ChildCtrl.controls['amount_received_bank'].updateValueAndValidity(); ChildCtrl.controls['amount_received_cash'].clearValidators();; ChildCtrl.controls['amount_received_cash'].updateValueAndValidity(); - let monthlyrentamt : any = value.monthly_rent_amount ; - if(monthlyrentamt != ''){ @@ -508,9 +515,9 @@ addMoreUnitDetails(){ ChildCtrl.controls['amount_received_bank'].setValidators([Validators.required,Validators.max(monthlyrentamt),Validators.min(0)]); ChildCtrl.controls['amount_received_bank'].updateValueAndValidity(); - let maxamt = monthlyrentamt-bank_amount - if(maxamt >= 0 ){ - ChildCtrl.controls['amount_received_cash'].setValue(maxamt); + let remainingAmt = monthlyrentamt-bank_amount + if(remainingAmt >= 0 ){ + ChildCtrl.controls['amount_received_cash'].setValue(remainingAmt); ChildCtrl.controls['amount_received_cash'].setValidators([Validators.required,Validators.max(monthlyrentamt-bank_amount),Validators.min(monthlyrentamt-bank_amount)]); } else{ @@ -523,8 +530,9 @@ addMoreUnitDetails(){ } } if(type==2 && value.payment_mode_per_met != ''){ - console.log('type,value.payment_mode_per_met',type,value.payment_mode_per_met); - if(value && value.payment_mode.id==3){ + + if(value && value.payment_mode_per_met.id==3){ + let ChildCtrl : any = control.controls[index]; ChildCtrl.controls['amount_received_bank_per_met'].clearValidators(); ChildCtrl.controls['amount_received_bank_per_met'].updateValueAndValidity(); @@ -532,10 +540,9 @@ addMoreUnitDetails(){ ChildCtrl.controls['amount_received_cash_per_met'].updateValueAndValidity(); let paidmonthlyrentamt : any = value.paid_monthly_rent_per_met; - if(paidmonthlyrentamt != ''){ - let bank_amount = value.amount_received_bank; + let bank_amount = value.amount_received_bank_per_met; ChildCtrl.controls['amount_received_bank_per_met'].setValidators([Validators.required,Validators.max(paidmonthlyrentamt),Validators.min(0)]); ChildCtrl.controls['amount_received_bank_per_met'].updateValueAndValidity(); let remainingAmt = paidmonthlyrentamt-bank_amount @@ -964,7 +971,6 @@ saveRental(formData: any) { if(formData.property_unit_details.length > 0){ - formData.property_unit_details.forEach((data,index) => { TempArray1[index] = data.monthly_rent_amount; ApplicantRentAmt = TempArray1.reduce((sum, val) => sum + +val, 0); @@ -978,7 +984,7 @@ saveRental(formData: any) { let Array : any = []; if(formData.multistoried_building_details.length > 0){ formData.multistoried_building_details.forEach((val,index) => { - // console.log('val.floor_rent_amount',val.floor_rent_amount,index); + Array[index] = val.floor_rent_amount; FloorsTotalRentAmt = Array.reduce((sum, val) => sum + +val, 0); }); From 95e56431a593f93f33a9657dad6e35347ca8c81a Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Fri, 5 Apr 2019 20:06:28 +0530 Subject: [PATCH 10/17] Issues Fixes : ps --- .../manage-daily-purchase.component.html | 2 +- .../manage-daily-purchase.component.ts | 2 +- .../manage-daily-sales.component.html | 3 +- .../manage-daily-sales.component.ts | 9 ++ .../manage-purchase.component.html | 85 +++++++------ .../manage-purchase.component.ts | 60 +++++----- .../assessed-income.component.html | 4 +- .../assessed-income.component.ts | 8 +- .../gross-profit-calculation.component.html | 2 +- .../gross-profit-calculation.component.ts | 20 +--- .../purchase-details.component.html | 2 +- .../other-applicant-details.component.html | 5 + .../other-applicant-details.component.ts | 64 ++++++++++ .../family-details.component.html | 2 +- .../general-info/general-info.component.html | 21 +++- .../general-info/general-info.component.scss | 9 ++ .../general-info/general-info.component.ts | 112 ++++++++++++------ 17 files changed, 280 insertions(+), 130 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.html index 24e2bc006..d81c0c7bc 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.html @@ -34,7 +34,7 @@
- + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts index 4714986fd..54c9d508c 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts @@ -21,7 +21,7 @@ export class ManageDailyPurchaseComponent implements OnInit { marginAmtInwords: any[]=[]; productListData : any[]=[]; private notifier: NotifierService; - + todaydate:Date = new Date(); constructor(notifier: NotifierService,private _fb: FormBuilder, private _pd: PdTrigerService, @Inject(MAT_DIALOG_DATA) public data: any, private dialogRef: MatDialogRef) { this.pageTitle = this.data.manage_status==1 ? 'Add Daily Purchase Item' : 'Update Daily Purchase Item'; this.notifier = notifier; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.html index 49aa54c6a..e6ec0618b 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.html @@ -38,7 +38,8 @@
- + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.ts index 6519c75b1..e434009bc 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.ts @@ -20,6 +20,15 @@ export class ManageDailySalesComponent implements OnInit { frequencyData: any[]=[]; marginAmtInwords: any[]=[]; productandservice : any[]=[]; + name = 'Angular'; + + now = new Date(); + year = this.now.getFullYear(); + month = this.now.getMonth(); + day = this.now.getDay(); + + todaydate:Date = new Date(); + private notifier: NotifierService; check_type:any=[{'type_id':"1",'type_name':'Date Information'},{'type_id':"2",'type_name':'Frequency Information'}] constructor(notifier: NotifierService,private _fb: FormBuilder, private _pd: PdTrigerService, @Inject(MAT_DIALOG_DATA) public data: any, private dialogRef: MatDialogRef) { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.html index 0483642e5..76a617f74 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.html @@ -34,54 +34,67 @@ {{types.type_name}}
+
- + {{uom.name}} - - + + - - +
-
- - - {{"₹"}} {{item.value.rate_per_unit | numberToWords}} Only - +
+ +
+ + + + {{"₹"}} {{item.value.rate_per_unit | numberToWords}} Only + - - - {{frq.name}} - - - - - {{"₹"}} {{item.value.annual_purchase_value | numberToWords}} Only - - -
-
- - - {{frq.name}} - - - - + + + + {{frq.name}} + + + + + + + {{"₹"}} {{item.value.annual_purchase_value | numberToWords}} Only + + +
+ +
+ + + + {{frq.name}} + + + + + {{"₹"}} {{item.value.rate_per_unit | numberToWords}} Only - - - - + + + + + + {{"₹"}} {{item.value.annual_purchase_value | numberToWords}} Only - -
+ + +
+
@@ -107,4 +120,4 @@ - + s diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts index 2ceadcc9c..19f7d9823 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts @@ -116,36 +116,8 @@ closeDialogue(){ this.dialogRef.close({update_status:false}); } -purchaseCalculation(indexVal: number,values: any): void { - let control:any = this.purchaseItemForm.controls['purchase']; - - if(values.purchase_type=="1" &&values.purchase_qty!='' && values.rate_per_unit!='' && values.fk_frequency_id!='') { - let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); - control.controls[indexVal].controls['annual_purchase_value'].setValue(parseInt(values.purchase_qty) * parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); - } - else if(values.purchase_type=="2" && values.rate_per_unit!='' && values.fk_frequency_id!='') { - - let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); - control.controls[indexVal].controls['annual_purchase_value'].setValue(parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); - } - else { - control.controls[indexVal].controls['annual_purchase_value'].setValue(''); - } -} - -removeItem(indexVal: number) : void { - let control = this.purchaseItemForm.controls['purchase']; - control.removeAt(indexVal); - -} -// generate other UOM -generateOtherUOM(index: number, values: any): void { - let control: any = this.purchaseItemForm.controls['purchase']; - values.fk_uom_id=="1" ? control.controls[index].addControl('uom_other', new FormControl('', Validators.required)) : control.controls[index].removeControl('uom_other'); -} - changeOptions(indexVal: any,event: any): void{ - + console.log('indexVal: any,event: any',indexVal,event); let control: any = this.purchaseItemForm.controls['purchase']; if(event.value=="1"){ control.controls[indexVal].controls['purchase_qty'].setValidators([Validators.required]); @@ -167,6 +139,36 @@ changeOptions(indexVal: any,event: any): void{ } } +purchaseCalculation(indexVal: number,values: any): void { + console.log('indexVal: number,values: any',indexVal,values); + let control:any = this.purchaseItemForm.controls['purchase']; + + if(values.purchase_type=="1" &&values.purchase_qty!='' && values.rate_per_unit!='' && values.fk_frequency_id!='') { + let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); + control.controls[indexVal].controls['annual_purchase_value'].setValue(parseInt(values.purchase_qty) * parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); + } + else if(values.purchase_type=="2" && values.rate_per_unit!='' && values.fk_frequency_id!='') { + console.log('purchaseCalculation else if'); + let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); + control.controls[indexVal].controls['annual_purchase_value'].setValue(parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); + } + else { + control.controls[indexVal].controls['annual_purchase_value'].setValue(''); + } +} + +removeItem(indexVal: number) : void { + let control = this.purchaseItemForm.controls['purchase']; + control.removeAt(indexVal); + +} +// generate other UOM +generateOtherUOM(index: number, values: any): void { + let control: any = this.purchaseItemForm.controls['purchase']; + values.fk_uom_id=="1" ? control.controls[index].addControl('uom_other', new FormControl('', Validators.required)) : control.controls[index].removeControl('uom_other'); +} + + // save purchase details submitDetails(records) { if (this.purchaseItemForm.invalid) { 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 7236948df..7e3aa97f8 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 @@ -37,7 +37,7 @@ - Declared by customer + Declared by Customer {{ i==7 ? element.declared_by_customer : i==9 ? element.declared_by_customer : element.declared_by_customer | rupeeCurrencyFormat}} @@ -74,7 +74,7 @@ - + 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 6decd1d47..658a0b146 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 @@ -14,6 +14,7 @@ import { RupeeCurrencyFormatPipe } from './../../../../../pd-pipes/rupee-currenc providers: [RupeeCurrencyFormatPipe] }) export class AssessedIncomeComponent implements OnInit { + displayedSummaryColumns: any =[]; summaryItemSource:any = []; customer_segment_abbr: any; @@ -213,6 +214,7 @@ public viewerOptions: any = { } 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 }); @@ -250,7 +252,8 @@ public viewerOptions: any = { : (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 Amount ',"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 Amount ',"declared_by_customer":'', "derived_item_wise":'' ,"derived_sales_book":value.records.final_data[0].consolidated_report.consolidated_nerprofit }) :''; - + + // 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 Profit to Sales %',"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 Profit to Sales % ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin +'%', "derived_item_wise":'' ,"derived_sales_book":'' }) @@ -277,6 +280,7 @@ public viewerOptions: any = { // 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 }); @@ -314,6 +318,8 @@ public viewerOptions: any = { : (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 }) :''; // 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":'' }) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/gross-profit-calculation/gross-profit-calculation.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/gross-profit-calculation/gross-profit-calculation.component.html index 77b9664b1..c2efa2f4d 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/gross-profit-calculation/gross-profit-calculation.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/gross-profit-calculation/gross-profit-calculation.component.html @@ -15,7 +15,7 @@ {{getSale.name}} --> -
+
- 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 ebc1d4fea..a6f32ba02 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,8 +49,13 @@ Age - +
+ + Age Required + + +
@@ -59,13 +64,17 @@ {{qual.qualification_name}} + Qualification Required + + Qualification Details Required + @@ -103,7 +112,8 @@ - Please Enter Correct Year + Please Enter Correct Year + {{entity.business_entity_type_name}} + Business Entity Type Required - + Please Specify Others Required

Number of Years For Which The Business Has Been Running

- Please Enter Correct Year + Please Enter Correct Year * { + width: 100%; + } + mat-header-cell mat-cell { display:flex; justify-content:flex-end; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts index c9d6860a3..41d67c7ff 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts @@ -603,7 +603,65 @@ export class GeneralInfoComponent implements OnInit { // submit form details temp: number = 0; submitGeneralForm(formData: any) { -// console.log('formData',formData); + // console.log('formData',formData); + + if (formData.individuals.length > 0) { + + formData.individuals.forEach((val, index) => { + + if (val.is_person_met == false) { + + this.temp++; + } + + }); + + if (this.temp == formData.individuals.length) { + this.notifier.notify('warning', 'Please Choose Name of Person Met.!'); + + this.temp = 0; + + return; + } + + let individualCtrl: any = this._generalForm.get('individuals') as FormArray; + let individualCtrlLength: any = individualCtrl.controls.length; + + if (individualCtrlLength > 0) { + + let icnt = 0; + while (icnt < individualCtrlLength) { + + let individualChildCtrl: any = individualCtrl.controls[icnt]; + + + individualChildCtrl.controls.age.clearValidators(); + individualChildCtrl.controls.qualification.clearValidators(); + individualChildCtrl.controls.course_name.clearValidators(); + + if (individualChildCtrl.controls.is_person_met.value == false && individualChildCtrl.controls.is_applicant.value == true) { + + individualChildCtrl.controls.age.setValidators(Validators.compose([Validators.required])); + individualChildCtrl.controls.qualification.setValidators(Validators.compose([Validators.required])); + + } + if (individualChildCtrl.controls.is_person_met.value == true && individualChildCtrl.controls.is_applicant.value == true) { + + individualChildCtrl.controls.age.setValidators(Validators.compose([Validators.required])); + individualChildCtrl.controls.qualification.setValidators(Validators.compose([Validators.required])); + + } + if(individualChildCtrl.controls.qualification.value == '' || individualChildCtrl.controls.qualification.value == '4' || individualChildCtrl.controls.qualification.value == '6') + {individualChildCtrl.controls.course_name.setValue(''); individualChildCtrl.controls.course_name.clearValidators();}else{ individualChildCtrl.controls.course_name.setValidators(Validators.compose([Validators.required]));} + + individualChildCtrl.controls.age.updateValueAndValidity(); + individualChildCtrl.controls.qualification.updateValueAndValidity(); + individualChildCtrl.controls.course_name.updateValueAndValidity(); + + icnt++; + } + } + } if (this.customer_segment_abbr != 'SE-RI') { this._generalForm.controls['rental_income_rcv_in_years'].clearValidators(); this._generalForm.controls['rental_income_rcv_in_years'].updateValueAndValidity(); @@ -611,28 +669,28 @@ export class GeneralInfoComponent implements OnInit { // SE-RI means Companies Control Required Removed. if (this.customer_segment_abbr == 'SE-RI') { let CompanyCtrl: any = this._generalForm.get('companies') as FormArray; - let CompanyCtrlLength : any = CompanyCtrl.controls.length; + let CompanyCtrlLength: any = CompanyCtrl.controls.length; if (CompanyCtrlLength > 0) { let cnt = 0; - while(cnt < CompanyCtrlLength){ + while (cnt < CompanyCtrlLength) { - let CompanyChildCtrl : any = CompanyCtrl.controls[cnt]; + let CompanyChildCtrl: any = CompanyCtrl.controls[cnt]; - CompanyChildCtrl.controls.company_name.clearValidators(); - CompanyChildCtrl.controls.company_name.updateValueAndValidity(); - - CompanyChildCtrl.controls.business_entity_type.clearValidators(); - CompanyChildCtrl.controls.business_entity_type.updateValueAndValidity(); - - // CompanyChildCtrl.controls.business_entity_type_other.clearValidators(); - // CompanyChildCtrl.controls.business_entity_type_other.updateValueAndValidity(); - - CompanyChildCtrl.controls.business_years.clearValidators(); - CompanyChildCtrl.controls.business_years.updateValueAndValidity(); - - cnt++; + CompanyChildCtrl.controls.company_name.clearValidators(); + CompanyChildCtrl.controls.company_name.updateValueAndValidity(); + + CompanyChildCtrl.controls.business_entity_type.clearValidators(); + CompanyChildCtrl.controls.business_entity_type.updateValueAndValidity(); + + // CompanyChildCtrl.controls.business_entity_type_other.clearValidators(); + // CompanyChildCtrl.controls.business_entity_type_other.updateValueAndValidity(); + + CompanyChildCtrl.controls.business_years.clearValidators(); + CompanyChildCtrl.controls.business_years.updateValueAndValidity(); + + cnt++; } - } + } } if (this._generalForm.invalid) { @@ -642,25 +700,7 @@ export class GeneralInfoComponent implements OnInit { return; } else { - if (formData.individuals.length > 0) { - formData.individuals.forEach((val, index) => { - - if (val.is_person_met == false) { - - this.temp++; - } - - }); - - if (this.temp == formData.individuals.length) { - this.notifier.notify('warning', 'Please Choose Name of Person Met.!'); - - this.temp = 0; - - return; - } - } this.disableAfterSubmit = true; let saveRecords: any = {} saveRecords.pdid = formData.pdid; From 13f22d5efb3a9da0420f656bec0e96c2f6c61271 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Sat, 6 Apr 2019 15:09:18 +0530 Subject: [PATCH 11/17] summary ai and issues fixes : ps --- .../manage-purchase/manage-purchase.component.ts | 6 +++--- .../assessed-income/assessed-income.component.html | 6 +++--- .../assessed-income/assessed-income.component.ts | 7 ++----- .../daily-purchase-details.component.html | 5 +++++ .../gross-profit-calculation.component.ts | 2 +- .../purchase-details/purchase-details.component.html | 4 ++-- .../forms/client-info/client-info.component.html | 12 ++++++------ .../other-applicant-details.component.ts | 3 --- .../forms/family-details/family-details.component.ts | 5 ++--- 9 files changed, 24 insertions(+), 26 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts index 19f7d9823..15abb995e 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts @@ -117,7 +117,7 @@ closeDialogue(){ } changeOptions(indexVal: any,event: any): void{ - console.log('indexVal: any,event: any',indexVal,event); + let control: any = this.purchaseItemForm.controls['purchase']; if(event.value=="1"){ control.controls[indexVal].controls['purchase_qty'].setValidators([Validators.required]); @@ -140,7 +140,7 @@ changeOptions(indexVal: any,event: any): void{ } purchaseCalculation(indexVal: number,values: any): void { - console.log('indexVal: number,values: any',indexVal,values); + let control:any = this.purchaseItemForm.controls['purchase']; if(values.purchase_type=="1" &&values.purchase_qty!='' && values.rate_per_unit!='' && values.fk_frequency_id!='') { @@ -148,7 +148,7 @@ purchaseCalculation(indexVal: number,values: any): void { control.controls[indexVal].controls['annual_purchase_value'].setValue(parseInt(values.purchase_qty) * parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); } else if(values.purchase_type=="2" && values.rate_per_unit!='' && values.fk_frequency_id!='') { - console.log('purchaseCalculation else if'); + let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); control.controls[indexVal].controls['annual_purchase_value'].setValue(parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); } 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 7e3aa97f8..6ea64611a 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 @@ -38,19 +38,19 @@ Declared by Customer - {{ i==7 ? element.declared_by_customer : i==9 ? element.declared_by_customer : element.declared_by_customer | rupeeCurrencyFormat}} + {{ i==7 ? element.declared_by_customer : i==10 ? element.declared_by_customer : element.declared_by_customer | rupeeCurrencyFormat}} As Derived from Item Wise Sales - {{ i==7 ? element.derived_item_wise : i==9 ? element.derived_item_wise : element.derived_item_wise | rupeeCurrencyFormat}} + {{ i==7 ? element.derived_item_wise : i==10 ? element.derived_item_wise : element.derived_item_wise | rupeeCurrencyFormat}} As Derived from Kuchha Sales Book/Bills - {{ i==7 ? element.derived_sales_book : i==9 ? element.derived_sales_book : element.derived_sales_book | rupeeCurrencyFormat}} + {{ i==7 ? element.derived_sales_book : i==10 ? element.derived_sales_book : element.derived_sales_book | rupeeCurrencyFormat}} 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 658a0b146..d4fbffdc4 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 @@ -214,7 +214,6 @@ public viewerOptions: any = { } 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 }); @@ -252,7 +251,6 @@ public viewerOptions: any = { : (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 Amount ',"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 Amount ',"declared_by_customer":'', "derived_item_wise":'' ,"derived_sales_book":value.records.final_data[0].consolidated_report.consolidated_nerprofit }) :''; - // 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 Profit to Sales %',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin +'%', "derived_item_wise":'' ,"derived_sales_book":'' }) @@ -279,8 +277,8 @@ public viewerOptions: any = { // 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)){ - + // 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)){ + 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 !== null && value.records.final_data[0].sales_declared_by_customer.purchases !== undefined)) || (value.records.final_data[0].sales_calculated_by_itemwise && (value.records.final_data[0].sales_calculated_by_itemwise.purchases !== null && value.records.final_data[0].sales_calculated_by_itemwise.purchases !== undefined)) || (value.records.final_data[0].sales_calculated_by_monthwise && (value.records.final_data[0].sales_calculated_by_monthwise.purchases !== null && value.records.final_data[0].sales_calculated_by_monthwise.purchases !== undefined))){ 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 }); @@ -317,7 +315,6 @@ public viewerOptions: any = { : (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 }) :''; - // 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":'' }) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-purchase-details/daily-purchase-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-purchase-details/daily-purchase-details.component.html index 434b1343f..17417dc47 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-purchase-details/daily-purchase-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-purchase-details/daily-purchase-details.component.html @@ -11,6 +11,7 @@
+
@@ -69,6 +70,10 @@ +
+ + + \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/gross-profit-calculation/gross-profit-calculation.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/gross-profit-calculation/gross-profit-calculation.component.ts index 1ee08d4e0..b6bdd2019 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/gross-profit-calculation/gross-profit-calculation.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/gross-profit-calculation/gross-profit-calculation.component.ts @@ -42,7 +42,7 @@ export class GrossProfitCalculationComponent implements OnInit, OnChanges { submitDetails(records: any){ - console.log(records); + // console.log(records); // return; if (this.grossProfitForm.invalid) { this.validateAllFormFields(this.grossProfitForm); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.html index d14d213a5..57a2082e6 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/purchase-details/purchase-details.component.html @@ -11,7 +11,7 @@
-
+
@@ -86,7 +86,7 @@ - Purchase Item is Not Available.. + 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 00618dea4..09101b0c8 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 @@ -99,8 +99,8 @@ Select Payment received in Cash. - Payment - received through Banking channels. + Payment received through Banking channels. + Payment received in Cash and also through Banking channels. @@ -233,8 +233,8 @@ Select Payment received in Cash. - Payment - received through Banking channels. + Payment received through Banking channels. + Payment received in Cash and also through Banking channels. @@ -366,8 +366,8 @@ Select Payment received in Cash. - Payment - received through Banking channels. + Payment received through Banking channels. + Payment received in Cash and also through Banking channels. diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts index 6eac2b00f..b74401b5c 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dialogue/other-applicant-details/other-applicant-details.component.ts @@ -95,9 +95,6 @@ export class OtherApplicantDetailsComponent implements OnInit { // save applicant temp: number = 0; saveApplicant(formData: any) { - console.log(formData); - // console.log('formData',formData); - if (formData.applicant_list.length > 0) { formData.applicant_list.forEach((val, index) => { 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 ac1802921..7d93f0355 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 @@ -63,7 +63,8 @@ export class FamilyDetailsComponent implements OnInit { this.form_id = 6; this.notifier = notifier; - this.selectPerson = this.pd_all_details.pdapplicants_detials; + console.clear(); + this.selectPerson = this.pd_all_details.pdapplicants_detials.filter(item => item.applicant_type != '2'); this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.main_applicant = this.pd_all_details.pdmaster_details.main_applicant; this.lender_applicant_id = this.pd_all_details.pdmaster_details.lender_applicant_id; @@ -81,8 +82,6 @@ export class FamilyDetailsComponent implements OnInit { this.getMasterDetails('STATE', 6); this._pd.getFamilyDetails(this.pdid).subscribe(data => { - console.clear(); - if (data.dataStatus == true) { let Temparr: any = []; From be0f45f2f944ceca1c307cfb56ce33a2f6423d5b Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Tue, 9 Apr 2019 14:53:10 +0530 Subject: [PATCH 12/17] issues fixes : ps --- .../list-pd/add-pd/add-pd.component.html | 7 ++- .../list-pd/add-pd/add-pd.component.ts | 36 ++++++----- .../edit-pd-applicant.component.html | 4 +- .../edit-pd-applicant.component.ts | 4 ++ .../manage-daily-purchase.component.html | 2 +- .../manage-daily-purchase.component.ts | 8 +-- .../manage-purchase.component.html | 2 +- .../daily-purchase-details.component.html | 3 +- .../daily-sales-details.component.html | 2 +- .../purchase-details.component.html | 3 +- .../sales-details.component.html | 2 +- .../family-details.component.html | 2 +- .../general-info/general-info.component.html | 2 +- .../rental-verification.component.ts | 20 ++++--- .../start-pd/forms/stock/stock.component.html | 16 +++-- .../start-pd/forms/stock/stock.component.ts | 60 +++++++++++++------ 16 files changed, 111 insertions(+), 62 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 051688668..e6b357766 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 @@ -44,8 +44,8 @@ - - Enter Valid Mobile Number. + + Enter Valid Mobile Number. + Purchase Calculation as per Kutcha Records / Bills
- + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts index a3a1bbe5f..cef98f989 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts @@ -74,8 +74,8 @@ export class ManageDailyPurchaseComponent implements OnInit { }); - // control.controls[control.value.length-1].controls['comments'].setValidators([Validators.required]); - // control.controls[control.value.length-1].controls['comments'].updateValueAndValidity(); + // control.controls[control.value.length-1].controls['comments'].setValue + } else{ this.purchaseItemForm = this._fb.group({ @@ -96,7 +96,7 @@ export class ManageDailyPurchaseComponent implements OnInit { other_purchase_item:[''], annual_purchase_value: [''], child: this._fb.array([]), - comments: ['', Validators.compose([Validators.required])], + comments: [''], isactive:[true], }); } @@ -122,7 +122,7 @@ createPurchaseItemWithData(values: any) { other_purchase_item:[values.otherPurchaseItem === null ? '' : values.otherPurchaseItem ], annual_purchase_value: [values.annualPurchaseValue], child: this._fb.array([]), - comments: [values.comments, Validators.compose([Validators.required])], + comments: [values.comments], isactive:[true], }); } @@ -192,7 +192,21 @@ purchaseCalculation(indexVal: number,values: any): void { mval.custum_date = this.pipe.transform(mval.purchase_date, 'yyyy-MM'); return mval; }); +// expandBodyContent.forEach((expnadElement, expnadIndex) => { + // let calculateItems = expnadElement.value.reduce((acc, calculate) => acc + Number(calculate.sales_value), 0); + // listItems.push({items:expnadElement, itemsTotal:calculateItems}) + // }) + + // let calculateAllItemsTotal:number=listItems.reduce((racc, rcalculate) => racc + Number(rcalculate.itemsTotal), 0); + // let convertYear : number = 12 / listItems.length; + // let footerMessage: any=[]; + // footerMessage.push({ + // month_message: listItems.length + ' Month Sales : '+ calculateAllItemsTotal, + // month_value:calculateAllItemsTotal, + // year_message: ' Yearly Sales Arrived : '+ calculateAllItemsTotal * convertYear, + // year_value: calculateAllItemsTotal * convertYear, + // }) if(transformData.length>0) { // let getUniqueMonthCounts = transformData.map(val=>val.custum_date) // .filter((fVal,fIndex,fArray)=>{ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.ts index e434009bc..0c433b6a7 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.ts @@ -238,8 +238,8 @@ salesCalculation(indexVal: number,values: any): void { return fIndex === fArray.indexOf(fVal); }); let getTotalValueCounts = transformData.map(val=>val.sales_value) - .reduce((sum, curr) => parseInt(sum) + parseInt(curr)); - let calculatedValue = parseInt(getTotalValueCounts) * (parseInt(values.margin_per)/100) * (12 / parseInt(getUniqueMonthCounts.length)); + .reduce((sum, curr) =>parseFloat(sum) +parseFloat(curr)); + let calculatedValue =parseFloat(getTotalValueCounts) * (parseFloat(values.margin_per)/100) * (12 /parseFloat(getUniqueMonthCounts.length)); control.controls[indexVal].controls['margin_value'].setValue(calculatedValue.toFixed(2)); } else{ @@ -258,10 +258,10 @@ salesCalculation(indexVal: number,values: any): void { if(values.child[values.child.length-1].fk_frequency_id!='' && values.child[values.child.length-1].frequency_value!=''){ let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.child[values.child.length-1].fk_frequency_id); - innercontrol.controls[innercontrol.value.length-1].controls['sales_value'].setValue(parseInt(filterFrequencyValue[0].mutiple_factor) * parseInt(values.child[values.child.length-1].frequency_value)); + innercontrol.controls[innercontrol.value.length-1].controls['sales_value'].setValue(parseFloat(filterFrequencyValue[0].mutiple_factor) *parseFloat(values.child[values.child.length-1].frequency_value)); - let getTotalValueCounts =parseInt(filterFrequencyValue[0].mutiple_factor) * parseInt(values.child[values.child.length-1].frequency_value) - let CalculatedVal = getTotalValueCounts * (parseInt(values.margin_per)/100); + let getTotalValueCounts =parseFloat(filterFrequencyValue[0].mutiple_factor) *parseFloat(values.child[values.child.length-1].frequency_value) + let CalculatedVal = getTotalValueCounts * (parseFloat(values.margin_per)/100); values.margin_per!='' ? control.controls[indexVal].controls['margin_value'].setValue( CalculatedVal.toFixed(2)) : ''; } else { @@ -276,7 +276,7 @@ salesCalculation(indexVal: number,values: any): void { if(values.child[values.child.length-1].fk_frequency_id!='' && values.child[values.child.length-1].frequency_value!=''){ let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.child[values.child.length-1].fk_frequency_id); - let marginCalculatedValue = parseInt(filterFrequencyValue[0].mutiple_factor) * parseInt(values.child[values.child.length-1].frequency_value); + let marginCalculatedValue =parseFloat(filterFrequencyValue[0].mutiple_factor) *parseFloat(values.child[values.child.length-1].frequency_value); innercontrol.controls[innercontrol.value.length-1].controls['sales_value'].setValue(marginCalculatedValue.toFixed(2)); } else { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-house-hold/manage-house-hold.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-house-hold/manage-house-hold.component.ts index 06336f63a..cb1e61b06 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-house-hold/manage-house-hold.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-house-hold/manage-house-hold.component.ts @@ -79,7 +79,8 @@ houseCalculation(indexVal: number,values: any): void { let control:any = this.houseItemForm.controls['houseExpense']; if(values.expense_value!='' && values.fk_frequency_id!='') { let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); - control.controls[indexVal].controls['annual_expense_value'].setValue(parseInt(values.expense_value) * parseInt(filterFrequencyValue[0].mutiple_factor)); + let CalculatedValue = parseFloat(values.expense_value) * parseFloat(filterFrequencyValue[0].mutiple_factor); + control.controls[indexVal].controls['annual_expense_value'].setValue(CalculatedValue.toFixed(2)); } else { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-other-business-income/manage-other-business-income.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-other-business-income/manage-other-business-income.component.ts index 1959d8e8c..c4399d79c 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-other-business-income/manage-other-business-income.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-other-business-income/manage-other-business-income.component.ts @@ -82,7 +82,8 @@ businessCalculation(indexVal: number,values: any): void { let control:any = this.businessIncomeItemForm.controls['busIncome']; if(values.income_value!='' && values.fk_frequency_id!='') { let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); - control.controls[indexVal].controls['annual_income_value'].setValue(parseInt(values.income_value) * parseInt(filterFrequencyValue[0].mutiple_factor)); + let CalculatedValue = parseFloat(values.income_value) * parseFloat(filterFrequencyValue[0].mutiple_factor); + control.controls[indexVal].controls['annual_income_value'].setValue(CalculatedValue.toFixed(2)); } else { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts index 15abb995e..9c2818b02 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts @@ -145,12 +145,14 @@ purchaseCalculation(indexVal: number,values: any): void { if(values.purchase_type=="1" &&values.purchase_qty!='' && values.rate_per_unit!='' && values.fk_frequency_id!='') { let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); - control.controls[indexVal].controls['annual_purchase_value'].setValue(parseInt(values.purchase_qty) * parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); + let Type1CalculatedValue = parseFloat(values.purchase_qty) * parseFloat(values.rate_per_unit) * parseFloat(filterFrequencyValue[0].mutiple_factor); + control.controls[indexVal].controls['annual_purchase_value'].setValue(Type1CalculatedValue.toFixed(2)); } else if(values.purchase_type=="2" && values.rate_per_unit!='' && values.fk_frequency_id!='') { let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); - control.controls[indexVal].controls['annual_purchase_value'].setValue(parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); + let Type2CaluculatedValue = parseFloat(values.rate_per_unit) * parseFloat(filterFrequencyValue[0].mutiple_factor); + control.controls[indexVal].controls['annual_purchase_value'].setValue(Type2CaluculatedValue.toFixed(2)); } else { control.controls[indexVal].controls['annual_purchase_value'].setValue(''); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.ts index ca3662268..bb06b8c90 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.ts @@ -159,11 +159,13 @@ salesCalculation(indexVal: number,values: any): void { let control:any = this.salesItemForm.controls['salesCalItemwise']; if(values.sales_type=="1" && values.sales_qty!='' && values.rate_per_unit!='' && values.fk_frequency_id!='') { let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); - control.controls[indexVal].controls['annual_sale_value'].setValue(parseInt(values.sales_qty) * parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); + let Type1CalculatedValue = parseFloat(values.sales_qty) * parseFloat(values.rate_per_unit) * parseFloat(filterFrequencyValue[0].mutiple_factor); + control.controls[indexVal].controls['annual_sale_value'].setValue(Type1CalculatedValue.toFixed(2)); } else if(values.sales_type=="2" && values.rate_per_unit!='' && values.fk_frequency_id!='') { let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); - control.controls[indexVal].controls['annual_sale_value'].setValue(parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); + let Type2CalculatedValue = parseFloat(values.rate_per_unit) * parseFloat(filterFrequencyValue[0].mutiple_factor) + control.controls[indexVal].controls['annual_sale_value'].setValue(Type2CalculatedValue.toFixed(2)); } else { control.controls[indexVal].controls['annual_sale_value'].setValue(''); @@ -176,7 +178,7 @@ salesMarginPerCalculation(indexVal: number,values: any): void { let control:any = this.salesItemForm.controls['salesCalItemwise']; control.controls[indexVal].controls['margin_per_uom'].setValue(''); if(values.margin_per!='' && values.annual_sale_value!='') { - let calculatedValue = parseInt(values.annual_sale_value) * (parseInt(values.margin_per)/100); + let calculatedValue = parseFloat(values.annual_sale_value) * (parseFloat(values.margin_per)/100); control.controls[indexVal].controls['margin_final_value'].setValue(calculatedValue.toFixed(2)); } else { @@ -189,10 +191,12 @@ salesMarginAmtCalculation(indexVal: number,values: any): void { if(values.sales_type=="1" && values.margin_per_uom!='' && values.sales_qty!='' && values.fk_frequency_id!='') { let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); - control.controls[indexVal].controls['margin_final_value'].setValue(parseInt(values.sales_qty) * parseInt(values.margin_per_uom) * parseInt(filterFrequencyValue[0].mutiple_factor)); + let Type1CalculatedValue = parseFloat(values.sales_qty) * parseFloat(values.margin_per_uom) * parseFloat(filterFrequencyValue[0].mutiple_factor); + control.controls[indexVal].controls['margin_final_value'].setValue(Type1CalculatedValue.toFixed(2)); } else if(values.sales_type=="2" && values.margin_per_uom!='' && values.rate_per_unit!='') { - control.controls[indexVal].controls['margin_final_value'].setValue(parseInt(values.rate_per_unit) * parseInt(values.margin_per_uom)); + let Type2CalculatedValue = parseFloat(values.rate_per_unit) * parseFloat(values.margin_per_uom); + control.controls[indexVal].controls['margin_final_value'].setValue(Type2CalculatedValue.toFixed(2)); } else { control.controls[indexVal].controls['margin_final_value'].setValue(''); 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 182b5f0d0..a52122f0e 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 @@ -177,7 +177,7 @@ Applicants
- +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts index c4d1d4cd6..3207e5e67 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts @@ -47,22 +47,23 @@ export class ViewPdComponent implements OnInit, OnDestroy { { 'backEnd_FieldName': "fk_pd_type", 'frontEnd_FieldName': "PD Type" }, { 'backEnd_FieldName': "fk_customer_segment", 'frontEnd_FieldName': "Customer Segment" }, { 'backEnd_FieldName': "loan_amount", 'frontEnd_FieldName': "Loan Amount" }, - { 'backEnd_FieldName': "addressline1", 'frontEnd_FieldName': "Address at which PD is to be done" }, - { 'backEnd_FieldName': "fk_city", 'frontEnd_FieldName': "City" }, - { 'backEnd_FieldName': "fk_state", 'frontEnd_FieldName': "State" }, - { 'backEnd_FieldName': "pincode", 'frontEnd_FieldName': "Pincode" }, { 'backEnd_FieldName': "pd_contact_person", 'frontEnd_FieldName': "Lender Contact Person" }, { 'backEnd_FieldName': "pd_contact_mobileno", 'frontEnd_FieldName': "Lender's Mobile Number" }, { 'backEnd_FieldName': "pd_branch_id", 'frontEnd_FieldName': "Branch" }, { 'backEnd_FieldName': "pd_contact_landline", 'frontEnd_FieldName': "Lender's Landline Number" }, { 'backEnd_FieldName': "main_applicant", 'frontEnd_FieldName': "Applicant Master" }]; - + // localAddressMandortyField: any = [ + // { 'backEnd_FieldName': "addressline1", 'frontEnd_FieldName': "Address at which PD is to be done" }, + // { 'backEnd_FieldName': "fk_city", 'frontEnd_FieldName': "City" }, + // { 'backEnd_FieldName': "fk_state", 'frontEnd_FieldName': "State" }, + // { 'backEnd_FieldName': "pincode", 'frontEnd_FieldName': "Pincode" } + // ]; viewID: string; viewParams: any; destroyType: number = 1; currentPDStatus: string; enableStartPD: boolean; - + CustomerSegmentAbbr:string; // create values for status check pdStatusCheck: any = { "DRAFT": 'DRAFT', @@ -105,6 +106,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { this.pd_QC_Rating = Number(this.pdMasterData.qc_rating); this.pdApplicantData = data.records.applicants_details; this.pdApplicantData = this.pdApplicantData.filter(appt => appt.applicant_type != 2); + this.CustomerSegmentAbbr = this.pdMasterData[0].customer_segment_abbr; this.pdDocumentsData = data.records.pd_documnets; this.masterPdLogsData = Object.keys(data.records.pd_logs.master).map(function (key) { return data.records.pd_logs.master[key]; @@ -203,6 +205,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { .subscribe(dataresult => { if (flag == 1) { let ffd: any = []; + console.log('this.FilteredFieldNames',this.FilteredFieldNames); this.FilteredFieldNames.forEach(field => { ffd.push(field.frontEnd_FieldName); }); @@ -227,10 +230,11 @@ export class ViewPdComponent implements OnInit, OnDestroy { this.viewPdDetails(this.viewID) }); } - editPdApplicant(applicantData: any) { + editPdApplicant(applicantData: any,CSAbbr : any) { let setPdDetails = { "pdID": this.viewID, - "records": applicantData + "records": applicantData, + "SegmentAbbr":CSAbbr, } const dialogApplicant = this.dialog.open(EditPdApplicantComponent, { data: setPdDetails, @@ -389,6 +393,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { let pdid = masterdetail.pd_id; let getValues = data.filter(val => val).map(Val => Val); + console.log('getValues',getValues); this.FilteredFieldNames = getValues.map(x => { let findIndex = this.localMandatoryFields.map(val => val.backEnd_FieldName).indexOf(x); return this.localMandatoryFields[findIndex]; From 15ee916b15797936e57c4607ae87c6a1a51ce3b6 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 10 Apr 2019 11:14:37 +0530 Subject: [PATCH 14/17] Annualpurcase : ps --- .../edit-pd-applicant.component.ts | 2 +- .../edit-pd-master.component.ts | 9 ++---- .../manage-daily-purchase.component.ts | 30 +++++-------------- 3 files changed, 11 insertions(+), 30 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts index cf5291c52..16ae01953 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts @@ -25,7 +25,7 @@ export class EditPdApplicantComponent implements OnInit { constructor(private _fb: FormBuilder, private _pd: PdTrigerService, notifier: NotifierService, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any) { - console.log('Dialog Data',data); + this.notifier=notifier } 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 3764c2cad..ea8523f7c 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 @@ -76,7 +76,6 @@ export class EditPdMasterComponent implements OnInit { data => { if (data.status == 200) { this.lenderList=data.records; - console.log('this.data.records.fk_lender_id',this.data.records.fk_lender_id); if(this.data.records.fk_lender_id != null){ let x = this.lenderList.filter(item => item.entity_id == this.data.records.fk_lender_id) this.lenderBranchList = x[0]['branches']; @@ -189,7 +188,7 @@ export class EditPdMasterComponent implements OnInit { data => { if (data.status == 200) { this.addressesList = data.records.filter(item => item.isactive == 1); - console.log('this.addressesList',this.addressesList); + if (this.addressesList.length > 0) { this.addressesList.forEach((val,index)=>{ @@ -297,9 +296,7 @@ export class EditPdMasterComponent implements OnInit { this.addressesDeactivited[index] = true; } - // console.log('address_control',address_control); - // console.log('address_control.controls[index]',address_control.controls[index]); - // console.log('address_control.controls[index][controls]',address_control.controls[index]['controls']); + // address_control.controls[index]['controls'].showHide(); // isactive.setValue(0); @@ -313,7 +310,7 @@ export class EditPdMasterComponent implements OnInit { // } // address_control.controls[index].disable(); - // console.log('address_control',address_control); + // address_control.removeAt(index); } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts index cef98f989..a6512497b 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts @@ -191,31 +191,15 @@ purchaseCalculation(indexVal: number,values: any): void { let transformData = values.child.filter(val=>val.purchase_date!='' && val.purchase_date!=null && val.purchase_date!=undefined && val.purchase_value!='' && val.isactive===true).map(mval=>{ mval.custum_date = this.pipe.transform(mval.purchase_date, 'yyyy-MM'); return mval; - }); -// expandBodyContent.forEach((expnadElement, expnadIndex) => { - // let calculateItems = expnadElement.value.reduce((acc, calculate) => acc + Number(calculate.sales_value), 0); - // listItems.push({items:expnadElement, itemsTotal:calculateItems}) - // }) - - // let calculateAllItemsTotal:number=listItems.reduce((racc, rcalculate) => racc + Number(rcalculate.itemsTotal), 0); - - // let convertYear : number = 12 / listItems.length; - // let footerMessage: any=[]; - // footerMessage.push({ - // month_message: listItems.length + ' Month Sales : '+ calculateAllItemsTotal, - // month_value:calculateAllItemsTotal, - // year_message: ' Yearly Sales Arrived : '+ calculateAllItemsTotal * convertYear, - // year_value: calculateAllItemsTotal * convertYear, - // }) + }); if(transformData.length>0) { - // let getUniqueMonthCounts = transformData.map(val=>val.custum_date) - // .filter((fVal,fIndex,fArray)=>{ - // return fIndex === fArray.indexOf(fVal); - // }); - + let TotalAnnualValue = transformData.map(val=>val.purchase_value) - .reduce((sum, curr) => parseInt(sum) + parseInt(curr)); - control.controls[indexVal].controls['annual_purchase_value'].setValue(TotalAnnualValue); + .reduce((sum, curr) => parseFloat(sum) + parseFloat(curr)); + + let Months : number = 12 / values.child.length; + + control.controls[indexVal].controls['annual_purchase_value'].setValue(TotalAnnualValue*Months); } else{ control.controls[indexVal].controls['annual_purchase_value'].setValue(""); From 8049d635b51f6feef784757546fdb55ca2d0b713 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 10 Apr 2019 13:20:57 +0530 Subject: [PATCH 15/17] save issues in trigger : ps --- .../manage-pd/list-pd/add-pd/add-pd.component.ts | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) 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 aa7cf174b..575d2a514 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 @@ -436,7 +436,7 @@ export class AddPdComponent implements OnInit, OnDestroy { // common function for both draft and process pd submitPdDetails(formValue: any, status: string) { - + console.log('inside the submitPdDetails data'); if (this._PDtriggerForm.invalid) { this.validateAllFormFields(this._PDtriggerForm); this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!'); @@ -447,12 +447,10 @@ export class AddPdComponent implements OnInit, OnDestroy { this.notifier.notify('warning', 'Either Mobile or Landline Need.!'); return; } - else if (formValue.mobile_no != null){ - if (formValue.mobile_no.length != 10){ - this.notifier.notify('warning', 'Please Check Applicant Mobile Number.!'); - return; - } - } + else if (formValue.mobile_no != null && formValue.mobile_no.length != 10){ + this.notifier.notify('warning', 'Please Check Applicant Mobile Number.!'); + return; + } else { this.disableAfterSubmit = true; From 71988caa069ebc3c39ea0b75a2ba650804729f74 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 10 Apr 2019 15:21:11 +0530 Subject: [PATCH 16/17] undo : ps --- .../manage-daily-purchase.component.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts index a6512497b..ca02f6c3f 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts @@ -198,8 +198,10 @@ purchaseCalculation(indexVal: number,values: any): void { .reduce((sum, curr) => parseFloat(sum) + parseFloat(curr)); let Months : number = 12 / values.child.length; - - control.controls[indexVal].controls['annual_purchase_value'].setValue(TotalAnnualValue*Months); + // console.log('transformData.length',transformData.length); + // console.log('TotalAnnualValue',TotalAnnualValue) + // console.log('TotalAnnualValue',TotalAnnualValue*Months); + control.controls[indexVal].controls['annual_purchase_value'].setValue(TotalAnnualValue); } else{ control.controls[indexVal].controls['annual_purchase_value'].setValue(""); From ef157b7e8216ce919bd0038cb9dd1c4e6d88ee00 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 10 Apr 2019 17:27:37 +0530 Subject: [PATCH 17/17] issues fixes : ps --- .../edit-pd-applicant.component.html | 2 +- .../loan-details/loan-details.component.ts | 41 +++++++++++++------ .../rental-verification.component.html | 2 + 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html index 600e8b43d..4dc179819 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.html @@ -66,7 +66,7 @@ - + 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 504aba892..330fd1f2a 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 @@ -75,7 +75,7 @@ export class LoanDetailsComponent implements OnInit { existCompanyList: any = []; companies: any = []; typeofproperties:any = []; - + generalFormApplicantList:any = []; /** Constructor Of the Class */ constructor(notifier: NotifierService, private fb: FormBuilder, @@ -84,7 +84,7 @@ export class LoanDetailsComponent implements OnInit { private _pd: PdTrigerService, private dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { - +console.log('this.pd_all_details.pdapplicants_detials',this.pd_all_details.pdapplicants_detials); this.applicants = this.pd_all_details.pdapplicants_detials; // this.applicants.push({'pd_co_applicant_id':'0','applicant_name':'Others'}); this.applicants = this.applicants.filter(appt => appt.applicant_type != 2) @@ -118,6 +118,11 @@ export class LoanDetailsComponent implements OnInit { this.getM_BTLenderList(); this.getM_EndUseofTopUpList(); + // note : Details of Property being Mortgaged section, In Name of the owner drop down list currently show all names (Applicants & In Person Met) need to change show Applicant names only. + let param: any = {}; + param.pd_id = this.pdid; + param.pd_form_id = '18'; + 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); @@ -129,19 +134,29 @@ export class LoanDetailsComponent implements OnInit { }); this.mergeCompanyApplicant.push({ groupName: 'COMPANIES', groupValues: modifyCompanyList }) } + + this._pd.retriveForm(param).subscribe(data => { + this.generalFormApplicantList = data.records.individuals.filter(app => app.is_applicant == true && app.is_active == true); + if (data.dataStatus) { + let modifyApplicantList: any = []; + if (this.applicants.length > 0) { + modifyApplicantList = this.generalFormApplicantList.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.listOfLanguagues.splice(this.listOfLanguagues.indexOf(languague), 1); + } + if (this.productAbbr != 'LAP') { + this.mergeCompanyApplicant.push({ groupName: 'OTHERS', groupValues: [{ id: 0, name: 'Not Yet Finalised', group_id: 2 }] }) + } + + } + }); - // this.listOfLanguagues.splice(this.listOfLanguagues.indexOf(languague), 1); - } - if (this.productAbbr != 'LAP') { - this.mergeCompanyApplicant.push({ groupName: 'OTHERS', groupValues: [{ id: 0, name: 'Not Yet Finalised', group_id: 2 }] }) - } + + + }) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.html index 59a3bd044..14f46964a 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/rental-verification/rental-verification.component.html @@ -615,10 +615,12 @@ +
What is the Reason for Difference in Rent Amount +