From 4541f61b6ab178c164414895c95e497bb6211f3b Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 22 Jul 2020 16:07:39 +0530 Subject: [PATCH] Fairoj : SMART PD FEEDBACK CHANGES --- .../forms/address/address.component.html | 6 +- .../forms/address/address.component.ts | 91 ++++++++++++++++++- .../dynamic-form/dynamic-form.component.html | 2 +- .../queries-docs/queries-docs.component.html | 2 +- .../queries-docs/queries-docs.component.ts | 42 ++++++++- .../list-pd/view-pd/view-pd.component.html | 10 +- .../list-pd/view-pd/view-pd.component.ts | 1 + .../pd-service/pd-triger.service.ts | 3 +- 8 files changed, 146 insertions(+), 11 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 18003f29e..d80399894 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 @@ -92,6 +92,10 @@ Pincode Required + + Pincode should be 6 digit @@ -258,7 +262,7 @@ + *ngIf="addressForm.controls['locality'].value == 1 && addressForm.controls['locality_others']"> 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 b3e357167..f53270bf4 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 @@ -420,6 +420,7 @@ export class AddressComponent implements OnInit { e == 1 ? this.addressForm.addControl('address_type_others', new FormControl('', Validators.required)) : this.addressForm.removeControl('address_type_others'); break; case 4: + console.log("value",e ); e == 1 ? this.addressForm.addControl('locality_others', new FormControl('', Validators.required)) : this.addressForm.removeControl('locality_others'); break; case 5: @@ -534,12 +535,24 @@ export class AddressComponent implements OnInit { }); } + public findInvalidControls() { + const invalid = []; + const controls = this.addressForm.controls; + for (const name in controls) { + if (controls[name].invalid) { + invalid.push(name); + } + } + return invalid; + } onSubmit() { if (!this.addressForm.valid) { this.validateAllFormFields(this.addressForm); this.notifier.notify('warning', 'Please Fill All Mandatory Fields.!'); this.disableAfterSubmit = false; + let inavalidCtrls = this.findInvalidControls(); + console.log(inavalidCtrls) return; } // else if (this.addressForm.value.address_form_remark == '') { @@ -881,9 +894,85 @@ export class AddressComponent implements OnInit { this._pd.getVendorDatas('address',this.pdid).subscribe(result=>{ if(result) { + let initiated_address_check =result.records.hasOwnProperty('is_pd_done_on_initiated_address') ? result.records.is_pd_done_on_initiated_address : true ; + if (initiated_address_check == false) { + + this.addressForm.addControl('alternative_addresses', this.fb.array([])); + const alternative_address_control = this.addressForm.controls['alternative_addresses']; + if (result.records.alternative_addresses.length > 0) { + + result.records.alternative_addresses.forEach((datas, index) => { + + if (datas.citySearch == "" || datas.citySearch == null){ + delete datas.citySearch; + } + if (datas.pinSearch == "" || datas.pinSearch == null){ + delete datas.pinSearch; + } + if (datas.stateSearch == "" || datas.stateSearch == null){ + delete datas.stateSearch; + } + + let obj = { + 'alternative_address': this.transformName(datas.alternative_address), + 'alternative_state': datas.alternative_state, + 'alternative_city': datas.alternative_city, + 'alternative_pincode': datas.alternative_pincode, + // 'alternative_pincode_others': datas.alternative_pincode == 1 ? datas.alternative_pincode_others : '', + 'reason_for_alternative_address': datas.reason_for_alternative_address, + } + this.getCityAndPincodeDetails(datas.alternative_state, index, 2); + if(alternative_address_control.length == 1) { + alternative_address_control.removeAt(0); + } + alternative_address_control.push(this.createAlternativeAddresses(obj)); + this.setOthers(+datas.alternative_pincode, index, 2); + if(datas.alternative_pincode == 1) { + let AltCtrl: any = alternative_address_control.controls[index]; + AltCtrl.controls['alternative_pincode_others'].setValue(datas.alternative_pincode_others); + AltCtrl.controls['alternative_pincode_others'].updateValueAndValidity(); + } + + this.addressForm.controls.pd_location.setValue(result.records.pd_location); + this.addressForm.controls.address_type.setValue(result.records.address_type); + + let selectedAddressType = this.addressData.filter(element => element.address_type_id == result.records.address_type)[0]; + if(selectedAddressType != undefined && selectedAddressType.hasOwnProperty('address_type')){ + this.selectedAddressType(selectedAddressType.address_type); + } + + this.setOthers(result.records.address_type, '', 3); + + if (result.records.address_type == 1) { + this.addressForm.controls.address_type_others.setValue(result.records.address_type_others); + this.selectedAddressType(result.records.address_type_others); + } + + this.addressForm.controls.comment_locality.setValue(result.records.comment_locality); + + this.addressForm.controls.locality.setValue(result.records.locality); + this.setOthers(result.records.locality, '', 4); + + if (result.records.locality == 1) { + this.addressForm.controls.locality_others.setValue(result.records.locality_others); + } + + if(this.lender_short_name != 'CLIX' && this.prod_catagory != 'BL'){ + this.addressForm.controls.estimated_area.setValue(result.records.estimated_area); + this.addressForm.controls.uom.setValue(result.records.uom); + this.setOthers(result.records.uom, '', 5); + if (result.records.uom == 1) { + this.addressForm.controls.uom_others.setValue(result.records.uom_others); + } + } + }); + } + } + setTimeout(() =>{ this.addressForm.patchValue(result.records); + },1000) // console.log(this.addressForm.value,this.commentData,this.locationdata); - // console.log(this.a.value) + console.log(this.addressForm.value) } }) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/dynamic-form/dynamic-form.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/dynamic-form/dynamic-form.component.html index 09e114a1e..c0f51dc66 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/dynamic-form/dynamic-form.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/dynamic-form/dynamic-form/dynamic-form.component.html @@ -5,7 +5,7 @@ - +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.html index 7827f1c6e..16dfdb20c 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.html @@ -70,7 +70,6 @@
-
@@ -87,6 +86,7 @@ +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.ts index bd6c86d1b..9c6f8e05b 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/queries-docs/queries-docs.component.ts @@ -198,10 +198,50 @@ export class QueriesDocsComponent implements OnInit { this.docsCollectedForm.patchValue(retrieved_data) } + if(this.pd_all_details.pdmaster_details.fk_pd_type == '2' && this.pd_all_details.pdmaster_details.hasOwnProperty('vendor_status') && this.pd_all_details.pdmaster_details.vendor_status == 'COMPLETED') { + console.log(this.pd_all_details.pdmaster_details.vendor_status); + setTimeout(()=>{ + this.getDataFromVendor() + },1000) + } },err=>{ }) } + + /************************* START OF VENDOR FORM DATAS *********************************/ + + getDataFromVendor() { + + this.pdTriggerService.getVendorDatas('queries_form',this.pdid).subscribe(result=>{ + if(result && result['dataStatus']) { + if(result.records.hasOwnProperty('docs_to_be_sighted') && result.records.docs_to_be_sighted.length > 0) { + result.records.docs_to_be_sighted.forEach((doc_value,index)=>{ + console.log(doc_value) + if(doc_value.hasOwnProperty('img') && doc_value.img && doc_value.img != '') { + this.docs_change_fun(index,'yes') + } + else if(doc_value.hasOwnProperty('reason') && doc_value.reason && doc_value.reason != '') { + this.docs_change_fun(index,'no'); + } + // let data=doc_value.control_name + // data=parseInt(data) + // console.log("data",data); + // data=doc_value.data + // this.docs_change_fun(index,data) + }) + this.docsCollectedForm.patchValue(result.records); + } + // let curr_control: any = ParCtrls.controls[0]; + // result.records.business_address_availability ='yes' + + // console.log(this._generalForm.value) + } + }) + + } + /************************* END OF VENDOR FORM DATAS *********************************/ + initControls(){ if(this.queries_docs.length != 0){ this.queries_docs.forEach(res=>{ @@ -375,7 +415,7 @@ export class QueriesDocsComponent implements OnInit { if(value == 'yes'){ // this.camera_btn[index]=true control.controls[index].removeControl('reason') - // control.controls[index].addControl('img',new FormControl('',Validators.required)) + control.controls[index].addControl('img',new FormControl('',Validators.required)) // control.controls[index].addControl('is_new',new FormControl('',Validators.required)) } else if(value == 'no'){ 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 7db1940b3..22190e036 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 @@ -179,7 +179,7 @@ {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Addon Pending' : master.pd_status | titlecase}} - + @@ -211,7 +211,7 @@ - +
@@ -348,7 +348,7 @@
Applicants
-
+
@@ -398,7 +398,7 @@
Credit Manager’s Specific Queries
-
+
@@ -421,7 +421,7 @@
Documents to be collected
-
+
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 9f424a4aa..5b08b9532 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 @@ -90,6 +90,7 @@ export class ViewPdComponent implements OnInit, OnDestroy { "COMPLETED": 'COMPLETED', "ADD_ON_PENDING": 'ADD_ON_PENDING', "QC_COMPLETED": 'QC_COMPLETED', + "ALLOCATED_TO_PARTNER":'ALLOCATED_TO_PARTNER' }; mandatoryFieldsValidations: any = []; 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 42fbb3731..3c9ee8e90 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 @@ -938,7 +938,8 @@ export class PdTrigerService { getVendorDatas(form_name,pd_id?) { let formsDet = [{form_name:"general",form_id:"18"},{form_name:"address",form_id:"5"},{form_name:"business_info",form_id:"13"}, {form_name:"business_assets",form_id:"22"},{form_name:"neighbourhood_details",form_id:"19"}, - {form_name:"final_remarks",form_id:"20"} + {form_name:"final_remarks",form_id:"20"}, + {form_name:"queries_form",form_id:"24"} ] // let records = {"records":data[form_name]}