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 3d94fbcb8..42ebf4240 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 @@ -465,7 +465,7 @@ export class AddPdComponent implements OnInit, OnDestroy { "fk_pd_type":formValue.fk_pd_type, "fk_customer_segment":formValue.fk_customer_segment, "loan_amount":formValue.loan_amount, - "addressline1":formValue.addressline1, + "addressline1":formValue.addressline1.toUpperCase(), "fk_city":formValue.fk_city, "fk_state":formValue.fk_state, "pincode":formValue.pincode, @@ -525,6 +525,8 @@ export class AddPdComponent implements OnInit, OnDestroy { pd_form.append("addtional_requirements",JSON.stringify(formValue.addtional_requirements)) } + // console.log('pd_form',pd_form); + // console.log('pd_details',pd_details); this._pd.addPdDetails(pd_form).subscribe(result => { if (result.status == 200) { this.disableAfterSubmit = false; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html index 68612360f..4cdb391c7 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html @@ -115,8 +115,9 @@ - + + 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 f62c7a59c..0636bcf42 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 @@ -168,7 +168,7 @@ export class EditPdMasterComponent implements OnInit { fk_pd_type: [this.data.records.fk_pd_type], fk_customer_segment: [this.data.records.fk_customer_segment], loan_amount: [this.data.records.loan_amount,Validators.compose([Validators.pattern('^[0-9]*$')])], -   addressline1: [this.data.records.addressline1], +   addressline1: [this.data.records.addressline1.toUpperCase()], fk_city: [this.data.records.fk_city], fk_state: [this.data.records.fk_state],   pincode : [this.data.records.pincode_id], @@ -334,7 +334,7 @@ export class EditPdMasterComponent implements OnInit { "fk_pd_type": my_array.fk_pd_type, "fk_customer_segment": my_array.fk_customer_segment, "loan_amount": my_array.loan_amount, -   "addressline1": my_array.addressline1, +   "addressline1": my_array.addressline1.toUpperCase(), "fk_city": my_array.fk_city, "fk_state": my_array.fk_state,   "pincode": my_array.pincode, 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 f5e0b6923..43a2473bd 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 @@ -135,7 +135,7 @@ - + Select {{uom.name}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html index 6e8cbef51..fcfd379ac 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html @@ -58,7 +58,6 @@ - Select Yes No 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 c95792620..a74cb1ed0 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 @@ -1208,14 +1208,34 @@ No - - + + Yes No - + + + + + + +
+
+ + + Select + {{ b.lender_name }} + + + + + +
+
+ + - @@ -1227,7 +1247,7 @@ Yes - No Major Changes In Sales + No Major Changes In Sales 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 b54ee3b53..e6c418c2a 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 @@ -48,6 +48,7 @@ export class BusinessInfoComponent implements OnInit { activityData: any = []; stateList: any = []; countryDataList : any = []; + bankList = []; relativeNames: any; applicants: any; @@ -86,6 +87,9 @@ export class BusinessInfoComponent implements OnInit { WholeSalesChecked: boolean; ServiceChecked: boolean; + temp_noofposmachine : any; + temp_additiondetailofposmachine : any = []; + constructor(notifier: NotifierService, private fb: FormBuilder, private route: ActivatedRoute, @@ -141,6 +145,7 @@ export class BusinessInfoComponent implements OnInit { this.getCompanyRelation(); this.getTitle(); this.getAllPersons(); + this.getBank(); // const Desgn = this.businessForm.controls['designation']; // const Partnr = this.businessForm.controls['partners']; // const otherDoc = this.businessForm.controls['documents']; @@ -162,6 +167,7 @@ export class BusinessInfoComponent implements OnInit { const wholesaleControl: any = this.businessForm.controls['wholesale_trading_activity_details']; const serviceProviderControl: any = this.businessForm.controls['service_provider_activity_details']; const othersControl: any = this.businessForm.controls['others_activity_details']; + if (data.status == 200) { let DocArray: any; // let DesgnArray = Object.keys(data.records.designation).map(function (key) { @@ -356,6 +362,9 @@ export class BusinessInfoComponent implements OnInit { selectedRetail.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('export_import_cert'); 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'); + selectedRetail.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('pos_machines_details', this.fb.array([])) : this.businessForm.removeControl('pos_machines_details'); + selectedRetail.forEach((element,index)=>{ this.CheckExport(element.area_of_sale,'RActivity',index); retailControl.push(this.createActivity()); @@ -418,6 +427,9 @@ export class BusinessInfoComponent implements OnInit { selectedWholesale.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('export_import_cert'); 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'); + selectedWholesale.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('pos_machines_details', this.fb.array([])) : this.businessForm.removeControl('pos_machines_details'); + selectedWholesale.forEach((element,index)=>{ this.CheckExport(element.area_of_sale,'WActivity',index); wholesaleControl.push(this.createActivity()); @@ -482,6 +494,9 @@ export class BusinessInfoComponent implements OnInit { selectedService.length > 0 ? this.businessForm.addControl('practice_cert', new FormControl('', Validators.required)) : this.businessForm.removeControl('practice_cert'); 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'); + selectedService.length > 0 && businessVal.applicant_use_pos_machines == 'yes' ? this.businessForm.addControl('pos_machines_details', this.fb.array([])) : this.businessForm.removeControl('pos_machines_details'); + selectedService.forEach((element,index)=>{ this.CheckExport(element.area_of_sale,'SPActivity',index); serviceProviderControl.push(this.createServiceActivity()); @@ -556,10 +571,15 @@ export class BusinessInfoComponent implements OnInit { } else { businessVal.others_activity_details=[]; - } - - this.businessForm.setValue(businessVal); + if(businessVal.applicant_use_pos_machines == 'yes'){ + this.businessForm.controls.no_of_pos_machines.setValue(businessVal.no_of_pos_machines); + const posControl: any = this.businessForm.controls['pos_machines_details']; + for(let i = 1; i<= businessVal.no_of_pos_machines; i++ ){ + posControl.push(this.createPOSMachinesDetails(businessVal.pos_machines_details)); + } + } + this.businessForm.setValue(businessVal); } else { //Desgn.push(this.createDesignation()); Partnr.push(this.createPartners()); @@ -722,6 +742,10 @@ export class BusinessInfoComponent implements OnInit { 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){ + this.changePOSMachinesAvailablity(this.businessForm.value.applicant_use_pos_machines,2); + } + if(this.ManufacturingChecked && this.RetailedChecked && this.WholeSalesChecked && this.ServiceChecked){ this.ExportFlag = false; } @@ -1089,6 +1113,14 @@ export class BusinessInfoComponent implements OnInit { }) }); } + + getBank(){ + this._pd.getAllMasterDatas('BTLENDERLIST').subscribe( + data => { + this.bankList = data.records.filter(data => data.isactive == 1 && data.lender_type == 1); + }) + } + // get title master getTitle() { let master_name = 'TITLES'; @@ -1159,9 +1191,7 @@ export class BusinessInfoComponent implements OnInit { // if(this.businessForm.controls.partners['controls'].length > 1) - // { - // console.log('asd'); - // } + // {} if(this.businessEntityTypeList.business_entity_type_name == 'OPC (One Person Company)' || this.businessEntityTypeList.business_entity_type_name == 'Sole proprietorship'){ this.EntityTypeFlag = true; @@ -1201,7 +1231,6 @@ export class BusinessInfoComponent implements OnInit { data.records.forEach(val => { if (val.isactive == 1) { this.countryDataList.push(val); - // console.log(this.countryDataList); } }) }); @@ -1836,5 +1865,55 @@ CheckExport(value,stringFlag,index){ } } + changePOSMachinesAvailablity(e,flag){ + + e == 'yes' + ? this.businessForm.addControl('no_of_pos_machines', new FormControl('')) + : this.businessForm.removeControl('no_of_pos_machines'); + + if(flag == 2){ + e == 'yes' + ? this.businessForm.controls.no_of_pos_machines.setValue(this.temp_noofposmachine) + : this.businessForm.removeControl('no_of_pos_machines'); + } + + } + toGetPOSMachinesDetails(e,flag){ + + if(flag == 1){ this.businessForm.addControl('pos_machines_details', this.fb.array([])); } + const control = this.businessForm.controls['pos_machines_details']; + + while (control.length !== 0) { + control.removeAt(0); + } + + if(e > 0 ){ + if(flag == 1){ + for(let i = 1 ; i<= e ; i++ ){ + control.push(this.createPOSMachinesDetails(null)); + } + } + else if(flag == 2){ + for(let i = 1 ; i<= e ; i++ ){ + control.push(this.createPOSMachinesDetails(this.temp_additiondetailofposmachine)); + } + } + } + } + + createPOSMachinesDetails(data){ + if(data == null){ + return this.fb.group({ + pos_machines_financial_institution_name: [''], + tid_no_of_pos_machine: [''], + }); + } + else if(data != null) { + return this.fb.group({ + pos_machines_financial_institution_name: [data.pos_machines_financial_institution_name], + tid_no_of_pos_machine: [data.tid_no_of_pos_machine], + }); + } + } } 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 42bd65146..a0140fec6 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 @@ -22,6 +22,7 @@
+ Select {{ pm.name }} @@ -36,6 +37,7 @@
+ Select {{tl.name}} @@ -77,12 +79,14 @@ {{ pm.name }} --> + Select {{ pm.name }} + Select Payment received in Cash. Payment received through Banking channels. @@ -135,6 +139,7 @@
+ Select {{ pm.name }} @@ -148,6 +153,7 @@
+ Select {{tl.name}} @@ -190,12 +196,14 @@ {{ pm.name }} --> + Select {{ pm.name }} + Select Payment received in Cash. Payment received through Banking channels. @@ -249,6 +257,7 @@
+ Select {{ pm.name }} @@ -262,6 +271,7 @@ --> + Select {{tl.name}} @@ -303,12 +313,14 @@ {{ pm.name }} --> + Select {{ pm.name }} + Select Payment received in Cash. Payment received through Banking channels. 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 7c9e8b6b8..0b36181b6 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 @@ -26,6 +26,7 @@ + Select Yes No @@ -44,6 +45,7 @@ + Select {{types.loan_type_name}} @@ -57,6 +59,7 @@ + Select {{ btLen.lender_name }} @@ -84,7 +87,8 @@ + formControlName="frequency" > + Select {{freq.name}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts index 77587c12e..2f75c964a 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.ts @@ -166,7 +166,6 @@ export class CurrentLoanComponent implements OnInit { let AssetData = data.record; - if(AssetData.business_assets.length>0){ AssetData.business_assets.map(element => { @@ -203,15 +202,25 @@ export class CurrentLoanComponent implements OnInit { if(val.mode == 1){ let data; + let owner val.details.forEach((v,index) => { data = v.any_other_assets; }); + if(val.form_type == 'Data From Business Assets'){ + owner = val.owner_name.map((e => { + return e.name.split(',') + })); + } + else { + owner = val.owner_name; + } let description = data != '' ? ' ( '+ data +' )' : ''; - labelarray[index] = ' : '+val.owner_name +' - '+ val.mode_name + description; + labelarray[index] = ' : '+owner +' - '+ val.mode_name + description; } if(val.mode == 2){ let data; + let owner; val.details.forEach((v,index) => { data = v.property_type; if(v.property_type != 1){ @@ -227,41 +236,81 @@ export class CurrentLoanComponent implements OnInit { }else{ data=v.other_property_type; } + if(val.form_type == 'Data From Business Assets'){ + owner = val.owner_name.map((e => { + return e.name.split(',') + })); + } + else { + owner = val.owner_name; + } - }); let description = data != '' ? ' ( '+ data +' )' : ''; - labelarray[index] = ' : '+val.owner_name +' - '+ val.mode_name + description; + labelarray[index] = ' : '+owner +' - '+ val.mode_name + description; } if(val.mode == 3){ - let data; + let data;let owner; val.details.forEach((v,index) => { data = v.manufacturer_model_vehicle; }); + if(val.form_type == 'Data From Business Assets'){ + owner = val.owner_name.map((e => { + return e.name.split(',') + })); + } + else { + owner = val.owner_name; + } let description = data != '' ? ' ( '+ data +' )' : ''; - labelarray[index] = ' : '+val.owner_name +' - '+ val.mode_name + description; + labelarray[index] = ' : '+owner +' - '+ val.mode_name + description; } if(val.mode == 4){ - let data; + let data;let owner; val.details.forEach((v,index) => { data = v.equipment_manufacturing_description; }); + if(val.form_type == 'Data From Business Assets'){ + owner = val.owner_name.map((e => { + return e.name.split(',') + })); + } + else { + owner = val.owner_name; + } let description = data != '' ? ' ( '+ data +' )' : ''; - labelarray[index] = ' : '+val.owner_name +' - '+ val.mode_name + description; + labelarray[index] = ' : '+owner +' - '+ val.mode_name + description; } if(val.mode == 6){ - labelarray[index] = ' : '+val.owner_name+' - '+ val.mode_name; + let owner + if(val.form_type == 'Data From Business Assets'){ + owner = val.owner_name.map((e => { + return e.name.split(',') + })); + } + else { + owner = val.owner_name; + } + labelarray[index] = ' : '+owner+' - '+ val.mode_name; } if(val.mode == 7){ - let data; + let data;let owner; val.details.forEach((v,index) => { data = v.investments_type != 1 ? this.investmentTypeData.filter(data => data.id == v.investments_type)[0].name : v.other_investments_type ; }); + if(val.form_type == 'Data From Business Assets'){ + owner = val.owner_name.map((e => { + return e.name.split(',') + })); + } + else { + owner = val.owner_name; + } let description = data != '' ? '( '+ data +' )' : ''; - labelarray[index] = ' : '+val.owner_name +' - '+ val.mode_name + description; + labelarray[index] = ' : '+owner +' - '+ val.mode_name + description; } }); const control = this.currentLoanForm.controls['loan_details']; @@ -444,7 +493,6 @@ export class CurrentLoanComponent implements OnInit { if (records.existing_loan == 'Yes') { records.loan_details = this.currentLoanForm.controls['loan_details'].value; } - // console.log('data', records); this._pd.saveForm(records).subscribe(data => { if(data.status == 200) { this.notifier.notify('success', 'Saved Successfully.'); @@ -517,9 +565,6 @@ export class CurrentLoanComponent implements OnInit { } } setRequiredValidation(value,item,flag) { - console.log('value',value); - console.log('item',item); - console.log('flag',flag); if(flag == 1){ value==1 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 2c914bda6..bf5383f5d 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 @@ -35,6 +35,7 @@ + Select Yes No @@ -50,6 +51,7 @@ + Select Yes No @@ -60,6 +62,7 @@ + Select Yes No @@ -67,6 +70,7 @@ + Select Yes No @@ -98,6 +102,7 @@ + Select {{ fd.name }} @@ -105,6 +110,7 @@ + Select Fixed Variable depending on performance Others @@ -116,6 +122,7 @@ + Select Yes No 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 0f304e756..e508f58cb 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 @@ -1,264 +1,3 @@ - - - -

{{main_applicant}} ({{lender_applicant_id}}), {{customer_segment_abbr}} - {{subproduct_abbr}}
@@ -283,6 +22,7 @@
+ Select {{person.applicant_name}} @@ -294,6 +34,7 @@
Residence Details of {{FamilyMemberAsLabel[ix]}}
+ Select {{s.name}} @@ -301,6 +42,7 @@ + Select {{c.city_name}} @@ -311,6 +53,7 @@ + Select {{p.pincode}} @@ -336,6 +79,7 @@ + Select {{ownerShip.name}} @@ -369,6 +113,7 @@ + Select {{relation.name}} @@ -381,6 +126,7 @@
+ Select {{earnings.type}} @@ -390,6 +136,7 @@
+ Select {{earn.earning_member_status}} @@ -413,6 +160,7 @@
+ Select {{occupation.name}} 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 16c5dfb3c..9073a7e12 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 @@ -266,7 +266,7 @@ {{"₹"}} {{AV_netProfitAmtToInwords[i]}} Only - + @@ -276,11 +276,12 @@
+ Working Capital Details - + - + @@ -324,7 +325,7 @@ - + @@ -343,7 +344,7 @@ {{"₹"}} {{AV_netLossAmtToInwords[i]}} Only - + 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 3d3650301..a48bbb000 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 @@ -30,7 +30,8 @@ {{loanAmtInWords}} Only - Loan Tenure applied for? + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html index dad103fba..4f23b10b7 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html @@ -36,6 +36,7 @@ + Select Yes No @@ -84,6 +85,7 @@
+ Select {{list.applicant_name}} @@ -119,6 +121,7 @@
+ Select Positive Negative diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts index d49bd592d..284274ae3 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts @@ -235,6 +235,51 @@ export class NeighbourHoodComponent implements OnInit { //save heighbourhood forms saveNeighbourhood(formData:any){ let resultMessage:string=''; + + + // const referencecheckControl = this._neighbourhoodForm.controls['referencecheck_list']; + // const referencecheckControl = this._neighbourhoodForm.get('referencecheck_list') as FormControl; + const neighbourhoodControl : FormGroup = this._neighbourhoodForm.controls['neighbourhood_list'] as FormGroup; + + if(formData.check_type==0){ + console.log('neighbourhoodControl',neighbourhoodControl); + + // neighbourhoodControl.contdols['neighbourhood_name'].setValidators([Validators.required]); + // neighbourhoodControl.controls['neighbourhood_name'].updateValueAndValidity(); + + // neighbourhoodControl.controls['do_know'].setValidators([Validators.required]); + // neighbourhoodControl.controls['do_know'].updateValueAndValidity(); + return; + } + + + // if(formData.check_type==1){ + // referencecheckControl.controls['reference_name'].setValidators([Validators.required]); + // referencecheckControl.controls['reference_name'].updateValueAndValidity(); + + // referencecheckControl.controls['location'].setValidators([Validators.required]); + // referencecheckControl.controls['location'].updateValueAndValidity(); + + // referencecheckControl.controls['mobile'].setValidators([Validators.required]); + // referencecheckControl.controls['mobile'].updateValueAndValidity(); + + // referencecheckControl.controls['relationship_with'].setValidators([Validators.required]); + // referencecheckControl.controls['relationship_with'].updateValueAndValidity(); + + // referencecheckControl.controls['year_relation_applicant'].setValidators([Validators.required]); + // referencecheckControl.controls['year_relation_applicant'].updateValueAndValidity(); + + // referencecheckControl.controls['business_volume_amount'].setValidators([Validators.required]); + // referencecheckControl.controls['business_volume_amount'].updateValueAndValidity(); + + // referencecheckControl.controls['business_volume_unit'].setValidators([Validators.required]); + // referencecheckControl.controls['business_volume_unit'].updateValueAndValidity(); + + // referencecheckControl.controls['reference_final_remarks'].setValidators([Validators.required]); + // referencecheckControl.controls['reference_final_remarks'].updateValueAndValidity(); + + // } + if (this._neighbourhoodForm.invalid) { this.validateAllFormFields(this._neighbourhoodForm); this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!'); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html index 74a444bff..47ac52c6e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html @@ -24,6 +24,7 @@ + Select Yes No @@ -40,6 +41,7 @@ + Select {{src.name}} +
Manufacturing Stock Details
-
+
-
Manufacturing Stock Details
Raw Material #{{a+1}} @@ -34,7 +34,8 @@ - + + Select Add Stock Details No Stock Observed @@ -44,8 +45,9 @@ - + + Select {{uom.name}} @@ -59,17 +61,6 @@ - - - Yes - No - - - - - Please comment on the stock level observed? - - @@ -89,7 +80,20 @@
-
+ + + + Select + Yes + No + + + + Please comment on the stock level observed? + + + +
@@ -101,7 +105,8 @@ - + + Select Add Stock Details No Stock Observed @@ -111,8 +116,9 @@ - + Select {{uom.name}} @@ -123,20 +129,6 @@ {{"₹"}} {{M_goodsValueInWords[b]}} Only - - - - Yes - No - - - - - Please comment on the finished goods stock level observed? - - - +
Retail Trading Details
- - -
-
Retail Trading Details
Traded Goods #{{e+1}} @@ -195,7 +183,8 @@ - + + Select Add Stock Details No Stock Observed @@ -205,8 +194,9 @@ - + Select {{uom.name}} @@ -217,9 +207,10 @@ {{"₹"}} {{R_tradedGoodsValueInWords[e]}} Only + + @@ -228,12 +219,10 @@ - + - +
Wholesale Trading Details
-
Wholesale Trading Details
+ Traded Goods #{{g+1}} @@ -286,6 +275,7 @@ + Select Add Stock Details No stock observed @@ -295,8 +285,9 @@ - + Select {{uom.name}} @@ -310,18 +301,18 @@ - - + + + Select {{ pm.name }} + Select Payment made in Cash. Payment made through Banking channels. @@ -145,6 +148,7 @@
+ Select {{tl.name}} @@ -187,11 +191,13 @@ {{ pm.name }} --> + Select {{ pm.name }} + Select Payment made in Cash. Payment made through Banking channels. 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 26dbfe146..cfa01dd06 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 @@ -248,11 +248,11 @@ - QC Remarks -
QC Feedback +
-
QC Remarks
+
QC Feedback
@@ -269,6 +269,11 @@ {{ pdMasterData[0]?.qc_feedback}}
+ + +

No Feedback

+ + PD History