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 28d6e7479..cdd4c43ea 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/edit-pd-master/edit-pd-master.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts index d53983f60..cf77dbc27 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.ts @@ -24,7 +24,7 @@ export class EditPdMasterComponent implements OnInit { productList:any; productAllList:any; subProductList:any; - lenderList:any; + lenderList:any = []; customerSegmentAllList:any; customerSegmentList:any; stateList:any; @@ -898,7 +898,7 @@ else{ this.loadControl=true } checkLender(value){ - if(value != null){ + if(value != null && this.lenderList.length > 0){ return this.lenderList.filter(val=>val.entity_id == value).map(mapping=>mapping.short_name)[0] } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts index fc78a3443..f5c2c4b35 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts @@ -374,12 +374,12 @@ export class StockComponent implements OnInit { let raw_mat_manu = manufacturingArray.at(0).get('manufacturing_raw_materials') console.log("Check2",raw_mat_manu) if(raw_mat_manu != null && raw_mat_manu) { - this.setStockObserveValue(raw_mat_manu['controls'],'stock_observed') + this.setStockObserveValue(raw_mat_manu['controls'],'stock_observed',result.records.is_stock_photo) } let finished_mat_manu =manufacturingArray.at(0).get('manufacturing_finished_goods') if(finished_mat_manu != null && finished_mat_manu) { - this.setStockObserveValue(finished_mat_manu['controls'],'goods_observed') + this.setStockObserveValue(finished_mat_manu['controls'],'goods_observed',result.records.is_stock_photo) } let retailformArray = this.stockForms.get('retail_details') as FormArray @@ -387,7 +387,7 @@ export class StockComponent implements OnInit { let retail_trade = retailformArray.at(0).get('retail_traded_goods') console.log("Check2stock",retail_trade) if(retail_trade != null && retail_trade) { - this.setStockObserveValue(retail_trade['controls'],'traded_goods_observed') + this.setStockObserveValue(retail_trade['controls'],'traded_goods_observed',result.records.is_stock_photo) } let wholeSaleFormArray = this.stockForms.get('trade_details') as FormArray @@ -395,7 +395,7 @@ export class StockComponent implements OnInit { let wholeSalesTrading = wholeSaleFormArray.at(0).get('trading_traded_goods') console.log("Check2stock",wholeSalesTrading) if(wholeSalesTrading != null && wholeSalesTrading) { - this.setStockObserveValue(wholeSalesTrading['controls'],'traded_goods_observed') + this.setStockObserveValue(wholeSalesTrading['controls'],'traded_goods_observed',result.records.is_stock_photo) } let serviceFormArray = this.stockForms.get('servicing_details') as FormArray @@ -403,7 +403,7 @@ export class StockComponent implements OnInit { let serviceTrading = serviceFormArray.at(0).get('service_provider') console.log("Check2stock",serviceTrading) if(serviceTrading != null && serviceTrading) { - this.setStockObserveValue(serviceTrading['controls'],'service_provider_observed') + this.setStockObserveValue(serviceTrading['controls'],'service_provider_observed',result.records.is_stock_photo) } } // individualsControl.patchValue(result.records.individuals); @@ -415,10 +415,10 @@ export class StockComponent implements OnInit { }) } - setStockObserveValue(controls,key_name) { + setStockObserveValue(controls,key_name,value_from_vendor) { if(controls && controls.length > 0) { controls.forEach(form_obj=>{ - form_obj.controls[key_name].patchValue('yes') + form_obj.controls[key_name].patchValue(value_from_vendor) }) } @@ -927,7 +927,7 @@ export class StockComponent implements OnInit { //To Remove The "Null" With Key also Object.keys(answerFormValues).forEach((key) => (answerFormValues[key] == null) && delete answerFormValues[key]); - this._pd.savePDFormDetailsWithID(answerFormValues).subscribe( + this._pd.saveForm(answerFormValues,this.pd_all_details.pdmaster_details.curr_vendor_ans_fetch_status).subscribe( dataresult => { if (dataresult.status == 200) { this.notifier.notify('success', 'Saved Successfully.'); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/vendor-pd-allocation/VendorPdAllocationComponent.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/vendor-pd-allocation/VendorPdAllocationComponent.ts index 4c251c7d5..306836dfd 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/vendor-pd-allocation/VendorPdAllocationComponent.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/vendor-pd-allocation/VendorPdAllocationComponent.ts @@ -74,7 +74,7 @@ export class VendorPdAllocationComponent implements OnInit { let updateData = { "pd_id":this.data.pd_id, "pd_agency_id": allocateDetails.entity_id, - "pd_status": "ALLOCATED_TO_PARTNER", + "pd_status": "ALLOCATED_TO_FIA", }; this._pd.updateVendor(updateData).subscribe( result => { 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 11414d29a..c1ae76764 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 @@ -180,7 +180,7 @@ {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Addon Pending' : master.pd_status | titlecase}} - + @@ -206,13 +206,13 @@
{{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status | titlecase}}
- ( {{master.vendor_status}} ) + ( {{master.agency_short_name}} - {{master.vendor_status}} )
- +
@@ -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.agency_short_name}} - {{master.vendor_status}} )
@@ -349,7 +349,7 @@
Applicants
-
+
@@ -399,7 +399,7 @@
Credit Manager’s Specific Queries
-
+
@@ -422,7 +422,7 @@
Document to be photographed/scanned
-
+
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 ac70c67d1..33560102f 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,7 +90,9 @@ export class ViewPdComponent implements OnInit, OnDestroy { "COMPLETED": 'COMPLETED', "ADD_ON_PENDING": 'ADD_ON_PENDING', "QC_COMPLETED": 'QC_COMPLETED', - "ALLOCATED_TO_PARTNER":'ALLOCATED_TO_PARTNER' + "ALLOCATED_TO_FIA":'ALLOCATED_TO_FIA', + "FIA_REJECTED":'FIA_REJECTED', + "FIA_ACCEPTED":'FIA_ACCEPTED' }; mandatoryFieldsValidations: any = []; diff --git a/ng6-seed/src/app/quality-check/qc-cus-images/qc-cus-images.component.scss b/ng6-seed/src/app/quality-check/qc-cus-images/qc-cus-images.component.scss index c11ccc6c0..c6e4d93fb 100644 --- a/ng6-seed/src/app/quality-check/qc-cus-images/qc-cus-images.component.scss +++ b/ng6-seed/src/app/quality-check/qc-cus-images/qc-cus-images.component.scss @@ -1,3 +1,8 @@ + +::ng-deep { .cus-images > mat-dialog-container { + overflow-y: scroll !important; +} +} .paragraph_change { color: #fff !important; background-color: #e00201 !important; 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 9c2dcaae7..b7a79207f 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 @@ -182,7 +182,7 @@
{{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status | titlecase}}
- ( {{master.vendor_status}} ) + ( {{master.agency_short_name}} - {{master.vendor_status}} )
@@ -226,7 +226,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.agency_short_name}} - {{master.vendor_status}} )
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 e29b4a5ba..938ab5210 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 @@ -326,7 +326,8 @@ export class QcViewComponent implements OnInit, OnDestroy { maxHeight: '100vh', height: '100%', width: '100%', - disableClose: true + disableClose: true, + panelClass:'cus-images' }); dialogRef.afterClosed() .subscribe(dataresult => {