From 6987831e17540f1faaeef4de87f53d8431e58d66 Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 6 Mar 2019 15:08:02 +0530 Subject: [PATCH] sheet changes : ps --- .../forms/address/address.component.html | 4 +- .../forms/address/address.component.ts | 10 -- .../assets-info/assets-info.component.html | 27 ++- .../assets-info/assets-info.component.ts | 37 ++--- .../banking-details.component.html | 6 +- .../banking-details.component.ts | 9 - .../business-assets-info.component.html | 20 +-- .../business-assets-info.component.ts | 15 +- .../business-banking-details.component.html | 6 +- .../business-banking-details.component.ts | 10 -- .../business-info.component.html | 8 +- .../business-info/business-info.component.ts | 10 -- .../client-info/client-info.component.html | 14 +- .../client-info/client-info.component.ts | 10 -- .../current-loan/current-loan.component.html | 10 +- .../current-loan/current-loan.component.ts | 60 ++----- .../other-applicant-details.component.html | 2 +- .../other-applicant-details.component.ts | 10 -- .../family-details.component.html | 6 +- .../family-details.component.ts | 10 -- .../financial-info.component.html | 20 +-- .../financial-info.component.ts | 11 -- .../general-info/general-info.component.html | 6 +- .../general-info/general-info.component.ts | 10 -- .../loan-details/loan-details.component.html | 14 +- .../loan-details/loan-details.component.ts | 10 -- .../neighbour-hood.component.html | 18 +- .../neighbour-hood.component.ts | 10 -- .../other-income/other-income.component.html | 4 +- .../other-income/other-income.component.ts | 9 - .../personal-info.component.html | 6 +- .../personal-info/personal-info.component.ts | 11 -- .../start-pd/forms/stock/stock.component.html | 154 ++++------------- .../start-pd/forms/stock/stock.component.ts | 157 +++++++----------- .../supplier-info.component.html | 16 +- .../supplier-info/supplier-info.component.ts | 12 +- 36 files changed, 226 insertions(+), 526 deletions(-) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html index f1971d12f..25299b839 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.html @@ -61,7 +61,7 @@ + formControlName="pincode_others" OnlyNumber type="text"> @@ -139,7 +139,7 @@
+ OnlyNumber type="text"> diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts index ea09b4586..8c0141199 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/address/address.component.ts @@ -518,16 +518,6 @@ createAddresses(AddressDetails): FormGroup { }); } - /** On Key Press Event For Numbers */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } - /** For DOCS Tab */ public viewerOptions: any = { navbar: false, diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html index 4572e9cad..b09397b92 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.html @@ -158,8 +158,9 @@
- + {{"₹"}} {{OtherPremiumPaidInwords[s]}} Only + @@ -174,7 +175,7 @@
- + {{"₹"}} {{OtherSumAssuredInwords[s]}} Only @@ -210,7 +211,7 @@ - + @@ -254,7 +255,7 @@
- + {{"₹"}} {{OtherAppxMarketAmtInwords[i]}} Only @@ -279,14 +280,22 @@ - {{val.name}} - + --> + + + + {{val.name}} + + + @@ -309,14 +318,14 @@ Age of Asset in Years - + Purchase Year - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts index 2066a1bad..cf2dbe496 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assets-info/assets-info.component.ts @@ -279,7 +279,7 @@ export class AssetsInfoComponent implements OnInit { // this.initDetails(), ]), // business_assets_details : this._formBuilder.array([]), - assets_form_remark:[value.assets_form_remark || 'check'] + assets_form_remark:[value.assets_form_remark] }); this.addAssetsDetailsWithData(value.assets_details); // this.addBusinessAssetsDetailsWithData(value.business_assets_details); @@ -611,17 +611,20 @@ export class AssetsInfoComponent implements OnInit { }; const control = this._assetsQuesFrom.controls['assets_details']; - // let Avaliablity = 1; - // val.name_of_the_owner.forEach(option => { - // if(option.id == 0 && option.group_id == 2){ - // Avaliablity = option.id; - // } - // }); - // this.isOtherOwner = Avaliablity == 0 ? true : false; + control.push(this.initDetailsWithdata(vals)); this.setAssetsDetailsWithData(vals.assets_mode, val.details, control.length - 1) } result.forEach((datas,index) => { + // let Avaliablity = 1; + // if(datas.name_of_the_owner.length>0){ + // datas.name_of_the_owner.forEach(option => { + // if(option.id == 0 && option.group_id == 2){ + // Avaliablity = option.id; + // } + // }); + // } + // this.isOtherOwner[index] = Avaliablity == 0 ? true : false; this.OtherAppxMarketAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.approximate_market_value); this.setRequiredValidation(datas.name_of_the_owner,index,'',4); }); @@ -840,16 +843,6 @@ export class AssetsInfoComponent implements OnInit { // this.getPdSupplierFormDetails(); // } - /** On Key Press Event For Number only Accepting */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } - /** To calculating Loan Elapsed Tenure both "Other Asset" And "Business Asset" using Flag */ loanTenureCalc(details ,flag) { @@ -872,7 +865,7 @@ export class AssetsInfoComponent implements OnInit { } setRequiredValidation(value,ParInx,ChdInx,flag) { - // console.log('value',value,'ParInx',ParInx,'ChdInx',ChdInx,'flag',flag); + console.log('value',value,'ParInx',ParInx,'ChdInx',ChdInx,'flag',flag); let ParCtrls = this._assetsQuesFrom.controls.assets_details; // console.log('ParCtrls',ParCtrls); let ChdCtrls:any = ParCtrls.controls[ParInx]; @@ -905,19 +898,21 @@ export class AssetsInfoComponent implements OnInit { if (flag == 4) { let Avaliablity = 1; // console.log('val',value); + if(value.length>0){ value.forEach(option => { if(option.id == 0 && option.group_id == 2){ Avaliablity = option.id; } }); + } if(Avaliablity == 0){ - // console.log('if Avaliablity',Avaliablity); + console.log('if Avaliablity',Avaliablity); // console.log('if this.isOtherOwner[ParInx]',this.isOtherOwner[ParInx]); ChdCtrls.controls.other_owner.setValidators([Validators.required]); this.isOtherOwner[ParInx] = true; // console.log('if this.isOtherOwner[ParInx]',this.isOtherOwner[ParInx]); }else if(Avaliablity == 1){ - // console.log('else Avaliablity',Avaliablity); + console.log('else Avaliablity',Avaliablity); // console.log('esle this.isOtherOwner[ParInx]',this.isOtherOwner[ParInx]); ChdCtrls.controls.other_owner.setValue(''); ChdCtrls.controls.other_owner.clearValidators(); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html index 8f1d2edd7..c48fae6ce 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.html @@ -147,7 +147,7 @@ + formControlName="limit" OnlyNumber type="text" (keyup)="inWords($event,i,1)"> {{"₹"}} {{amtInwords[i]}} Only
@@ -156,10 +156,10 @@
- + - +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts index 85969821f..1152b35b6 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/banking-details/banking-details.component.ts @@ -357,13 +357,4 @@ export class BankingDetailsComponent implements OnInit { } } - /** On Key Press Event For Numbers */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } } diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html index c4a49beca..6d7073527 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.html @@ -44,14 +44,14 @@ + (change)="checkWithExistBusinessYear($event.target.value,i)" OnlyNumber type="text"> {{yearErrorMessage[i]}} + OnlyNumber type="text" (change)="ConvertMonthintoYear($event.target.value,i)"> {{monthErrorMessage[i]}} @@ -90,7 +90,7 @@ + OnlyNumber type="text" (keyup)="inWords($event,i,9)"> {{"₹"}} {{RentAmtInwordsForAddress[i]}} Only Monthly Rent Amount Required @@ -101,7 +101,7 @@ + OnlyNumber type="text" autocomplete="off" (keyup)="inWords($event,i,10)"> {{"₹"}} {{appxMarketAmtInwordsForAddress[i]}} Only @@ -126,14 +126,14 @@ Approx Vintage + minlength="1" maxlength="3" OnlyNumber type="text" (keyup)="calculateVintagePurchase($event.target.value,i,3)"> Purchase Year + minlength="4" maxlength="4" OnlyNumber type="text" (keyup)="calculateVintagePurchase($event.target.value,i,4)">
@@ -288,7 +288,7 @@ + OnlyNumber type="text" (keyup)="inWords($event,i,8)"> {{"₹"}} {{RentAmtInwords[i]}} Only Monthly Rent Amount Required @@ -298,7 +298,7 @@
+ OnlyNumber type="text" autocomplete="off" (keyup)="inWords($event,i,1)"> {{"₹"}} {{appxMarketAmtInwords[i]}} Only @@ -323,14 +323,14 @@ Approx Vintage + minlength="1" maxlength="3" OnlyNumber type="text" (keyup)="calculateVintagePurchase($event.target.value,i,1)"> Purchase Year + minlength="4" maxlength="4" OnlyNumber type="text" (keyup)="calculateVintagePurchase($event.target.value,i,2)">
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts index d2415150f..15938b197 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-assets-info/business-assets-info.component.ts @@ -608,12 +608,14 @@ export class BusinessAssetsInfoComponent implements OnInit { this.appxMarketAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.business_approximate_market_value); this.RentAmtInwords[index] = this.pdTrigerService.convertNumberToWords(+datas.business_monthly_rented_amt); let Avaliablity = 1; - + console.log('datas.business_name_of_the_owner.length',datas.business_name_of_the_owner.length); + if(datas.business_name_of_the_owner.length > 0){ datas.business_name_of_the_owner.forEach(option => { if(option.id == 0 && option.group_id == 2){ Avaliablity = option.id; } }); + } this.isOtherOwner[index] = Avaliablity == 0 ? true : false; }); @@ -777,17 +779,6 @@ export class BusinessAssetsInfoComponent implements OnInit { } } - /** On Key Press Event For Number only Accepting */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } - - /** To Convert Month into Year */ ConvertMonthintoYear(e,i) { // const address_control = this._EditPDtriggerForm.controls['addresses']; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html index 3fe220cc1..fce0202d3 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.html @@ -82,7 +82,7 @@ + formControlName="limit" OnlyNumber type="text" (keyup)="inWords($event,i,1)"> {{"₹"}} {{amtInwords[i]}} Only
@@ -91,10 +91,10 @@
- + - +
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts index 4206e8787..0be70f0f9 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-banking-details/business-banking-details.component.ts @@ -330,16 +330,6 @@ export class BusinessBankingDetailsComponent implements OnInit { } } - /** On Key Press Event For Numbers */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } - setRequiredValidation(value,item,flag) { if(flag == 1){ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html index 256a1094f..a4d93c429 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.html @@ -52,7 +52,7 @@
- @@ -69,16 +69,16 @@
- + {{yearErrorMessage[i]}} - + {{monthErrorMessage[i]}} + formControlName="total_business_experiance" OnlyNumber type="text" (keyup)="getWorkExperience(members.value,i)" autocomplete="off" required (change)="checkWithExistTotalWorkExperience($event.target.value,i,members)"> {{errorMessageForExistTotalWorkExperience[i]}}
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts index 21bd246d0..3f7db69fb 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/business-info/business-info.component.ts @@ -1658,16 +1658,6 @@ export class BusinessInfoComponent implements OnInit { return []; } } - - /** On Key Press Event For Amount */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } /** To Convert Amount into Words */ // inWords(e){ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html index a0140fec6..c2eb30ada 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.html @@ -65,11 +65,11 @@ Enter Valid Mobile Number. - + Enter Valid STD Code Number.   -   - + Enter Valid LandLine Number.
@@ -177,15 +177,15 @@
- + Enter Valid Mobile Number. - + Enter Valid STD Code Number.   -   - + Enter Valid LandLine Number.
@@ -299,11 +299,11 @@ Enter Valid Mobile Number. - + Enter Valid STD Code Number.   -   - + Enter Valid LandLine Number. diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts index 94b2c1134..a453b926f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/client-info/client-info.component.ts @@ -676,16 +676,6 @@ export class ClientInfoComponent implements OnInit { // this._addQuesFrom.reset(); } - /** On Key Press Event For Mobile Number */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } - selectedPersonDesignation(items,e,flag){ if(flag == 1){ e==1 ? items.controls['other_person_designation'].setValidators([Validators.required]) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html index 0b36181b6..4398ec76f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/current-loan/current-loan.component.html @@ -54,7 +54,7 @@ - + {{"₹"}} {{amtInwords[i]}} Only @@ -96,8 +96,8 @@ - - + + {{"₹"}} {{emiAmtInwords[i]}} Only - + @@ -91,7 +91,7 @@ - + {{"₹"}} {{RentAmount[i]}} Only @@ -146,7 +146,7 @@ - + {{"₹"}} {{IncomePerMonth[i]}} Only diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts index fadbf148e..47a10bbf4 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/family-details/family-details.component.ts @@ -568,16 +568,6 @@ removeFamilyMembers(inx,i) { // }); // } - /** On Key Press Event For Age */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } - /** To Convert Amount into Words */ inWords(e,flag:number,i){ switch(flag){ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html index 080e1b084..2c34b0525 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.html @@ -36,13 +36,13 @@ Enter year from which financials provided + OnlyNumber type="text" [readonly]="isReadOnly"> Invalid year format + OnlyNumber type="text" [readonly]="isReadOnly">
@@ -57,7 +57,7 @@ + OnlyNumber type="text" (keyup)="inWords($event,i,1)"> {{"₹"}} {{FY_annualSalesInwords[i]}} Only @@ -65,7 +65,7 @@ + OnlyNumber type="text" readonly> No difference in Sales in FY @@ -110,13 +110,13 @@ + OnlyNumber type="text" (keyup)="inWords($event,i,2)"> {{"₹"}} {{FY_netProfitAmtInwords[i]}} Only @@ -124,13 +124,13 @@ + OnlyNumber type="text" (keyup)="inWords($event,i,3)"> {{"₹"}} {{FY_netLossAmtInwords[i]}} Only @@ -139,7 +139,7 @@ @@ -174,7 +174,7 @@ + OnlyNumber type="text" readonly> No difference in Profit sales % in FY diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts index 0d6adea81..90f55cd0e 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/financial-info/financial-info.component.ts @@ -1693,17 +1693,6 @@ export class FinancialInfoComponent implements OnInit { }); } - /** On Key Press Event For Input Field */ - keyPress(event: any) { - //const pattern = /[0-9\-\.\ ]/; - const pattern = /[0-9\.]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } - /** To Convert Amount into Words */ inWords(e,i,flag:number){ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html index cba606396..d4f878cd9 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.html @@ -49,7 +49,7 @@ Age + OnlyNumber type="text" autocomplete="off"> @@ -126,12 +126,12 @@

Number of Years For Which The Business Has Been Running

+ autocomplete="off" OnlyNumber type="text"> Please Enter Correct Year + autocomplete="off" OnlyNumber type="text" (change)="ConvertMonthintoYearforBusiness($event.target.value,c)"> {{"₹"}} {{loanAmtInWords}} Only Loan Tenure applied for? - @@ -59,7 +59,7 @@ {{"₹"}} {{balTxrfAmtInWords}} Only @@ -80,7 +80,7 @@ - {{"₹"}} @@ -106,7 +106,7 @@ {{"₹"}} {{ownContributionInWords}} Only @@ -134,7 +134,7 @@ + OnlyNumber type="text" (keyup)="inWords($event,6)" autocomplete="off"> {{"₹"}} {{emiAmtInWords}} Only @@ -204,7 +204,7 @@ {{"₹"}} {{emvAmtInWords}} Only diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts index eb7badb24..57763bc9c 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/loan-details/loan-details.component.ts @@ -524,16 +524,6 @@ export class LoanDetailsComponent implements OnInit { } - /** On Key Press Event For Amount */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } - /** To Convert Amount into Words */ inWords(e, flag: number) { switch (flag) { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html index 4f23b10b7..ace8290ba 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.html @@ -43,17 +43,17 @@ - +
- + - +
@@ -134,15 +134,15 @@ - + Enter Valid Mobile Number. - + Enter Valid STD Code. - - + Enter Valid Landline Number. @@ -162,13 +162,13 @@

Period of Relationship

- + - + - + {{"₹"}} {{amtInwords[r]}} Only diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts index 2a8551fcb..cd1edeaae 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/neighbour-hood/neighbour-hood.component.ts @@ -222,16 +222,6 @@ export class NeighbourHoodComponent implements OnInit { remove_control.removeAt(renoveIndex) } - /** On Key Press Event For Mobile Number */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } - //save heighbourhood forms saveNeighbourhood(formData:any){ let resultMessage:string=''; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html index aaef973c2..e6e369c8d 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.html @@ -78,7 +78,7 @@ - + {{"₹"}} {{amtInwords[i]}} Only @@ -333,7 +333,7 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts index 193103930..d691796aa 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/other-income/other-income.component.ts @@ -237,15 +237,6 @@ public viewerOptions: any = { }); } - /** On Key Press Event For Amount */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } /** Amount InWords */ inWords(e,i){ this.amtInwords[i] = this._pd.convertNumberToWords(e.target.value); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html index a3459ae4f..e9e4c39a5 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.html @@ -39,7 +39,7 @@ - + Enter Valid Age. @@ -69,7 +69,7 @@ - + Enter Valid Vintage. @@ -155,7 +155,7 @@ - + Enter Valid Vintage. diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts index c06d1da6a..e5a386855 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/personal-info/personal-info.component.ts @@ -193,17 +193,6 @@ public viewerOptions: any = { }, error => this.errorMessage = error); } - -/** On Key Press Event For Mobile Number */ -keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } -} - // init form details public initFormDetails(): void { this._personalForm = this._fb.group({ diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html index eb2eef1b5..f1ecb659f 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.html @@ -9,7 +9,6 @@
-
@@ -18,9 +17,6 @@
-
Manufacturing Stock Details
@@ -33,8 +29,7 @@ - - + Select Add Stock Details No Stock Observed @@ -42,7 +37,7 @@ - + - - {{"₹"}} {{M_rawValueInWords[a]}} Only + + {{"₹"}} {{mrm.get('raw_value').value | numberToWords}} Only - @@ -81,18 +73,19 @@
- - - Select - Yes - No - - - - Please comment on the stock level observed? - - - + + + + Select + Yes + No + + + + Please comment on the stock level observed? + + +
@@ -104,8 +97,7 @@ - - + Select Add Stock Details No Stock Observed @@ -113,7 +105,7 @@ - + - - {{"₹"}} {{M_goodsValueInWords[b]}} Only + + {{"₹"}} {{mfg.get('goods_value').value | numberToWords}} Only - - -
@@ -154,10 +136,6 @@ Add More Finished Goods
-
@@ -167,10 +145,6 @@ - -
Retail Trading Details
@@ -183,7 +157,7 @@ - + Select Add Stock Details No Stock Observed @@ -191,7 +165,7 @@ - + - - {{"₹"}} {{R_tradedGoodsValueInWords[e]}} Only + + {{"₹"}} {{item.get('estimated_traded_goods_value').value | numberToWords}} Only - - -
@@ -256,11 +206,6 @@ - - -
Wholesale Trading Details
@@ -274,7 +219,7 @@ - + Select Add Stock Details No stock observed @@ -282,7 +227,7 @@ - + Select {{uom.name}} - - + + - - {{"₹"}} {{T_tradedGoodsValueInWords[g]}} Only + + {{"₹"}} {{tradetg.get('estimated_traded_goods_value').value | numberToWords}} Only - - - - -
@@ -347,7 +267,7 @@ -
+

@@ -494,12 +414,4 @@ {{ errorMessage }}
Fill Business Form First! / No Company Found at this ID {{company_id}}! ....
- - - - - \ No newline at end of file + \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts index d75dee662..0f49afc58 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/stock/stock.component.ts @@ -41,25 +41,9 @@ export class StockComponent implements OnInit { form_id: number; company_id: string; - // rawmaterial : any; + RMCommentCard: boolean = false; + TGCommentCard: boolean = false - M_rawValueInWords : any = []; - M_goodsValueInWords : any = []; - R_tradedGoodsValueInWords : any = []; - T_tradedGoodsValueInWords : any = []; - - - // rawMaterialAccess: Boolean = false; - // finishedGoodsAccess: Boolean = false; - // tradeConcernAccess: Boolean = false; - // serviceAccess: Boolean = false; - - mrmCommentFlag: boolean = false; - finishedAndTradedGoodsCommentCard : boolean; - mfgCommentFlag:any=[]; - rtrdCommentFlag:any=[]; - wtrdCommentFlag:any=[]; - serviceProviderForm: Boolean = false; suppliers_raw_materials : any = []; suppliers_retail_trade_details : any = []; @@ -189,7 +173,6 @@ export class StockComponent implements OnInit { if (val.type_of_activity_id == 2) { if(val.products){ - if(dataForm.manufacturing_details[0].manufacturing_finished_goods ){this.finishedAndTradedGoodsCommentCard = true;} let manufacturing_temparr = []; manufacturing_temparr['manufacturing_raw_materials'] = dataForm.manufacturing_details[0].manufacturing_raw_materials; this.stockForms.controls['manufacturing_details']['controls'][0].controls['is_sufficiant_raw'].setValue(dataForm.manufacturing_details[0].is_sufficiant_raw), @@ -201,7 +184,6 @@ export class StockComponent implements OnInit { } if (val.type_of_activity_id == 3) { if(val.products){ - this.finishedAndTradedGoodsCommentCard = true; let retail_temparr = []; retail_temparr['retail_traded_goods'] = dataForm.retail_details[0].retail_traded_goods; this.initRetailDetails(retail_temparr); @@ -209,7 +191,6 @@ export class StockComponent implements OnInit { } if (val.type_of_activity_id == 4) { if(val.products){ - this.finishedAndTradedGoodsCommentCard = true; let trading_temparr = []; trading_temparr['trading_traded_goods'] = dataForm.trade_details[0].trading_traded_goods; this.initTradingDetails(trading_temparr); @@ -243,7 +224,6 @@ export class StockComponent implements OnInit { api.forEach(val => { if (val.type_of_activity_id == 2) { if(val.products){ - if(val.products){this.finishedAndTradedGoodsCommentCard = true;} this.suppliers_raw_materials = rm_api; this.suppliers_finished_goods = val.products; this.initManufacturingDetails(null); @@ -253,14 +233,12 @@ export class StockComponent implements OnInit { } if (val.type_of_activity_id == 3) { if(val.products){ - this.finishedAndTradedGoodsCommentCard = true; this.suppliers_retail_trade_details = val.products; this.initRetailDetails(null); } } if (val.type_of_activity_id == 4) { if(val.products){ - this.finishedAndTradedGoodsCommentCard = true; this.suppliers_wholesale_trade_details =val.products; this.initTradingDetails(null); } @@ -294,7 +272,6 @@ export class StockComponent implements OnInit { api.forEach(val => { if (val.type_of_activity_id == 2) { if(val.products){ - if(val.products){this.finishedAndTradedGoodsCommentCard = true;} this.suppliers_finished_goods = val.products; this.suppliers_raw_materials = rm_api; this.initManufacturingDetails(null); @@ -305,13 +282,11 @@ export class StockComponent implements OnInit { if (val.type_of_activity_id == 3) { if(val.products){ this.suppliers_retail_trade_details= val.products; - this.finishedAndTradedGoodsCommentCard = true; this.initRetailDetails(null); } } if (val.type_of_activity_id == 4) { if(val.products){ - this.finishedAndTradedGoodsCommentCard = true; this.suppliers_wholesale_trade_details = val.products; this.initTradingDetails(null); } @@ -428,9 +403,7 @@ tradingFormCreation(val) { if(datas.manufacturing_raw_materials != undefined){ // for (let val of datas.manufacturing_raw_materials) { datas.manufacturing_raw_materials.forEach((val,index) => { - if(val.raw_value){ - this.inWords(val.raw_value,1,index); - } + this.checkComments(val.stock_observed,1,index); // this.checkComments(val.is_sufficiant_raw,1,index); rawMaterial.push(this.createRawmaterial(val)); }); @@ -441,13 +414,8 @@ tradingFormCreation(val) { if(datas.manufacturing_finished_goods != undefined){ // for (let val of datas.manufacturing_finished_goods) { datas.manufacturing_finished_goods.forEach((val,index) => { - - if(val.goods_value){ - this.inWords(val.goods_value,2,index); - } - + this.checkComments(val.goods_observed,2,index); finishedGoods.push(this.createGoods(val)); - }); } else{ @@ -484,12 +452,6 @@ tradingFormCreation(val) { } } - selectedValueofStockObserved(selectedvalue : any,index : number,flag : number){ - console.log('selectedvalue',selectedvalue); - console.log('index',index); - console.log('flag',flag); - } - initRetailDetails(datas) { const tradedGoods = this.stockForms.controls['retail_details']['controls'][0].controls['retail_traded_goods']; @@ -518,13 +480,8 @@ tradingFormCreation(val) { if(datas.retail_traded_goods !== undefined){ // for (let val of datas.retail_traded_goods) { datas.retail_traded_goods.forEach((val,index) => { - - if(val.estimated_traded_goods_value){ - this.inWords(val.estimated_traded_goods_value,3,index); - } - + this.checkComments(val.traded_goods_observed,3,index); tradedGoods.push(this.createTradedGoods(val)); - }); } else{ @@ -613,10 +570,7 @@ tradingFormCreation(val) { { // for (let val of datas.trading_traded_goods) { datas.trading_traded_goods.forEach((val,index) => { - - if(val.estimated_traded_goods_value){ - this.inWords(val.estimated_traded_goods_value,4,index); - } + this.checkComments(val.traded_goods_observed,4,index); tradedGoods.push(this.createTradedGoods(val)); }); } @@ -800,53 +754,58 @@ tradingFormCreation(val) { } } - /** To Convert Amount into Words */ - inWords(e,flag:number,i){ +ManufacturingCounterArray: any = []; +FinishedCounterArray: any = []; +RetailCounterArray: any = []; +WholeSaleCounterArray: any = []; - switch(flag){ - case 1 : - this.M_rawValueInWords[i] = this._pd.convertNumberToWords(e); - break; - case 2 : - this.M_goodsValueInWords[i] = this._pd.convertNumberToWords(e); - break; - case 3 : - this.R_tradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e); - break; - case 4 : - this.T_tradedGoodsValueInWords[i] = this._pd.convertNumberToWords(e); - break; - default: - break; - } - } +checkComments(value,flag,index){ + // console.log(value,flag,index); + if(flag == 1){ + this.ManufacturingCounterArray[index] = value == "yes" ? 1 : 0 + let RMOverallCount = this.ManufacturingCounterArray.reduce((sum, val) => sum + +val, 0); + this.RMCommentCard = RMOverallCount > 0 ? true : false ; + } + if(flag == 2){ + this.FinishedCounterArray[index] = value == "yes" ? 1 : 0 + } + if(flag == 3){ + this.RetailCounterArray[index] = value == "yes" ? 1 : 0 + } + if(flag == 4){ + this.WholeSaleCounterArray[index] = value == "yes" ? 1 : 0 + } + let FGOverallCount = this.FinishedCounterArray.reduce((sum, val) => sum + +val, 0); + let RTGOverallCount = this.RetailCounterArray.reduce((sum, val) => sum + +val, 0); + let WTGOverallCount = this.WholeSaleCounterArray.reduce((sum, val) => sum + +val, 0); + let TGOverallCount = FGOverallCount + RTGOverallCount + WTGOverallCount; + this.TGCommentCard = TGOverallCount > 0 ? true : false ; +} - - checkComments(e,flag,index){ - - if(flag == 1 && e=='no'){ - this.mrmCommentFlag = true; - } - else if(flag == 1 && e!='no'){ - this.mrmCommentFlag = false; - } - if(flag == 2 && e=='no'){ - this.mfgCommentFlag[index] = true; - } - else if(flag == 2 && e!='no'){ - this.mfgCommentFlag[index] = false; - } - if(flag == 3 && e=='no'){ - this.rtrdCommentFlag[index] = true; - } - else if(flag == 3 && e!='no'){ - this.rtrdCommentFlag[index] = false; - } - if(flag == 4 && e=='no'){ - this.wtrdCommentFlag[index] = true; - } - else if(flag == 4 && e!='no'){ - this.wtrdCommentFlag[index] = false; - } - } + // checkComments(e,flag,index){ + // if(flag == 1 && e=='no'){ + // this.mrmCommentFlag = true; + // } + // else if(flag == 1 && e!='no'){ + // this.mrmCommentFlag = false; + // } + // if(flag == 2 && e=='no'){ + // this.mfgCommentFlag[index] = true; + // } + // else if(flag == 2 && e!='no'){ + // this.mfgCommentFlag[index] = false; + // } + // if(flag == 3 && e=='no'){ + // this.rtrdCommentFlag[index] = true; + // } + // else if(flag == 3 && e!='no'){ + // this.rtrdCommentFlag[index] = false; + // } + // if(flag == 4 && e=='no'){ + // this.wtrdCommentFlag[index] = true; + // } + // else if(flag == 4 && e!='no'){ + // this.wtrdCommentFlag[index] = false; + // } + // } } \ No newline at end of file diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html index 05a7de677..b15d9e11c 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.html @@ -55,15 +55,15 @@
- + Enter Valid Mobile Number. - + Enter Valid STD Code Number.   -   - + Enter Valid LandLine Number.
@@ -117,7 +117,7 @@
+ type="number" autocomplete="off" OnlyNumber type="text" maxlength="3">
@@ -172,16 +172,16 @@
- + Enter Valid Mobile Number. - + Enter Valid STD Code Number.   -   - + Enter Valid LandLine Number.
@@ -205,7 +205,7 @@
No.of days of Credit Provided by Supplier diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts index abf5bb447..842a1a255 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/supplier-info/supplier-info.component.ts @@ -516,17 +516,7 @@ export class SupplierInfoComponent implements OnInit { /** To Reset Popup Data */ onReset() { // this._addQuesFrom.reset(); - } - - /** On Key Press Event For Mobile Number */ - keyPress(event: any) { - const pattern = /[0-9]/; - - let inputChar = String.fromCharCode(event.charCode); - if (event.keyCode != 8 && !pattern.test(inputChar)) { - event.preventDefault(); - } - } + } selectedPersonDesignation(items,e,flag){ if(flag == 1){