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

Fairoj Web Changes applied

Browse Source
This commit is contained in:
saravanakumarkandasami 2019-02-19 11:31:44 +05:30
parent 621aae1bca
commit 69a871145f
15 changed files with 275 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.sourcemaps/main.js.map
View File

File diff suppressed because one or more lines are too long

2
src/pages/pd-list/pd-list.ts
View File

@ -120,7 +120,7 @@ export class PdListPage {
{ {
console.log(this.pdlistdetails); console.log(this.pdlistdetails);
this.pdlistaccess = true; this.pdlistaccess = true;
this.pdschduleDetails = this.pdlistdetails.records.filter(sch=>sch.pd_status =="ACCEPTED" || sch.pd_status =="SCHEDULED" || sch.pd_status =="INITIATED" || sch.pd_status =="STARTED" || sch.pd_status =="INPROGRESS"); this.pdschduleDetails = this.pdlistdetails.records.filter(sch=>sch.pd_status =="ACCEPTED" || sch.pd_status =="SCHEDULED" || sch.pd_status =="INITIATED" || sch.pd_status =="STARTED" || sch.pd_status =="INPROGRESS" && sch.applicat_details);
this.searchpast = this.pdschduleDetails; this.searchpast = this.pdschduleDetails;
// console.log(65,this.pdlistdetails.records.filter(sch=>sch.pd_status =="STARTED" || sch.pd_status == "INPROGRESS" || sch.pd_status =="ACCEPTED" || sch.pd_status =="SCHEDULED" && sch.pd_status =="INITIATED" || sch.pd_status =="STARTED")); // console.log(65,this.pdlistdetails.records.filter(sch=>sch.pd_status =="STARTED" || sch.pd_status == "INPROGRESS" || sch.pd_status =="ACCEPTED" || sch.pd_status =="SCHEDULED" && sch.pd_status =="INITIATED" || sch.pd_status =="STARTED"));
this.pdinprogress = this.pdlistdetails.records.filter(allocate=>allocate.pd_status == "ALLOCATED"); this.pdinprogress = this.pdlistdetails.records.filter(allocate=>allocate.pd_status == "ALLOCATED");

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

@ -286,7 +286,7 @@
</mat-list> </mat-list>
</div> </div>
<br/> <br/>
<div *ngIf="sup.get('emi').value== 'yes'" fxFlex="33"> <!-- <div *ngIf="sup.get('emi').value== 'yes'" fxFlex="33">
<mat-card> <mat-card>
<div *ngIf="sup.get('emi').value === 'yes'" fxFlex="33"> <div *ngIf="sup.get('emi').value === 'yes'" fxFlex="33">
<mat-form-field style="width:100%"> <mat-form-field style="width:100%">
@ -309,7 +309,7 @@
</mat-form-field> </mat-form-field>
</div> </div>
</mat-card> </mat-card>
</div> </div>-->
</div> </div>
</div> </div>
<ion-buttons end> <ion-buttons end>

40
src/pages/pd-question/pd-question-assests/pd-question-assests.ts
View File

@ -177,10 +177,10 @@ export class PdQuestionAssestsPage {
vintage_personal : [''], vintage_personal : [''],
// purchase_month: [null], // purchase_month: [null],
emi: [null], emi: [null],
emi_paid: [null], // emi_paid: [null],
elapsed_tenure: [null], // elapsed_tenure: [null],
balance_tenure: [null], // balance_tenure: [null],
original_loan_tenure :[null], // original_loan_tenure :[null],
}); });
} }
@ -436,14 +436,14 @@ export class PdQuestionAssestsPage {
{ {
console.log(answerData); console.log(answerData);
Object.keys(answerData).forEach((key) => (answerData[key] == null) && delete answerData[key]); Object.keys(answerData).forEach((key) => (answerData[key] == null) && delete answerData[key]);
answerData.assets_details.map(val => { // answerData.assets_details.map(val => {
if (val.emi == 'no') { // if (val.emi == 'no') {
val.emi_paid = ''; // val.emi_paid = '';
val.elapsed_tenure = ''; // val.elapsed_tenure = '';
val.balance_tenure = ''; // val.balance_tenure = '';
val.original_loan_tenure =''; // val.original_loan_tenure ='';
} // }
}); // });
answerData.pdid = this.pdDetails.pd_id; answerData.pdid = this.pdDetails.pd_id;
answerData.formid = this.FormId.form_id; answerData.formid = this.FormId.form_id;
@ -484,10 +484,10 @@ export class PdQuestionAssestsPage {
vintage_personal:val.vintage_personal, vintage_personal:val.vintage_personal,
// purchase_month: val.purchase_month, // purchase_month: val.purchase_month,
emi: val.emi, emi: val.emi,
emi_paid: val.emi_paid, // emi_paid: val.emi_paid,
elapsed_tenure: val.elapsed_tenure, // elapsed_tenure: val.elapsed_tenure,
balance_tenure: val.balance_tenure, // balance_tenure: val.balance_tenure,
original_loan_tenure:val.original_loan_tenure, // original_loan_tenure:val.original_loan_tenure,
//assets_form_remark:val.assets_form_remark //assets_form_remark:val.assets_form_remark
}; };
const control = <FormArray>this.AssetsDetailsForm.controls['assets_details']; const control = <FormArray>this.AssetsDetailsForm.controls['assets_details'];
@ -546,10 +546,10 @@ export class PdQuestionAssestsPage {
purchase_year: [data.purchase_year,Validators.compose([Validators.minLength(4),Validators.maxLength(4)])], purchase_year: [data.purchase_year,Validators.compose([Validators.minLength(4),Validators.maxLength(4)])],
// purchase_month: [data.purchase_month], // purchase_month: [data.purchase_month],
emi: [data.emi || 0], emi: [data.emi || 0],
emi_paid: [data.emi_paid || ''], // emi_paid: [data.emi_paid || ''],
elapsed_tenure: [data.elapsed_tenure || ''], // elapsed_tenure: [data.elapsed_tenure || ''],
balance_tenure: [data.balance_tenure || ''], // balance_tenure: [data.balance_tenure || ''],
original_loan_tenure:[data.original_loan_tenure ||''], // original_loan_tenure:[data.original_loan_tenure ||''],
//assets_form_remark:[data.assets_form_remark || ''] //assets_form_remark:[data.assets_form_remark || '']
}); });
} }

2
src/pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets.html
View File

@ -55,7 +55,7 @@
<mat-form-field *ngIf=" _businessAssetsQuesFrom.controls['business_is_pd_visited'].value != ''" > <mat-form-field *ngIf=" _businessAssetsQuesFrom.controls['business_is_pd_visited'].value != ''" >
<input matInput autocomplete="off" placeholder="Remarks" formControlName="business_pd_visited_remark"> <input matInput autocomplete="off" placeholder="Remarks" formControlName="business_pd_visited_remark">
<mat-error *ngIf="!_businessAssetsQuesFrom.controls['business_pd_visited_remark'].value.valid">Remarks Required</mat-error> <!-- <mat-error *ngIf="!_businessAssetsQuesFrom.controls['business_pd_visited_remark'].value.valid">Remarks Required</mat-error> -->
</mat-form-field> </mat-form-field>
</div> </div>
</mat-card-content> </mat-card-content>

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

@ -23,6 +23,7 @@
<h2 style="font-size: 18px !important;">{{item.get('applicant_name').value | titlecase}}</h2> <h2 style="font-size: 18px !important;">{{item.get('applicant_name').value | titlecase}}</h2>
<p>Age : {{item.get('age').value}}&nbsp;&nbsp;<ion-icon name="school"> <p>Age : {{item.get('age').value}}&nbsp;&nbsp;<ion-icon name="school">
</ion-icon> {{item.get('qualification_name').value}}</p> </ion-icon> {{item.get('qualification_name').value}}</p>
<p *ngIf="item.get('course_name').value != ''"><ion-icon name="copy"></ion-icon>&nbsp; {{item.get('course_name').value | titlecase}}</p>
<!--<p><ion-icon name="school"></ion-icon> {{item.get('qualification').value}}</p>--> <!--<p><ion-icon name="school"></ion-icon> {{item.get('qualification').value}}</p>-->
</ion-item> </ion-item>
<ion-item-options side="right"> <ion-item-options side="right">
@ -81,7 +82,10 @@
<mat-select placeholder="Qualification" formControlName="qualification" > <mat-select placeholder="Qualification" formControlName="qualification" >
<mat-option [value]="qu.qualification_id" *ngFor="let qu of qualificationList">{{qu.qualification_name}}</mat-option> <mat-option [value]="qu.qualification_id" *ngFor="let qu of qualificationList">{{qu.qualification_name}}</mat-option>
</mat-select> </mat-select>
</mat-form-field>
<p style="color:red;font-size:12px;margin:0;padding:0;font-weight: normal;float:right" *ngIf="indi.controls['qualification'].errors?.required && indi.controls['qualification'].touched">Qualification is Required</p> <p style="color:red;font-size:12px;margin:0;padding:0;font-weight: normal;float:right" *ngIf="indi.controls['qualification'].errors?.required && indi.controls['qualification'].touched">Qualification is Required</p>
<mat-form-field style="width:100%" *ngIf="indi.get('qualification').value != ''">
<input matInput placeholder="Qualification Details" formControlName="course_name">
</mat-form-field> </mat-form-field>
<mat-checkbox class="table-checkbox-com" color="primary" formControlName="is_person_met">Is Person Met</mat-checkbox><br/> <br/> <mat-checkbox class="table-checkbox-com" color="primary" formControlName="is_person_met">Is Person Met</mat-checkbox><br/> <br/>
<mat-checkbox class="table-checkbox-com" color="primary" formControlName="is_applicant">Is Applicant</mat-checkbox> <mat-checkbox class="table-checkbox-com" color="primary" formControlName="is_applicant">Is Applicant</mat-checkbox>
@ -188,7 +192,7 @@
</mat-form-field> </mat-form-field>
<mat-checkbox class="table-checkbox-com" color="primary" formControlName="is_company_applicant">Is Applicant</mat-checkbox><br/> <mat-checkbox class="table-checkbox-com" color="primary" formControlName="is_company_applicant">Is Applicant</mat-checkbox><br/>
<p style="color:red;font-size:12px;margin:0;padding:0;font-weight: normal;float:right" *ngIf="cmp.controls['company_name'].errors?.required && cmp.controls['company_name'].touched">company name is Required</p> <p style="color:red;font-size:12px;margin:0;padding:0;font-weight: normal;float:right" *ngIf="cmp.controls['company_name'].errors?.required && cmp.controls['company_name'].touched">company name is Required</p>
<p style="color:red;font-size:12px;margin:0;padding:0;font-weight: normal;float:right" *ngIf="cmp.controls['company_name'].errors?.required && cmp.controls['company_name'].touched">company name is Required</p>
<br/> <br/>
<mat-form-field style="width:100%"> <mat-form-field style="width:100%">
<mat-select placeholder="Business Entity Type" formControlName="business_entity_type" > <mat-select placeholder="Business Entity Type" formControlName="business_entity_type" >
@ -197,7 +201,7 @@
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<p style="color:red;font-size:12px;margin:0;padding:0;font-weight: normal;float:right" *ngIf="cmp.controls['business_entity_type'].errors?.required && cmp.controls['business_entity_type'].touched"> Required</p> <p style="color:red;font-size:12px;margin:0;padding:0;font-weight: normal;float:right" *ngIf="cmp.controls['business_entity_type'].errors?.required && cmp.controls['business_entity_type'].touched">Business Entity Required</p>
<mat-form-field style="width:100%" *ngIf="cmp.value.business_entity_type==1"> <mat-form-field style="width:100%" *ngIf="cmp.value.business_entity_type==1">
<input matInput type="text" placeholder="Please Specity Others" formControlName="business_entity_type_other"> <input matInput type="text" placeholder="Please Specity Others" formControlName="business_entity_type_other">
</mat-form-field> </mat-form-field>

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

@ -154,6 +154,7 @@ export class PdQuestionGeneralInfoPage {
is_applicant:val.is_applicant, is_applicant:val.is_applicant,
age:[val.age], age:[val.age],
qualification:[val.qualification], qualification:[val.qualification],
course_name:[val.course_name],
individuals_order_id:[this.lengthv.individuals.length+1], individuals_order_id:[this.lengthv.individuals.length+1],
is_new:true, is_new:true,
@ -179,6 +180,7 @@ export class PdQuestionGeneralInfoPage {
is_applicant:val.is_applicant, is_applicant:val.is_applicant,
age:[val.age], age:[val.age],
qualification:[val.qualification], qualification:[val.qualification],
course_name:[val.course_name],
individuals_order_id:[val.individuals_order_id], individuals_order_id:[val.individuals_order_id],
is_new:[val.is_new], is_new:[val.is_new],
@ -304,6 +306,7 @@ export class PdQuestionGeneralInfoPage {
is_applicant:false, is_applicant:false,
age:['',Validators.required], age:['',Validators.required],
qualification:['',Validators.required], qualification:['',Validators.required],
course_name:[''],
applicant_title_name:[''] applicant_title_name:['']
}); });

31
src/pages/pd-question/pd-question-loans/pd-question-loans.html
View File

@ -53,13 +53,13 @@
<input type="number" matInput placeholder="What is the amount required for Balance Transfer ? " (blur)="loanCalc()"formControlName="balance_transfer_amount" (keyup)="inWords($event,2)"> <input type="number" matInput placeholder="What is the amount required for Balance Transfer ? " (blur)="loanCalc()"formControlName="balance_transfer_amount" (keyup)="inWords($event,2)">
<mat-hint align="end" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{balTxrfAmtInWords}} Only</mat-hint> <mat-hint align="end" *ngIf="loanDetailsForm.controls['loan_amount'].value != ''">{{"&#8377;"}} {{balTxrfAmtInWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 100%" *ngIf="loanDetailsForm.controls['is_transfer'].value == 'yes'"> <!-- <mat-form-field style="width: 100%" *ngIf="loanDetailsForm.controls['is_transfer'].value == 'yes'">
<mat-select placeholder="Is there a Top Up" <mat-select placeholder="Is there a Top Up"
formControlName="is_topup" required> formControlName="is_topup" required>
<mat-option value="yes">Yes</mat-option> <mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option> <mat-option value="no">No</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>-->
<mat-form-field style="width: 100%" *ngIf="loanDetailsForm.controls['is_transfer'].value == 'yes'"> <mat-form-field style="width: 100%" *ngIf="loanDetailsForm.controls['is_transfer'].value == 'yes'">
<mat-select placeholder="Lender from where balance transfer done" <mat-select placeholder="Lender from where balance transfer done"
formControlName="lender"> formControlName="lender">
@ -70,17 +70,26 @@
<mat-form-field style="width: 100%" *ngIf="loanDetailsForm.controls['lender'].value == 3"> <mat-form-field style="width: 100%" *ngIf="loanDetailsForm.controls['lender'].value == 3">
<input matInput placeholder="Specify Others Lender" formControlName="other_bt_lender"> <input matInput placeholder="Specify Others Lender" formControlName="other_bt_lender">
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 100%" *ngIf="loanDetailsForm.controls['is_transfer'].value == 'yes' && loanDetailsForm.controls['is_topup'].value == 'yes'"> <mat-form-field style="width: 100%">
<input matInput placeholder="Top Up Amt" type="text" formControlName="topup_amount" (keyup)="inWords($event,5)"> <input matInput placeholder="Top Up Amt" type="text" formControlName="topup_amount" (keyup)="inWords($event,5)">
<mat-hint align="end" *ngIf="loanDetailsForm.controls['topup_amount'].value != ''">{{"&#8377;"}} {{topUpAmtInWords}} Only</mat-hint> <mat-hint align="end" *ngIf="loanDetailsForm.controls['topup_amount'].value != ''">{{"&#8377;"}} {{topUpAmtInWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="loanDetailsForm.controls['topup_amount'].value > 0 " >
<mat-select placeholder="What is the End Use of the Top Up?"
formControlName="end_use_topup" >
<mat-option *ngFor="let list of m_endUseOFTopUpList" [value]="list.end_use_of_topup_id">{{ list.end_use_of_topup }}</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field *ngIf="loanDetailsForm.controls['end_use_topup'].value == 1">
<input matInput placeholder="Specify End Use of Top Up" formControlName="other_end_use_topup" autocomplete="off">
</mat-form-field>
<mat-form-field style="width: 100%" *ngIf="loanDetailsForm.controls['is_transfer'].value == 'no'"> <mat-form-field style="width: 100%" *ngIf="loanDetailsForm.controls['is_transfer'].value == 'no'">
<input matInput placeholder="Amount of Own Contribution" formControlName="own_contribution" type="number" required (keyup)="inWords($event,4)"> <input matInput placeholder="Amount of Own Contribution" formControlName="own_contribution" type="number" required (keyup)="inWords($event,4)">
<mat-hint align="end" *ngIf="loanDetailsForm.controls['own_contribution'].value != ''">{{"&#8377;"}} {{ownContributionInWords}} Only</mat-hint> <mat-hint align="end" *ngIf="loanDetailsForm.controls['own_contribution'].value != ''">{{"&#8377;"}} {{ownContributionInWords}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 100%" *ngIf="loanDetailsForm.controls['is_transfer'].value == 'no'"> <mat-form-field style="width: 100%" *ngIf="loanDetailsForm.controls['is_transfer'].value == 'no'">
<mat-select placeholder="Source" formControlName="source" (selectionChange)="sourceChange($event.value)" multiple > <mat-select placeholder="Source of Own Contribution" formControlName="source" (selectionChange)="sourceChange($event.value)" multiple >
<mat-option *ngFor="let sour of m_sourceofamount" [value]="sour.id">{{ sour.name }}</mat-option> <mat-option *ngFor="let sour of m_sourceofamount" [value]="sour.id">{{ sour.name }}</mat-option>
</mat-select> </mat-select>
@ -91,9 +100,9 @@
<mat-option value="other">Loan from another lender</mat-option> <mat-option value="other">Loan from another lender</mat-option>
</mat-select>--> </mat-select>-->
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="isPLSource" style="width: 100%"> <!-- <mat-form-field *ngIf="isPLSource" style="width: 100%"> -->
<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: 100%"> <mat-form-field *ngIf="isOtherSource" style="width: 100%">
<input matInput placeholder="Specify Other Sources" formControlName="other_source" autocomplete="off"> <input matInput placeholder="Specify Other Sources" formControlName="other_source" autocomplete="off">
@ -104,10 +113,10 @@
</mat-form-field> </mat-form-field>
</mat-card> </mat-card>
<div *ngIf="mortagetypeAccess"> <div *ngIf="mortageCardAccess">
<mat-card > <mat-card >
<mat-card-header> <mat-card-header>
<p>Mortgage <p>Details of Property being Mortgaged
<p> <p>
</mat-card-header> </mat-card-header>
<mat-card-content class="matcard"> <mat-card-content class="matcard">
@ -136,10 +145,10 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 100%" *ngIf="loanDetailsForm.controls['construction_status'].value == 4"> <!-- <mat-form-field style="width: 100%" *ngIf="loanDetailsForm.controls['construction_status'].value == 4">
<input matInput placeholder="What is the approximate stage of construction (%)?" <input matInput placeholder="What is the approximate stage of construction (%)?"
formControlName="percentage_of_construction" type="number" required> formControlName="percentage_of_construction" type="number" required>
</mat-form-field> </mat-form-field>-->
<!--<mat-select placeholder="Status of construction" <!--<mat-select placeholder="Status of construction"
formControlName="construction_status"> formControlName="construction_status">

107
src/pages/pd-question/pd-question-loans/pd-question-loans.ts
View File

@ -23,6 +23,7 @@ export class PdQuestionLoansPage {
propertyType: any; propertyType: any;
mortagetypeAccess: boolean; mortagetypeAccess: boolean;
mortageAccess: boolean = false; mortageAccess: boolean = false;
mortageCardAccess: boolean;
topUpAmtInWords: any; topUpAmtInWords: any;
ownContributionInWords: any; ownContributionInWords: any;
valAsPerAgmtInWords: any; valAsPerAgmtInWords: any;
@ -48,7 +49,8 @@ export class PdQuestionLoansPage {
users: any; users: any;
mergeCompanyApplicant:any=[]; mergeCompanyApplicant:any=[];
existCompanyList:any; existCompanyList:any;
m_endUseOFTopUpList:any=[]
isContribution: boolean = false;
isOtherSource: boolean = false; isOtherSource: boolean = false;
@ -64,6 +66,7 @@ export class PdQuestionLoansPage {
this.pdDetails = this.navParams.get('pdDetails'); this.pdDetails = this.navParams.get('pdDetails');
console.log(this.pdDetails); console.log(this.pdDetails);
this.applicants = this.pdDetails.applicat_details this.applicants = this.pdDetails.applicat_details
this.productAbbr = this.pdDetails.product_abbr;
this.users = this.aws.getlocale(); this.users = this.aws.getlocale();
this.pdid=this.pdDetails.pd_id; this.pdid=this.pdDetails.pd_id;
this.getDropdown(); this.getDropdown();
@ -73,14 +76,16 @@ export class PdQuestionLoansPage {
end_use_other: [''], end_use_other: [''],
is_transfer: ['', Validators.compose([Validators.required])], is_transfer: ['', Validators.compose([Validators.required])],
//is_topup: ['', Validators.compose([Validators.required])], //is_topup: ['', Validators.compose([Validators.required])],
is_topup: [''], // is_topup: [''],
balance_transfer_amount: [''], balance_transfer_amount: [''],
topup_amount: [''], topup_amount: [''],
end_use_topup:[''],
other_end_use_topup:[''],
lender: [''], lender: [''],
other_bt_lender : [''], other_bt_lender : [''],
own_contribution: ['', Validators.compose([Validators.required])], own_contribution: ['', Validators.compose([Validators.required])],
source: [''], source: [''],
personal_loan_source:[''], //personal_loan_source:[''],
other_source:[''], other_source:[''],
//lender_name_type: [''], //lender_name_type: [''],
emi_level: ['', Validators.compose([Validators.required])], emi_level: ['', Validators.compose([Validators.required])],
@ -88,7 +93,7 @@ export class PdQuestionLoansPage {
property_type_others:[''], property_type_others:[''],
owner_name: ['', Validators.compose([Validators.required])], owner_name: ['', Validators.compose([Validators.required])],
construction_status: ['', Validators.compose([Validators.required])], construction_status: ['', Validators.compose([Validators.required])],
percentage_of_construction : [''], //percentage_of_construction : [''],
emv_per_customer: ['', Validators.compose([Validators.required])], emv_per_customer: ['', Validators.compose([Validators.required])],
//value_per_agreement: ['', Validators.compose([Validators.required])], //value_per_agreement: ['', Validators.compose([Validators.required])],
loandetails_remarks: ['', Validators.compose([Validators.required])], loandetails_remarks: ['', Validators.compose([Validators.required])],
@ -105,6 +110,9 @@ export class PdQuestionLoansPage {
console.log(this.mortagetypeAccess); console.log(this.mortagetypeAccess);
if(this.productAbbr == 'PL' || this.productAbbr == 'BL' || this.productAbbr == 'LAP'){
this.isContribution = true;
}
} }
@ -195,7 +203,13 @@ export class PdQuestionLoansPage {
}); });
this.mergeCompanyApplicant.push({groupName:'APPLICANTS',groupValues:modifyApplicantList}) this.mergeCompanyApplicant.push({groupName:'APPLICANTS',groupValues:modifyApplicantList})
// this.listOfLanguagues.splice(this.listOfLanguagues.indexOf(languague), 1); // this.listOfLanguagues.splice(this.listOfLanguagues.indexOf(languague), 1);
if(this.productAbbr != 'LAP'){
this.mergeCompanyApplicant.push({groupName:'OTHERS',groupValues:[{id:0,name:'Not Yet Finalised',group_id:2}]})
} }
}
this.qustCat.getcommondrop('ENDUSEOFTOPUP').subscribe(data=>{
this.m_endUseOFTopUpList=data['records'].filter(val=>val.is_active == 1)
})
console.log("complete") console.log("complete")
@ -343,7 +357,7 @@ export class PdQuestionLoansPage {
records.end_use_other = this.loanDetailsForm.controls['end_use_other'].value; records.end_use_other = this.loanDetailsForm.controls['end_use_other'].value;
} }
records.is_transfer = this.loanDetailsForm.controls['is_transfer'].value; records.is_transfer = this.loanDetailsForm.controls['is_transfer'].value;
records.is_topup = this.loanDetailsForm.controls['is_topup'].value; // records.is_topup = this.loanDetailsForm.controls['is_topup'].value;
if (this.loanDetailsForm.controls['is_transfer'].value == 'yes') { if (this.loanDetailsForm.controls['is_transfer'].value == 'yes') {
records.balance_transfer_amount = this.loanDetailsForm.controls['balance_transfer_amount'].value; records.balance_transfer_amount = this.loanDetailsForm.controls['balance_transfer_amount'].value;
} }
@ -353,6 +367,7 @@ export class PdQuestionLoansPage {
let dataSource_list=[]; let dataSource_list=[];
if(this.loanDetailsForm.controls['source'].value != '') if(this.loanDetailsForm.controls['source'].value != '')
{ {
this.loanDetailsForm.controls['source'].value.forEach(element => { this.loanDetailsForm.controls['source'].value.forEach(element => {
dataSource_list.push({sources : element}) dataSource_list.push({sources : element})
}); });
@ -360,13 +375,20 @@ export class PdQuestionLoansPage {
records.source_group=dataSource_list; records.source_group=dataSource_list;
} }
if (this.loanDetailsForm.controls['is_topup'].value == 'yes') { //if (this.loanDetailsForm.controls['is_topup'].value == 'yes') {
records.topup_amount = this.loanDetailsForm.controls['topup_amount'].value; records.topup_amount = this.loanDetailsForm.controls['topup_amount'].value;
//}
if(records.topup_amount > 0){
records.end_use_topup = this.loanDetailsForm.controls['end_use_topup'].value;
if(records.end_use_topup == 1){
records.other_end_use_topup = this.loanDetailsForm.controls['other_end_use_topup'].value;
} }
if (this.loanDetailsForm.controls['is_topup'].value == 'yes' || this.loanDetailsForm.controls['is_transfer'].value == 'yes') { }
if (this.loanDetailsForm.controls['is_transfer'].value == 'yes') {
records.lender = this.loanDetailsForm.controls['lender'].value; records.lender = this.loanDetailsForm.controls['lender'].value;
} }
if(this.loanDetailsForm.controls['lender'].value == 3){ if(this.loanDetailsForm.controls['lender'].value == 1){
records.other_bt_lender = this.loanDetailsForm.controls['other_bt_lender'].value; records.other_bt_lender = this.loanDetailsForm.controls['other_bt_lender'].value;
} }
@ -380,23 +402,37 @@ export class PdQuestionLoansPage {
if(this.isOtherSource){ if(this.isOtherSource){
records.other_source=this.loanDetailsForm.controls['other_source'].value; records.other_source=this.loanDetailsForm.controls['other_source'].value;
} }
if(this.isPLSource){ else{
records.personal_loan_source=this.loanDetailsForm.controls['personal_loan_source'].value; records.other_source = '';
} }
records.emi_level = this.loanDetailsForm.controls['emi_level'].value; records.emi_level = this.loanDetailsForm.controls['emi_level'].value;
if(this.mortageCardAccess == true){
records.property_type = this.loanDetailsForm.controls['property_type'].value; records.property_type = this.loanDetailsForm.controls['property_type'].value;
if(this.loanDetailsForm.value.property_type_others !='' && this.loanDetailsForm.value.property_type_others !=null){ if(this.loanDetailsForm.value.property_type_others !='' && this.loanDetailsForm.value.property_type_others !=null){
records.property_type_others = this.loanDetailsForm.controls['property_type_others'].value; records.property_type_others = this.loanDetailsForm.controls['property_type_others'].value;
}; };
// records.owner_name_group = this.ownerNames; // records.owner_name_group = this.ownerNames;
// console.log(this.loanDetailsForm.controls['owner_name'].value); // console.log(this.loanDetailsForm.controls['owner_name'].value);
if(this.loanDetailsForm.controls['owner_name'].value != ''){
let dataOwner_name = []; let dataOwner_name = [];
this.loanDetailsForm.controls['owner_name'].value.forEach(element => { this.loanDetailsForm.controls['owner_name'].value.forEach(element => {
dataOwner_name.push({owner_name: element}) dataOwner_name.push({owner_name: element})
}); });
records.owner_name_group = dataOwner_name; records.owner_name_group = dataOwner_name;
}
records.owner_name_group='';
records.construction_status = this.loanDetailsForm.controls['construction_status'].value; records.construction_status = this.loanDetailsForm.controls['construction_status'].value;
records.percentage_of_construction = this.loanDetailsForm.controls['percentage_of_construction'].value; // records.percentage_of_construction = this.loanDetailsForm.controls['percentage_of_construction'].value;
}else{
records.property_type = null;
records.property_type_others = null;
records.owner_name_group = null;
records.construction_status = null;
records.emv_per_customer = null;
}
records.emv_per_customer = this.loanDetailsForm.controls['emv_per_customer'].value; records.emv_per_customer = this.loanDetailsForm.controls['emv_per_customer'].value;
//records.value_per_agreement = this.loanDetailsForm.controls['value_per_agreement'].value; //records.value_per_agreement = this.loanDetailsForm.controls['value_per_agreement'].value;
records.loandetails_remarks = this.loanDetailsForm.controls['loandetails_remarks'].value; records.loandetails_remarks = this.loanDetailsForm.controls['loandetails_remarks'].value;
@ -424,20 +460,23 @@ export class PdQuestionLoansPage {
let result = Object.keys(loanDetails.end_use_group).map(function (key) { let result = Object.keys(loanDetails.end_use_group).map(function (key) {
return loanDetails.end_use_group[key]; return loanDetails.end_use_group[key];
}); });
//this.enduse
result.forEach(val => {
this.enduse.push(val.end_use);
//this.endUserList.push({'end_use':val.end_use});
});
let ownername: any = [];
if(loanDetails.owner_name_group != null){
let owner = Object.keys(loanDetails.owner_name_group).map(function (key) { let owner = Object.keys(loanDetails.owner_name_group).map(function (key) {
return loanDetails.owner_name_group[key]; return loanDetails.owner_name_group[key];
}); });
this.enduse
result.forEach(val => {
this.enduse.push(val.end_use);
this.endUserList.push({'end_use':val.end_use});
});
let ownername: any = [];
owner.forEach(val => { owner.forEach(val => {
ownername.push(val.owner_name); ownername.push(val.owner_name);
this.ownerNames.push({'end_use':val.end_use}); this.ownerNames.push({'end_use':val.end_use});
}); });
}
// console.log('enduse', enduse); // console.log('enduse', enduse);
console.log('ownername', loanDetails); console.log('ownername', loanDetails);
this.loanDetailsForm.controls['loan_amount'].setValue(loanDetails.loan_amount); this.loanDetailsForm.controls['loan_amount'].setValue(loanDetails.loan_amount);
@ -459,8 +498,14 @@ export class PdQuestionLoansPage {
if (loanDetails.topup_amount) { if (loanDetails.topup_amount) {
this.loanDetailsForm.controls['topup_amount'].setValue(loanDetails.topup_amount); this.loanDetailsForm.controls['topup_amount'].setValue(loanDetails.topup_amount);
this.topUpAmtInWords = this.constant.convertNumberToWords(loanDetails.topup_amount); this.topUpAmtInWords = this.constant.convertNumberToWords(loanDetails.topup_amount);
if(loanDetails.topup_amount > 0){
this.loanDetailsForm.controls['end_use_topup'].setValue(loanDetails.end_use_topup);
if (loanDetails.end_use_topup == 1) {
this.loanDetailsForm.controls['other_end_use_topup'].setValue(loanDetails.other_end_use_topup);
} }
this.loanDetailsForm.controls['is_topup'].setValue(loanDetails.is_topup); }
}
// this.loanDetailsForm.controls['is_topup'].setValue(loanDetails.is_topup);
if (loanDetails.balance_transfer_amount) { if (loanDetails.balance_transfer_amount) {
this.loanDetailsForm.controls['balance_transfer_amount'].setValue(loanDetails.balance_transfer_amount); this.loanDetailsForm.controls['balance_transfer_amount'].setValue(loanDetails.balance_transfer_amount);
} }
@ -492,10 +537,7 @@ export class PdQuestionLoansPage {
this.loanDetailsForm.controls['other_source'].setValue(loanDetails.other_source); this.loanDetailsForm.controls['other_source'].setValue(loanDetails.other_source);
} }
if(loanDetails.personal_loan_source) {
// this.isPLSource = true;
this.loanDetailsForm.controls['personal_loan_source'].setValue(loanDetails.personal_loan_source);
}
} }
/* if (loanDetails.lender_name_type) { /* if (loanDetails.lender_name_type) {
@ -509,8 +551,10 @@ export class PdQuestionLoansPage {
this.loanDetailsForm.controls['other_bt_lender'].setValue(loanDetails.other_bt_lender); this.loanDetailsForm.controls['other_bt_lender'].setValue(loanDetails.other_bt_lender);
this.loanDetailsForm.controls['property_type'].setValue(loanDetails.property_type); this.loanDetailsForm.controls['property_type'].setValue(loanDetails.property_type);
this.propertyType =loanDetails.property_type; this.propertyType =loanDetails.property_type;
if(loanDetails.property_type_others!=''){ if(loanDetails.property_type_others!=null){
this.mortageAccess=true; this.mortage_type(this.propertyType);
console.log("mortageCardAccess",this.mortageCardAccess);
if(this.mortageCardAccess == true){
this.loanDetailsForm.controls['property_type_others'].setValue(loanDetails.property_type_others); this.loanDetailsForm.controls['property_type_others'].setValue(loanDetails.property_type_others);
// this.mortage_type(loanDetails.property_type_others); // this.mortage_type(loanDetails.property_type_others);
@ -522,12 +566,25 @@ export class PdQuestionLoansPage {
{ {
this.emvAmtInWords=this.constant.convertNumberToWords(loanDetails.emv_per_customer); this.emvAmtInWords=this.constant.convertNumberToWords(loanDetails.emv_per_customer);
} }
}
// this.loanDetailsForm.controls['value_per_agreement'].setValue(loanDetails.value_per_agreement); // this.loanDetailsForm.controls['value_per_agreement'].setValue(loanDetails.value_per_agreement);
this.loanDetailsForm.controls['loandetails_remarks'].setValue(loanDetails.loandetails_remarks); this.loanDetailsForm.controls['loandetails_remarks'].setValue(loanDetails.loandetails_remarks);
} else { } else {
} }
}) })
if(this.productAbbr == 'BL' || this.productAbbr == 'PL' || this.productAbbr == 'LL'){
this.mortageCardAccess = false;
this.loanDetailsForm.controls['owner_name'].setValue('');
this.loanDetailsForm.controls['owner_name'].clearValidators();
this.loanDetailsForm.controls['owner_name'].updateValueAndValidity();
}else{
this.mortageCardAccess = true;
this.loanDetailsForm.controls['owner_name'].setValidators([Validators.required]);
this.loanDetailsForm.controls['owner_name'].updateValueAndValidity();
}
} }
} }

8
src/pages/pd-question/pd-question-neighbour-hood/pd-question-neighbour-hood.ts
View File

@ -116,12 +116,7 @@ export class PdQuestionNeighbourHoodPage {
toggleVisibility(e,index,flag){ toggleVisibility(e,index,flag){
console.log(e,index); console.log(e,index);
let val let val
if(e.checked == true){
val=1
}
else{
val=0
}
if(flag == 1){ if(flag == 1){
// console.log("val",val); // console.log("val",val);
this.isDisplay[index] = e; this.isDisplay[index] = e;
@ -303,6 +298,7 @@ checkOthers(values){
console.log("data") console.log("data")
neighbourhood_list.forEach((element,index)=> neighbourhood_list.forEach((element,index)=>
{ {
console.log("did_not Know",element.did_not_know_the_business_operation)
this.toggleVisibility(element.did_not_know_the_business_operation,index,1); this.toggleVisibility(element.did_not_know_the_business_operation,index,1);
this.toggleVisibility(element.did_not_know_the_owner,index,2); this.toggleVisibility(element.did_not_know_the_owner,index,2);
neicontrol.push(this.createNeighbourhood()); neicontrol.push(this.createNeighbourhood());

2
src/pages/pd-question/pd-question-other-income/pd-question-other-income.html
View File

@ -49,7 +49,7 @@
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<mat-select placeholder="Income Earned By" formControlName="income_earned_by"> <mat-select placeholder="Income Earned By" formControlName="income_earned_by">
<mat-option *ngFor="let person of incomeEarnedBy" [value]="person">{{person}}</mat-option> <mat-option *ngFor="let person of incomeEarnedBy" value="{{person.applicant_id}}">{{person.applicant_name | titlecase}}</mat-option>
<mat-option value="others">Others</mat-option> <mat-option value="others">Others</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>

28
src/pages/pd-question/pd-question-other-income/pd-question-other-income.ts
View File

@ -27,7 +27,7 @@ export class PdQuestionOtherIncomePage {
users: any; users: any;
pdDetails: any; pdDetails: any;
pdid:any; pdid:any;
incomeEarnedBy:any; incomeEarnedBy:any=[];
amtInWords:any=[]; amtInWords:any=[];
frequencyData: any; frequencyData: any;
@ -39,7 +39,7 @@ export class PdQuestionOtherIncomePage {
this.pdid=this.pdDetails.pd_id; this.pdid=this.pdDetails.pd_id;
console.log("pdid",this.pdid); console.log("pdid",this.pdid);
this.FormId = this.navParams.get('FormId'); this.FormId = this.navParams.get('FormId');
this.getFrequency();
this.users = this.aws.getlocale(); this.users = this.aws.getlocale();
this.otherIncomeForm = this.fb.group({ this.otherIncomeForm = this.fb.group({
@ -47,8 +47,8 @@ export class PdQuestionOtherIncomePage {
otherincome_remarks:[null], otherincome_remarks:[null],
income_details: this.fb.array([]) income_details: this.fb.array([])
}); });
this.getFrequency();
this.getOtherIncome();
//this.incomeDetails=this.otherIncomeForm.get('income_details')as FormArray //this.incomeDetails=this.otherIncomeForm.get('income_details')as FormArray
//this.incomeDetails.push(this.createDetail()) //this.incomeDetails.push(this.createDetail())
@ -56,6 +56,7 @@ export class PdQuestionOtherIncomePage {
ionViewDidLoad() { ionViewDidLoad() {
console.log('ionViewDidLoad PdQuestionOtherIncomePage'); console.log('ionViewDidLoad PdQuestionOtherIncomePage');
this.getOtherIncome();
} }
createDetail():FormGroup { createDetail():FormGroup {
@ -90,6 +91,15 @@ checkotherDetails(val)
} }
} }
getFrequency() { getFrequency() {
this.qustCat.getAllPersonsName(this.pdid).subscribe(res=>{
// console.log("income earn",res)
if(res['dataStatus']==true)
{
console.log("income Earned by",res);
this.incomeEarnedBy=res['record'];
//console.log("res",res['record'])
}
})
let master_name = 'FREQUENCY'; let master_name = 'FREQUENCY';
this.qustCat.getcommondrop(master_name).subscribe(data => { this.qustCat.getcommondrop(master_name).subscribe(data => {
//console.log('data', data); //console.log('data', data);
@ -105,15 +115,7 @@ getFrequency() {
this.sourceIncome = res['records']; this.sourceIncome = res['records'];
} }
}); });
this.qustCat.getAllPersonsName(this.pdid).subscribe(res=>{
console.log("income earn",res)
if(res['dataStatus']==true)
{
// console.log("income Earned by",res);
this.incomeEarnedBy=res['record'];
console.log("res",res['record'])
}
})
} }
inWords(val,i){ inWords(val,i){

132
www/build/main.js
View File

File diff suppressed because one or more lines are too long

2
www/build/main.js.map
View File

File diff suppressed because one or more lines are too long

2
www/build/vendor.js.map
View File

File diff suppressed because one or more lines are too long