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

Fairoj: Financial form completed

Browse Source
This commit is contained in:
saravanakumarkandasami 2019-02-21 19:13:34 +05:30
parent 69a871145f
commit da300816cc
46 changed files with 3787 additions and 1724 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/app/app.module.ts
View File

@ -79,7 +79,7 @@ import { PdQuestionEmpInfoPage } from '../pages/pd-question/pd-question-emp-info
import { PdQuestionFamilyPage } from '../pages/pd-question/pd-question-family/pd-question-family'; import { PdQuestionFamilyPage } from '../pages/pd-question/pd-question-family/pd-question-family';
import { PdQuestionLoansPage } from '../pages/pd-question/pd-question-loans/pd-question-loans'; import { PdQuestionLoansPage } from '../pages/pd-question/pd-question-loans/pd-question-loans';
import { PdQuestionFinancialInfoPage } from '../pages/pd-question/pd-question-financial-info/pd-question-financial-info'; import { PdQuestionFinancialInfoPage } from '../pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info';
import { PdQuestionOtherIncomePage } from '../pages/pd-question/pd-question-other-income/pd-question-other-income'; import { PdQuestionOtherIncomePage } from '../pages/pd-question/pd-question-other-income/pd-question-other-income';
import { PdQuestionSupplierInfoPage } from '../pages/pd-question/pd-question-supplier-info/pd-question-supplier-info'; import { PdQuestionSupplierInfoPage } from '../pages/pd-question/pd-question-supplier-info/pd-question-supplier-info';
import { Geolocation } from '@ionic-native/geolocation'; import { Geolocation } from '@ionic-native/geolocation';

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

@ -21,7 +21,7 @@ import { PdQuestionOtherIncomePage } from '../pd-question/pd-question-other-inco
import { PdQuestionSupplierInfoPage } from '../pd-question/pd-question-supplier-info/pd-question-supplier-info'; import { PdQuestionSupplierInfoPage } from '../pd-question/pd-question-supplier-info/pd-question-supplier-info';
import { PdQuestionPersonalInfoPage } from '../pd-question/pd-question-personal-info/pd-question-personal-info'; import { PdQuestionPersonalInfoPage } from '../pd-question/pd-question-personal-info/pd-question-personal-info';
import { PdQuestionStockInfoPage } from '../pd-question/pd-question-stock-info/pd-question-stock-info'; import { PdQuestionStockInfoPage } from '../pd-question/pd-question-stock-info/pd-question-stock-info';
import { PdQuestionFinancialInfoPage } from '../pd-question/pd-question-financial-info/pd-question-financial-info'; import { PdQuestionFinancialInfoPage } from '../pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info';
import { PdQuestionClientInfoPage } from '../pd-question/pd-question-client-info/pd-question-client-info'; import { PdQuestionClientInfoPage } from '../pd-question/pd-question-client-info/pd-question-client-info';
import { PdQuestionRentalInfoPage } from '../pd-question/pd-question-rental-info/pd-question-rental-info'; import { PdQuestionRentalInfoPage } from '../pd-question/pd-question-rental-info/pd-question-rental-info';
import { PdQuestionAssessedInfoPage } from '../pd-question/pd-question-assessed-info/pd-question-assessed-info'; import { PdQuestionAssessedInfoPage } from '../pd-question/pd-question-assessed-info/pd-question-assessed-info';

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

@ -116,8 +116,8 @@
</div> </div>
<mat-card> <mat-card>
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput placeholder="Remarks" <textarea matInput placeholder="Remarks"
formControlName="banking_form_remark"> formControlName="banking_form_remark"></textarea>
</mat-form-field> </mat-form-field>
</mat-card> </mat-card>
<ion-row> <ion-row>

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

@ -65,7 +65,7 @@
<div *ngFor="let sup of _businessAssetsQuesFrom.controls.business_assets_details['controls']; let i=index; let last=last;"> <div *ngFor="let sup of _businessAssetsQuesFrom.controls.business_assets_details['controls']; let i=index; let last=last;">
<div [formGroupName]="i"> <div [formGroupName]="i">
<mat-card-header> <mat-card-header>
<mat-card-title>Business Premises And Other Assets {{i+1}}</mat-card-title> <mat-card-title><h6>Business Premises And Other Assets {{i+1}}</h6></mat-card-title>
</mat-card-header> </mat-card-header>
<mat-card-content> <mat-card-content>
<mat-form-field> <mat-form-field>
@ -191,18 +191,22 @@
<mat-radio-button value="yes">Yes</mat-radio-button> <mat-radio-button value="yes">Yes</mat-radio-button>
<mat-radio-button value="no">No</mat-radio-button> <mat-radio-button value="no">No</mat-radio-button>
</mat-radio-group> </mat-radio-group>
</div><br/><br/> </div>
</div> </div>
<ion-buttons end>
<button ion-button float-right clear color="optblue" (click)="removeAssetsDetails(i)" *ngIf="i>0"><ion-icon style="font-size: 22px" name="md-trash"></ion-icon></button> <ion-col col-3 offset-3>
<button ion-button clear color="optblue" (click)="removeAssetsDetails(i)" *ngIf="i>0"><ion-icon style="font-size: 22px" name="md-trash"></ion-icon></button>
</ion-col>
<ion-col col-2 offset-1>
<button ion-button clear color="optblue" (click)="addAssetDetails($event)" *ngIf="last"><ion-icon style="font-size: 24px" name="add-circle"></ion-icon></button><br/>
</ion-col>
</ion-buttons><br/>
</div> </div>
<button ion-button float-right clear color="optblue" (click)="addAssetDetails($event)"><ion-icon style="font-size: 24px" name="add-circle"></ion-icon></button><br/>
</div> </div>
</mat-card> </mat-card>
<mat-card> <mat-card>
<mat-form-field appearance="outline"> <mat-form-field appearance="outline">

3
src/pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets.scss
View File

@ -10,5 +10,8 @@ page-pd-question-business-assets {
.mat-card-content{ .mat-card-content{
margin-bottom: 0px !important; margin-bottom: 0px !important;
} }
.scroll-content{
background-color: #eee;
}
} }

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

@ -144,7 +144,7 @@ export class PdQuestionBusinessAssetsPage {
this.qustcat.retiverForm(params).subscribe(res=>{ this.qustcat.retiverForm(params).subscribe(res=>{
if(res['dataStatus']==true){ if(res['dataStatus']==true){
// console.log("records",res['records']) console.log("records",res['records'])
//this.data_all=res['records'] //this.data_all=res['records']
/* var assestArray=Object.keys(res['records'].business_assets_details).map(function(key){ /* var assestArray=Object.keys(res['records'].business_assets_details).map(function(key){
return res['records'].business_assets_details[key] return res['records'].business_assets_details[key]

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

@ -15,7 +15,7 @@
<ion-content padding> <ion-content padding>
<form [formGroup]="bankingForm"> <form [formGroup]="bankingForm">
<div formArrayName="itemRows"> <div formArrayName="itemRows" class="accordion">
<mat-accordion *ngFor="let itemrow of bankingForm.controls.itemRows['controls']; let i=index;let last=last" <mat-accordion *ngFor="let itemrow of bankingForm.controls.itemRows['controls']; let i=index;let last=last"
[formGroupName]="i"> [formGroupName]="i">
<mat-expansion-panel [expanded]="step == i"> <mat-expansion-panel [expanded]="step == i">

17
src/pages/pd-question/pd-question-business-group/pd-question-business-banking/pd-question-business-banking.scss
View File

@ -1,3 +1,18 @@
page-pd-question-business-banking { page-pd-question-business-banking {
.mat-card{
margin-bottom: 15px;
border-radius: 10px !important;
box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important;
}
.mat-card-content{
margin-bottom: 0px !important;
}
.accordion{
margin-bottom: 15px;
border-radius: 10px !important;
box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important;
}
.scroll-content{
background-color: #eee;
}
} }

5
src/pages/pd-question/pd-question-business-group/pd-question-business-group.ts
View File

@ -7,6 +7,7 @@ import { PdQuestionClientInfoPage } from '../../../pages/pd-question/pd-question
import { PdQuestionBusinessInfoPage } from '../../../pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info'; import { PdQuestionBusinessInfoPage } from '../../../pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info';
import { PdQuestionBusinessAssetsPage } from '../../../pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets' import { PdQuestionBusinessAssetsPage } from '../../../pages/pd-question/pd-question-business-group/pd-question-business-assets/pd-question-business-assets'
import {PdQuestionBusinessBankingPage} from '../../../pages/pd-question/pd-question-business-group/pd-question-business-banking/pd-question-business-banking' import {PdQuestionBusinessBankingPage} from '../../../pages/pd-question/pd-question-business-group/pd-question-business-banking/pd-question-business-banking'
import {PdQuestionFinancialInfoPage} from '../../../pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info'
/** /**
* Generated class for the PdQuestionBusinessGroupPage page. * Generated class for the PdQuestionBusinessGroupPage page.
@ -41,7 +42,7 @@ export class PdQuestionBusinessGroupPage {
getCompanyListForBusiness(): void{ getCompanyListForBusiness(): void{
this.qustCat.getCompaniesListsForBusiness(this.pdDetails.pd_id).subscribe(data=>{ this.qustCat.getCompaniesListsForBusiness(this.pdDetails.pd_id).subscribe(data=>{
if(data.dataStatus){ if(data.dataStatus){
this.existCompanyList = data.records.filter(val =>val.is_active && val.is_company_applicant===true); this.existCompanyList = data.records.filter(val =>val.is_active);
this.waitLoading = true; this.waitLoading = true;
} }
else { else {
@ -73,7 +74,7 @@ export class PdQuestionBusinessGroupPage {
console.log("form_id",details.form_id) console.log("form_id",details.form_id)
} }
if(details.form_id==14){ if(details.form_id==14){
this.navCtrl.push(PdQuestionSupplierInfoPage,{'FormId':details.form_id,'pdDetails':this.pdDetails}); this.navCtrl.push(PdQuestionFinancialInfoPage,{'FormId':details.form_id,'pdDetails':this.pdDetails});
console.log("form_id",details.form_id) console.log("form_id",details.form_id)
} }
if(details.form_id==15){ if(details.form_id==15){

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

@ -366,7 +366,7 @@
<mat-label>States Where Max Sales Done for {{retail.value.main_products}}</mat-label> <mat-label>States Where Max Sales Done for {{retail.value.main_products}}</mat-label>
<mat-select multiple placeholder="States" formControlName="state_name"> <mat-select multiple placeholder="States" formControlName="state_name">
<mat-option *ngFor="let MSL of retail.value.pan_india_options=='Yes' ? stateList : filterMaxSaleState(stateList,retail.value.india_where_sale_done)" [value]="MSL.state_id"> <mat-option [value]="MSL.state_id">
{{MSL.state_name}} {{MSL.state_name}}
</mat-option> </mat-option>
</mat-select> </mat-select>

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

@ -19,4 +19,7 @@ page-pd-question-business-info {
.mat-card-content{ .mat-card-content{
margin-bottom: 0px !important; margin-bottom: 0px !important;
} }
.scroll-content{
background-color: #eee;
}
} }

4
src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts
View File

@ -125,7 +125,7 @@ export class PdQuestionBusinessInfoPage {
ionViewDidLoad() { ionViewDidLoad() {
console.log('ionViewDidLoad PdQuestionBusinessInfoPage'); console.log('ionViewDidLoad PdQuestionBusinessInfoPage');
this.getDetails();
} }
@ -194,7 +194,7 @@ this.qustCat.getStateCityDetails().subscribe(data=>{
// console.log("data first23",data.records) // console.log("data first23",data.records)
this.stateList=data.records this.stateList=data.records
// console.log("stateListFun",this.stateList) // console.log("stateListFun",this.stateList)
this.getDetails();
}); });

270
src/pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info.html Normal file
View File

@ -0,0 +1,270 @@
<!--
Generated template for the PdQuestionFinancialInfoPage page.
See http://ionicframework.com/docs/components/#navigation for more info on
Ionic pages and navigation.
-->
<ion-header>
<ion-navbar color="optblue">
<ion-title>Financial Information</ion-title>
</ion-navbar>
</ion-header>
<ion-content padding>
<form [formGroup]="financialForm">
<mat-card>
<mat-card-header>
<mat-card-title>
<h5>Data As Per Financial Statements</h5>
</mat-card-title>
</mat-card-header>
<mat-form-field>
<mat-select placeholder="Financial Statements Available ?" formControlName="is_financial_statements" (selectionChange)="selectedStatement($event.value)">
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
</mat-select>
</mat-form-field>
<div *ngIf="isDisplay">
<mat-form-field>
<mat-label>Enter year from Which Financials Provided</mat-label>
<input matInput autocomplete="off" placeholder="YYYY eg.2018" formControlName="financial_starting_year" (keypress)="keyPress($event)">
<mat-error align="end" style="font-size: 12px"> Invalid year format</mat-error>
</mat-form-field>
<mat-form-field>
<input matInput autocomplete="off" placeholder="Number of Financial Years" formControlName="financial_no_of_year" (change)="dynamicalFinYear($event)" (keypress)="keyPress($event)">
</mat-form-field>
</div>
<div *ngIf="financial_no_of_year != ''" formArrayName="date_per_financial">
<div *ngFor="let details of financialForm.controls.date_per_financial['controls']; let i=index" [formGroupName]="i">
<mat-card-content>
<mat-label style="color:blue">Financial Year : {{details.get('financial_year').value}}</mat-label>
<br/><mat-form-field>
<input matInput autocomplete="off" placeholder="Annual Sale" formControlName="financial_annual_sale" (change)="calculationForFinanicalStatement()" (keypress)="keyPress($event)" (keyup)="inWords($event,i,1)">
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('financial_annual_sale').value != ''">{{"&#8377;"}} {{FY_annualSalesInwords[i]}} Only</mat-hint>
</mat-form-field>
<div *ngIf="i>0">
<mat-label>Sale Variation from Previous Year in %</mat-label>
&nbsp;&nbsp;-<input matInput placeholder="Sale Variation from Previous Year in %" formControlName="financial_annualsales_variation" (keypress)="keyPress($event)" readonly>
<p class="info" *ngIf="details.get('financial_annualsales_variation').value != '' " >
<span *ngIf="details.get('financial_annualsales_variation').value == 0">
No difference in Sales in FY <i> {{details.get('financial_year').value}} </i> over Sales in FY <i> {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} </i>
</span>
<span *ngIf="details.get('financial_annualsales_variation').value > 0" class="greenhighlight">
Increase in Sales in FY <i> {{details.get('financial_year').value}} </i> over Sales in FY <i> {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} </i> <b> {{details.get('financial_annualsales_variation').value}} % </b>
</span>
<span *ngIf="details.get('financial_annualsales_variation').value < 0" class="highlight">
Decrease in Sales in FY <i> {{details.get('financial_year').value}} </i> over Sales in FY <i>{{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} </i> <b> {{(details.get('financial_annualsales_variation').value).replace('-', '')}} % </b>
</span>
</p>
</div>
<mat-form-field>
<mat-select placeholder="Is there Net Profit or Net Loss?" formControlName="finanical_profit_or_loss" (selectionChange)="selectedProfitOrLossType($event,details)">
<mat-option value="1">Net Profit</mat-option>
<mat-option value="2">Net Loss</mat-option>
</mat-select>
</mat-form-field>
<div *ngIf="details.get('finanical_profit_or_loss').value == 1">
<mat-form-field>
<input matInput autocomplete="off" formControlName="financial_net_profit" (change)="calculationForFinanicalStatement()" placeholder="Net Profit Amount" (keyup)="inWords($event,i,2)" (keypress)="keyPress($event)" >
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('financial_net_profit').value != ''">{{"&#8377;"}} {{FY_netProfitAmtInwords[i]}} Only</mat-hint>
</mat-form-field>
<mat-form-field>
<input matInput autocomplete="off" placeholder="Net Profit to Sales in %" formControlName="financial_margin_of_profit" readonly>
</mat-form-field>
</div>
<div *ngIf="details.get('finanical_profit_or_loss').value == 2">
<mat-form-field>
<input matInput placeholder="Net Loss Amount" formControlName="financial_net_loss" (change)="calculationForFinanicalStatement()" (keypress)="keyPress($event)" (keyup)="inWords($event,i,3)" autocomplete="off">
<mat-hint align="end" style="font-size: 11px" *ngIf="details.get('financial_net_loss').value != ''">{{"&#8377;"}}{{FY_netLossAmtInwords[i]}} Only</mat-hint>
</mat-form-field>
<mat-form-field>
<input matInput placeholder="Net Loss to Sale in %" formControlName="financial_margin_of_loss" (keypress)="keyPress($event)" readonly>
</mat-form-field>
</div>
<div *ngIf="i>0">
<mat-label>Profit Variation from Previous Year in %: </mat-label>
&nbsp;&nbsp;- <input matInput autocomplete="off" [ngClass]="{'highlight': (details.controls['financial_variation'].value > 40) || (details.controls['financial_variation'].value < -40)}" placeholder="Profit Variation from Previous Year in %" formControlName="financial_variation" (keypress)="keyPress($event)" readonly>
<p class="info" *ngIf="i != 0 && details.get('financial_variation').value != '' " [ngClass]="{'highlight': (details.controls['financial_variation'].value > 40) || (details.controls['financial_variation'].value < -40)}" >
<span *ngIf="details.get('financial_variation').value == 0">
No difference in Profit in FY <i> {{details.get('financial_year').value}} </i> over Profit in FY <i> {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} </i>
</span>
<span *ngIf="details.get('financial_variation').value > 0" class="greenhighlight">
Increase in Profit in FY <i> {{details.get('financial_year').value}} </i> over Profit in FY <i> {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} </i> <b> {{details.get('financial_variation').value}} % </b>
</span>
<span *ngIf="details.get('financial_variation').value < 0" class="highlight">
Decrease in Profit in FY <i> {{details.get('financial_year').value}} </i> over Profit in FY <i> {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} </i> <b> {{(details.get('financial_variation').value).replace('-', '')}} % </b>
</span>
</p>
<mat-label>Variation of Profit % over sales</mat-label>
&nbsp;&nbsp;-<input matInput autocomplete="off" [ngClass]="{'highlight': (details.controls['financial_profit_to_sale_variation'].value > 40) || (details.controls['financial_profit_to_sale_variation'].value < -40)}" placeholder="Variation of Profit % over sales" formControlName="financial_profit_to_sale_variation" (keypress)="keyPress($event)" readonly>
<p class="info" *ngIf="i != 0 && details.get('financial_profit_to_sale_variation').value != '' " [ngClass]="{'highlight': (details.controls['financial_profit_to_sale_variation'].value > 40) || (details.controls['financial_profit_to_sale_variation'].value < -40)}">
<span *ngIf="details.get('financial_profit_to_sale_variation').value == 0">
No difference in Profit sales % in FY <i> {{details.get('financial_year').value}} </i> over Profit sales % in FY <i> {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} </i>
</span>
<span *ngIf="details.get('financial_profit_to_sale_variation').value > 0" class="greenhighlight">
Increase in Profit sales % in FY <i> {{details.get('financial_year').value}} </i> over Profit sales % in FY <i> {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} </i> <b> {{details.get('financial_profit_to_sale_variation').value}} % </b>
</span>
<span *ngIf="details.get('financial_profit_to_sale_variation').value < 0" class="highlight">
Decrease in Profit sales % in FY <i> {{details.get('financial_year').value}} </i> over Profit sales % in FY <i> {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} </i> <b> {{(details.get('financial_profit_to_sale_variation').value).replace('-', '')}} % </b>
</span>
</p>
</div>
</mat-card-content>
</div>
</div>
<div *ngIf="isDisplay">
<mat-form-field *ngIf="financial_no_of_year != '' && customerCommentsFlag">
<input matInput autocomplete="off" formControlName="financial_reason" placeholder="Comments on Financials">
</mat-form-field>
</div>
</mat-card>
<mat-card>
<mat-card-header>
<mat-card-title>
<h5>Financial As Per Customers</h5>
</mat-card-title>
</mat-card-header>
<mat-card-content>
<mat-form-field>
<mat-select placeholder="Same as Financial Statements ?" formControlName="is_financial_customer" (selectionChange)="selectedFinancialCustomer($event.value)">
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
</mat-select>
</mat-form-field>
</mat-card-content>
<div formArrayName="estimated_value">
<div *ngFor="let details of financialForm.controls.estimated_value['controls']; let i=index"
[formGroupName]="i">
<mat-card-content>
<mat-form-field>
<input matInput type="number" placeholder="Annual Sales From" formControlName="estimate_sales_from" (change)="calculateSalesAverage(i,details)" (keyup)="inWords($event,i,11)">
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_sales_from').value != ''">{{"&#8377;"}} {{AV_SalesFrmInwords[i]}} Only</mat-hint>
</mat-form-field>
<mat-form-field>
<input matInput type="number" placeholder="Annual Sales To" formControlName="estimate_sales_to" (change)="confirmAlert(i,details)" (keyup)="inWords($event,i,12)">
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_sales_to').value != ''">{{"&#8377;"}} {{AV_SalesToInwords[i]}} Only</mat-hint>
</mat-form-field>
<mat-form-field>
<input matInput type="number" placeholder="Consider Sales Average" formControlName="estimate_sales_average" readonly>
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_sales_to').value != ''">{{"&#8377;"}} {{AV_SalesInwords[i]}} Only</mat-hint>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="Was there Net Profit or Net Loss?" formControlName="estimate_profit_or_loss">
<mat-option value="1">Net Profit</mat-option>
<mat-option value="2">Net Loss</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field>
<mat-select placeholder="Is there Net Margin information Available?" formControlName="estimate_net_margin_availablity">
<mat-option value="yes">Yes</mat-option>
<mat-option value="no">No</mat-option>
</mat-select>
</mat-form-field>
<div *ngIf="details.get('estimate_profit_or_loss').value == 1 && details.get('estimate_net_margin_availablity').value == 'yes' ">
<mat-form-field>
<input matInput autocomplete="off" placeholder="Net Profit % From" formControlName="estimate_profit_range_from" type="number" min="0" max="100" (change)="calculateMarginProfit(i,details);">
</mat-form-field>
<mat-form-field >
<input matInput autocomplete="off" placeholder="Net Profit % To" formControlName="estimate_profit_range_to" type="number" min='0' max='100' (change)="calculateMarginProfit( i, details);">
</mat-form-field>
<mat-form-field>
<input matInput autocomplete="off" placeholder="Net Profit % Considered" formControlName="estimate_profit_margin_percent" type="number" readonly>
<!-- <mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_profit_margin').value != ''"> {{"&#8377;"}} {{AV_marginProfitAmtInwords[i]}} Only ( {{"&#8377;"}} {{details.get('estimate_profit_margin').value}} ) </mat-hint> -->
</mat-form-field>
<mat-form-field >
<input matInput placeholder="Net Profit Amount Considered" formControlName="estimate_profit_margin" readonly>
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_profit_margin').value != ''"> {{"&#8377;"}} {{AV_marginProfitAmtInwords[i]}} Only </mat-hint>
</mat-form-field>
</div>
<div style="width:100%" *ngIf="details.get('estimate_profit_or_loss').value == 1 && details.get('estimate_net_margin_availablity').value == 'no' ">
<mat-form-field >
<input matInput autocomplete="off" placeholder="Net Profit Amount From" formControlName="estimate_net_profit_from" type="number" (change)="calculateProfitAmount(i, details);" (keyup)="inWords($event,i,7)">
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_net_profit_from').value != ''">{{"&#8377;"}} {{AV_netProfitAmtFrmInwords[i]}} Only </mat-hint>
</mat-form-field>
<mat-form-field >
<input matInput autocomplete="off" type="number" placeholder="Net Profit Amount To" formControlName="estimate_net_profit_to" type="number" (change)="calculateProfitAmount(i, details);" (keyup)="inWords($event,i,8)">
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_net_profit_to').value != ''">{{"&#8377;"}} {{AV_netProfitAmtToInwords[i]}} Only </mat-hint>
</mat-form-field>
<mat-form-field >
<input matInput autocomplete="off" placeholder="Considered Net Profit" formControlName="estimate_net_profit_percent" readonly>
</mat-form-field>
<mat-form-field >
<input matInput autocomplete="off" placeholder="Considered Profit Amount" formControlName="estimate_net_profit" type="number" readonly>
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_net_profit').value != ''">{{"&#8377;"}} {{AV_netProfitAmtInwords[i]}} Only </mat-hint>
<!-- // -->
</mat-form-field>
</div>
<!-- <span *ngIf="details.get('estimate_profit_or_loss').value == 2 "> -->
<div style="width:100%" *ngIf="details.get('estimate_profit_or_loss').value == 2 && details.get('estimate_net_margin_availablity').value == 'yes' ">
<mat-form-field >
<input matInput autocomplete="off" placeholder="Net Loss % From" formControlName="estimate_loss_range_from" min='0' max='100' type="number" (change)="calculateMarginLoss( i, details);">
</mat-form-field>
<mat-form-field >
<input matInput autocomplete="off" placeholder="Net Loss % To" formControlName="estimate_loss_range_to" min='0' max='100' type="number" (change)="calculateMarginLoss( i, details);">
</mat-form-field>
<mat-form-field >
<input matInput autocomplete="off" placeholder="Net Profit % Considered" formControlName="estimate_loss_margin_percent" type="number" readonly>
<!-- <mat-hint align="start" style="font-size:70%" *ngIf="details.get('estimate_loss_margin').value != ''">{{"&#8377;"}} {{AV_marginLossAmtInwords[i]}} Only ( {{"&#8377;"}} {{details.get('estimate_loss_margin').value}} ) </mat-hint> -->
<!-- // -->
</mat-form-field>
<mat-form-field >
<input matInput placeholder="Net Loss Amount Considered" formControlName="estimate_loss_margin" readonly>
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_loss_margin').value != ''">{{"&#8377;"}} {{AV_marginLossAmtInwords[i]}} Only </mat-hint>
</mat-form-field>
</div>
<div style="width:100%" *ngIf="details.get('estimate_profit_or_loss').value == 2 && details.get('estimate_net_margin_availablity').value == 'no' ">
<mat-form-field >
<input matInput autocomplete="off" placeholder="Net Loss Amount From" formControlName="estimate_net_loss_from" type="number" (change)="calculateLossAmount(i, details);" (keyup)="inWords($event,i,9)">
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_net_loss_from').value != ''">{{"&#8377;"}} {{AV_netLossAmtFrmInwords[i]}} Only </mat-hint>
</mat-form-field>
<mat-form-field >
<input matInput autocomplete="off" placeholder="Net Loss Amount To" formControlName="estimate_net_loss_to" type="number" (change)="calculateLossAmount(i, details);" (keyup)="inWords($event,i,10)">
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_net_loss_to').value != ''">{{"&#8377;"}} {{AV_netLossAmtToInwords[i]}} Only </mat-hint>
</mat-form-field>
<mat-form-field >
<input matInput autocomplete="off" placeholder="Considered Net Loss" formControlName="estimate_net_loss_percent" readonly>
</mat-form-field>
<mat-form-field >
<input matInput autocomplete="off" placeholder="Considered Loss Amount" formControlName="estimate_net_loss" type="number" readonly>
<mat-hint align="end" style="font-size:11px" *ngIf="details.get('estimate_net_loss').value != ''">{{"&#8377;"}} {{AV_netLossAmtInwords[i]}} Only</mat-hint>
<!-- // -->
</mat-form-field>
</div>
<div *ngIf="details.get('estimate_profit_or_loss').value == 2">
<mat-form-field>
<input matInput autocomplete="off" placeholder="What is the reason for the Loss?" formControlName="estimate_reason_for_loss">
</mat-form-field>
</div>
</mat-card-content>
</div>
</div>
</mat-card>
<mat-card >
<mat-form-field appearance="outline">
<mat-label>Remarks</mat-label>
<textarea matInput autocomplete="off" placeholder="Remarks" formControlName="financial_remarks"></textarea>
</mat-form-field>
</mat-card>
<ion-row>
<button ion-button full color="optblue" (click)="submitDetails()">Save</button>
</ion-row>
</form>
</ion-content>

37
src/pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info.scss Normal file
View File

@ -0,0 +1,37 @@
page-pd-question-financial-info {
mat-form-field{
width:100%;
}
.info > span{
bottom:20px;
margin-left:10px;
font-size:13px;
}
i,b{
font-size:12px;
}
.greenhighlight {
color: green;
background-color: white;
}
.highlight {
color: red;
background-color: white;
}
.mat-card{
margin-bottom: 15px;
border-radius: 10px !important;
box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important;
}
.mat-card-content{
margin-bottom: 0px !important;
}
.scroll-content{
background-color: #eee;
}
}

1153
src/pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info.ts Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -94,14 +94,15 @@
<input type="number" matInput placeholder="Elapsed Tenure in Months" formControlName="elapsed_tenure" autocomplete="off"> <input type="number" matInput placeholder="Elapsed Tenure in Months" formControlName="elapsed_tenure" autocomplete="off">
</mat-form-field> </mat-form-field>
<ion-buttons end> <ion-buttons end>
<ion-col col-3>
<a (click)="addLoanDetails()" *ngIf="last"> <ion-col offset-3 col-3>
<ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon></a>
</ion-col>
<ion-col offset-2 col-3>
<a (click)="deleteLoanDetails(i)"> <a (click)="deleteLoanDetails(i)">
<ion-icon name="close-circle" color="optblue" style="font-size: 24px;"></ion-icon></a> <ion-icon name="md-trash" color="optblue" style="font-size: 24px;"></ion-icon></a>
</ion-col> </ion-col>
<ion-col col-2 offset-1>
<a (click)="addLoanDetails()" *ngIf="last">
<ion-icon name="add-circle" color="optblue" style="font-size: 24px;"></ion-icon></a>
</ion-col>
</ion-buttons> </ion-buttons>
</mat-card-content> </mat-card-content>
</div> </div>
@ -110,8 +111,8 @@
</mat-card> </mat-card>
<mat-card> <mat-card>
<mat-form-field style="width: 100%"> <mat-form-field style="width: 100%">
<input matInput placeholder="Remarks" <textarea matInput placeholder="Remarks"
formControlName="currentloan_remarks"> formControlName="currentloan_remarks"></textarea>
</mat-form-field> </mat-form-field>
</mat-card> </mat-card>
<ion-row> <ion-row>

33
src/pages/pd-question/pd-question-current-loans/pd-question-current-loans.ts
View File

@ -18,7 +18,7 @@ import {ConstantsProvider} from '../../../providers/constants/constants'
templateUrl: 'pd-question-current-loans.html', templateUrl: 'pd-question-current-loans.html',
}) })
export class PdQuestionCurrentLoansPage { export class PdQuestionCurrentLoansPage {
applicants: any; public applicants: any=[]
placeholderName: any = []; placeholderName: any = [];
lenderData: any; lenderData: any;
frequencyData: any; frequencyData: any;
@ -38,11 +38,17 @@ export class PdQuestionCurrentLoansPage {
investmentTypeData: any=[]; investmentTypeData: any=[];
constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,public qustCat:QuestionCategoryProvider,public toast:ToastProvider, public aws:AwsServiceProvider,public constant:ConstantsProvider) { constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,public qustCat:QuestionCategoryProvider,public toast:ToastProvider, public aws:AwsServiceProvider,public constant:ConstantsProvider) {
this.applicants=[]
// console.log("before",this.applicants)
this.questionDetails = this.navParams.get('questionDetails'); this.questionDetails = this.navParams.get('questionDetails');
this.pdDetails = this.navParams.get('pdDetails'); this.pdDetails = this.navParams.get('pdDetails');
this.pdid=this.pdDetails.pd_id; this.pdid=this.pdDetails.pd_id;
this.FormId = this.navParams.get('FormId'); this.FormId = this.navParams.get('FormId');
this.applicants = this.pdDetails.applicat_details; this.applicants = this.pdDetails.applicat_details;
this.applicants.push({'pd_co_applicant_id':'0','applicant_name':'Others'});
this.getdropdown();
// this.applicants.push // this.applicants.push
console.log(this.applicants); console.log(this.applicants);
this.users = this.aws.getlocale(); this.users = this.aws.getlocale();
@ -52,10 +58,13 @@ export class PdQuestionCurrentLoansPage {
currentloan_remarks:[null], currentloan_remarks:[null],
loan_details: this.fb.array([]) loan_details: this.fb.array([])
}); });
this.getdropdown();
this.getcurrentLoans();
}
ionViewDidLoad() {
console.log('ionViewDidLoad PdQuestionCurrentLoansPage');
this.getcurrentLoans()
} }
getdropdown() getdropdown()
{ {
@ -82,6 +91,7 @@ export class PdQuestionCurrentLoansPage {
modifyCompanyList = this.existCompanyList.map(element => { modifyCompanyList = this.existCompanyList.map(element => {
return {id:element.company_order_id.toString(),name:element.company_name,group_id:1}; return {id:element.company_order_id.toString(),name:element.company_name,group_id:1};
}); });
//modifyCompanyList.push({'id':"0",'name':'Others','group_id':1})
this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList}) this.mergeCompanyApplicant.push({groupName:'COMPANIES',groupValues:modifyCompanyList})
console.log("Company applicant",this.mergeCompanyApplicant) console.log("Company applicant",this.mergeCompanyApplicant)
} }
@ -91,7 +101,9 @@ export class PdQuestionCurrentLoansPage {
modifyApplicantList = this.applicants.map(element => { modifyApplicantList = this.applicants.map(element => {
return {id:element.pd_co_applicant_id,name:element.applicant_name,group_id:2}; return {id:element.pd_co_applicant_id,name:element.applicant_name,group_id:2};
}); });
this.mergeCompanyApplicant.push({groupName:'APPLICANTS',groupValues:modifyApplicantList})
this.mergeCompanyApplicant.push({groupName:'APPLICANTS',groupValues:modifyApplicantList})
console.log(this.mergeCompanyApplicant); console.log(this.mergeCompanyApplicant);
// this.listOfLanguagues.splice(this.listOfLanguagues.indexOf(languague), 1); // this.listOfLanguagues.splice(this.listOfLanguagues.indexOf(languague), 1);
} }
@ -103,9 +115,7 @@ export class PdQuestionCurrentLoansPage {
}); });
} }
ionViewDidLoad() {
console.log('ionViewDidLoad PdQuestionCurrentLoansPage');
}
exitsCheck(val) exitsCheck(val)
{ {
console.log(val); console.log(val);
@ -272,7 +282,8 @@ submitCurrentloan(answerData) {
this.currentLoans.controls['existing_loan'].setValue(currentLoanDetails.existing_loan); this.currentLoans.controls['existing_loan'].setValue(currentLoanDetails.existing_loan);
this.currentLoans.controls['currentloan_remarks'].setValue(currentLoanDetails.currentloan_remarks); this.currentLoans.controls['currentloan_remarks'].setValue(currentLoanDetails.currentloan_remarks);
const control = <FormArray>this.currentLoans.controls['loan_details']; const control = <FormArray>this.currentLoans.controls['loan_details'];
if(currentLoanDetails.existing_loan != 'No')
{
if(result.length ==0) if(result.length ==0)
{ {
control.push(this.createLoanDetail(null)); control.push(this.createLoanDetail(null));
@ -293,7 +304,9 @@ submitCurrentloan(answerData) {
this.currentLoans.controls['loan_details'].setValue(result); this.currentLoans.controls['loan_details'].setValue(result);
} }
}else }
}
else
{ {
this.currentLoans.controls['existing_loan'].setValue(currentLoanDetails.existing_loan); this.currentLoans.controls['existing_loan'].setValue(currentLoanDetails.existing_loan);
this.currentLoans.controls['currentloan_remarks'].setValue(currentLoanDetails.currentloan_remarks); this.currentLoans.controls['currentloan_remarks'].setValue(currentLoanDetails.currentloan_remarks);

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

@ -1,76 +0,0 @@
<ion-header>
<ion-navbar color="optblue">
<button ion-button menuToggle>
<ion-icon name="menu"></ion-icon>
</button>
<ion-title *ngIf="!viewchange">CurrentLoans Category</ion-title>
</ion-navbar>
</ion-header>
<ion-content padding>
<form [formGroup]="currentLoans">
<mat-card>
<mat-form-field style="width: 100%">
<mat-select placeholder="Do you have any other existing Loan"
formControlName="existing_loan" (selectionChange)="exitsCheck($event.value)">
<mat-option value="Yes">Yes</mat-option>
<mat-option value="No">No</mat-option>
</mat-select>
</mat-form-field>
</mat-card>
<mat-card *ngIf="currentLoans.controls.existing_loan.value == 'Yes'">
<div formArrayName="loan_details">
<div *ngFor="let details of currentLoans.get('loan_details').controls; let i=index;let last=last"
[formGroupName]="i">
<mat-card-content class="matcard">
<mat-form-field style="width: 100%">
<input matInput placeholder="Loan Amount" formControlName="loan_amount">
</mat-form-field>
<mat-form-field style="width: 100%">
<input matInput placeholder="EMI" formControlName="emi">
</mat-form-field>
<mat-form-field style="width: 100%">
<input matInput placeholder="Loan Type" formControlName="loan_type">
</mat-form-field>
<mat-form-field style="width: 100%">
<input matInput placeholder="Lender" formControlName="lender">
</mat-form-field>
<mat-form-field style="width: 100%">
<input matInput placeholder="Original Tenure" formControlName="original_tenure">
</mat-form-field>
<mat-form-field style="width: 100%">
<input matInput placeholder="Current Balance Tenure" formControlName="current_balance_tenure">
</mat-form-field>
<ion-col col-3>
<a (click)="addLoanDetails()" *ngIf="last">
<ion-icon name="md-add" color="optblue" style="font-size: 22px;"></ion-icon></a>
</ion-col>
<ion-col offset-6 col-3 *ngIf="!last">
<a (click)="deleteLoanDetails(i)">
<ion-icon name="md-close" color="optblue" style="font-size: 22px;"></ion-icon></a>
</ion-col>
</mat-card-content>
</div>
</div>
</mat-card>
<br/>
<mat-card>
<mat-form-field style="width: 100%">
<input matInput placeholder="Remarks"
formControlName="currentloan_remarks">
</mat-form-field>
</mat-card>
<ion-row>
<!-- <ion-buttons >
<ion-button color="optblue"
full[disabled]="!pdforms.valid" mat-raised-button style="width:100%" (click)="savepdDetails(pdforms.value)">Save <ion-icon name="md-disc"></ion-icon></ion-button> -->
<button ion-button full color="optblue" (click)="submitCurrentloan(currentLoans.value)" > Save</button>
<!-- </ion-buttons> -->
</ion-row>
</form>
</ion-content>

3
src/pages/pd-question/pd-question-current-loans1/pd-question-current-loans.scss
View File

@ -1,3 +0,0 @@
page-pd-question-current-loans {
}

123
src/pages/pd-question/pd-question-current-loans1/pd-question-current-loans.ts
View File

@ -1,123 +0,0 @@
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
import { FormGroup,FormArray,FormBuilder } from '@angular/forms';
import { QuestionCategoryProvider } from '../../../providers/question-category/question-category';
import { AwsServiceProvider } from '../../../providers/aws-service/aws-service';
import { ToastProvider } from '../../../providers/common-provider/toast';
/**
* Generated class for the PdQuestionCurrentLoansPage page.
*
* See https://ionicframework.com/docs/components/#navigation for more info on
* Ionic pages and navigation.
*/
@Component({
selector: 'page-pd-question-current-loans',
templateUrl: 'pd-question-current-loans.html',
})
export class PdQuestionCurrentLoansPage {
users: any;
pdDetails: any;
questionDetails: any;
currentLoans:FormGroup;
constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,public qustCat:QuestionCategoryProvider,public toast:ToastProvider, public aws:AwsServiceProvider) {
this.questionDetails = this.navParams.get('questionDetails');
this.pdDetails = this.navParams.get('pdDetails');
this.users = this.aws.getlocale();
this.currentLoans = this.fb.group(
{
existing_loan: [null],
currentloan_remarks:[null],
loan_details: this.fb.array([])
});
this.getcurrentLoans()
}
ionViewDidLoad() {
console.log('ionViewDidLoad PdQuestionCurrentLoansPage');
}
exitsCheck(val)
{
console.log(val);
if(val =="Yes")
{
this.addLoanDetails();
}
}
createLoanDetail() {
return this.fb.group({
loan_amount: [null],
emi: [null],
loan_type: [null],
lender: [null],
original_tenure: [null],
current_balance_tenure: [null],
});
}
addLoanDetails() {
const control = <FormArray>this.currentLoans.controls['loan_details'];
control.push(this.createLoanDetail());
}
deleteLoanDetails(index) {
const control = <FormArray>this.currentLoans.controls['loan_details'];
control.removeAt(index);
}
submitCurrentloan(answerData) {
console.log(answerData);
let records: any = {};
records.pdid = this.pdDetails.pd_id;
records.formid = '336';
records.fk_createdby = this.users;
records.existing_loan = answerData.existing_loan;
records.loan_details = answerData.loan_details;
records.currentloan_remarks = answerData.currentloan_remarks;
console.log('data', records);
this.qustCat.saveForm(records).subscribe(data => {
console.log('data', data);
if(data['dataStatus']==true)
{
this.toast.pdTriggerappmessage('Record Saved Successfully.!');
this.navCtrl.pop();
}
});
}
getcurrentLoans()
{
let records = {'pd_id':this.pdDetails.pd_id,'pd_form_id':'336'};
this.qustCat.retiverForm(records).subscribe(res=>
{
if(res['dataStatus']==true)
{
var result = Object.keys(res['records'].loan_details).map(function(key) {
//console.log(res);
return res['records'].loan_details[key];
});
let currentLoanDetails = res['records'];
this.currentLoans.controls['existing_loan'].setValue(currentLoanDetails.existing_loan);
this.currentLoans.controls['currentloan_remarks'].setValue(currentLoanDetails.currentloan_remarks);
const control = <FormArray>this.currentLoans.controls['loan_details'];
if(result.length ==0)
{
control.push(this.createLoanDetail());
}else
{
result.forEach(datas=>
{
control.push(this.createLoanDetail());
})
this.currentLoans.controls['loan_details'].setValue(result);
}
}
})
}
}

43
src/pages/pd-question/pd-question-family/pd-question-family.html
View File

@ -21,7 +21,7 @@
</mat-card-header> </mat-card-header>
<mat-form-field> <mat-form-field>
<mat-select placeholder="Applicants" formControlName="selected_person" required> <mat-select placeholder="Applicants" formControlName="selected_person" (selectionChange)="selectedPerson($event.value,i)" required>
<mat-option value="{{pd.pd_co_applicant_id}}" <mat-option value="{{pd.pd_co_applicant_id}}"
*ngFor="let pd of pdDetails.applicat_details">{{pd.applicant_name}}</mat-option> *ngFor="let pd of pdDetails.applicat_details">{{pd.applicant_name}}</mat-option>
@ -40,6 +40,7 @@
<!-- <mat-form-field *ngIf="familyForm.controls['person'].value =='8'" style="width: 100%"> <!-- <mat-form-field *ngIf="familyForm.controls['person'].value =='8'" style="width: 100%">
<input matInput placeholder="Enter the relationship" formControlName="personOther"> <input matInput placeholder="Enter the relationship" formControlName="personOther">
</mat-form-field> --> </mat-form-field> -->
<h5>Residence Details of {{FamilyMemberAsLabel[i]}}</h5>
<mat-form-field style="width:100%"> <mat-form-field style="width:100%">
<input matInput placeholder="Place " formControlName="residence_place" required/> <input matInput placeholder="Place " formControlName="residence_place" required/>
</mat-form-field> </mat-form-field>
@ -75,19 +76,20 @@
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="tech.get('residence_ownership').value== 3"> <mat-form-field *ngIf="tech.get('residence_ownership').value== 3">
<input matInput type="number" placeholder="Rent Amount" formControlName="rent" /> <input matInput type="number" placeholder="Rent Amount" formControlName="rent" />
<mat-hint align="end" style="font-size: 11px" *ngIf="tech.get('rent').value != ''">{{"&#8377;"}} {{RentAmount[i]}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="tech.get('residence_ownership').value== 4"> <mat-form-field *ngIf="tech.get('residence_ownership').value== 1">
<input matInput type="text" placeholder="Please Specify" formControlName="ownershipOther" /> <input matInput type="text" placeholder=" Specify Ownership" formControlName="ownershipOther" />
</mat-form-field> </mat-form-field>
<mat-form-field> <!-- <mat-form-field>
<input matInput type="number" min="0" placeholder="Family Members" formControlName="total_number_of_family_members" (focusout)="getNumberOfFamilyMemberDetails(i)"> <input matInput type="number" min="0" placeholder="Family Members" formControlName="total_number_of_family_members" (focusout)="getNumberOfFamilyMemberDetails(i)">
</mat-form-field> </mat-form-field> -->
</mat-card> </mat-card>
<mat-card>
<div formArrayName="family_members_details" > <div formArrayName="family_members_details" >
<div *ngFor="let item of tech.controls.family_members_details['controls']; let ix=index" [formGroupName]="ix"> <div *ngFor="let item of tech.controls.family_members_details['controls']; let ix=index; let last=last" [formGroupName]="ix">
<mat-card>
<mat-card-header appearence="outline">Family Member Details {{ix+1}}</mat-card-header> <mat-card-header appearence="outline">Family Member Details # {{ix+1}} Of {{FamilyMemberAsLabel[i]}}</mat-card-header>
<mat-form-field> <mat-form-field>
<input matInput type="text" placeholder="Name" formControlName="family_member_name" /> <input matInput type="text" placeholder="Name" formControlName="family_member_name" />
</mat-form-field> </mat-form-field>
@ -98,7 +100,7 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<input matInput type="number" placeholder="Age" formControlName="family_member_age"/> <input matInput type="number" placeholder="Age" formControlName="family_member_age" [readonly]="isReadOnly[ix]"/>
</mat-form-field> </mat-form-field>
<mat-form-field > <mat-form-field >
<mat-select placeholder="Earning Status *" formControlName="family_member_earning_status"> <mat-select placeholder="Earning Status *" formControlName="family_member_earning_status">
@ -115,15 +117,18 @@
</mat-option> </mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="item.get('earning_segment').value==1">
<input matInput placeholder="Specify Others" formControlName="earning_if_others_segment">
</mat-form-field>
<mat-form-field> <mat-form-field>
<input matInput type="number" placeholder="Income Per Month" formControlName="earning_gross_income_per_month" > <input matInput type="number" placeholder="Income Per Month" formControlName="earning_gross_income_per_month" >
<mat-hint align="end" style="font-size: 11px" *ngIf="item.get('earning_gross_income_per_month').value != '' ">{{"&#8377;"}} {{IncomePerMonth[ix]}} Only</mat-hint>
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<input matInput placeholder="Name of the Employer/Business" formControlName="earning_name_of_the_employer_or_business" > <input matInput placeholder="Name of the Employer/Business" formControlName="earning_name_of_the_employer_or_business" >
</mat-form-field> </mat-form-field>
<mat-form-field> <mat-form-field>
<input matInput type="number" placeholder="No. of years in Employer/Business" formControlName="earning_number_of_years_in_employment_or_business" <input matInput type="number" placeholder="No. of years in Employer/Business" formControlName="earning_number_of_years_in_employment_or_business" >
>
</mat-form-field> </mat-form-field>
</div> </div>
@ -139,18 +144,28 @@
<mat-form-field *ngIf="item.get('non_earning_occupation').value==1"> <mat-form-field *ngIf="item.get('non_earning_occupation').value==1">
<input matInput placeholder="Specify Others" formControlName="non_earning_if_others" > <input matInput placeholder="Specify Others" formControlName="non_earning_if_others" >
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="item.get('non_earning_occupation').value==2" >
<input matInput placeholder="Specify School/College Name" formControlName="non_earning_if_schoolorcollege">
</mat-form-field>
<mat-form-field *ngIf="item.get('non_earning_occupation').value==3"> <mat-form-field *ngIf="item.get('non_earning_occupation').value==3">
<input matInput type="date" placeholder="Retired From" formControlName="non_earning_if_retired_from" > <input matInput type="date" placeholder="Retired From" formControlName="non_earning_if_retired_from" >
</mat-form-field> </mat-form-field>
</div> </div>
</mat-card> <ion-buttons end>
<ion-col col-3 offset-3>
<button ion-button color="optblue" clear (click)="removeMemberDet(ix,i)" ><ion-icon style="font-size:22px" name="md-trash"></ion-icon></button>
</ion-col>
<ion-col col-1 offset-1>
<button ion-button color="optblue" (click)="addMemberDet(i)" *ngIf="last" clear ><ion-icon style="font-size:24px" name="add-circle"></ion-icon></button>
</ion-col>
</ion-buttons>
</div> </div>
</div> </div>
</mat-card>
</section> </section>
</div> </div>

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

@ -5,6 +5,7 @@ import { QuestionCategoryProvider } from '../../../providers/question-category/q
import { AwsServiceProvider } from '../../../providers/aws-service/aws-service'; import { AwsServiceProvider } from '../../../providers/aws-service/aws-service';
import { ToastProvider } from '../../../providers/common-provider/toast'; import { ToastProvider } from '../../../providers/common-provider/toast';
import { controlNameBinding } from '@angular/forms/src/directives/reactive_directives/form_control_name'; import { controlNameBinding } from '@angular/forms/src/directives/reactive_directives/form_control_name';
import { ConstantsProvider } from '../../../providers/constants/constants'
/** /**
* Generated class for the PdQuestionFamilyPage page. * Generated class for the PdQuestionFamilyPage page.
@ -49,11 +50,20 @@ data:any;
stateData:any; stateData:any;
cityData: any =[]; cityData: any =[];
pincodeData:any=[]; pincodeData:any=[];
FamilyMemberAsLabel: any=[];
selectPerson: any=[];
apiFamilyMembers: any=[];
isReadOnly: any=[];
RentAmount: any=[];
IncomePerMonth: any=[];
// cons: any;
constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,public qustCat:QuestionCategoryProvider,public aws:AwsServiceProvider,public toast:ToastProvider) { constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
public qustCat:QuestionCategoryProvider,public aws:AwsServiceProvider,public toast:ToastProvider,public cons:ConstantsProvider) {
this.FormId = this.navParams.get('FormId'); this.FormId = this.navParams.get('FormId');
this.pdDetails = this.navParams.get('pdDetails'); this.pdDetails = this.navParams.get('pdDetails');
this.selected_person=this.pdDetails.pdapplicants_details; this.selected_person=this.pdDetails.pdapplicants_details;
this.selectPerson=this.pdDetails.applicat_details
console.log("applicant details",this.selected_person); console.log("applicant details",this.selected_person);
console.log('Pd Applicant',this.pdDetails); console.log('Pd Applicant',this.pdDetails);
this.users = this.aws.getlocale(); this.users = this.aws.getlocale();
@ -71,13 +81,14 @@ data:any;
}); });
this.getRelation(); this.getRelation();
this.getoccupation(); this.getoccupation();
this.getFamilyData();
} }
ionViewDidLoad() { ionViewDidLoad() {
console.log('ionViewDidLoad PdQuestionFamilyPage'); console.log('ionViewDidLoad PdQuestionFamilyPage');
this.getFamilyData();
} }
initFamilyDetails(records) : void initFamilyDetails(records) : void
{ {
@ -101,6 +112,11 @@ data:any;
} }
else{ else{
records.forEach((val,index)=>{ records.forEach((val,index)=>{
if(val.rent != null){
this.RentAmount[index] = this.cons.convertNumberToWords(val.rent);
}
this.FamilyMemberAsLabel[index] = this.selectPerson.filter(item => item.pd_co_applicant_id == val.selected_person)[0].applicant_name;
this.getCity(val.residence_state,index); this.getCity(val.residence_state,index);
let formData:FormGroup=this.fb.group({ let formData:FormGroup=this.fb.group({
selected_person:[val.selected_person], selected_person:[val.selected_person],
@ -166,24 +182,31 @@ data:any;
initFamilyMembersDetails(inx,val) :void { initFamilyMembersDetails(inx,val) :void {
const control = <FormArray>this.familyForm.controls['family_details']['controls'][inx].controls.family_members_details; const control = <FormArray>this.familyForm.controls['family_details']['controls'][inx].controls.family_members_details;
// console.log("Controls for family members ",control.length); // console.log("Controls for family members ",control.length);
for (let vals of val) { val.forEach((vals,index)=>{
if(vals.earning_gross_income_per_month != null){
this.IncomePerMonth[index] = this.cons.convertNumberToWords(vals.earning_gross_income_per_month);
}
let datas = this.fb.group({ let datas = this.fb.group({
family_member_name: [vals.family_member_name || null, Validators.compose([])], family_member_name: [vals.family_member_name || null, Validators.compose([])],
family_member_relationship: [vals.family_member_relationship || null, Validators.compose([])], family_member_relationship: [vals.family_member_relationship || null, Validators.compose([])],
family_member_age: [vals.family_member_age || null, Validators.compose([])], family_member_age: [vals.family_member_age || null, Validators.compose([])],
family_member_earning_status: [vals.family_member_earning_status || null, Validators.compose([])], family_member_earning_status: [vals.family_member_earning_status || null, Validators.compose([])],
earning_segment: [vals.earning_segment || null, Validators.compose([])], earning_segment: [vals.earning_segment || null, Validators.compose([])],
earning_if_others_segment:[vals.earning_if_others_segment || null, Validators.compose([])],
earning_gross_income_per_month: [vals.earning_gross_income_per_month || null, Validators.compose([])], earning_gross_income_per_month: [vals.earning_gross_income_per_month || null, Validators.compose([])],
earning_name_of_the_employer_or_business: [vals.earning_name_of_the_employer_or_business || null, Validators.compose([])], earning_name_of_the_employer_or_business: [vals.earning_name_of_the_employer_or_business || null, Validators.compose([])],
earning_number_of_years_in_employment_or_business: [vals.earning_number_of_years_in_employment_or_business || null, Validators.compose([])], earning_number_of_years_in_employment_or_business: [vals.earning_number_of_years_in_employment_or_business || null, Validators.compose([])],
non_earning_occupation: [vals.non_earning_occupation || null, Validators.compose([])], non_earning_occupation: [vals.non_earning_occupation || null, Validators.compose([])],
non_earning_if_others: [vals.non_earning_if_others || null, Validators.compose([])], non_earning_if_others: [vals.non_earning_if_others || null, Validators.compose([])],
non_earning_if_schoolorcollege:[vals.non_earning_if_schoolorcollege || null, Validators.compose([])],
non_earning_if_retired_from: [vals.non_earning_if_retired_from || null, Validators.compose([])], non_earning_if_retired_from: [vals.non_earning_if_retired_from || null, Validators.compose([])],
}) })
// console.log("family member control",control); // console.log("family member control",control);
control.push(datas); control.push(datas);
} });
} }
/*return this.fb.group({ /*return this.fb.group({
@ -214,6 +237,23 @@ data:any;
const control=<FormArray>this.familyForm.controls['family_details']; const control=<FormArray>this.familyForm.controls['family_details'];
control.removeAt(i); control.removeAt(i);
} }
addMemberDet(data:any){
const control=<FormArray>this.familyForm.controls['family_details']['controls'][data].controls.family_members_details;
//this.initFamilyMembersDetails('','')
control.push(this.generateFamilyMembersDetailsGet())
}
removeMemberDet(index:any,f_index:any){
const control=<FormArray>this.familyForm.controls['family_details']['controls'][f_index].controls.family_members_details;
console.log("length",control)
if(control.length>1){
control.removeAt(index);
}
else{
control.reset()
}
// if(control.value !=null && index == 0)
}
getNumberOfFamilyMemberDetails(data) getNumberOfFamilyMemberDetails(data)
{ {
@ -275,11 +315,13 @@ data:any;
family_member_age: ['', Validators.compose([])], family_member_age: ['', Validators.compose([])],
family_member_earning_status: ['', Validators.compose([])], family_member_earning_status: ['', Validators.compose([])],
earning_segment: ['', Validators.compose([])], earning_segment: ['', Validators.compose([])],
earning_if_others_segment:['',Validators.compose([])],
earning_gross_income_per_month: ['', Validators.compose([])], earning_gross_income_per_month: ['', Validators.compose([])],
earning_name_of_the_employer_or_business: ['', Validators.compose([])], earning_name_of_the_employer_or_business: ['', Validators.compose([])],
earning_number_of_years_in_employment_or_business: ['', Validators.compose([])], earning_number_of_years_in_employment_or_business: ['', Validators.compose([])],
non_earning_occupation: ['', Validators.compose([])], non_earning_occupation: ['', Validators.compose([])],
non_earning_if_others: ['', Validators.compose([])], non_earning_if_others: ['', Validators.compose([])],
non_earning_if_schoolorcollege:['',Validators.compose([])],
non_earning_if_retired_from: ['', Validators.compose([])], non_earning_if_retired_from: ['', Validators.compose([])],
}) })
} }
@ -525,6 +567,84 @@ savepdfamily(answerData)
} }
})*/ })*/
} }
selectedPerson(e,inx){
this.FamilyMemberAsLabel[inx] = this.selectPerson.filter(item => item.pd_co_applicant_id == e)[0].applicant_name;
const control = <FormArray>this.familyForm.controls['family_details']['controls'][inx].controls.family_members_details;
let newControlLength: number;
let oldControlLength: number = control.length;
if(this.apiFamilyMembers.length>0){
let arraydata : any;
let data = this.apiFamilyMembers.filter(item => item.relation_to == e);
// data_gets_from:'GeneralForm'
// data_gets_from:'BusinessForm'
if(data.length > 0){
newControlLength = data.length;
let index: number = 0;
while(index < oldControlLength)
{
control.removeAt(index);
index++;
}
oldControlLength = newControlLength
data.forEach((val,inx) => {
// family_member_earning_status
if(val.age){
this.isReadOnly[inx] = true;
}else{
this.isReadOnly[inx] = false;
}
arraydata = {
'family_member_name' : val.name,
'family_member_relationship' : val.relationship,
'family_member_age' : val.age,
'family_member_earning_status': val.data_gets_from == 'BusinessForm' ? '1' :'',
'earning_segment': '',
'earning_gross_income_per_month': '',
'earning_name_of_the_employer_or_business':'',
'earning_number_of_years_in_employment_or_business': '',
'earning_if_others_segment':'',
'non_earning_occupation': '',
'non_earning_if_others': '',
'non_earning_if_retired_from': '',
'non_earning_if_schoolorcollege': ''
}
control.push(this.initgenerateFamilyMembersDetailsGet(arraydata));
});
}
else{
let index: number = 0;
while(index < oldControlLength)
{
control.removeAt(index);
index++;
}
oldControlLength = 1;
control.push(this.generateFamilyMembersDetailsGet());
}
}
else{
control.push(this.generateFamilyMembersDetailsGet());
}
}
generateFamilyMembersDetailsGetData(data){ generateFamilyMembersDetailsGetData(data){
var result = Object.keys(data).map(function (key) { var result = Object.keys(data).map(function (key) {
return data[key]; return data[key];
@ -543,11 +663,13 @@ initgenerateFamilyMembersDetailsGet(val):FormGroup{
family_member_age: [val.family_member_age, Validators.compose([])], family_member_age: [val.family_member_age, Validators.compose([])],
family_member_earning_status: [val.family_member_earning_status, Validators.compose([])], family_member_earning_status: [val.family_member_earning_status, Validators.compose([])],
earning_segment: [val.earning_segment, Validators.compose([])], earning_segment: [val.earning_segment, Validators.compose([])],
earning_if_others_segment:[val.earning_if_others_segment,Validators.compose([])],
earning_gross_income_per_month: [val.earning_gross_income_per_month, Validators.compose([])], earning_gross_income_per_month: [val.earning_gross_income_per_month, Validators.compose([])],
earning_name_of_the_employer_or_business: [val.earning_name_of_the_employer_or_business, Validators.compose([])], earning_name_of_the_employer_or_business: [val.earning_name_of_the_employer_or_business, Validators.compose([])],
earning_number_of_years_in_employment_or_business: [val.earning_number_of_years_in_employment_or_business, Validators.compose([])], earning_number_of_years_in_employment_or_business: [val.earning_number_of_years_in_employment_or_business, Validators.compose([])],
non_earning_occupation: [val.non_earning_occupation, Validators.compose([])], non_earning_occupation: [val.non_earning_occupation, Validators.compose([])],
non_earning_if_others: [val.non_earning_if_others, Validators.compose([])], non_earning_if_others: [val.non_earning_if_others, Validators.compose([])],
non_earning_if_schoolorcollege:[val.non_earning_if_schoolorcollege,Validators.compose([])],
non_earning_if_retired_from: [val.non_earning_if_retired_from, Validators.compose([])], non_earning_if_retired_from: [val.non_earning_if_retired_from, Validators.compose([])],
}) })
} }
@ -555,6 +677,44 @@ resValue:any;
getFamilyData() getFamilyData()
{ {
this.qustCat.getFamilyDetails(this.pdDetails.pd_id).subscribe(res=>{
if(res['dataStatus']==true){
let Temparr : any = [];
console.log("Family Details",res.record)
if(res.record.from_general_form.length>0){
let familyMembersGeneralForm=Object.keys(res.record.from_general_form).map(function(key){
return res.record.from_general_form[key]
});
let datas=familyMembersGeneralForm.map(element=>{
return {id:element.pd_co_applicant_id.toString(),
name:element.applicant_name,
relationship:element.relationship,
relation_to:element.relation_to,
age:element.age,
data_gets_from:'GeneralForm'};
// console.log('familyMembersGeneralForm',familyMembersGeneralForm);
});
Temparr.push(datas);
}
if(res.record.from_business_form.length >0){
let familyMembersBusinessForm=Object.keys(res.record.from_business_form).map(function(key){
return res.record.from_business_form[key]
});
let datas=familyMembersBusinessForm.map(element=>{
return {id:element.other_family_relationship_id.toString(),
name:element.family_member_name,
relationship:element.other_family_relationship_id,
relation_to:element.relation_to_id,
age:'',
data_gets_from:'BusinessForm'};
});
Temparr.push(datas);
}
this.apiFamilyMembers = [].concat.apply([],Temparr);
}
})
let records={'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id}; let records={'pd_id':this.pdDetails.pd_id,'pd_form_id':this.FormId.form_id};
this.qustCat.retiverForm(records).subscribe(res=>{ this.qustCat.retiverForm(records).subscribe(res=>{
@ -656,6 +816,20 @@ resValue:any;
} }
}) */ }) */
} }
/** To Convert Amount into Words */
inWords(e,flag:number,i){
switch(flag){
case 1 :
this.RentAmount[i] = this.cons.convertNumberToWords(e.target.value);
break;
case 2 :
this.IncomePerMonth[i] = this.cons.convertNumberToWords(e.target.value);
break;
default:
break;
}
}
initSetValue(records):void{ initSetValue(records):void{
for(let val of records){ for(let val of records){
let formData:FormGroup=this.fb.group({ let formData:FormGroup=this.fb.group({

180
src/pages/pd-question/pd-question-family1/pd-question-family.html
View File

@ -1,180 +0,0 @@
<ion-header>
<ion-navbar color="optblue">
<button ion-button menuToggle>
<ion-icon name="menu"></ion-icon>
</button>
<ion-title *ngIf="!viewchange">Family Category</ion-title>
</ion-navbar>
</ion-header>
<ion-content padding>
<form class="address" [formGroup]="familyForm">
<mat-card>
<mat-form-field style="width: 100%">
<mat-select placeholder="Person Met" formControlName="person">
<mat-option *ngFor="let state of filteredStates" [value]="state">
{{state}}
</mat-option>
</mat-select>
</mat-form-field>
{{person}}
<mat-form-field *ngIf="person =='Other'" style="width: 100%">
<input matInput placeholder="Enter the relationship" formControlName="personOther">
</mat-form-field>
<mat-form-field style="width: 100%">
<input matInput placeholder="No. Of family members" formControlName="members">
</mat-form-field>
</mat-card>
<mat-card>
<mat-card-header>
<p>Earning Members
<p>
</mat-card-header>
<div formArrayName="earningMembers">
<div *ngFor="let item of familyForm.get('earningMembers').controls; let i=index;let last = last"
[formGroupName]="i">
<mat-card-content class="matcard">
<mat-form-field style="width: 100%">
<mat-select placeholder="Relation" formControlName="relation">
<mat-option value="{{relation.relationship_id}}"
*ngFor="let relation of relationData">
{{relation.name}}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width: 100%">
<mat-select placeholder="Segment" formControlName="segment">
<mat-option value="Salaried">Salaried</mat-option>
<mat-option value="SENP">SENP</mat-option>
<mat-option value="SEP">SEP</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width: 100%">
<input matInput placeholder="Income / Revenue"
formControlName="income">
</mat-form-field>
<mat-form-field style="width: 100%">
<input matInput placeholder="Name of Employer / Business"
formControlName="employerName">
</mat-form-field>
<ion-buttons end >
<ion-col col-3>
<a (click)="addearningMembers()" *ngIf="last">
<ion-icon name="md-add" color="optblue" style="font-size: 22px;"></ion-icon></a>
</ion-col>
<ion-col col-3>
<a (click)="deleteEarningMembers(i)">
<ion-icon name="md-close" color="optblue" style="font-size: 22px;"></ion-icon></a>
</ion-col>
</ion-buttons>
</mat-card-content>
</div>
</div>
</mat-card>
<br/>
<mat-card>
<mat-card-header>
<p>Non Earning Members
<p>
</mat-card-header>
<div formArrayName="nonEarningMembers">
<div *ngFor="let members of familyForm.get('nonEarningMembers').controls; let i=index;let last = last"
[formGroupName]="i">
<mat-card-content class="matcard">
<mat-form-field style="width: 100%">
<mat-select placeholder="Relation"
formControlName="relationship">
<mat-option value="{{relation.relationship_id}}"
*ngFor="let relation of relationData">
{{relation.name}}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width: 100%">
<mat-select placeholder="Occupation"
formControlName="occupation">
<mat-option value="{{occupation.occupation_non_earning_member_id}}"
*ngFor="let occupation of occupationData">{{occupation.name}}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width: 100%">
<input matInput placeholder="Retired From"
formControlName="retired">
</mat-form-field>
<ion-buttons end >
<ion-col col-3>
<a (click)="addMembers()" *ngIf="last">
<ion-icon name="md-add" color="optblue" style="font-size: 22px;"></ion-icon></a>
</ion-col>
<ion-col offset-3 col-3>
<a (click)="deleteMembers(i)">
<ion-icon name="md-close" color="optblue" style="font-size: 22px;"></ion-icon></a>
</ion-col>
</ion-buttons>
</mat-card-content>
</div>
</div>
</mat-card>
<br/>
<mat-card>
<mat-card-header>
<p>Residence
<p>
</mat-card-header>
<mat-card-content class="matcard">
<mat-form-field style="width: 100%">
<input matInput placeholder="Where is the residence"
formControlName="residence">
</mat-form-field>
<mat-form-field style="width: 100%">
<input matInput placeholder="No.of yrs" formControlName="years">
</mat-form-field>
<mat-form-field>
<mat-select placeholder="Ownership" formControlName="ownership">
<mat-option value="Self">Self Owned</mat-option>
<mat-option value="Family">Family Owned</mat-option>
<mat-option value="Rented">Rented</mat-option>
<mat-option value="Others">Others</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width: 100%" *ngIf="ownership =='Others'">
<input matInput placeholder="Please specify" formControlName="ownershipOther">
</mat-form-field>
<mat-form-field style="width: 100%" *ngIf="ownership =='Rented'">
<input matInput placeholder="what rent"
formControlName="rent">
</mat-form-field>
</mat-card-content>
</mat-card>
<br/>
<mat-card>
<mat-form-field style="width: 100%">
<input matInput placeholder="Remarks"
formControlName="family_details_form_remark">
</mat-form-field>
</mat-card>
<ion-row>
<!-- <ion-buttons >
<ion-button color="optblue" full[disabled]="!pdforms.valid" mat-raised-button style="width:100%" (click)="savepdDetails(pdforms.value)">Save <ion-icon name="md-disc"></ion-icon></ion-button> -->
<button ion-button full color="optblue" (click)="savepdfamily(familyForm.value)"> Save</button>
<!-- </ion-buttons> -->
</ion-row>
</form>
</ion-content>

3
src/pages/pd-question/pd-question-family1/pd-question-family.scss
View File

@ -1,3 +0,0 @@
page-pd-question-family {
}

220
src/pages/pd-question/pd-question-family1/pd-question-family.ts
View File

@ -1,220 +0,0 @@
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
import { FormGroup, FormBuilder, FormArray } from '@angular/forms';
import { QuestionCategoryProvider } from '../../../providers/question-category/question-category';
import { AwsServiceProvider } from '../../../providers/aws-service/aws-service';
import { ToastProvider } from '../../../providers/common-provider/toast';
/**
* Generated class for the PdQuestionFamilyPage page.
*
* See https://ionicframework.com/docs/components/#navigation for more info on
* Ionic pages and navigation.
*/
@Component({
selector: 'page-pd-question-family',
templateUrl: 'pd-question-family.html',
})
export class PdQuestionFamilyPage {
users: any;
pdDetails: any;
occupationData: any;
membersitem: FormArray;
items: FormArray;
relationData: any;
familyForm: FormGroup;
filteredStates: any = [
'Co-Applicant 1 to x',
'Accountant',
'Manager',
'Relative of the applicant',
'Friend of the Applicant',
'DSA',
'Other'
];
constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,public qustCat:QuestionCategoryProvider,public aws:AwsServiceProvider,public toast:ToastProvider) {
this.pdDetails = this.navParams.get('pdDetails');
this.users = this.aws.getlocale();
this.getFamilyData();
this.familyForm = this.fb.group({
person: [null],
personOther: [null],
members: [null],
residence: [null],
years: [null],
ownership: [null],
ownershipOther: [null],
rent: [null],
family_details_form_remark:[null],
earningMembers: this.fb.array([]),
nonEarningMembers: this.fb.array([])
});
this.getRelation();
this.getoccupation();
}
ionViewDidLoad() {
console.log('ionViewDidLoad PdQuestionFamilyPage');
}
getRelation() {
let master_name = 'RELATIONSHIPS';
this.qustCat.getcommondrop(master_name).subscribe(data => {
//console.log('data', data);
if(data['dataStatus'] == true){
this.relationData = data['records'].filter(rel=>rel.isactive ==1);
}
});
}
getoccupation()
{
let master_name = 'OCCUPATIONMEMBERS';
this.qustCat.getcommondrop(master_name).subscribe(data => {
//console.log('data', data);
if(data['dataStatus']==true){
this.occupationData = data['records'].filter(occ=>occ.isactive ==1);
}
});
}
createMembers(): FormGroup {
return this.fb.group({
relation: [null],
segment: [null],
income: [null],
employerName: [null],
});
}
addearningMembers()
{
this.items = this.familyForm.get('earningMembers') as FormArray;
this.items.push(this.createMembers());
}
deleteEarningMembers(i)
{
this.items.removeAt(i);
}
createNonMembers(): FormGroup {
return this.fb.group({
relationship: [null],
occupation: [null],
retired: [null],
});
}
addMembers()
{
this.membersitem =this.familyForm.get('nonEarningMembers') as FormArray;
this.membersitem.push(this.createNonMembers());
}
deleteMembers(i)
{
this.membersitem.removeAt(i);
}
savepdfamily(answerData)
{
console.log(answerData);
let records: any = {};
records.no_of_years = answerData.years;
if (answerData.ownership == 'Others') {
records.ownership = answerData.ownershipOther;
} else {
records.ownership = answerData.ownership;
}
records.residence = answerData.residence;
if (answerData.ownership == 'Rented') {
records.what_rent = answerData.rent;
}
if (answerData.person == 'Other') {
records.person_met = answerData.personOther.value;
} else {
records.person_met = answerData.person;
}
records.family_members = answerData.members;
records.earning_members = answerData.earningMembers;
records.non_earning_members = answerData.nonEarningMembers;
records.pdid = this.pdDetails.pd_id;
records.formid = '335';
records.fk_createdby = this.users;
records.family_details_form_remark = answerData.family_details_form_remark;
console.log('params', records);
this.qustCat.saveForm(records).subscribe(res=>
{
//console.log(res);
if(res['dataStatus']==true)
{
this.toast.pdTriggerappmessage('Record Saved Successfully.!');
this.navCtrl.pop();
}
})
}
getFamilyData()
{
let earning:any = [];
let non_earning:any = [];
let records = {'pd_id':this.pdDetails.pd_id,'pd_form_id':'335'}
this.qustCat.retiverForm(records).subscribe(res=>
{
if(res['dataStatus']==true)
{
non_earning = Object.keys(res['records'].non_earning_members).map(function(key) {
return res['records'].non_earning_members[key];
});
console.log(non_earning);
this.familyForm.controls['family_details_form_remark'].setValue(res['records'].family_details_form_remark);
earning = Object.keys(res['records'].earning_members).map(function(key) {
return res['records'].earning_members[key];
});
console.log(earning);
let familyDetails = res['records'];
this.familyForm.controls['person'].setValue(familyDetails.person_met);
this.familyForm.controls['personOther'].setValue(familyDetails.personOther);
this.familyForm.controls['members'].setValue(familyDetails.family_members);
this.familyForm.controls['residence'].setValue(familyDetails.residence);
this.familyForm.controls['years'].setValue(familyDetails.no_of_years);
this.familyForm.controls['ownership'].setValue(familyDetails.ownership);
this.familyForm.controls['ownershipOther'].setValue(familyDetails.ownershipOther);
this.familyForm.controls['rent'].setValue(familyDetails.rent);
// this.familyForm.controls['earningMembers'].setValue(earning);
// for(this.)
this.items = this.familyForm.get('earningMembers') as FormArray;
this.membersitem =this.familyForm.get('nonEarningMembers') as FormArray;
if(earning.length==0)
{
this.items.push(this.createMembers());
}else
{
earning.forEach(datas => {
this.items.push(this.createMembers());
});
}
this.familyForm.controls['earningMembers'].setValue(earning);
if(non_earning.length==0)
{
this.membersitem.push(this.createNonMembers());
}else
{
non_earning.forEach(datas => {
this.membersitem.push(this.createNonMembers());
});
}
this.familyForm.controls['nonEarningMembers'].setValue(non_earning);
// for(let earningDetails of earning){
// this.items = this.familyForm.get('earningMembers') as FormArray;
// this.items.push(earning);
// }
}
})
}
}

3
src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.scss
View File

@ -7,5 +7,8 @@ page-pd-question-final-remark {
mat-form-field{ mat-form-field{
width:100%; width:100%;
} }
.scroll-content{
background-color: #eee;
}
} }

18
src/pages/pd-question/pd-question-financial-info/pd-question-financial-info.html
View File

@ -1,18 +0,0 @@
<!--
Generated template for the PdQuestionFinancialInfoPage page.
See http://ionicframework.com/docs/components/#navigation for more info on
Ionic pages and navigation.
-->
<ion-header>
<ion-navbar>
<ion-title>pdQuestionFinancialInfo</ion-title>
</ion-navbar>
</ion-header>
<ion-content padding>
</ion-content>

3
src/pages/pd-question/pd-question-financial-info/pd-question-financial-info.scss
View File

@ -1,3 +0,0 @@
page-pd-question-financial-info {
}

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

@ -1,25 +0,0 @@
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
/**
* Generated class for the PdQuestionFinancialInfoPage page.
*
* See https://ionicframework.com/docs/components/#navigation for more info on
* Ionic pages and navigation.
*/
@Component({
selector: 'page-pd-question-financial-info',
templateUrl: 'pd-question-financial-info.html',
})
export class PdQuestionFinancialInfoPage {
constructor(public navCtrl: NavController, public navParams: NavParams) {
}
ionViewDidLoad() {
console.log('ionViewDidLoad PdQuestionFinancialInfoPage');
}
}

3
src/pages/pd-question/pd-question-lender-representative/pd-question-lender-representative.scss
View File

@ -4,5 +4,8 @@ page-pd-question-lender-representative {
border-radius: 10px !important; border-radius: 10px !important;
box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important; box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important;
} }
.scroll-content{
background-color: #eee;
}
} }

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

@ -73,14 +73,14 @@
<mat-form-field style="width: 100%"> <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-form-field style="width:100%" *ngIf="loanDetailsForm.controls['topup_amount'].value > 0 " >
<mat-select placeholder="What is the End Use of the Top Up?" <mat-select placeholder="What is the End Use of the Top Up?"
formControlName="end_use_topup" > 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-option *ngFor="let list of m_endUseOFTopUpList" [value]="list.end_use_of_topup_id">{{ list.end_use_of_topup }}</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="loanDetailsForm.controls['end_use_topup'].value == 1"> <mat-form-field style="width:100%" *ngIf="loanDetailsForm.controls['end_use_topup'].value == 1">
<input matInput placeholder="Specify End Use of Top Up" formControlName="other_end_use_topup" autocomplete="off"> <input matInput placeholder="Specify End Use of Top Up" formControlName="other_end_use_topup" autocomplete="off">
</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'">

6
src/pages/pd-question/pd-question-neighbour-hood/pd-question-neighbour-hood.html
View File

@ -14,7 +14,7 @@
<ion-content padding> <ion-content padding>
<form [formGroup]="neighbourhoodForm"> <form [formGroup]="neighbourhoodForm">
<mat-card> <mat-card>
<mat-label>Please Select the type</mat-label> <mat-label>Please Select the type</mat-label><br/>
<mat-radio-group formControlName="check_type" class="example-radio-group" style="width: 100%;"> <mat-radio-group formControlName="check_type" class="example-radio-group" style="width: 100%;">
<mat-radio-button style="margin-top:10px" class="example-radio-button" color="primary" [value]="types.id" *ngFor="let types of check_type; let t = index">{{types.type_name}}</mat-radio-button> <mat-radio-button style="margin-top:10px" class="example-radio-button" color="primary" [value]="types.id" *ngFor="let types of check_type; let t = index">{{types.type_name}}</mat-radio-button>
</mat-radio-group> </mat-radio-group>
@ -36,7 +36,7 @@
<mat-option value="No">No</mat-option> <mat-option value="No">No</mat-option>
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<div *ngIf="neighbourhood.controls.do_know.value=='Yes'"> <div *ngIf="neighbourhood.controls.do_know.value!=''">
<br/> <br/>
<div appearance="outline"> <div appearance="outline">
@ -182,7 +182,9 @@
</div> </div>
</mat-card> </mat-card>
<mat-card> <mat-card>
<mat-form-field>
<textarea matInput type="text" placeholder="Remarks" name="neighbour_reference_remark" formControlName="neighbour_reference_remark"></textarea> <textarea matInput type="text" placeholder="Remarks" name="neighbour_reference_remark" formControlName="neighbour_reference_remark"></textarea>
</mat-form-field>
</mat-card> </mat-card>
<ion-row> <ion-row>

3
src/pages/pd-question/pd-question-neighbour-hood/pd-question-neighbour-hood.scss
View File

@ -10,5 +10,8 @@ page-pd-question-neighbour-hood {
mat-hint{ mat-hint{
font-size: 11px; font-size: 11px;
} }
.scroll-content{
background-color: #eee;
}
} }

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

@ -16,14 +16,14 @@
<form [formGroup]="otherIncomeForm" class="address"> <form [formGroup]="otherIncomeForm" class="address">
<!-- <mat-form-field style="width: 100%" > <!-- <mat-form-field style="width: 100%" >
<mat-select placeholder="Other Income" <mat-select placeholder="Other Income"
formControlName="other_income" (selectionChange)="checkotherDetails($event.value)"> formControlName="other_income" >
<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-card style="width: 100%"> <mat-card style="width: 100%">
<p>Other Income</p> <p>Other Income</p>
<mat-radio-group formControlName="other_income"> <mat-radio-group formControlName="other_income" (change)="checkotherDetails($event.value)">
<mat-radio-button value="Yes">Yes</mat-radio-button> <mat-radio-button value="Yes">Yes</mat-radio-button>
&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;
<mat-radio-button value="No">No</mat-radio-button> <mat-radio-button value="No">No</mat-radio-button>

3
src/pages/pd-question/pd-question-other-income/pd-question-other-income.scss
View File

@ -13,5 +13,8 @@ page-pd-question-other-income {
.mat-card-content{ .mat-card-content{
margin-bottom: 0px !important; margin-bottom: 0px !important;
} }
.scroll-content{
background-color: #eee;
}
} }

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

@ -85,10 +85,23 @@ deleteIncomeDetails(index) {
} }
checkotherDetails(val) checkotherDetails(val)
{ {
console.log("Change",val)
if(val=="Yes") if(val=="Yes")
{ {
this.addIncomeDetails(); this.addIncomeDetails();
} }
if(val=="No"){
//let length=this.otherIncomeForm.income_details.controls.length
const control= <FormArray>this.otherIncomeForm.controls['income_details'];
control.removeAt(0)
// let len=control.length
// console.log("Form",this.otherIncomeForm)
// console.log("Length",control.length)
// for(let i=0;i<len;i++){
// control.removeAt(i);
// }
// //this.deleteIncomeDetails("")
}
} }
getFrequency() { getFrequency() {
this.qustCat.getAllPersonsName(this.pdid).subscribe(res=>{ this.qustCat.getAllPersonsName(this.pdid).subscribe(res=>{

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

@ -1,79 +0,0 @@
<ion-header>
<ion-navbar color="optblue">
<button ion-button menuToggle>
<ion-icon name="menu"></ion-icon>
</button>
<ion-title *ngIf="!viewchange">Other Income Category</ion-title>
</ion-navbar>
</ion-header>
<ion-content padding>
<form [formGroup]="otherIncomeForm" class="address">
<mat-form-field style="width: 100%" >
<mat-select placeholder="Other Income"
formControlName="other_income" (selectionChange)="checkotherDetails($event.value)">
<mat-option value="Yes">Yes</mat-option>
<mat-option value="No">No</mat-option>
</mat-select>
</mat-form-field>
<mat-card *ngIf="otherIncomeForm.controls.other_income.value == 'Yes'">
<mat-card-header>
</mat-card-header>
<div formArrayName="income_details">
<div *ngFor="let details of otherIncomeForm.get('income_details').controls; let i=index;let last=last;"
[formGroupName]="i">
<h3>Loan Details{{i+1}}</h3>
<mat-card-content class="matcard">
<mat-form-field style="width: 100%">
<mat-select placeholder="Source"
formControlName="source">
<mat-option value="rental_income">Rental Income</mat-option>
<mat-option value="interest_income">Interest Income</mat-option>
<mat-option value="agricultural_income">Agricultural Income</mat-option>
<mat-option value="dividend_income">Dividend Income and Others</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width: 100%">
<input matInput placeholder="Amount" formControlName="amount">
</mat-form-field>
<mat-form-field style="width: 100%">
<mat-select placeholder="Frequency" formControlName="frequency">
<mat-option value="{{frq.frequency_id}}" *ngFor="let frq of frequencyData">{{frq.name}}</mat-option>
</mat-select>
</mat-form-field>
<ion-buttons end>
<ion-col col-3>
<a (click)="addIncomeDetails()" *ngIf="last">
<ion-icon name="md-add" color="optblue" style="font-size: 22px;"></ion-icon></a>
</ion-col>
<ion-col offset-3 col-3>
<a (click)="deleteIncomeDetails(i)">
<ion-icon name="md-close" color="optblue" style="font-size: 22px;"></ion-icon></a>
</ion-col>
</ion-buttons>
</mat-card-content>
</div>
</div>
</mat-card>
<br/>
<mat-card>
<mat-form-field style="width: 100%">
<input matInput placeholder="Remarks"
formControlName="otherincome_remarks">
</mat-form-field>
</mat-card>
<ion-row>
<!-- <ion-buttons >
<ion-button color="optblue"
full[disabled]="!pdforms.valid" mat-raised-button style="width:100%" (click)="savepdDetails(pdforms.value)">Save <ion-icon name="md-disc"></ion-icon></ion-button> -->
<button ion-button full color="optblue" (click)="submitOtherIncome(otherIncomeForm.value)" > Save</button>
<!-- </ion-buttons> -->
</ion-row>
</form>
</ion-content>

3
src/pages/pd-question/pd-question-other-income1/pd-question-other-income.scss
View File

@ -1,3 +0,0 @@
page-pd-question-other-income {
}

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

@ -1,136 +0,0 @@
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
import { FormGroup, FormBuilder,FormArray } from '@angular/forms';
import { QuestionCategoryProvider } from '../../../providers/question-category/question-category';
import { AwsServiceProvider } from '../../../providers/aws-service/aws-service';
import { ToastProvider } from '../../../providers/common-provider/toast';
/**
* Generated class for the PdQuestionOtherIncomePage page.
*
* See https://ionicframework.com/docs/components/#navigation for more info on
* Ionic pages and navigation.
*/
@Component({
selector: 'page-pd-question-other-income',
templateUrl: 'pd-question-other-income.html',
})
export class PdQuestionOtherIncomePage {
otherIncomeDetails: any;
users: any;
pdDetails: any;
questionDetails: any;
frequencyData: any;
otherIncomeForm: FormGroup;
incomeDetails:FormArray;
constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,public qustCat:QuestionCategoryProvider,public aws:AwsServiceProvider,public toast:ToastProvider) {
this.questionDetails = this.navParams.get('questionDetails');
this.pdDetails = this.navParams.get('pdDetails');
this.users = this.aws.getlocale();
this.otherIncomeForm = this.fb.group({
other_income: [null],
otherincome_remarks:[null],
income_details: this.fb.array([])
});
this.getOtherIncome();
this.getFrequency();
}
ionViewDidLoad() {
console.log('ionViewDidLoad PdQuestionOtherIncomePage');
}
createDetail():FormGroup {
return this.fb.group({
source: [null],
amount: [null],
frequency: [null],
});
}
addIncomeDetails() {
this.incomeDetails = this.otherIncomeForm.get('income_details') as FormArray;
this.incomeDetails.push(this.createDetail());
}
deleteIncomeDetails(index) {
this.incomeDetails = this.otherIncomeForm.get('income_details') as FormArray;
this.incomeDetails.removeAt(index);
}
checkotherDetails(val)
{
if(val=="Yes")
{
this.addIncomeDetails();
}
}
getFrequency() {
let master_name = 'FREQUENCY';
this.qustCat.getcommondrop(master_name).subscribe(data => {
//console.log('data', data);
if(data['dataStatus']==true)
{
this.frequencyData = data['records'].filter(fre=>fre.isactive==1);
}
});
}
submitOtherIncome(answerData)
{
let records: any = {};
records.pdid = this.pdDetails.pd_id;
records.formid = '337';
records.fk_createdby = this.users;
records.other_income = answerData.other_income;
records.income_details = answerData.income_details;
records.otherincome_remarks = answerData.otherincome_remarks;
console.log('data', records);
this.qustCat.saveForm(records).subscribe(data => {
console.log('data', data);
this.navCtrl.pop();
this.toast.pdTriggerappmessage('Record Saved Successfully.!');
}, error => {
})
}
getOtherIncome()
{
let records = {'pd_id':this.pdDetails.pd_id,'pd_form_id':'337'};
this.qustCat.retiverForm(records).subscribe(res=>
{
if(res['dataStatus']==true)
{
var incomeArray = Object.keys(res['records'].income_details).map(function(key) {
//console.log(res);
return res['records'].income_details[key];
});
this.otherIncomeDetails = res['records'];
console.log(this.otherIncomeDetails);
this.otherIncomeForm.controls['other_income'].setValue(this.otherIncomeDetails.other_income);
this.otherIncomeForm.controls['otherincome_remarks'].setValue(this.otherIncomeDetails.otherincome_remarks);
this.incomeDetails = this.otherIncomeForm.get('income_details') as FormArray;
if(incomeArray.length==0)
{
this.incomeDetails.push(this.createDetail());
}else
{
incomeArray.forEach(datas=>
{
this.incomeDetails.push(this.createDetail());
})
}
this.otherIncomeForm.controls['income_details'].setValue(incomeArray);
}
})
}
}

3
src/providers/question-category/question-category.ts
View File

@ -105,4 +105,7 @@ savePDImages(imagesDetails)
let record = {'records':imagesDetails}; let record = {'records':imagesDetails};
return this.http.post(this.apiurl+'savePDPhotos',record); return this.http.post(this.apiurl+'savePDPhotos',record);
} }
getFamilyDetails(pdid:any){
return this.http.post<any>(this.apiurl+'getFamilyDetails',{"pd_id":pdid})
}
} }

85
www/build/main.css
View File

@ -29295,6 +29295,32 @@ page-pd-question-business-assets .mat-card-content {
margin-bottom: 0px !important; margin-bottom: 0px !important;
} }
page-pd-question-business-assets .scroll-content {
background-color: #eee;
}
page-pd-question-business-banking .mat-card {
margin-bottom: 15px;
border-radius: 10px !important;
-webkit-box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important;
box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important;
}
page-pd-question-business-banking .mat-card-content {
margin-bottom: 0px !important;
}
page-pd-question-business-banking .accordion {
margin-bottom: 15px;
border-radius: 10px !important;
-webkit-box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important;
box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important;
}
page-pd-question-business-banking .scroll-content {
background-color: #eee;
}
page-pd-question-business-info mat-form-field { page-pd-question-business-info mat-form-field {
width: 100%; width: 100%;
} }
@ -29320,6 +29346,49 @@ page-pd-question-business-info .mat-card-content {
margin-bottom: 0px !important; margin-bottom: 0px !important;
} }
page-pd-question-business-info .scroll-content {
background-color: #eee;
}
page-pd-question-financial-info mat-form-field {
width: 100%;
}
page-pd-question-financial-info .info > span {
bottom: 20px;
margin-left: 10px;
font-size: 13px;
}
page-pd-question-financial-info i, page-pd-question-financial-info b {
font-size: 12px;
}
page-pd-question-financial-info .greenhighlight {
color: green;
background-color: white;
}
page-pd-question-financial-info .highlight {
color: red;
background-color: white;
}
page-pd-question-financial-info .mat-card {
margin-bottom: 15px;
border-radius: 10px !important;
-webkit-box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important;
box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important;
}
page-pd-question-financial-info .mat-card-content {
margin-bottom: 0px !important;
}
page-pd-question-financial-info .scroll-content {
background-color: #eee;
}
page-pd-question-current-loans mat-form-field { page-pd-question-current-loans mat-form-field {
width: 100%; width: 100%;
} }
@ -29377,6 +29446,10 @@ page-pd-question-final-remark mat-form-field {
width: 100%; width: 100%;
} }
page-pd-question-final-remark .scroll-content {
background-color: #eee;
}
page-pd-question-general-info .item-md { page-pd-question-general-info .item-md {
padding-left: 0px !important; padding-left: 0px !important;
} }
@ -29413,6 +29486,10 @@ page-pd-question-lender-representative mat-card {
box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important; box-shadow: 0 16px 38px -12px rgba(0, 0, 0, 0.56), 0 4px 25px 0 rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.2) !important;
} }
page-pd-question-lender-representative .scroll-content {
background-color: #eee;
}
page-pd-question-loans mat-hint { page-pd-question-loans mat-hint {
font-size: 12px; font-size: 12px;
} }
@ -29447,6 +29524,10 @@ page-pd-question-neighbour-hood mat-hint {
font-size: 11px; font-size: 11px;
} }
page-pd-question-neighbour-hood .scroll-content {
background-color: #eee;
}
page-pd-question-other-income mat-form-field { page-pd-question-other-income mat-form-field {
width: 100%; width: 100%;
} }
@ -29466,6 +29547,10 @@ page-pd-question-other-income .mat-card-content {
margin-bottom: 0px !important; margin-bottom: 0px !important;
} }
page-pd-question-other-income .scroll-content {
background-color: #eee;
}
page-pd-question-rental-info .button-md { page-pd-question-rental-info .button-md {
padding: 0 2.9em !important; padding: 0 2.9em !important;
} }

1636
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

1070
www/build/vendor.js
View File

File diff suppressed because it is too large Load Diff

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

File diff suppressed because one or more lines are too long