diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html index 5fd0d1a95..28d6e7479 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/all-pd/all-pd.component.html @@ -127,7 +127,7 @@ {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
- ( {{details.vendor_status}} ) + ( {{details.vendor_status}} ) {{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }} {{details.scheduled_on}} diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html index 2a7082b55..f32289cc9 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/completed-pd/completed-pd.component.html @@ -114,7 +114,7 @@ {{details.pd_status}}
{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
- ( {{details.vendor_status}} ) + ( {{details.vendor_status}} ) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html index b84123952..7adc78f94 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/inprogress-pd/inprogress-pd.component.html @@ -111,7 +111,7 @@ {{details.pd_status}}
{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
- ( {{details.vendor_status}} ) + ( {{details.vendor_status}} ) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html index 2f8296a5d..75bf44859 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/qc-completed-pd/qc-completed-pd.component.html @@ -113,7 +113,7 @@ QC COMPLETED
{{ (details.updatedon)? (details.updatedon | slice:0:10):(details.updatedon) }}
- ( {{details.vendor_status}} ) + ( {{details.vendor_status}} ) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html index a8d1db732..83eba4ba1 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/scheduled-pd/scheduled-pd.component.html @@ -113,7 +113,7 @@ --> {{details.scheduled_on}}
- ( {{details.vendor_status}} ) + ( {{details.vendor_status}} ) 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 ea169e3da..26947ee8e 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 @@ -275,7 +275,7 @@ export class AddressComponent implements OnInit { this.addressForm.controls['uom'].clearValidators(); this.addressForm.controls['uom'].updateValueAndValidity(); } - if(this.lender_short_name == 'CLIX' || this.prod_catagory == 'BL'){ + if(this.lender_short_name == 'CLIX' || this.prod_catagory == 'BL' || this.CustSegAbbr == 'SAL'){ this.addressForm.removeControl('estimated_area'); this.addressForm.removeControl('uom'); } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts index 407c62939..ff2ef38b5 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts @@ -246,7 +246,8 @@ export class BusinessAssetsInfoComponent implements OnInit { business_is_pd_visited_yes_value = business_is_pd_visited_yes_value.replace('Others (Please specify)',result.records.specify_pd_visited) console.log(business_is_pd_visited_yes_value) } - this._businessAssetsQuesFrom.controls.business_assets_form_remark.setValue(business_is_pd_visited_yes_value); + // this._businessAssetsQuesFrom.controls.business_assets_form_remark.setValue(business_is_pd_visited_yes_value); + result.records.business_pd_visited_remark = business_is_pd_visited_yes_value } } let assetCtrl: any = ParCtrls.controls[0]; 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 7d3e10577..9dbd1beab 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 @@ -104,8 +104,29 @@ - Specify Person Met Required + Required +
+ + Photograph of “Photo ID card of the Employer/Manager" + + {{item}} + + + + Specify Photo ID card of the Employer/Manager + + + + Employer’s/Manager’s Company ID card / Visiting Card provided”? + + Yes + No + + Required + +
Salary register seen Required +
+ + + Select + Yes + No + + Required + + + + Select + Yes + No + + Required + + + + Select + Yes + No + + Required + + + + Others please specify + + Select + Yes + No + + Other Document Required + + + Specify the Document + + Required + + +
+ + + {{item}} + + Required + + + Specify the reason + + +
+
--> +
+ + + Select + Yes + No + + Required + +
+ + Enter the reason for not paying regular salary + + + + Enter the amount paid / percentage paid + + +
+
@@ -242,6 +343,7 @@ Given Value is More than Net Salary Given Value is Less than Net Salary + Select @@ -266,6 +368,7 @@ + 0){ this.split_customer_abbr = this.split_customer_abbr[0]; @@ -157,6 +165,7 @@ export class EmploymentInfoComponent implements OnInit { } this.employmentForm.controls['attendance_seen'].setValue(value.records.attendance_seen); this.employmentForm.controls['sal_reg_seen'].setValue(value.records.sal_reg_seen); + this.employmentForm.controls['from_date_the_salary_is_rcv'].setValue(value.records.from_date_the_salary_is_rcv); if(value.records.from_date_the_salary_is_rcv){ this.formDate(value.records.from_date_the_salary_is_rcv); @@ -191,12 +200,46 @@ export class EmploymentInfoComponent implements OnInit { } this.employmentForm.controls['employment_remarks'].setValue(value.records.employment_remarks); + if (this.fk_pd_type == '2' || this.fk_pd_type == '3') { + let additional_value :any = {cash_voucher:value.records.cash_voucher,sal_certificate:value.records.sal_certificate,sal_slip:value.records.sal_slip, + doc_not_available:value.records.doc_not_available,doc_not_available_specify:value.records.doc_not_available_specify,other_doc:value.records.other_doc, + other_doc_name:value.records.other_doc_name,photo_id_card:value.records.photo_id_card,photo_id_others:value.records.photo_id_others,visiting_card:value.records.visiting_card} + if(this.fk_pd_type == '2') { + additional_value.sal_paid_regularly =value.records.sal_paid_regularly + additional_value.reason_not_sal_pay = value.records.reason_not_sal_pay + additional_value.paid_amount = value.records.paid_amount + } + // this.employmentForm.controls.cash_voucher.setValue(value.records.cash_voucher) + // records.sal_certificate = this.employmentForm.controls['sal_certificate'].value; + // records.sal_slip = this.employmentForm.controls['sal_slip'].value; + // records.doc_not_available = this.employmentForm.controls['doc_not_available'].value; + // records.doc_not_available_specify = this.employmentForm.controls['doc_not_available_specify'].value; + // records.other_doc = this.employmentForm.controls['other_doc'].value; + // records.other_doc_name = this.employmentForm.controls['other_doc_name'].value; + + // records.photo_id_card = this.employmentForm.controls['photo_id_card'].value; + // records.photo_id_others = this.employmentForm.controls['photo_id_others'].value; + // records.visiting_card = this.employmentForm.controls['visiting_card'].value; + + // if (this.fk_pd_type == '2') { + // records.sal_paid_regularly = this.employmentForm.controls['sal_paid_regularly'].value; + // records.reason_not_sal_pay = this.employmentForm.controls['reason_not_sal_pay'].value; + // records.paid_amount = this.employmentForm.controls['paid_amount'].value; + // } + this.employmentForm.patchValue(additional_value) + } if(value.records.total_business_experience != ''){ this.checkWorkingExperiences(); // this.workExperienceFlag = (+value.records.total_business_previous_experience) < (+value.records.how_long_year) ? true : false; } } + console.log(this.employmentForm.value) + // && this.pd_all_details.pdmaster_details.curr_vendor_ans_fetch_status == '0' + 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' && this.pd_all_details.pdmaster_details.curr_vendor_ans_fetch_status == '0') { + console.log(this.pd_all_details.pdmaster_details.vendor_status); + this.getDataFromVendor() + } }) /** For Bonus Frequency Dropdown */ this._pd.getAllMasterDatas('FREQUENCY').subscribe( @@ -262,7 +305,7 @@ export class EmploymentInfoComponent implements OnInit { check_validated:[''], how_was_it_validated: [''], why_was_it_not_validated: [''], - any_delays: ['', Validators.compose([Validators.required])], + any_delays: [''], bonus_incentive: ['', Validators.compose([Validators.required])], bonus_frequency: [''], bonus_type: [''], @@ -272,8 +315,61 @@ export class EmploymentInfoComponent implements OnInit { // employment_details: this.fb.array([]), employment_remarks: [''], }); + if(this.fk_pd_type == '2' || this.fk_pd_type == '3') { + this.employmentForm = this.fb.group({ + ...this.employmentForm.controls, + + photo_id_card:[''], + photo_id_others:[''], + visiting_card:[''], + + + cash_voucher:[''], + sal_certificate:[''], + sal_slip:[''], + doc_not_available:[''], + doc_not_available_specify:[''], + other_doc:[''], + other_doc_name:[''] + }) + } + if(this.fk_pd_type == '2') { + this.employmentForm = this.fb.group({ + ...this.employmentForm.controls, + sal_paid_regularly:[''], + reason_not_sal_pay:[''], + paid_amount:[''] + }) + } } + /************************* START OF VENDOR FORM DATAS *********************************/ + + getDataFromVendor() { + + this._pd.getVendorDatas('employer',this.pdid).subscribe(result=>{ + if(result) { + if(result['records']){ + let records=result['records'] + if(!records.hasOwnProperty('docs_sighted')) { + records.docs_sighted = {} + } + if(!records.hasOwnProperty('employer_details')) { + records.employer_details = {} + } + else{ + this.employmentForm.controls['was_met'].setValue('yes') + } + let all_fetch = {...records.docs_sighted, ...records.employer_details} + console.log(records,all_fetch); + this.employmentForm.patchValue(all_fetch); + } + } + }) + + } + /************************* END OF VENDOR FORM DATAS *********************************/ + filtercompanyrelationship(companyid, applicantid) { var array = companyid.split("-"); let data = this.company_related_applicants_list.filter(cmpy => cmpy.relation_to_company == array[0] && cmpy.applicant_name == applicantid); @@ -487,6 +583,7 @@ export class EmploymentInfoComponent implements OnInit { if (!this.employmentForm.valid) { this.validateAllFormFields(this.employmentForm); + console.log("Invalid fields",this.findInvalidControls()) this.notifier.notify('warning', 'Please Fill/Correct All Mandatory Fields.!'); return; } @@ -526,6 +623,27 @@ export class EmploymentInfoComponent implements OnInit { records.total_business_previous_experience = this.employmentForm.controls['total_business_previous_experience'].value; records.attendance_seen = this.employmentForm.controls['attendance_seen'].value; records.sal_reg_seen = this.employmentForm.controls['sal_reg_seen'].value; + + if (this.fk_pd_type == '2' || this.fk_pd_type == '3') { + records.cash_voucher = this.employmentForm.controls['cash_voucher'].value; + records.sal_certificate = this.employmentForm.controls['sal_certificate'].value; + records.sal_slip = this.employmentForm.controls['sal_slip'].value; + records.doc_not_available = this.employmentForm.controls['doc_not_available'].value; + records.doc_not_available_specify = this.employmentForm.controls['doc_not_available_specify'].value; + records.other_doc = this.employmentForm.controls['other_doc'].value; + records.other_doc_name = this.employmentForm.controls['other_doc_name'].value; + + records.photo_id_card = this.employmentForm.controls['photo_id_card'].value; + records.photo_id_others = this.employmentForm.controls['photo_id_others'].value; + records.visiting_card = this.employmentForm.controls['visiting_card'].value; + + if (this.fk_pd_type == '2') { + records.sal_paid_regularly = this.employmentForm.controls['sal_paid_regularly'].value; + records.reason_not_sal_pay = this.employmentForm.controls['reason_not_sal_pay'].value; + records.paid_amount = this.employmentForm.controls['paid_amount'].value; + } + + } records.from_date_the_salary_is_rcv = this.employmentForm.controls['from_date_the_salary_is_rcv'].value; records.to_date_the_salary_is_rcv = this.employmentForm.controls['to_date_the_salary_is_rcv'].value; records.gross_monthly_salary = this.employmentForm.controls['gross_monthly_salary'].value; @@ -560,7 +678,7 @@ export class EmploymentInfoComponent implements OnInit { records.employment_remarks = this.employmentForm.controls['employment_remarks'].value; - this._pd.saveForm(records).subscribe(data => { + this._pd.saveForm(records,this.pd_all_details.pdmaster_details.curr_vendor_ans_fetch_status).subscribe(data => { // this.notifier.notify('success', 'Saved Successfully.'); if (data.status == 200) { @@ -591,7 +709,16 @@ export class EmploymentInfoComponent implements OnInit { // this.workExperienceErrorFlag = false; // } // } - + public findInvalidControls() { + const invalid = []; + const controls = this.employmentForm.controls; + for (const name in controls) { + if (controls[name].invalid) { + invalid.push(name); + } + } + return invalid; +} validateAllFormFields(formGroup: any) { // console.log('validateAllFormFields'); Object.keys(formGroup.controls).forEach(field => { @@ -699,4 +826,25 @@ export class EmploymentInfoComponent implements OnInit { this.employmentForm.controls['net_monthly_salary'].setValidators([Validators.max(value),Validators.min(0)]); this.employmentForm.controls['net_monthly_salary'].updateValueAndValidity(); } + checkSpecifyField(value) { + // let field=this.getBusinessInfoControls().at(1)['controls']['business_is_pd_visited_yes'].value + // console.log(field); + if(value && value.filter(vv=>vv.includes('Others')).length > 0) { + return true + } + return false + } + checkPartEnable() { + // if(!this.getDocsSightedGroup) { return false} + let ctrl_values=this.employmentForm['value'] + if(ctrl_values.sal_reg_seen == 'no' && ctrl_values.attendance_seen == 'no' && ctrl_values.cash_voucher == 'no' && ctrl_values.sal_certificate == 'no' && ctrl_values.sal_slip == 'no' && ctrl_values.other_doc == 'no') { + this.employmentForm['controls'].doc_not_available.setValidators(Validators.required); + return true; + } + else { + this.employmentForm['controls'].doc_not_available.setValue('') + this.employmentForm['controls'].doc_not_available.clearValidators(); + return false + } + } } 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 bf676ed52..be84f89b2 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 @@ -334,6 +334,16 @@ export class FinalRemarksComponent implements OnInit { let comments:String =''; comments = result.records.hasOwnProperty('final_visit_status') && result.records.final_visit_status != '' ? "Final Status of visit : "+result.records.final_visit_status+'\n' : '' comments += result.records.final_comments + if(this.customer_segment_abbr == 'SAL' && result.records.hasOwnProperty('company_existence_neighbour_confirmed')) { + if(result.records.company_existence_neighbour_confirmed == 'yes') { + result.records.company_existence_months = result.records.company_existence_months ? result.records.company_existence_months : 0 + result.records.company_existence_years = result.records.company_existence_years ? result.records.company_existence_years : 0 + comments+= "\n Existence of organization/office confirmed by neighbour and is in existence for " +result.records.company_existence_years+ " years"+ result.records.company_existence_months + " months" + } + else { + comments+= '\n Existence of organization/office was not confirmed by neighbour.' + } + } this._finalRemarkForm.controls.final_form_remarks.patchValue(comments); } }) 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 52b8a6259..c8ff81e58 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 @@ -438,6 +438,7 @@ export class GeneralInfoComponent implements OnInit { // } let newPersonMet:any = result.records if(this.customer_segment_abbr == 'SAL') { + // newPersonMet.person_met_entered = 'name' if(newPersonMet.person_met_entered) { let commonRemarks = "Met "+newPersonMet.person_met_entered +", at the time of FI visit." this._generalForm.controls.general_remark.patchValue(commonRemarks) @@ -799,7 +800,7 @@ export class GeneralInfoComponent implements OnInit { }); - if (this.temp == formData.individuals.length && this.split_customer_abbr != 'SAL') { + if (this.temp == formData.individuals.length && this.split_customer_abbr != 'SAL' && this.fk_pd_type != '2') { this.notifier.notify('warning', 'Please Choose Name of Person Met.!'); this.temp = 0; return; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts index fa01225bb..84baf293d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/start-pd.component.ts @@ -140,13 +140,19 @@ export class StartPdComponent implements OnInit, OnDestroy { this.answeredQuestions = getAnsweredFormsCount.length; this.pdFullDetails = data.records; // VENDOR FORM ANSWER FETCH STATUS START(SMART PD ONLY) + // if(this.pdMasterList.fk_pd_type == '2') { + // if(data.records.vendor_form_status && data.records.vendor_form_status.length > 0) { + // this.vendor_form_status_arr = JSON.stringify(data.records.vendor_form_status) + // localStorage.setItem("vendorFormStatus_arr",this.vendor_form_status_arr) + // } + // } if(this.pdMasterList.fk_pd_type == '2') { - let temp_vendor_status = localStorage.getItem("vendorFormStatus_arr") - if(temp_vendor_status) { - temp_vendor_status = JSON.parse(temp_vendor_status) - if(temp_vendor_status && temp_vendor_status.length > 0 ) { - this.vendor_status_arr = temp_vendor_status - } + // let temp_vendor_status = localStorage.getItem("vendorFormStatus_arr") + if(data.records.hasOwnProperty('vendor_form_status') && data.records.vendor_form_status && data.records.vendor_form_status.length > 0) { + // temp_vendor_status = JSON.parse(temp_vendor_status) + // if(temp_vendor_status && temp_vendor_status.length > 0 ) { + this.vendor_status_arr = data.records.vendor_form_status + // } } } // END OF VENDOR FORM ANSWER FETCH 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 2e8991728..11414d29a 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 @@ -173,7 +173,7 @@ videocam  Call - @@ -249,7 +249,7 @@
{{addresses.addtional_pd_data[0].pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : addresses.addtional_pd_data[0].pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : addresses.addtional_pd_data[0].pd_status | titlecase}}
- ( {{master.vendor_status}} ) + ( {{master.vendor_status}} )
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 a25d156c0..1e357af4f 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 @@ -968,7 +968,8 @@ export class PdTrigerService { {form_name:"neighbourhood_details",form_id:"19"}, {form_name:"final_remarks",form_id:"20"}, {form_name:"queries_form",form_id:"24"}, - {form_name:"COMMENTS",form_id:"COMMENTS"} + {form_name:"COMMENTS",form_id:"COMMENTS"}, + {form_name:"employer",form_id:'12'} ] // let records = {"records":data[form_name]}