@@ -469,7 +410,7 @@
No History
-
+ -->
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 d97987d..5f1a5ca 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
@@ -132,7 +132,7 @@ export class ViewPdComponent implements OnInit, OnDestroy {
this.pdMasterData[0].addresses = data.records.pd_address.filter(item => item.isactive == 1);
- this.currentPDStatus = data.records.pd_master_details[0].pd_status;
+ this.currentPDStatus = data.records.pd_master_details[0].vendor_status;
this.pdAdditionalReqData = data.records.pd_additional_requirements;
this.pdCollectedDocument=data.records.docs_to_be_collected;
// enable pd start time
@@ -359,7 +359,7 @@ export class ViewPdComponent implements OnInit, OnDestroy {
this.destroyType = 3;
if (status == this.pdStatusCheck.ALLOCATED || status == this.pdStatusCheck.SCHEDULED) {
const dialogRef = this.dialog.open(PdStatusChangeDialogueComponent, {
- data: { pdid: pdDetails.assigned_pd, pd_status: this.pdStatusCheck.INPROGRESS },
+ data: { pdid: pdDetails.assigned_pd, vendor_status: this.pdStatusCheck.INPROGRESS },
disableClose: true,
minWidth: '30%',
maxWidth: '40%',
@@ -453,7 +453,7 @@ export class ViewPdComponent implements OnInit, OnDestroy {
if(parentData.main_applicant){
masterApplicantID = this.pdApplicantData.filter(appt => appt.applicant_name == parentData.main_applicant)[0].pd_co_applicant_id;}
const dialogRef = this.dialog.open(InitiateAdditionalPdComponent, {
- data: { "type":type,"pd_id":parentData.pd_id,"fk_customer_segment":parentData.fk_customer_segment, "pd_status":parentData.pd_status, "pd_address_id": childData.pd_address_id,"applicant_id":masterApplicantID,"applicants_details":this.pdApplicantData},
+ data: { "type":type,"pd_id":parentData.pd_id,"fk_customer_segment":parentData.fk_customer_segment, "vendor_status":parentData.vendor_status, "pd_address_id": childData.pd_address_id,"applicant_id":masterApplicantID,"applicants_details":this.pdApplicantData},
disableClose: true,
// position: { right: '0' },
minWidth: '40%',
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 f6c785a..3e39091 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
@@ -237,7 +237,7 @@ export class PdTrigerService {
// update pd master details
editPdMasterDetails(editData: any, status: string): Observable
{
- editData.pd_status = status;
+ editData.vendor_status = status;
editData.fk_updatedby = this._aws.getlocale();
// editData.updatedon = currentdate;
return this._http.post(this.apiUrl + "updatePDMaster", { records: editData })
diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.html b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.html
index 77805c4..c9a2a85 100755
--- a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.html
+++ b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-pd-report.component.html
@@ -1,5 +1,5 @@
-
+
@@ -82,7 +82,7 @@
-
+
diff --git a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-review/qc-review.component.ts b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-review/qc-review.component.ts
index 77f1818..5cf23a6 100755
--- a/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-review/qc-review.component.ts
+++ b/ng6-seed/src/app/quality-check/qc-list/qc-pd-report/qc-review/qc-review.component.ts
@@ -50,7 +50,7 @@ export class QcReviewComponent implements OnInit {
this.recordData = data.records[0];
this.ngForm = this._formBuilder.group({
qc_remarks: [this.recordData.qc_remarks],
- pd_status: [this.recordData.pd_status]
+ vendor_status: [this.recordData.vendor_status]
})
this.showForm = true;
}
@@ -65,7 +65,7 @@ export class QcReviewComponent implements OnInit {
this.ngForm = this._formBuilder.group({
qc_feedback: [this.recordData.qc_feedback],
qc_rating: [Number(this.recordData.qc_rating)],
- pd_status: ["QC_COMPLETED"],
+ vendor_status: ["QC_COMPLETED"],
})
this.showForm = true;
}
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 2940f75..fc50bc5 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
@@ -96,7 +96,7 @@
@@ -115,13 +115,13 @@
- {{master.pd_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.pd_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.pd_status | titlecase}}
+ {{master.vendor_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : master.vendor_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : master.vendor_status | titlecase}}
@@ -156,18 +156,18 @@
-
-
+
+
- {{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].vendor_status==pdStatusCheck.QC_COMPLETED ? 'QC Completed' : addresses.addtional_pd_data[0].vendor_status==pdStatusCheck.ADD_ON_PENDING ? 'Completed' : addresses.addtional_pd_data[0].vendor_status | titlecase}}
-
-
+
+
@@ -335,7 +335,7 @@
QC Feedback
-
QC Feedback
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 82a5546..57744b2 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
@@ -79,7 +79,7 @@ export class QcViewComponent implements OnInit, OnDestroy {
this.masterPdLogsData=data.records.pd_logs.master;
this.pdMasterData[0].addresses = data.records.pd_address.filter(item => item.isactive == 1);
//this.applicantPDLogsData= data.records.pd_logs.master;
- this.currentPDStatus = data.records.pd_master_details[0].pd_status;
+ this.currentPDStatus = data.records.pd_master_details[0].vendor_status;
this.pdAdditionalReqData = data.records.pd_additional_requirements;
// enable pd start time
if(data.records.pd_master_details[0].scheduled_on_for_validation){
@@ -168,7 +168,7 @@ export class QcViewComponent implements OnInit, OnDestroy {
// this is for initiate additional pd
initiateAddtionalPD(parentData: any, childData: any, type: boolean){
const dialogRef = this.dialog.open(InitiateAdditionalPdComponent, {
- data: { "type":type,"pd_id":parentData.pd_id,"fk_customer_segment":parentData.fk_customer_segment, "pd_status":parentData.pd_status, "pd_address_id": childData.pd_address_id},
+ data: { "type":type,"pd_id":parentData.pd_id,"fk_customer_segment":parentData.fk_customer_segment, "vendor_status":parentData.vendor_status, "pd_address_id": childData.pd_address_id},
disableClose: true,
// position: { right: '0' },
minWidth: '40%',
diff --git a/ng6-seed/src/app/quality-check/qc-service/qc.service.ts b/ng6-seed/src/app/quality-check/qc-service/qc.service.ts
index 83a7449..0e07a92 100755
--- a/ng6-seed/src/app/quality-check/qc-service/qc.service.ts
+++ b/ng6-seed/src/app/quality-check/qc-service/qc.service.ts
@@ -152,7 +152,7 @@ export class QcService {
// update pd master details
editPdMasterDetails(editData: any, status: string): Observable
{
- editData.pd_status = status;
+ editData.vendor_status = status;
editData.fk_updatedby = this._aws.getlocale();
// editData.updatedon = currentdate;
return this._http.post(this.apiUrl + "updatePDMaster", { records: editData })
diff --git a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.html b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.html
index 0f540fb..4ac88d2 100755
--- a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.html
+++ b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.html
@@ -182,7 +182,7 @@
{{row.pd_officer}} |
-
+
Status of the PD |
{{row.current_status}} |
diff --git a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts
index 388e9dd..2866650 100755
--- a/ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts
+++ b/ng6-seed/src/app/reports/pd-mis/pd-mis.component.ts
@@ -45,7 +45,7 @@ export class PdMisComponent implements OnInit {
'sending_pd_report_date',
'agency_name',
'officer_name',
- 'pd_status'];
+ 'vendor_status'];
diff --git a/ng6-seed/src/app/sales-pd/advance-filter/advance-filter.component.html b/ng6-seed/src/app/sales-pd/advance-filter/advance-filter.component.html
index 3afdcd8..7b59e93 100755
--- a/ng6-seed/src/app/sales-pd/advance-filter/advance-filter.component.html
+++ b/ng6-seed/src/app/sales-pd/advance-filter/advance-filter.component.html
@@ -15,7 +15,7 @@
-
+
{{status}}
diff --git a/ng6-seed/src/app/sales-pd/advance-filter/advance-filter.component.ts b/ng6-seed/src/app/sales-pd/advance-filter/advance-filter.component.ts
index 84fd3b0..0dfa515 100755
--- a/ng6-seed/src/app/sales-pd/advance-filter/advance-filter.component.ts
+++ b/ng6-seed/src/app/sales-pd/advance-filter/advance-filter.component.ts
@@ -29,7 +29,7 @@ export class AdvanceFilterComponent implements OnInit {
ngOnInit() {
this.searchForm=this._fb.group({
- pd_status:[''],
+ vendor_status:[''],
pd_from_date:[''],
pd_to_date:[''],
pd_products:[''],
@@ -66,7 +66,7 @@ export class AdvanceFilterComponent implements OnInit {
ngOnChanges(){
console.log(this.drop_down_datas)
if(this.drop_down_datas != undefined){
- this.pdStatus=this.drop_down_datas.pd_status
+ this.pdStatus=this.drop_down_datas.vendor_status
if(this.ENTITY.length != 0) {
this.entityCheck()
}
diff --git a/ng6-seed/src/app/sales-pd/sales-pd.component.ts b/ng6-seed/src/app/sales-pd/sales-pd.component.ts
index 31228ec..6ee6662 100755
--- a/ng6-seed/src/app/sales-pd/sales-pd.component.ts
+++ b/ng6-seed/src/app/sales-pd/sales-pd.component.ts
@@ -63,7 +63,7 @@ export class SalesPdComponent implements OnInit {
if(this.salesPdData.length > 0){
let products=[]
let lenders=[]
- let pd_status=[]
+ let vendor_status=[]
this.salesPdData.map(val=>{
if(products.length > 0 ){
if(products.filter(pro=>pro == val.product_id).length == 0 ){
@@ -81,16 +81,16 @@ export class SalesPdComponent implements OnInit {
else{
lenders.push(val.lender_id)
}
- if(pd_status.length > 0 ){
- if(pd_status.filter(pro=>pro == val.status).length == 0 ){
- pd_status.push(val.status)
+ if(vendor_status.length > 0 ){
+ if(vendor_status.filter(pro=>pro == val.status).length == 0 ){
+ vendor_status.push(val.status)
}
}
else{
- pd_status.push(val.status)
+ vendor_status.push(val.status)
}
})
- this.filter_drop_down_data={product_ids:products,lender_ids:lenders,pd_status:pd_status}
+ this.filter_drop_down_data={product_ids:products,lender_ids:lenders,vendor_status:vendor_status}
// console.log(this.filter_drop_down_data);
}
}