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

Merge branch 'master' of https://bitbucket.org/sriramv18/pd_officer

Browse Source
This commit is contained in:
saravanakumarkandasami 2019-04-08 10:46:41 +05:30
commit b675b574d7
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pages/pd-question/pd-question-business-group/pd-question-client-info/pd-question-client-info.html
View File

@ -87,6 +87,7 @@
Cash.</mat-option> Cash.</mat-option>
<mat-option value="Payment received through Banking channels.">Payment <mat-option value="Payment received through Banking channels.">Payment
received through Banking channels.</mat-option> received through Banking channels.</mat-option>
<mat-option value="Payment received in Cash and also through Banking channels.">Payment received in Cash and also through Banking channels.</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<span *ngIf="items.get('manufacturing_payment_type').value == 3"> <span *ngIf="items.get('manufacturing_payment_type').value == 3">
@ -203,6 +204,7 @@
Cash.</mat-option> Cash.</mat-option>
<mat-option value="Payment received through Banking channels.">Payment <mat-option value="Payment received through Banking channels.">Payment
received through Banking channels.</mat-option> received through Banking channels.</mat-option>
<mat-option value="Payment received in Cash and also through Banking channels.">Payment received in Cash and also through Banking channels.</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
@ -323,6 +325,7 @@
Cash.</mat-option> Cash.</mat-option>
<mat-option value="Payment received through Banking channels.">Payment <mat-option value="Payment received through Banking channels.">Payment
received through Banking channels.</mat-option> received through Banking channels.</mat-option>
<mat-option value="Payment received in Cash and also through Banking channels.">Payment received in Cash and also through Banking channels.</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<!-- <mat-form-field style="width: 45%" *ngIf="items.get('service_provider_product_payment_type').value == 3"> <!-- <mat-form-field style="width: 45%" *ngIf="items.get('service_provider_product_payment_type').value == 3">

4
src/pages/pd-question/pd-question-current-loans/pd-question-current-loans.html
View File

@ -39,7 +39,7 @@
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput type="number" placeholder="Loan Amount" formControlName="loan_amount" (keyup)="inWords($event,i,1)"> <input matInput type="number" placeholder="Loan Amount" formControlName="loan_amount" (keyup)="inWords($event,i,1)">
<mat-hint align="end" *ngIf="details.get('loan_amount').value != '' ">{{"&#8377;"}}{{amtInwords[i]}}only</mat-hint> <mat-hint align="end" *ngIf="details.get('loan_amount').value != '' ">{{"&#8377;"}} {{amtInwords[i]}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
@ -82,7 +82,7 @@
</mat-form-field> </mat-form-field>
<mat-form-field style="width: 100%" *ngIf="details.get('frequency').value != '' "> <mat-form-field style="width: 100%" *ngIf="details.get('frequency').value != '' ">
<input matInput type="number" [placeholder] ="placeholderName[i] != '' ? placeholderName[i] :'Instalment Amount' " formControlName="emi" (keypress)="keyPress($event)" (keyup)="inWords($event,i,2)" required> <input matInput type="number" [placeholder] ="placeholderName[i] != '' ? placeholderName[i] :'Instalment Amount' " formControlName="emi" (keypress)="keyPress($event)" (keyup)="inWords($event,i,2)" required>
<mat-hint align="end" *ngIf="details.get('emi').value != '' " >{{"&#8377;"}}{{emiAmtInwords[i]}}only</mat-hint> <mat-hint align="end" *ngIf="details.get('emi').value != '' " >{{"&#8377;"}} {{emiAmtInwords[i]}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<!-- <mat-form-field style="width: 100%"> <!-- <mat-form-field style="width: 100%">
<input matInput placeholder="EMI" formControlName="emi"> <input matInput placeholder="EMI" formControlName="emi">

3
src/pages/pd-question/pd-question-family/pd-question-family.ts
View File

@ -695,7 +695,9 @@ resValue:any;
getFamilyData() getFamilyData()
{ {
this.qustCat.getFamilyDetails(this.pdDetails.pd_id).subscribe(res=>{ this.qustCat.getFamilyDetails(this.pdDetails.pd_id).subscribe(res=>{
// console.log(res);
if(res['dataStatus']==true){ if(res['dataStatus']==true){
// console.log('res.record.from_general_form',res.record.from_general_form,res['record']);
let Temparr : any = []; let Temparr : any = [];
if(res.record.from_general_form.length>0){ if(res.record.from_general_form.length>0){
@ -712,6 +714,7 @@ resValue:any;
}); });
Temparr.push(datas); Temparr.push(datas);
// console.log('Temparr',Temparr);
} }
else{ else{
console.log("No data in General Form") console.log("No data in General Form")