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

Merge Fairoj

Browse Source
This commit is contained in:
saravanakumarkandasami 2019-03-25 20:08:22 +05:30
commit e6905e25a7
4 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/pages/pd-question/pd-question-assests/pd-question-assests.html
View File

@ -223,6 +223,7 @@
<div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none"> <div fxLayout="row wrap" fxLayoutGap="2px" fxLayoutAlign="start none">
<!-- <div *ngIf="sup.get('assets_mode').value == 2 || sup.get('assets_mode').value == 5"> -->
<div *ngIf="sup.get('assets_mode').value == 1 || sup.get('assets_mode').value == 2 || sup.get('assets_mode').value == 3 || sup.get('assets_mode').value == 4 || sup.get('assets_mode').value == 5"> <div *ngIf="sup.get('assets_mode').value == 1 || sup.get('assets_mode').value == 2 || sup.get('assets_mode').value == 3 || sup.get('assets_mode').value == 4 || sup.get('assets_mode').value == 5">
<div fxFlex="33"> <div fxFlex="33">
<mat-form-field style="width:100%"> <mat-form-field style="width:100%">

2
src/pages/pd-question/pd-question-banking/pd-question-banking.ts
View File

@ -82,7 +82,7 @@ export class PdQuestionBankingPage {
this.qustCat.getcommondrop('BTLENDERLIST').subscribe( this.qustCat.getcommondrop('BTLENDERLIST').subscribe(
data => { data => {
if(data['dataStatus']==true){ if(data['dataStatus']==true){
this.m_btLenderList = data['records'].filter(data => data.isactive == 1); this.m_btLenderList = data['records'].filter(data => data.isactive == 1 && data.lender_type == 1);
} }
}); });
this.qustCat.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{ this.qustCat.getCompaniesListsForBusiness(this.pdid).subscribe(data=>{

2
src/pages/pd-question/pd-question-general-info/pd-question-general-info.html
View File

@ -313,7 +313,7 @@
</mat-card> </mat-card>
</div> </div>
<mat-card> <mat-card *ngIf="customer_segment_abbr != 'SE-RI'">
<div formArrayName="company_with_relationships"> <div formArrayName="company_with_relationships">
<mat-card-header> <mat-card-header>
<mat-card-title style="font-size:16px;font-weight:bold"> Relationship of Individuals to Company / Firm</mat-card-title> <mat-card-title style="font-size:16px;font-weight:bold"> Relationship of Individuals to Company / Firm</mat-card-title>

25
src/pages/pd-question/pd-question-general-info/pd-question-general-info.ts
View File

@ -81,6 +81,7 @@ export class PdQuestionGeneralInfoPage {
//this.maxDate=new Date(get_max_date) //this.maxDate=new Date(get_max_date)
this.FormId = this.navParams.get('FormId'); this.FormId = this.navParams.get('FormId');
this.customer_segment_abbr = this.pdDetails.customer_segment_abbr; this.customer_segment_abbr = this.pdDetails.customer_segment_abbr;
console.log('this.customer_segment_abbr',this.customer_segment_abbr)
this.users = this.aws.getlocale(); this.users = this.aws.getlocale();
this.getdropdown(); this.getdropdown();
@ -877,20 +878,30 @@ console.log('1)',this.temp);
} }
} }
saveRecords.individuals=valuesData_indi; if (this.customer_segment_abbr != 'SE-RI') {
saveRecords.companies=valuesData saveRecords.companies=valuesData
saveRecords.company_with_relationships=answerData.company_with_relationships
saveRecords.rental_income_rcv_in_years = null;
saveRecords.rental_income_rcv_in_month = null;
//saveRecords.applicant_relation=answerData.applicant_relation;
}
else if (this.customer_segment_abbr == 'SE-RI') {
saveRecords.companies = [];
saveRecords.company_with_relationships = [];
saveRecords.rental_income_rcv_in_years = answerData.rental_income_rcv_in_years;
saveRecords.rental_income_rcv_in_month = answerData.rental_income_rcv_in_month;
//saveRecords.applicant_relation=answerData.applicant_relation;
}
saveRecords.individuals=valuesData_indi;
// saveRecords.companies=valuesData
saveRecords.pdid=answerData.pdid; saveRecords.pdid=answerData.pdid;
saveRecords.formid=answerData.formid; saveRecords.formid=answerData.formid;
saveRecords.fk_createdby=this.users; saveRecords.fk_createdby=this.users;
saveRecords.persons_with_relationships=answerData.persons_with_relationships; saveRecords.persons_with_relationships=answerData.persons_with_relationships;
saveRecords.company_with_relationships=answerData.company_with_relationships // saveRecords.company_with_relationships=answerData.company_with_relationships
saveRecords.general_remark=answerData.general_remark; saveRecords.general_remark=answerData.general_remark;
this.qustCat.saveForm(saveRecords).subscribe(dataResult=>{ this.qustCat.saveForm(saveRecords).subscribe(dataResult=>{
if(dataResult['dataStatus']==true){ if(dataResult['dataStatus']==true){
this.toast.pdTriggerappmessage('Record Saved Successfully.!'); this.toast.pdTriggerappmessage('Record Saved Successfully.!');