diff --git a/ng6-seed/Sineedge_prod_280119.zip b/ng6-seed/Sineedge_prod_280119.zip
new file mode 100644
index 000000000..f866c99dc
Binary files /dev/null and b/ng6-seed/Sineedge_prod_280119.zip differ
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
index f69ffd8e8..d48972ff1 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/add-pd/add-pd.component.ts
@@ -428,12 +428,20 @@ export class AddPdComponent implements OnInit, OnDestroy {
this.disableAfterSubmit=true;
let concat_landline
+ let concat_landline1
if(formValue.lender_stdcode != null || formValue.lender_landline != null){
concat_landline = formValue.lender_stdcode +'-'+formValue.lender_landline;
}
else{
concat_landline = null;
}
+
+ if(formValue.applicant_stdcode != null || formValue.applicant_landline != null){
+ concat_landline1 = formValue.applicant_stdcode +'-'+formValue.applicant_landline;
+ }
+ else{
+ concat_landline1 = null;
+ }
let pd_details:any={
"fk_lender_id":formValue.fk_lender_id,
@@ -463,7 +471,7 @@ export class AddPdComponent implements OnInit, OnDestroy {
"applicant_title_name":formValue.applicant_title_name,
"company_name":formValue.company_name,
"mobile_no":formValue.mobile_no,
- "landline":formValue.applicant_stdcode +'-'+formValue.applicant_landline,
+ "landline":concat_landline1 ,
"applicant_type":1,
"relation":"",
});
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts
index 0726d05f3..94fadf60c 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts
@@ -55,9 +55,11 @@ export class EditPdApplicantComponent implements OnInit {
}
loadApplicantFormData() {
+ console.log('loadApplicantFormData',this.mainApplicantData[0].landline);
let stdcodesearch = this.mainApplicantData[0].landline.search("-");
- let stdcode = this.mainApplicantData[0].landline.substr(0,stdcodesearch);
- let landline = this.mainApplicantData[0].landline.substr(+stdcodesearch + 1,8);
+ let stdcode = this.mainApplicantData[0].landline.substr(0,stdcodesearch) ;
+ let landline = this.mainApplicantData[0].landline.substr(+stdcodesearch + 1,8) ;
+
this._EditApplicantForm = this._fb.group({
fk_applicant_primary_id: [this.mainApplicantData[0].pd_co_applicant_id],
applicant_name: [this.mainApplicantData[0].applicant_name, Validators.compose([Validators.required])],
@@ -79,16 +81,16 @@ export class EditPdApplicantComponent implements OnInit {
}
createItem(listData): FormGroup {
+ console.log('listData',listData);
if(listData){
let stdcode;
let landline;
if(listData.landline != null){
let stdcodesearch = listData.landline.search("-");
stdcode = listData.landline.substr(0,stdcodesearch);
- //console.log(stdcode);
landline = listData.landline.substr(+stdcodesearch + 1,8);}
else{
- stdcode = '';
+ stdcode = '';
landline = '';
}
return this._fb.group({
@@ -144,17 +146,32 @@ export class EditPdApplicantComponent implements OnInit {
return;
}
else{
+ let concat_landline1
+ if(formValue.stdcode != null && formValue.landline != null){
+ if(formValue.stdcode == '' && formValue.landline == ''){
+ concat_landline1 = null;
+ }else {
+ let std = formValue.stdcode == '' ? '' : formValue.stdcode;
+ let landline = formValue.landline == '' ? '' : formValue.landline;
+ concat_landline1 = std+'-'+landline;
+ }
+ }
+ else if(formValue.stdcode == '' && formValue.landline == ''){
+ concat_landline1 = null;
+ }else{
+ concat_landline1 = null;
+ }
+
let pd_applicant_details : any=[{
"fk_pd_id": this.data.pdID,
"pd_co_applicant_id": formValue.fk_applicant_primary_id,
"applicant_name":formValue.applicant_name,
"company_name":formValue.company_name,
"mobile_no":formValue.mobile_no,
- "landline":formValue.stdcode+'-'+formValue.landline,
+ "landline":concat_landline1,
"applicant_type":formValue.applicant_type,
"relation":formValue.relationship,
"applicant_title_name": formValue.applicant_title_name,
-
"isactive":1
}];
formValue.coApplicantItems.forEach((itemElement, itemIndex) => {
@@ -189,19 +206,19 @@ export class EditPdApplicantComponent implements OnInit {
}
pd_applicant_details.push(obj1)
});
-
- // this._pd.updatePdApplicant(pd_applicant_details).subscribe(result => {
- // if (result.status == 200) {
- // this.notifier.notify('success', 'PD Details Updated.');
- // this.dialogRef.close();
- // }
- // else {
- // this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
- // }
- // }, error => {
- // this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
- // });
- }}
+ this._pd.updatePdApplicant(pd_applicant_details).subscribe(result => {
+ if (result.status == 200) {
+ this.notifier.notify('success', 'PD Details Updated.');
+ this.dialogRef.close();
+ }
+ else {
+ this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
+ }
+ }, error => {
+ this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
+ });
+ }
+ }
}
// get relation master details
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 7d4ca2fbb..583560975 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
@@ -150,6 +150,10 @@
{{PL.pincode}}
+
+
+
+
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 f54d1c334..734c88988 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
@@ -168,6 +168,7 @@ export class EditPdMasterComponent implements OnInit {
fk_city: [this.data.records.fk_city],
fk_state: [this.data.records.fk_state],
pincode : [this.data.records.pincode],/** Validators.compose([Validators.minLength(6),Validators.maxLength(6),Validators.pattern('^[0-9]*$')])], */
+ other_pincode:[this.data.records.other_pincode],
remarks: [this.data.records.remarks],
});
}
@@ -206,7 +207,7 @@ export class EditPdMasterComponent implements OnInit {
}
//trigger pd
triggerPD(formValue: any, status:any){
-
+ console.log('triggerPD',formValue);
// this._EditPDtriggerForm.controls['fk_lender_id'].setValidators([Validators.required]);
// this._EditPDtriggerForm.controls['fk_lender_id'].updateValueAndValidity();
@@ -333,6 +334,7 @@ export class EditPdMasterComponent implements OnInit {
"fk_city": my_array.fk_city,
"fk_state": my_array.fk_state,
"pincode": my_array.pincode,
+ "other_pincode":my_array.other_pincode,
"remarks": my_array.remarks,
}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
index 26d5cf659..1bc256334 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html
@@ -25,7 +25,7 @@
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
index 1d0e0f11c..151d0ec2b 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
@@ -111,7 +111,7 @@
{{ btLen.lender_name }}
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html
index d6a1ecfd0..e321a90e9 100644
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html
@@ -42,7 +42,7 @@
{{ btLen.lender_name }}
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
index 8fd31e47b..55a63c68f 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
@@ -315,6 +315,9 @@
+
+
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
index 375560841..dfc8bb27e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
@@ -237,10 +237,10 @@ export class LoanDetailsComponent implements OnInit {
this.loanDetailsForm.controls['other_source'].setValue(value.records.other_source);
}
- if(value.records.personal_loan_source) {
- // this.isPLSource = true;
- this.loanDetailsForm.controls['personal_loan_source'].setValue(value.records.personal_loan_source);
- }
+ // if(value.records.personal_loan_source) {
+ // // this.isPLSource = true;
+ // this.loanDetailsForm.controls['personal_loan_source'].setValue(value.records.personal_loan_source);
+ // }
}
// if (value.records.lender_name_type) {
@@ -435,7 +435,7 @@ getM_sourceofamount() {
own_contribution: [''],
source: [''],
other_source:[''],
- personal_loan_source:[''],
+ // personal_loan_source:[''],
//lender_name_type: [''],
emi_level: [''],
property_type: [''],
@@ -465,9 +465,9 @@ getM_sourceofamount() {
event.forEach(option => {
// let othersData = this.m_endUseofLoad.filter(sub=>sub.subproduct_id==option)[0];
let othersData = this.m_endUseForLoan.filter(sub=>sub.enduse_of_loan_id==option)[0];
- // console.log(othersData);
+ // console.log('1',othersData);
OthersAvaliable = othersData.enduse_of_loan.substr(0,6).toLowerCase();
- // console.log(OthersAvaliable);
+ // console.log('1',OthersAvaliable);
this.endUserList.push({ end_use: option });
});
@@ -488,8 +488,8 @@ getM_sourceofamount() {
// this.isOtherSource = (evt.some(e => e == 4) == true) ? true : false ;
// this.isPLSource = (evt.some(e => e == 3) == true) ? true : false ;
- this.isOtherSource = evt.some(e => e == 4) // this return true or false Only;
- this.isPLSource = evt.some(e => e == 3) // this return true or false Only;
+ this.isOtherSource = evt.some(e => e == 1) // this return true or false Only;
+ // this.isPLSource = evt.some(e => e == 3) // this return true or false Only;
this.sourceList = [];
@@ -603,9 +603,9 @@ getM_sourceofamount() {
records.other_source = this.loanDetailsForm.controls['other_source'].value;
}else{ records.other_source = ''; }
- if(this.isPLSource){
- records.personal_loan_source = this.loanDetailsForm.controls['personal_loan_source'].value;
- }else{ records.personal_loan_source = ''; }
+ // if(this.isPLSource){
+ // records.personal_loan_source = this.loanDetailsForm.controls['personal_loan_source'].value;
+ // }else{ records.personal_loan_source = ''; }
//records.percentage_of_construction = this.loanDetailsForm.controls['percentage_of_construction'].value;
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
index 6a3dd6da8..017731376 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
@@ -85,7 +85,6 @@
- +91
Enter Valid STD Code.
-
@@ -104,7 +103,7 @@
-
+
Period of Relationship
@@ -126,7 +125,7 @@
-
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
index ef0521e21..47c367d0e 100755
--- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
@@ -48,7 +48,7 @@
-
+
@@ -80,7 +80,7 @@
-
+