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 03f652498..dd682760c 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 @@ -936,7 +936,7 @@ export class AddressComponent implements OnInit { getDataFromVendor() { this._pd.getVendorDatas('address',this.pdid).subscribe(result=>{ - if(result) { + if(result && result['dataStatus']) { 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) { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts index e4d4ac084..9fa02656b 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts @@ -34,7 +34,7 @@ export class BusinessInfoGroupComponent implements OnInit { lender_short_name :any; product_abbr :any; prod_catagory: any; - vendor_status_arr: any=[]; + // vendor_status_arr: any=[]; constructor(notifier: NotifierService, private route: ActivatedRoute, @@ -58,22 +58,22 @@ export class BusinessInfoGroupComponent implements OnInit { ngOnInit() { this.getCompanyListForBusiness(); - // VENDOR FORM ANSWER FETCH STATUS START(SMART PD ONLY) - if(this.pd_all_details.pdmaster_details.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 - } - } - } - // END OF VENDOR FORM ANSWER FETCH + } getCompanyListForBusiness(): void{ this._pd.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{ if(data.dataStatus){ this.existCompanyList = data.records.filter(val =>val.is_active == 1); + // VENDOR FORM ANSWER FETCH STATUS START(SMART PD ONLY) + // if(this.existCompanyList.length > 0 && this.pd_all_details.pdmaster_details.fk_pd_type == '2') { + // if(this.existCompanyList[0].hasOwnProperty('vendor_form_status') && this.existCompanyList[0].vendor_form_status && this.existCompanyList[0].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 = this.existCompanyList[0].vendor_form_status + // // } + // } + // } + // END OF VENDOR FORM ANSWER FETCH this.waitLoading = true; } else { @@ -93,8 +93,8 @@ export class BusinessInfoGroupComponent implements OnInit { let curr_vendor_ans_fetch_status = null if(this.pd_all_details.pdmaster_details.fk_pd_type == '2') { - if(this.vendor_status_arr && this.vendor_status_arr.length > 0) { - curr_vendor_ans_fetch_status =this.vendor_status_arr.filter(val=>val.fk_form_id == String(details.form_id)) + if(company.hasOwnProperty('vendor_form_status') && company.vendor_form_status && company.vendor_form_status.length > 0) { + curr_vendor_ans_fetch_status =company.vendor_form_status.filter(val=>val.fk_form_id == String(details.form_id)) if(curr_vendor_ans_fetch_status.length > 0) { curr_vendor_ans_fetch_status = curr_vendor_ans_fetch_status[0].form_status } 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 a5992384e..ac70c67d1 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 @@ -206,8 +206,8 @@ export class ViewPdComponent implements OnInit, OnDestroy { this.existPDs=data.records.exist_pd_details if(this.pdMasterData[0].fk_pd_type == '2' || this.pdMasterData[0].fk_pd_type == '3') { 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) + // this.vendor_form_status_arr = JSON.stringify(data.records.vendor_form_status) + // localStorage.setItem("vendorFormStatus_arr",this.vendor_form_status_arr) } this._pd.updateTwlioVideoStatus({"pd_id":this.viewID,"random_string":this.masterRandomString}).subscribe(rr=>{ diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.ts index d9dcf0246..0ea07af8d 100755 --- a/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.ts +++ b/ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.ts @@ -69,6 +69,7 @@ export class QcStartComponent implements OnInit, OnDestroy { answeredQuestions: number; private notifier: NotifierService; prod_catagory: any; + vendor_status_arr: any = []; constructor(notifier: NotifierService, private dialog: MatDialog, private fb: FormBuilder, private route: ActivatedRoute, private router: Router, @@ -129,6 +130,23 @@ export class QcStartComponent implements OnInit, OnDestroy { if(type==1 && data.records.pdmaster_details.pd_status=='SCHEDULED') { this.pdStatusDialogue(this.pdStatusCheck.INPROGRESS) } + // 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(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 } else{ this.pdMasterList = ""; @@ -164,7 +182,20 @@ export class QcStartComponent implements OnInit, OnDestroy { // direct form based questions OnSelectDirectForms(details: any) { this.selectedFormsCategory = details; - + let curr_vendor_ans_fetch_status = null + if(this.pdMasterList.fk_pd_type == '2') { + if(this.vendor_status_arr && this.vendor_status_arr.length > 0 && this.selectedFormsCategory.form_id != 13) { + console.log(this.vendor_status_arr,this.selectedFormsCategory) + curr_vendor_ans_fetch_status =this.vendor_status_arr.filter(val=>val.fk_form_id == String(this.selectedFormsCategory.form_id)) + if(curr_vendor_ans_fetch_status.length > 0) { + curr_vendor_ans_fetch_status = curr_vendor_ans_fetch_status[0].form_status + } + else { + curr_vendor_ans_fetch_status = null + } + } + } + this.pdFullDetails.pdmaster_details.curr_vendor_ans_fetch_status = curr_vendor_ans_fetch_status if(this.selectedFormsCategory.form_id==1){ const dialogRef = this.dialog.open(SupplierInfoComponent, { data: this.pdFullDetails, 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 033244369..9c2dcaae7 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 @@ -152,7 +152,10 @@ Play - + @@ -178,7 +181,8 @@
- {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status | titlecase}} + {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status | titlecase}}
+ ( {{master.vendor_status}} )
@@ -221,7 +225,8 @@
- {{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}} + {{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}} )
@@ -262,6 +267,23 @@ {{addresses.addressline1}},
{{addresses.city_name}},
{{addresses.state_name}}-{{addresses.pincode_id == 1 ? addresses.other_pincode : addresses.pincode }}
+
+ people + {{addresses.addtional_pd_data[0].customer_segment_abbr}} +
+
+ OTP Done: check_circle +
+
+ OTP Done:cancel +
+
+
+
+
+ OTP Reject Reason: {{addresses.addtional_pd_data[0].rejection_reason != 'Others' ? addresses.addtional_pd_data[0].rejection_reason : addresses.addtional_pd_data[0].otp_reject_other_reason}} +
+
diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts index 87feb7959..e29b4a5ba 100755 --- a/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts +++ b/ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts @@ -117,6 +117,15 @@ export class QcViewComponent implements OnInit, OnDestroy { else { this.enableStartPD=false; } + if(this.pdMasterData[0].fk_pd_type == '2' || this.pdMasterData[0].fk_pd_type == '3') { + 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) + } + this.pdService.updateTwlioVideoStatus({"pd_id":this.viewID,"random_string":this.masterRandomString}).subscribe(rr=>{ + + }) + } } }, error => this.errorMessage = error); } diff --git a/ng6-seed/src/environments/environment.prod.ts b/ng6-seed/src/environments/environment.prod.ts index 33feca4ac..a320d44d3 100755 --- a/ng6-seed/src/environments/environment.prod.ts +++ b/ng6-seed/src/environments/environment.prod.ts @@ -22,7 +22,7 @@ export const environment = { // For Vendor venIdentityPoolId: "ap-south-1:5ad3ce43-4260-4273-87b2-e6a377b8e874", - venUserPoolId: "ap-south-1_K57yPaWxV", + venUserPoolId: "ap-south-1_7Xvnpr2At", venClientId: "6coneo2783pdhr30nstq32o86i", firebase: {