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

merge : kms

Browse Source
This commit is contained in:
gandhimathi 2019-01-10 10:50:30 +05:30
parent a928bc80f7
commit eadd513906
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -694,8 +694,8 @@ public m_investmentType = [];
}); });
result.forEach((datas,index) => { result.forEach((datas,index) => {
this.OtherAppxMarketAmtInwords[index] = this.pdTrigerService.convertNumberToWords(datas.approximate_market_value); this.OtherAppxMarketAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.approximate_market_value);
this.OtherEmiAmtInwords[index] = this.pdTrigerService.convertNumberToWords(datas.emi_paid); this.OtherEmiAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.emi_paid);
}); });
if (result.length > 0) { if (result.length > 0) {
@ -730,8 +730,8 @@ public m_investmentType = [];
if (result.length > 0) { if (result.length > 0) {
result.forEach((datas,index) => { result.forEach((datas,index) => {
this.appxMarketAmtInwords[index] = this.pdTrigerService.convertNumberToWords(datas.business_approximate_market_value); this.appxMarketAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.business_approximate_market_value);
this.emiAmtInwords[index] = this.pdTrigerService.convertNumberToWords(datas.business_emi_paid); this.emiAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.business_emi_paid);
}); });
for (let val of result) { for (let val of result) {

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

@ -104,9 +104,9 @@ export class BankingDetailsComponent implements OnInit {
control.push(this.createBankarray()); control.push(this.createBankarray());
} else { } else {
result.forEach((datas,index) => { result.forEach((datas,index) => {
this.amtInwords[index] = this._pd.convertNumberToWords(datas.limit); this.amtInwords[index] = this._pd.convertNumberToWords(+datas.limit);
this.selectedBorrower(datas.applicant_name,index); this.selectedBorrower(datas.applicant_name,index);
this.selectedAccTypeChanges(datas.account_type,index) this.selectedAccTypeChanges(+datas.account_type,index)
// this.emiAmtInwords[index] = this._pd.convertNumberToWords(val.emi); // this.emiAmtInwords[index] = this._pd.convertNumberToWords(val.emi);
control.push(this.createBankarray()); control.push(this.createBankarray());
@ -230,10 +230,10 @@ export class BankingDetailsComponent implements OnInit {
if(event == 2 || event == 1) { if(event == 2 || event == 1) {
this.limitCaseFlag[i] = false; this.limitCaseFlag[i] = false;
const control = <FormArray>this.bankingForm.controls['itemRows']; // const control = <FormArray>this.bankingForm.controls['itemRows'];
control.controls[0].get('limit').clearValidators(); // control.controls[0].get('limit').clearValidators();
control.controls[0].get('limit').updateValueAndValidity(); // control.controls[0].get('limit').updateValueAndValidity();
} }
else{ else{

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

@ -1207,8 +1207,8 @@
</mat-card-header> </mat-card-header>
<mat-card-content class="matcard"> <mat-card-content class="matcard">
<mat-form-field> <mat-form-field>
<input matInput placeholder="Amount Invested by Applicant" formControlName="invested_amount" (keypress)="keyPress($event)" (keyup)="inWords($event.target.value)" autocomplete="off"> <input matInput placeholder="Amount Invested by Applicant" formControlName="invested_amount" (keypress)="keyPress($event)" autocomplete="off">
<mat-hint align="start" style="font-size:70%" *ngIf="businessForm.controls['invested_amount'].value != ''">{{"&#8377;"}} {{InvestedAmountInWords}} Only</mat-hint> <!--<mat-hint align="start" style="font-size:70%" *ngIf="businessForm.controls['invested_amount'].value != ''">{{"&#8377;"}} {{InvestedAmountInWords}} Only</mat-hint>-->
</mat-form-field> </mat-form-field>
<!-- <mat-form-field> <!-- <mat-form-field>
<input matInput placeholder="Monthly Working Capital Needed" <input matInput placeholder="Monthly Working Capital Needed"

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

@ -55,7 +55,7 @@ export class BusinessInfoComponent implements OnInit {
//sourceNames: any = {"Private Limited Company": 'Director / Shareholder Details',"Proprietorship": 'Proprietor Details', "Sole Proprietorship": 'Proprietor Details',"Partnership": 'Partner Details',"Limited Liability Partnership (LLP)": 'Partner Details',"One Person Company (OPC)": 'Director Details',"Hindu Undivided Family (HUF)": 'Karta Details',"Society": 'Member Details',"Cooperative": 'Member Details',"Trust": 'Trustee Details',"Public Ltd Company": 'Director / Shareholder Details','Individual':'Self',"Others": 'Other Enitity Details'}; //sourceNames: any = {"Private Limited Company": 'Director / Shareholder Details',"Proprietorship": 'Proprietor Details', "Sole Proprietorship": 'Proprietor Details',"Partnership": 'Partner Details',"Limited Liability Partnership (LLP)": 'Partner Details',"One Person Company (OPC)": 'Director Details',"Hindu Undivided Family (HUF)": 'Karta Details',"Society": 'Member Details',"Cooperative": 'Member Details',"Trust": 'Trustee Details',"Public Ltd Company": 'Director / Shareholder Details','Individual':'Self',"Others": 'Other Enitity Details'};
sourceNames: {[k: string]: any} = {}; sourceNames: {[k: string]: any} = {};
maxDate:any; maxDate:any;
InvestedAmountInWords:any; // InvestedAmountInWords:any;
public relationSource= new MatTableDataSource(); public relationSource= new MatTableDataSource();
displayedColumns = ['family_member_name','relation','relation_to','relationship_with_company','started_business']; displayedColumns = ['family_member_name','relation','relation_to','relationship_with_company','started_business'];
constructor(notifier: NotifierService, constructor(notifier: NotifierService,
@ -113,7 +113,7 @@ export class BusinessInfoComponent implements OnInit {
params.company_id = this.company_id; params.company_id = this.company_id;
this._pd.retriveForm(params).subscribe(data => { this._pd.retriveForm(params).subscribe(data => {
let businessVal = data.records; let businessVal = data.records;
this.inWords(data.records.invested_amount); // this.inWords(data.records.invested_amount);
let constVal: any; let constVal: any;
//const Desgn = <FormArray>this.businessForm.controls['designation']; //const Desgn = <FormArray>this.businessForm.controls['designation'];
const Partnr: any = <FormArray>this.businessForm.controls['partners']; const Partnr: any = <FormArray>this.businessForm.controls['partners'];
@ -1440,9 +1440,9 @@ export class BusinessInfoComponent implements OnInit {
} }
/** To Convert Amount into Words */ /** To Convert Amount into Words */
inWords(e){ // inWords(e){
this.InvestedAmountInWords = this._pd.convertNumberToWords(e); // this.InvestedAmountInWords = this._pd.convertNumberToWords(e);
} // }
getCompanyListForBusiness(): void{ getCompanyListForBusiness(): void{