{
if (data.status == 200) {
this.cityList[index] = data.records.cities;
@@ -1245,8 +1246,8 @@ searchFun(control:any,i:number,option){
onChangeSelectedAddress(value) {
console.log(value)
- let city_id=value.city;
- this.getvendor(city_id)
+ let state=value.state;
+ this.getvendor(state)
if(value) {
let control_address = this._PDtriggerForm.get('addresses')['controls'][0] as FormArray
console.log(control_address);
@@ -1275,5 +1276,5 @@ searchFun(control:any,i:number,option){
}
})
- }
+ }
}
\ No newline at end of file
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 68bb11f..0c97a42 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
@@ -159,7 +159,7 @@
{{details.city_name}}-{{details.pincode_id == 1 ? details.other_pincode : details.pincode }}
- {{details.pd_status}}
+ {{details.pd_status=="ALLOCATED_TO_FIA" ? 'Allocated to vendor' :details.pd_status}}
{{details.vendor_status}}
QC COMPLETED
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 939fca8..61b1aa5 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
@@ -151,7 +151,7 @@
{{details.city_name}}-{{details.pincode_id == 1 ? details.other_pincode : details.pincode }}
- {{details.pd_status}}
+ {{details.pd_status=="ALLOCATED_TO_FIA" ? 'Allocated to vendor' :details.pd_status}}
{{details.vendor_status}}
QC COMPLETED
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
index 7e70bb8..62c46f9 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
@@ -233,7 +233,7 @@
-
+
{
+ this.getvendor(stateID)
+ this._pd.getStateWiseCities(stateID).subscribe(data=>{
if (data.status == 200) {
this.cityList[i] = data.records.cities;
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 5b23926..fa0e012 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
@@ -150,7 +150,7 @@
{{details.city_name}}-{{details.pincode_id == 1 ? details.other_pincode : details.pincode }}
-
{{details.pd_status}}
+
{{details.pd_status=="ALLOCATED_TO_FIA" ? 'Allocated to vendor' :details.pd_status}}
{{details.vendor_status}}
QC COMPLETED
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts
index 298d2da..98e53e2 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-allocation/pd-allocation.component.ts
@@ -105,7 +105,7 @@ export class PdAllocationComponent implements OnInit {
}
getSmcVendorPdOfficerList1(){
- this._pd.getvendorlist(this.data.city_id).subscribe(
+ this._pd.getvendorlist(this.data.state_id).subscribe(
list => {
console.log('list');
console.log(list);
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.ts
index 8ab6bea..c26e5cb 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/pd-status-change-dialogue/pd-status-change-dialogue.component.ts
@@ -68,10 +68,10 @@ export class PdStatusChangeDialogueComponent implements OnInit {
}
getSmcVendorPdOfficerList1(){
- this.pd.getvendorlist(this.data.city_id).subscribe(
+ this.pd.getvendorlist(this.data.state_id).subscribe(
list => {
console.log('list');
- console.log(list);
+ console.log(list);
if(list['status'] == '200') {
this.vendorOfficerList= list['records']
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/form/form.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/form/form.component.ts
index 2207b71..b8710df 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/form/form.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/form/form.component.ts
@@ -161,7 +161,7 @@ else
let params = {"fk_entity_id":this.pd_all_details.pdmaster_details.fk_lender_id,"fk_product_id":this.pd_all_details.pdmaster_details.fk_product_id,"pd_form_id":this.pd_all_details.form_id,"fk_pd_id":this.pd_all_details.pdmaster_details.pd_id}
this.pdTriggerService.loadCreditPDTemplate(params).subscribe(result=>{
if(!environment.production){
- //result.dataStatus = false
+ result.dataStatus = false
}
if(result.dataStatus) {
let question_template: any = result.records
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 9699f59..2948aa7 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
@@ -929,7 +929,7 @@ export class PdTrigerService {
}
//FOR TRIGGER PD PAGE MASTER FOR PRODUCT,CUS SEG,PD TYPE
getvendorlist(value){
- return this._http.get
(this.apiUrl+'getSMCVendorList?city_id='+value)
+ return this._http.get(this.apiUrl+'getSMCVendorList?state_id='+value)
.pipe(
catchError(this.handleError('operation', []))
)
diff --git a/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/LFMP/19.json b/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/LFMP/19.json
index fac96f7..9ffde02 100644
--- a/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/LFMP/19.json
+++ b/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/LFMP/19.json
@@ -154,7 +154,7 @@
"question":[{
"question":"Reasons for marking PD status as Positive/negative/ refer to credit",
"question_key":"reason",
- "type":"1",
+ "type":"7",
"field_width":"100",
"api_properties":null,
"onchange_properties":null,
@@ -196,7 +196,7 @@
"isactive":"1",
"validator":"Validators.required",
"message":"Field Required",
- "value":null
+ "value":null
}
]
},
diff --git a/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/LFMP/8.json b/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/LFMP/8.json
index e25db33..4497a3a 100644
--- a/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/LFMP/8.json
+++ b/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/LFMP/8.json
@@ -47,7 +47,7 @@
"place_holder":"",
"field_type":"num",
"type":"1",
- "field_width":"45",
+ "field_width":"45",
"api_properties":null,
"onchange_properties":null,
"is_repeatable":null,
@@ -328,7 +328,7 @@
"question":"Is there any other business asset available?",
"question_key":"asset_info_available",
"type":"2",
- "field_width":"45",
+ "field_width":"100",
"api_properties":null,
"onchange_properties":[{
"purpose":"FORM_CTRL",
diff --git a/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/WCTL/19.json b/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/WCTL/19.json
index 0ede0b8..9448035 100644
--- a/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/WCTL/19.json
+++ b/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/WCTL/19.json
@@ -152,9 +152,9 @@
"questions":[
{
"question":[{
- "question":"Reasons for marking PD status as Positive/negative/ refer to credit",
+ "question":"Reasons for marking PD status as Positive/negative/ refer to credit",
"question_key":"reason",
- "type":"1",
+ "type":"7",
"field_width":"100",
"api_properties":null,
"onchange_properties":null,
diff --git a/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/WCTL/8.json b/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/WCTL/8.json
index b0d3cb4..7456ee2 100644
--- a/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/WCTL/8.json
+++ b/ng6-seed/src/assets/data/SMC_CREDIT_TEMPLATES/WCTL/8.json
@@ -2,10 +2,25 @@
"section_id":"8",
"section_name":"Business Assets",
"onsubmit":null,
+
"questions":[
+ {
+ "question":"Address",
+ "question_key":"initiated_address",
+ "type":"7",
+ "field_width":"100",
+ "answers":null,
+ "api_properties":null,
+ "onchange_properties":null,
+ "is_repeatable":null,
+ "validations":[
+
+ ]
+ },
+
{
"question":" Is this the business address?",
- "question_key":"is_business_address",
+ "question_key":"is_business_address",
"type":"2",
"field_width":"100",
"answers":[{
@@ -28,30 +43,7 @@
"is_business_address"
],
"questions":[
- {
- "question":"No of Years",
- "sub_title":"How Long has business been operated from visited premises? (Eg. If operating for 5 years and 4 months enter 5 in Years field and 4 in months field",
- "question_key":"business_years",
- "place_holder":"",
- "field_type":"num",
- "type":"1",
- "field_width":"100",
- "api_properties":null,
- "onchange_properties":null,
- "is_repeatable":null,
- "is_subfield":"1",
- "parent_question_key":"is_business_address",
- "answers":null,
- "validations":[
- {
- "name":"required",
- "isactive":"1",
- "validator":"Validators.required",
- "message":"Field required",
- "value":null
- }
- ]
- },
+
{
"question":"No of Months",
"question_key":"business_months",
@@ -68,12 +60,36 @@
"validations":[
]
},
+ {
+ "question":"No of Years",
+ "sub_title":"How Long has business been operated from visited premises? (Eg. If operating for 5 years and 4 months enter 5 in Years field and 4 in months field",
+ "question_key":"business_years",
+ "place_holder":"",
+ "field_type":"num",
+ "type":"1",
+ "field_width":"100",
+ "api_properties":null,
+ "onchange_properties":null,
+ "is_repeatable":null,
+ "is_subfield":"1",
+ "parent_question_key":"is_business_address",
+ "answers":null,
+ "validations":[
+ {
+ "name":"required",
+ "isactive":"1",
+ "validator":"Validators.required",
+ "message":"Field required",
+ "value":null
+ }
+ ]
+ },
{
"question":"Was any business activities seen during visit?",
"question_key":"business_is_pd_visited",
"place_holder":"",
"type":"2",
- "field_width":"45",
+ "field_width":"100",
"api_properties":null,
"onchange_properties":[
{
@@ -354,7 +370,7 @@
"question":"Is there any other business asset available?",
"question_key":"asset_info_available",
"type":"2",
- "field_width":"45",
+ "field_width":"100",
"api_properties":null,
"onchange_properties":[{
"purpose":"FORM_CTRL",