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

pending Changes : ps

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-01-28 20:38:35 +05:30
parent 67238513de
commit b743724616
16 changed files with 82 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ng6-seed/Sineedge_prod_280119.zip Normal file
View File

Binary file not shown.

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

@ -428,12 +428,20 @@ export class AddPdComponent implements OnInit, OnDestroy {
this.disableAfterSubmit=true; this.disableAfterSubmit=true;
let concat_landline let concat_landline
let concat_landline1
if(formValue.lender_stdcode != null || formValue.lender_landline != null){ if(formValue.lender_stdcode != null || formValue.lender_landline != null){
concat_landline = formValue.lender_stdcode +'-'+formValue.lender_landline; concat_landline = formValue.lender_stdcode +'-'+formValue.lender_landline;
} }
else{ else{
concat_landline = null; 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={ let pd_details:any={
"fk_lender_id":formValue.fk_lender_id, "fk_lender_id":formValue.fk_lender_id,
@ -463,7 +471,7 @@ export class AddPdComponent implements OnInit, OnDestroy {
"applicant_title_name":formValue.applicant_title_name, "applicant_title_name":formValue.applicant_title_name,
"company_name":formValue.company_name, "company_name":formValue.company_name,
"mobile_no":formValue.mobile_no, "mobile_no":formValue.mobile_no,
"landline":formValue.applicant_stdcode +'-'+formValue.applicant_landline, "landline":concat_landline1 ,
"applicant_type":1, "applicant_type":1,
"relation":"", "relation":"",
}); });

55
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-applicant/edit-pd-applicant.component.ts
View File

@ -55,9 +55,11 @@ export class EditPdApplicantComponent implements OnInit {
} }
loadApplicantFormData() { loadApplicantFormData() {
console.log('loadApplicantFormData',this.mainApplicantData[0].landline);
let stdcodesearch = this.mainApplicantData[0].landline.search("-"); let stdcodesearch = this.mainApplicantData[0].landline.search("-");
let stdcode = this.mainApplicantData[0].landline.substr(0,stdcodesearch); let stdcode = this.mainApplicantData[0].landline.substr(0,stdcodesearch) ;
let landline = this.mainApplicantData[0].landline.substr(+stdcodesearch + 1,8); let landline = this.mainApplicantData[0].landline.substr(+stdcodesearch + 1,8) ;
this._EditApplicantForm = this._fb.group({ this._EditApplicantForm = this._fb.group({
fk_applicant_primary_id: [this.mainApplicantData[0].pd_co_applicant_id], fk_applicant_primary_id: [this.mainApplicantData[0].pd_co_applicant_id],
applicant_name: [this.mainApplicantData[0].applicant_name, Validators.compose([Validators.required])], applicant_name: [this.mainApplicantData[0].applicant_name, Validators.compose([Validators.required])],
@ -79,16 +81,16 @@ export class EditPdApplicantComponent implements OnInit {
} }
createItem(listData): FormGroup { createItem(listData): FormGroup {
console.log('listData',listData);
if(listData){ if(listData){
let stdcode; let stdcode;
let landline; let landline;
if(listData.landline != null){ if(listData.landline != null){
let stdcodesearch = listData.landline.search("-"); let stdcodesearch = listData.landline.search("-");
stdcode = listData.landline.substr(0,stdcodesearch); stdcode = listData.landline.substr(0,stdcodesearch);
//console.log(stdcode);
landline = listData.landline.substr(+stdcodesearch + 1,8);} landline = listData.landline.substr(+stdcodesearch + 1,8);}
else{ else{
stdcode = ''; stdcode = '';
landline = ''; landline = '';
} }
return this._fb.group({ return this._fb.group({
@ -144,17 +146,32 @@ export class EditPdApplicantComponent implements OnInit {
return; return;
} }
else{ 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=[{ let pd_applicant_details : any=[{
"fk_pd_id": this.data.pdID, "fk_pd_id": this.data.pdID,
"pd_co_applicant_id": formValue.fk_applicant_primary_id, "pd_co_applicant_id": formValue.fk_applicant_primary_id,
"applicant_name":formValue.applicant_name, "applicant_name":formValue.applicant_name,
"company_name":formValue.company_name, "company_name":formValue.company_name,
"mobile_no":formValue.mobile_no, "mobile_no":formValue.mobile_no,
"landline":formValue.stdcode+'-'+formValue.landline, "landline":concat_landline1,
"applicant_type":formValue.applicant_type, "applicant_type":formValue.applicant_type,
"relation":formValue.relationship, "relation":formValue.relationship,
"applicant_title_name": formValue.applicant_title_name, "applicant_title_name": formValue.applicant_title_name,
"isactive":1 "isactive":1
}]; }];
formValue.coApplicantItems.forEach((itemElement, itemIndex) => { formValue.coApplicantItems.forEach((itemElement, itemIndex) => {
@ -189,19 +206,19 @@ export class EditPdApplicantComponent implements OnInit {
} }
pd_applicant_details.push(obj1) pd_applicant_details.push(obj1)
}); });
this._pd.updatePdApplicant(pd_applicant_details).subscribe(result => {
// this._pd.updatePdApplicant(pd_applicant_details).subscribe(result => { if (result.status == 200) {
// if (result.status == 200) { this.notifier.notify('success', 'PD Details Updated.');
// this.notifier.notify('success', 'PD Details Updated.'); this.dialogRef.close();
// this.dialogRef.close(); }
// } else {
// else { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
// this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); }
// } }, error => {
// }, error => { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
// this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); });
// }); }
}} }
} }
// get relation master details // get relation master details

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/edit-pd-master/edit-pd-master.component.html
View File

@ -150,6 +150,10 @@
<mat-option *ngFor="let PL of pincodeList" [value]="PL.pincode_id">{{PL.pincode}}</mat-option> <mat-option *ngFor="let PL of pincodeList" [value]="PL.pincode_id">{{PL.pincode}}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 24%" *ngIf="pdMain.pincode.value == 1" >
<input matInput autocomplete="off" placeholder="Specify Pincode" formControlName="other_pincode" type="number">
</mat-form-field>
</mat-card-content> </mat-card-content>
</mat-card> </mat-card>

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

@ -168,6 +168,7 @@ export class EditPdMasterComponent implements OnInit {
fk_city: [this.data.records.fk_city], fk_city: [this.data.records.fk_city],
fk_state: [this.data.records.fk_state], fk_state: [this.data.records.fk_state],
  pincode : [this.data.records.pincode],/** Validators.compose([Validators.minLength(6),Validators.maxLength(6),Validators.pattern('^[0-9]*$')])], */   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], remarks: [this.data.records.remarks],
}); });
} }
@ -206,7 +207,7 @@ export class EditPdMasterComponent implements OnInit {
} }
//trigger pd //trigger pd
triggerPD(formValue: any, status:any){ triggerPD(formValue: any, status:any){
console.log('triggerPD',formValue);
// this._EditPDtriggerForm.controls['fk_lender_id'].setValidators([Validators.required]); // this._EditPDtriggerForm.controls['fk_lender_id'].setValidators([Validators.required]);
// this._EditPDtriggerForm.controls['fk_lender_id'].updateValueAndValidity(); // this._EditPDtriggerForm.controls['fk_lender_id'].updateValueAndValidity();
@ -333,6 +334,7 @@ export class EditPdMasterComponent implements OnInit {
"fk_city": my_array.fk_city, "fk_city": my_array.fk_city,
"fk_state": my_array.fk_state, "fk_state": my_array.fk_state,
  "pincode": my_array.pincode,   "pincode": my_array.pincode,
"other_pincode":my_array.other_pincode,
"remarks": my_array.remarks, "remarks": my_array.remarks,
} }

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

@ -25,7 +25,7 @@
<mat-form-field style="width: 80%;"> <mat-form-field style="width: 80%;">
<!-- <input matInput placeholder="Name" formControlName="name_ans" type="text" required> --> <!-- <input matInput placeholder="Name" formControlName="name_ans" type="text" required> -->
<input matInput placeholder="Address" formControlName="address" required autocomplete="off"> <input matInput placeholder="Address" formControlName="address" oninput="this.value = this.value.toUpperCase()" required autocomplete="off">
</mat-form-field> </mat-form-field>
</div> </div>

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html
View File

@ -111,7 +111,7 @@
<mat-option *ngFor="let btLen of m_btLenderList" [value]="btLen.bt_lender_list_id">{{ btLen.lender_name }}</mat-option> <mat-option *ngFor="let btLen of m_btLenderList" [value]="btLen.bt_lender_list_id">{{ btLen.lender_name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="itemrow.get('bank_name').value == 3"> <mat-form-field *ngIf="itemrow.get('bank_name').value == 1">
<input matInput placeholder="Specify Bank Name" <input matInput placeholder="Specify Bank Name"
formControlName="other_bank" autocomplete="off"> formControlName="other_bank" autocomplete="off">
</mat-form-field> </mat-form-field>

2
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html
View File

@ -42,7 +42,7 @@
<mat-option *ngFor="let btLen of m_btLenderList" [value]="btLen.bt_lender_list_id">{{ btLen.lender_name }}</mat-option> <mat-option *ngFor="let btLen of m_btLenderList" [value]="btLen.bt_lender_list_id">{{ btLen.lender_name }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="itemrow.get('bank_name').value == 3"> <mat-form-field *ngIf="itemrow.get('bank_name').value == 1">
<input matInput placeholder="Specify Bank Name" <input matInput placeholder="Specify Bank Name"
formControlName="other_bank" autocomplete="off"> formControlName="other_bank" autocomplete="off">
</mat-form-field> </mat-form-field>

3
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.html
View File

@ -315,6 +315,9 @@
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="sup.get('residence_pin').value == 1">
<input matInput placeholder="Specify PinCode" formControlName="residence_other_pincode">
</mat-form-field>
<!-- <mat-form-field> <!-- <mat-form-field>
<input matInput placeholder="City" formControlName="residence_city" required> <input matInput placeholder="City" formControlName="residence_city" required>

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

@ -551,6 +551,7 @@ export class FamilyDetailsComponent implements OnInit {
residence_city: ['', Validators.compose([])], residence_city: ['', Validators.compose([])],
residence_state: ['', Validators.compose([])], residence_state: ['', Validators.compose([])],
residence_pin: ['', Validators.compose([])], residence_pin: ['', Validators.compose([])],
residence_other_pincode:[''],
residence_No_of_years: ['', Validators.compose([])], residence_No_of_years: ['', Validators.compose([])],
residence_ownership: ['', Validators.compose([])], residence_ownership: ['', Validators.compose([])],
ownershipOther: [''], ownershipOther: [''],
@ -570,6 +571,7 @@ export class FamilyDetailsComponent implements OnInit {
residence_city: [val.residence_city, Validators.compose([])], residence_city: [val.residence_city, Validators.compose([])],
residence_state: [val.residence_state, Validators.compose([])], residence_state: [val.residence_state, Validators.compose([])],
residence_pin: [val.residence_pin, Validators.compose([])], residence_pin: [val.residence_pin, Validators.compose([])],
residence_other_pincode:[val.residence_other_pincode],
residence_No_of_years: [val.residence_No_of_years, Validators.compose([])], residence_No_of_years: [val.residence_No_of_years, Validators.compose([])],
residence_ownership: [val.residence_ownership, Validators.compose([])], residence_ownership: [val.residence_ownership, Validators.compose([])],
ownershipOther: [val.ownershipOther || null], ownershipOther: [val.ownershipOther || null],

3
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/final-remarks/final-remarks.component.html
View File

@ -47,4 +47,5 @@
</div> </div>
</mat-dialog-actions> </mat-dialog-actions>
</form> </form>
</div> </div>
<notifier-container></notifier-container>

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

@ -112,7 +112,7 @@ export class GeneralInfoComponent implements OnInit {
this.companyRelationShipList=data.records.filter(item => item.name != 'Others'); this.companyRelationShipList=data.records.filter(item => item.name != 'Others');
} }
if(type==3){ if(type==3){
this.qualificationList = data.records; this.qualificationList = data.records.filter(item => item.qualification_name != 'Others');
} }
if(type==4) { if(type==4) {
this.businessEntityTypeList = data.records; this.businessEntityTypeList = data.records;

6
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.html
View File

@ -58,7 +58,7 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="loanDetailsForm.controls['lender'].value == 3" style="width: 28%"> <mat-form-field *ngIf="loanDetailsForm.controls['lender'].value == 1" style="width: 28%">
<input matInput placeholder="Specify Others Lender" formControlName="other_bt_lender" autocomplete="off"> <input matInput placeholder="Specify Others Lender" formControlName="other_bt_lender" autocomplete="off">
</mat-form-field> </mat-form-field>
@ -84,9 +84,9 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="isPLSource" style="width: 28%"> <!-- <mat-form-field *ngIf="isPLSource" style="width: 28%">
<input matInput placeholder="Specify Personal Loan" formControlName="personal_loan_source" autocomplete="off"> <input matInput placeholder="Specify Personal Loan" formControlName="personal_loan_source" autocomplete="off">
</mat-form-field> </mat-form-field> -->
<mat-form-field *ngIf="isOtherSource" style="width: 28%"> <mat-form-field *ngIf="isOtherSource" style="width: 28%">
<input matInput placeholder="Specify Other Sources" formControlName="other_source" autocomplete="off"> <input matInput placeholder="Specify Other Sources" formControlName="other_source" autocomplete="off">

24
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts
View File

@ -237,10 +237,10 @@ export class LoanDetailsComponent implements OnInit {
this.loanDetailsForm.controls['other_source'].setValue(value.records.other_source); this.loanDetailsForm.controls['other_source'].setValue(value.records.other_source);
} }
if(value.records.personal_loan_source) { // if(value.records.personal_loan_source) {
// this.isPLSource = true; // // this.isPLSource = true;
this.loanDetailsForm.controls['personal_loan_source'].setValue(value.records.personal_loan_source); // this.loanDetailsForm.controls['personal_loan_source'].setValue(value.records.personal_loan_source);
} // }
} }
// if (value.records.lender_name_type) { // if (value.records.lender_name_type) {
@ -435,7 +435,7 @@ getM_sourceofamount() {
own_contribution: [''], own_contribution: [''],
source: [''], source: [''],
other_source:[''], other_source:[''],
personal_loan_source:[''], // personal_loan_source:[''],
//lender_name_type: [''], //lender_name_type: [''],
emi_level: [''], emi_level: [''],
property_type: [''], property_type: [''],
@ -465,9 +465,9 @@ getM_sourceofamount() {
event.forEach(option => { event.forEach(option => {
// let othersData = this.m_endUseofLoad.filter(sub=>sub.subproduct_id==option)[0]; // 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]; 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(); OthersAvaliable = othersData.enduse_of_loan.substr(0,6).toLowerCase();
// console.log(OthersAvaliable); // console.log('1',OthersAvaliable);
this.endUserList.push({ end_use: option }); this.endUserList.push({ end_use: option });
}); });
@ -488,8 +488,8 @@ getM_sourceofamount() {
// this.isOtherSource = (evt.some(e => e == 4) == true) ? true : false ; // this.isOtherSource = (evt.some(e => e == 4) == true) ? true : false ;
// this.isPLSource = (evt.some(e => e == 3) == 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.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.isPLSource = evt.some(e => e == 3) // this return true or false Only;
this.sourceList = []; this.sourceList = [];
@ -603,9 +603,9 @@ getM_sourceofamount() {
records.other_source = this.loanDetailsForm.controls['other_source'].value; records.other_source = this.loanDetailsForm.controls['other_source'].value;
}else{ records.other_source = ''; } }else{ records.other_source = ''; }
if(this.isPLSource){ // if(this.isPLSource){
records.personal_loan_source = this.loanDetailsForm.controls['personal_loan_source'].value; // records.personal_loan_source = this.loanDetailsForm.controls['personal_loan_source'].value;
}else{ records.personal_loan_source = ''; } // }else{ records.personal_loan_source = ''; }
//records.percentage_of_construction = this.loanDetailsForm.controls['percentage_of_construction'].value; //records.percentage_of_construction = this.loanDetailsForm.controls['percentage_of_construction'].value;

5
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html
View File

@ -85,7 +85,6 @@
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 12%"> <mat-form-field style="width: 12%">
<input matInput autocomplete="off" placeholder=" STD " formControlName="std_code" type="text" (keypress)="keyPress($event)"> <input matInput autocomplete="off" placeholder=" STD " formControlName="std_code" type="text" (keypress)="keyPress($event)">
<span matPrefix>+91</span>
<mat-error *ngIf="reference['controls'].std_code.hasError('maxlength') || reference['controls'].std_code.hasError('minlength')">Enter Valid STD Code. </mat-error> <mat-error *ngIf="reference['controls'].std_code.hasError('maxlength') || reference['controls'].std_code.hasError('minlength')">Enter Valid STD Code. </mat-error>
</mat-form-field> <span>-</span> </mat-form-field> <span>-</span>
<mat-form-field style="width: 20%"> <mat-form-field style="width: 20%">
@ -104,7 +103,7 @@
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 30%" *ngIf="reference.controls.relationship_with.value==5"> <mat-form-field style="width: 30%" *ngIf="reference.controls.relationship_with.value==1">
<input matInput autocomplete="off" placeholder="Specify Business Relation" formControlName="others" type="text"> <input matInput autocomplete="off" placeholder="Specify Business Relation" formControlName="others" type="text">
</mat-form-field> </mat-form-field>
<p #period_paragraph>Period of Relationship</p> <p #period_paragraph>Period of Relationship</p>
@ -126,7 +125,7 @@
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 30%" *ngIf="reference.controls.business_volume_unit.value==8"> <mat-form-field style="width: 30%" *ngIf="reference.controls.business_volume_unit.value==1">
<input matInput autocomplete="off" placeholder="Specify Unit" formControlName="others_unit" type="text"> <input matInput autocomplete="off" placeholder="Specify Unit" formControlName="others_unit" type="text">
</mat-form-field> </mat-form-field>
<span style="width:100%"> <span style="width:100%">

4
ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html
View File

@ -48,7 +48,7 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width:45%" *ngIf="details.get('source').value == 5"> <mat-form-field style="width:45%" *ngIf="details.get('source').value == 1">
<input matInput autocomplete="off" placeholder="Specify Source" <input matInput autocomplete="off" placeholder="Specify Source"
formControlName="others_source"> formControlName="others_source">
</mat-form-field> </mat-form-field>
@ -80,7 +80,7 @@
<!-- {{otherIncomeForm.controls.frequency.value}} --> <!-- {{otherIncomeForm.controls.frequency.value}} -->
<mat-form-field style="width:45%" *ngIf="details.get('frequency').value == 8"> <mat-form-field style="width:45%" *ngIf="details.get('frequency').value == 1">
<input matInput autocomplete="off" placeholder="Specify Frequency" <input matInput autocomplete="off" placeholder="Specify Frequency"
formControlName="others_frequency"> formControlName="others_frequency">
</mat-form-field> </mat-form-field>