From 3b71c3f3d022dd5b35929173fe9fad2da6f72c33 Mon Sep 17 00:00:00 2001 From: sriram-at-840620226347 Date: Fri, 8 Nov 2019 16:45:43 +0530 Subject: [PATCH] MONEYWISE added in all form --- .../forms/address/address.component.ts | 12 +++---- .../assets-info/assets-info.component.html | 8 ++--- .../business-assets-info.component.html | 8 ++--- .../business-info.component.html | 2 +- .../business-info/business-info.component.ts | 14 ++++---- .../client-info/client-info.component.html | 33 +++++++++++++++---- .../client-info/client-info.component.ts | 10 ++++-- .../family-details.component.html | 4 +-- .../final-remarks.component.html | 3 +- .../final-remarks/final-remarks.component.ts | 4 +-- .../financial-info.component.html | 4 +-- .../loan-details/loan-details.component.html | 8 ++--- .../loan-details/loan-details.component.ts | 6 ++-- .../start-pd/forms/stock/stock.component.html | 21 ++++++++---- .../start-pd/forms/stock/stock.component.ts | 3 ++ .../supplier-info.component.html | 33 +++++++++++++++---- .../supplier-info/supplier-info.component.ts | 7 ++++ 17 files changed, 123 insertions(+), 57 deletions(-) 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 69b67fdf9..62b53d73d 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 @@ -179,7 +179,7 @@ export class AddressComponent implements OnInit { } } - if(this.lender_short_name != 'CLIX') { + if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE') { this.addressForm.controls.estimated_area.setValue(datas.estimated_area ? datas.estimated_area : '') this.addressForm.controls.uom.setValue(datas.uom); @@ -222,7 +222,7 @@ export class AddressComponent implements OnInit { // was_the_company_name_board_sighted:['', Validators.compose([Validators.required])], address_form_remark: [''] }); - if(this.lender_short_name == 'CLIX'){ + if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'MONEYWISE'){ this.addressForm.removeControl('estimated_area'); this.addressForm.removeControl('uom'); } @@ -532,7 +532,7 @@ export class AddressComponent implements OnInit { records.addresses[0].locality_mixuse = this.addressForm.controls.locality_mixuse.value; records.addresses[0].pd_location = this.addressForm.controls.pd_location.value; records.addresses[0].comment_locality = this.addressForm.controls.comment_locality.value; - if(this.lender_short_name != 'CLIX') { + if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE') { records.addresses[0].estimated_area = this.addressForm.controls.estimated_area.value records.addresses[0].uom = this.addressForm.controls.uom.value; if (this.addressForm.controls.uom.value == 1) { @@ -557,7 +557,7 @@ export class AddressComponent implements OnInit { records.alternative_addresses[0].locality_mixuse = this.addressForm.controls.locality_mixuse.value; records.alternative_addresses[0].pd_location = this.addressForm.controls.pd_location.value; records.alternative_addresses[0].comment_locality = this.addressForm.controls.comment_locality.value; - if(this.lender_short_name != 'CLIX') { + if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE') { records.alternative_addresses[0].estimated_area = this.addressForm.controls.estimated_area.value records.alternative_addresses[0].uom = this.addressForm.controls.uom.value; if (this.addressForm.controls.uom.value == 1) { @@ -735,7 +735,7 @@ export class AddressComponent implements OnInit { this.addressForm.controls.locality_others.setValue(datas.locality_others); } - if(this.lender_short_name != 'CLIX'){ + if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE'){ this.addressForm.controls.estimated_area.setValue(datas.estimated_area ? datas.estimated_area : '') this.addressForm.controls.uom.setValue(datas.uom) this.setOthers(datas.uom, '', 5); @@ -806,7 +806,7 @@ export class AddressComponent implements OnInit { this.addressForm.controls.locality_others.setValue(datas.locality_others); } - if(this.lender_short_name != 'CLIX'){ + if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE'){ this.addressForm.controls.estimated_area.setValue(datas.estimated_area); this.addressForm.controls.uom.setValue(datas.uom); this.setOthers(datas.uom, '', 5); 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 884e9b4df..f63c4aab2 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 @@ -74,13 +74,13 @@ - + -
+
@@ -358,7 +358,7 @@ -->
- + @@ -386,7 +386,7 @@ -
+
- + Age of Asset in Years - +
@@ -416,7 +416,7 @@ Owned by is Required - + Age of Asset in Years + *ngIf="(sup.get('business_assets_mode').value != '') && sup.get('business_ownership_type').value == 'owned' && (lender_short_name != 'CLIX' && lender_short_name != 'MONEYWISE')">
Permanent Required - + Temporary Required diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts index cd4fbb770..6100500d4 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts @@ -258,7 +258,7 @@ export class BusinessInfoComponent implements OnInit { //businessVal.designation = DesgnArray; businessVal.partners = PartnrArray; businessVal.documents = DocArray; - if(this.lender_short_name != 'CLIX'){ + if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE'){ if (data.records.persons_with_relationships) { let selectedFamilyMember = Object.keys(data.records.persons_with_relationships).map(function (key) { return data.records.persons_with_relationships[key]; @@ -394,7 +394,7 @@ export class BusinessInfoComponent implements OnInit { }); if (selectedRetail.length > 0) { selectedRetail.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('export_import_cert'); - if(this.lender_short_name != 'CLIX'){ + if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE'){ selectedRetail.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl('')) : this.businessForm.removeControl('applicant_use_mobile_wallets'); selectedRetail.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl('')) : this.businessForm.removeControl('applicant_use_pos_machines'); selectedRetail.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) : this.businessForm.removeControl('no_of_pos_machines'); @@ -461,7 +461,7 @@ export class BusinessInfoComponent implements OnInit { }); if (selectedWholesale.length > 0) { selectedWholesale.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('export_import_cert'); - if(this.lender_short_name != 'CLIX'){ + if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE'){ selectedWholesale.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl('')) : this.businessForm.removeControl('applicant_use_mobile_wallets'); selectedWholesale.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl('')) : this.businessForm.removeControl('applicant_use_pos_machines'); selectedWholesale.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) : this.businessForm.removeControl('no_of_pos_machines'); @@ -530,7 +530,7 @@ export class BusinessInfoComponent implements OnInit { }); if (selectedService.length > 0) { selectedService.length > 0 ? this.businessForm.addControl('practice_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('practice_cert'); - if(this.lender_short_name != 'CLIX'){ + if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE'){ selectedService.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl('')) : this.businessForm.removeControl('applicant_use_mobile_wallets'); selectedService.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl('')) : this.businessForm.removeControl('applicant_use_pos_machines'); selectedService.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) : this.businessForm.removeControl('no_of_pos_machines'); @@ -657,7 +657,7 @@ export class BusinessInfoComponent implements OnInit { this.product_abbr == 'LAEP' ? this.businessForm.addControl('fire_noc', new FormControl('', Validators.required)) : this.businessForm.removeControl('fire_noc'); - if(this.lender_short_name != 'CLIX'){ + if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE'){ // change relation with businees update dat sorce table this.businessForm.controls['persons_with_relationships'].valueChanges.subscribe(val => { let relationControl = this.businessForm.controls['persons_with_relationships']; @@ -719,7 +719,7 @@ export class BusinessInfoComponent implements OnInit { service_provider_activity_details: this.fb.array([]), // others_activity_details: this.fb.array([]), }); - if(this.lender_short_name == 'CLIX'){ + if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'MONEYWISE'){ this.businessForm.removeControl('persons_with_relationships'); } } @@ -800,7 +800,7 @@ export class BusinessInfoComponent implements OnInit { this.businessForm.value.service_provider_activity_details.length > 0 ? this.businessForm.addControl('practice_cert', new FormControl(this.businessForm.value.practice_cert, Validators.required)) : this.businessForm.removeControl('practice_cert'); // check activity for extra question make dynamic - if(this.lender_short_name != 'CLIX'){ + if(this.lender_short_name != 'CLIX' && this.lender_short_name != 'MONEYWISE'){ this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0 ? this.businessForm.addControl('applicant_use_mobile_wallets', new FormControl(this.businessForm.value.applicant_use_mobile_wallets)) : this.businessForm.removeControl('applicant_use_mobile_wallets'); this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0 ? this.businessForm.addControl('applicant_use_pos_machines', new FormControl(this.businessForm.value.applicant_use_pos_machines)) : this.businessForm.removeControl('applicant_use_pos_machines'); if (this.businessForm.value.service_provider_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0) { 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 12fd1c5a6..bb5b28b9e 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 @@ -56,7 +56,7 @@
-
+
Select @@ -104,7 +104,7 @@ Enter Valid LandLine Number.
-
+
@@ -382,7 +396,7 @@ Enter Valid LandLine Number.
-
+
-
+
@@ -273,7 +273,7 @@
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html index e54872b00..6d6d2ab7d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html @@ -147,9 +147,10 @@ Specify the Mode of Transport Used to Visit the PD address Required - + CLIX + MONEYWISE diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts index bd8fcf686..c379216e2 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.ts @@ -100,7 +100,7 @@ export class FinalRemarksComponent implements OnInit { final_form_remarks: [''] }); - if(this.lender_short_name == 'CLIX' || this.product_abbr == 'LAEP'){ + if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'MONEYWISE' || this.product_abbr == 'LAEP'){ this.product_abbr == 'LAEP' ? this._finalRemarkForm.addControl('outlet_location', new FormControl('', Validators.required)) : this._finalRemarkForm.removeControl('outlet_location'); this._finalRemarkForm.addControl('is_competition', new FormControl('')); this._finalRemarkForm.addControl('sealing_activity', new FormControl('')); @@ -239,7 +239,7 @@ export class FinalRemarksComponent implements OnInit { this._finalRemarkForm.controls.market_intelligence.setValue(data.records.market_intelligence || ''); - if(this.lender_short_name == 'CLIX' || this.product_abbr == 'LAEP'){ + if(this.lender_short_name == 'CLIX' || this.lender_short_name == 'MONEYWISE' || this.product_abbr == 'LAEP'){ if(this.product_abbr == 'LAEP') {this._finalRemarkForm.controls.outlet_location.setValue(this.product_abbr == 'LAEP' ? data.records.outlet_location : ''); } this._finalRemarkForm.controls.is_competition.setValue(data.records.is_competition); 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 e1038369f..2bf2b6808 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 @@ -397,7 +397,7 @@ {{AV_netProfitAmtInwords[i]}} Only --> - + {{"₹"}} @@ -486,7 +486,7 @@
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html index de7c0f7a2..64839cefb 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html @@ -58,7 +58,7 @@ End Use Required - + Select @@ -76,7 +76,7 @@ -
+
@@ -119,7 +119,7 @@ - + Select @@ -166,7 +166,7 @@ - + {{"₹"}} {{ loanDetailsForm.controls['emi_level'].value | numberToWords }} Only 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 0ace46d78..36a6dfebc 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 @@ -335,7 +335,7 @@ export class LoanDetailsComponent implements OnInit { if (this.pd_all_details.pdmaster_details.fk_subproduct_id) { this.loanDetailsForm.controls['sub_product'].setValue(this.pd_all_details.pdmaster_details.fk_subproduct_id); } - if(this.lenderShortName == 'CLIX'){ + if(this.lenderShortName == 'CLIX' || this.lenderShortName == 'MONEYWISE'){ // console.log(this.lenderShortName); this.loanDetailsForm.controls['is_transfer'].setValue("no"); this.selectedBalancesTransferChanges("no") @@ -838,7 +838,7 @@ export class LoanDetailsComponent implements OnInit { } } } - if(this.lenderShortName == 'CLIX'){ + if(this.lenderShortName == 'CLIX' || this.lenderShortName == 'MONEYWISE'){ this.loanDetailsForm.controls['own_contribution'].setValue(''); this.loanDetailsForm.controls['own_contribution'].clearValidators(); this.loanDetailsForm.controls['own_contribution'].updateValueAndValidity(); @@ -892,7 +892,7 @@ export class LoanDetailsComponent implements OnInit { records.balance_transfer_amount = this.loanDetailsForm.controls['balance_transfer_amount'].value; } else if (this.loanDetailsForm.controls['is_transfer'].value == 'no') { - if (this.isContribution || this.lenderShortName == 'CLIX') { + if (this.isContribution || this.lenderShortName == 'CLIX' || this.lenderShortName == 'MONEYWISE') { records.own_contribution = ''; records.source_group = ''; records.other_source = ''; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html index 4682378f2..42d21368b 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html @@ -12,7 +12,7 @@
-
+ @@ -46,7 +46,7 @@ Stock Required -
+
@@ -141,7 +141,7 @@ -
+
-
+
-
+
- +

@@ -430,7 +430,7 @@ -
+
+
+ + + +

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 084d44818..19b60a76f 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 @@ -176,6 +176,7 @@ export class StockComponent implements OnInit { trade_details: this.fb.array([this.tradingFormCreation(type4length)]), servicing_details: this.fb.array([this.servicingFormCreation(type5length)]), is_sufficiant_finished_and_traded_goods: [dataForm.is_sufficiant_finished_and_traded_goods], + stock_validated: [dataForm.stock_validated || null], finished_and_traded_goods_remarks: [dataForm.finished_and_traded_goods_remarks], is_sufficiant_service_goods: [dataForm.hasOwnProperty('is_sufficiant_service_goods') ? dataForm.is_sufficiant_service_goods : ''], service_goods_remarks: [dataForm.hasOwnProperty('service_goods_remarks') ? dataForm.service_goods_remarks : '' ] @@ -240,6 +241,7 @@ export class StockComponent implements OnInit { trade_details: this.fb.array([this.tradingFormCreation(type4length)]), servicing_details: this.fb.array([this.servicingFormCreation(type5length)]), is_sufficiant_finished_and_traded_goods: [''], + stock_validated: [''], finished_and_traded_goods_remarks: [''], is_sufficiant_service_goods: [''], service_goods_remarks: [''] @@ -294,6 +296,7 @@ export class StockComponent implements OnInit { trade_details: this.fb.array([this.tradingFormCreation(type4length)]), servicing_details: this.fb.array([this.servicingFormCreation(type5length)]), is_sufficiant_finished_and_traded_goods: [''], + stock_validated: [''], finished_and_traded_goods_remarks: [''], is_sufficiant_service_goods: [''], service_goods_remarks: [''] diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html index 522c2ed2a..c2b8904b1 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html @@ -50,7 +50,7 @@ formControlName="manufacturing_supplier_name">
-
+
@@ -108,7 +108,7 @@ Enter Valid LandLine Number.
-
+