Sineedge/sparqsineedge
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Form Fetch issue in QC Module and vendor userPool id changes in production env

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2020-10-06 17:56:00 +05:30
parent fa38233a61
commit 0037840a4a
7 changed files with 84 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts
View File

@ -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) {

28
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info-group/business-info-group.component.ts
View File

@ -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
}

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/view-pd/view-pd.component.ts
View File

@ -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=>{

33
ng6-seed/src/app/quality-check/qc-list/qc-start/qc-start.component.ts
View File

@ -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,

28
ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.html
View File

@ -152,7 +152,10 @@
<strong>Play</strong>
</button>
<!-- </span> -->
<button mat-raised-button class="mr-1 mb-1" color="primary" style="cursor: not-allowed !important;">
<button *ngIf="master.fk_pd_type == '2' && master.vendor_status != null" mat-raised-button class="mr-1 mb-1" color="primary" matTooltip="Vendor Status" matTooltipPosition="above" style="cursor: not-allowed !important;background-color: #2699ce !important;">
<strong> {{master.vendor_status}}</strong>
</button>
<button mat-raised-button class="mr-1 mb-1" color="primary" style="cursor: not-allowed !important;" matTooltip="PD Status" matTooltipPosition="above">
<strong> {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Addon Pending' : master.pd_status | titlecase}}</strong>
</button>
<span *ngIf="userRoleID == 10 || userRoleID == 3"><button *ngIf="currentPDStatus==pdStatusCheck.DRAFT || currentPDStatus==pdStatusCheck.TRIGGERED || currentPDStatus==pdStatusCheck.ALLOCATED || currentPDStatus==pdStatusCheck.SCHEDULED || currentPDStatus==pdStatusCheck.COMPLETED" mat-raised-button mat-icon-button class="mr-1 mb-1 hover-icon" type="button" (click)="editPdMaster(master)" matTooltipPosition="above" matTooltip="Edit PD Master"><mat-icon>edit</mat-icon></button></span>
@ -178,7 +181,8 @@
<div fxLayout="row nowrap">
<div fxFlex="100">
<div fxFlex="40" align="left" style="color: #e00201">
{{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status | titlecase}}
<span matTooltip="PD Status" matTooltipPosition="above">{{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status | titlecase}} </span><br/>
<span *ngIf="master.fk_pd_type == '2' && master.vendor_status != null" matTooltip="Vendor Status" matTooltipPosition="above" style="font-size:14px !important;color:rgb(2, 124, 181) !important;">( {{master.vendor_status}} )</span>
</div>
<div fxFlex="60" align="right">
<button *ngIf="addresses.assigned_pd==null || addresses.assigned_pd==''" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" [matTooltip]="master.fk_primary_address_id ? 'Initiate Address for Additional PD Process' : 'Initiate Address for PD Process'" matTooltipPosition="above" (click)="initiateAddtionalPD(master,addresses,master.fk_primary_address_id ? true : false)"><mat-icon>where_to_vote</mat-icon></button>
@ -221,7 +225,8 @@
<div align="right" *ngIf="master.fk_primary_address_id!=null && addresses.addtional_pd_data.length>0">
<div fxLayout="row nowrap">
<div fxFlex="40" align="left" style="color: #e00201">
{{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}}
<span matTooltip="PD Status" matTooltipPosition="above">{{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}} </span><br/>
<span *ngIf="master.fk_pd_type == '2' && master.vendor_status != null" matTooltip="Vendor Status" matTooltipPosition="above" style="font-size:14px !important;color:rgb(2, 124, 181) !important">( {{master.vendor_status}} )</span>
</div>
<div fxFlex="60" align="right">
<span *ngIf="userRoleID == 3 || userRoleID == 4 || userRoleID == 5 || userRoleID == 10"><button *ngIf="addresses.assigned_pd && addresses.addtional_pd_data[0].pd_type_name && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.DRAFT && addresses.addtional_pd_data[0].pd_status!=pdStatusCheck.QC_COMPLETED" mat-raised-button mat-button-md mat-icon-button class="mr-1 mb-1 hover-icon" type="button" matTooltip="Allocate" matTooltipPosition="above" (click)="pdAllocationTo(master,addresses)"><mat-icon>verified_user</mat-icon></button></span>
@ -262,6 +267,23 @@
<span *ngIf="addresses.state_name" class="hover-icon"> {{addresses.addressline1}},<br> {{addresses.city_name}},<br>{{addresses.state_name}}-{{addresses.pincode_id == 1 ? addresses.other_pincode : addresses.pincode }} </span>
</div>
</div>
<div fxLayout="row nowrap" style="color: #e00201" *ngIf="addresses.addtional_pd_data.length>0" >
<span fxFlex="10" ><mat-icon>people</mat-icon></span>
<span fxFlex="50" *ngIf="addresses.addtional_pd_data[0].customer_segment_abbr"> {{addresses.addtional_pd_data[0].customer_segment_abbr}} </span>
<div fxFlex="40" align="right" style="color: #e00201" *ngIf="addresses.addtional_pd_data && addresses.addtional_pd_data[0].is_otp_done">
<div *ngIf="addresses.addtional_pd_data[0].is_otp_done == '1'">
<span >OTP Done:</span> <span ><mat-icon style="color:green">check_circle</mat-icon> </span>
</div>
<div *ngIf="addresses.addtional_pd_data[0].is_otp_done == '0'">
<span > OTP Done:<mat-icon style="color:#e00201">cancel</mat-icon> </span>
</div>
</div>
</div>
<div fxLayout="row nowrap" *ngIf="addresses.addtional_pd_data.length>0" >
<div align="left" *ngIf="addresses.addtional_pd_data[0].is_otp_done == '0' && addresses.addtional_pd_data[0].rejection_reason != null">
<mat-label><span style="color: #e00201">OTP Reject Reason: </span> <span>{{addresses.addtional_pd_data[0].rejection_reason != 'Others' ? addresses.addtional_pd_data[0].rejection_reason : addresses.addtional_pd_data[0].otp_reject_other_reason}}</span></mat-label>
</div>
</div>
</mat-card-content>
<!-- <mat-divider></mat-divider> -->

9
ng6-seed/src/app/quality-check/qc-list/qc-view/qc-view.component.ts
View File

@ -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 = <any> error);
}

2
ng6-seed/src/environments/environment.prod.ts
View File

@ -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: {