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 75b00621a..c5bc7fba6 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 @@ -347,13 +347,13 @@ - Documents to be collected + Document to be photographed/scanned - + @@ -363,7 +363,7 @@ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-collected-docs/pd-collected-docs.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-collected-docs/pd-collected-docs.component.html index d18c4624c..08da93034 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-collected-docs/pd-collected-docs.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-collected-docs/pd-collected-docs.component.html @@ -15,7 +15,7 @@ - + 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 177917766..309351b20 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 @@ -105,6 +105,7 @@ export class BusinessInfoComponent implements OnInit { @ViewChild('business_activity_type') business_activity_type_scroll : ElementRef prod_catagory: any; fk_pd_type: any; + vendor_data_answers: any = {documents_info:{}}; constructor(notifier: NotifierService, @@ -697,6 +698,16 @@ export class BusinessInfoComponent implements OnInit { if(result) { let individualsControl = this.businessForm.controls['individuals']; console.log("Vendor Datas",result.records) + this.vendor_data_answers = result.records + this.vendor_data_answers = JSON.parse(JSON.stringify(this.vendor_data_answers)) + + var updated_result = {}; + let docs_info = this.vendor_data_answers.documents_info + for (var i = 0; i < docs_info.length; i++) { + updated_result[docs_info[i].document_name] = 'yes'; + } + this.vendor_data_answers.raw_documents_info = this.vendor_data_answers.documents_info + this.vendor_data_answers.documents_info = updated_result // individualsControl.patchValue(result.records.individuals); result.records.documents_info.forEach(val=>{ if(val) { @@ -796,7 +807,7 @@ export class BusinessInfoComponent implements OnInit { // businees activity type change event changeBusinessActivity(event: any) { - console.log(event); + console.log(event,this.vendor_data_answers,this.businessForm.value); if (event.value.exist_status == true && event.value.type_of_activity_id == 2) { this.ManufacturingUnChecked = event.value.exist_status; @@ -810,7 +821,7 @@ export class BusinessInfoComponent implements OnInit { this.ManufacturingUnChecked = event.value.exist_status; let manufacturingControl = this.businessForm.controls['manufacturing_activity_details']; manufacturingControl.push(this.createActivity()); - this.businessForm.addControl('eb_bill',new FormControl('',Validators.compose([Validators.required]))) + this.businessForm.addControl('eb_bill',new FormControl(this.vendor_data_answers.documents_info['eb_bill'] || '',Validators.compose([Validators.required]))) } @@ -864,9 +875,9 @@ export class BusinessInfoComponent implements OnInit { // othersControl.push(this.createOthersActivity()); // } // check activity type for make dosument sighted filed dynamically - this.businessForm.value.manufacturing_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('export_import_cert', new FormControl(this.businessForm.value.export_import_cert, Validators.required)) : this.businessForm.removeControl('export_import_cert'); - this.businessForm.value.manufacturing_activity_details.length > 0 ? this.businessForm.addControl('factory_cert', new FormControl(this.businessForm.value.factory_cert, Validators.required)) : this.businessForm.removeControl('factory_cert'); - 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'); + this.businessForm.value.manufacturing_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('export_import_cert', new FormControl(this.businessForm.value.export_import_cert || this.vendor_data_answers.documents_info['export_import_cert'], Validators.required)) : this.businessForm.removeControl('export_import_cert'); + this.businessForm.value.manufacturing_activity_details.length > 0 ? this.businessForm.addControl('factory_cert', new FormControl(this.businessForm.value.factory_cert || this.vendor_data_answers.documents_info['factory_cert'], Validators.required)) : this.businessForm.removeControl('factory_cert'); + this.businessForm.value.service_provider_activity_details.length > 0 ? this.businessForm.addControl('practice_cert', new FormControl(this.businessForm.value.practice_cert || this.vendor_data_answers.documents_info['practice_cert'], Validators.required)) : this.businessForm.removeControl('practice_cert'); // check activity for extra question make dynamic if(!(this.lender_short_name == 'CLIX' && this.prod_catagory == 'BL') && !(this.lender_short_name == 'MWISE' && this.prod_catagory == 'BL')){ 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 9c54da778..e7f7b3c5a 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 @@ -298,6 +298,7 @@ export class FinalRemarksComponent implements OnInit { console.log(this.pd_all_details.pdmaster_details.vendor_status); this.getDataFromVendor() } + this.getVendorComments() } @@ -321,8 +322,16 @@ export class FinalRemarksComponent implements OnInit { this._finalRemarkForm.patchValue(result.records); console.log(this._finalRemarkForm.value) } - }) + }) + + + } + // FOR GETTING THE COMMENTS API CALL + getVendorComments() { + this.pdTrigerService.getVendorDatas('COMMENTS',this.pdid).subscribe(result=>{ + this._finalRemarkForm.controls.final_form_remarks.patchValue(result.records.final_comments); + }) } /************************* END OF VENDOR FORM DATAS *********************************/ 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 ec546a998..b2aef1eeb 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 @@ -386,6 +386,9 @@ export class GeneralInfoComponent implements OnInit { let individualsControl = this._generalForm.controls['individuals']; console.log("Vendor Datas",result.records) individualsControl.patchValue(result.records.individuals); + if(result.records.general_remark) { + this._generalForm.controls.general_remark.patchValue(result.records.general_remark) + } console.log(this._generalForm.value) } }) 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 7007c785c..ee040aa05 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 @@ -63,8 +63,8 @@ -
Documents to be collected
-
Docuements to be uploaded
+
Document to be photographed/scanned
+
Document to be photographed/scanned
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 70f227400..847ebee10 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 @@ -416,10 +416,10 @@ - Collected Documents + Document to be photographed/scanned
- Documents to be collected + Document to be photographed/scanned
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 fdb9430b0..ecbba0a72 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 @@ -960,7 +960,8 @@ export class PdTrigerService { 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:"queries_form",form_id:"24"} + {form_name:"queries_form",form_id:"24"}, + {form_name:"COMMENTS",form_id:"COMMENTS"} ] // let records = {"records":data[form_name]} diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html index 8e88ac5ce..033244369 100755 --- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html +++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html @@ -366,10 +366,10 @@ - Collected Documents + Document to be photographed/scanned
- Documents to be collected + Document to be photographed/scanned