diff --git a/src/pages/pd-question/pd-question-assests/pd-question-assests.html b/src/pages/pd-question/pd-question-assests/pd-question-assests.html index 4d2430f6..acd13d0d 100755 --- a/src/pages/pd-question/pd-question-assests/pd-question-assests.html +++ b/src/pages/pd-question/pd-question-assests/pd-question-assests.html @@ -222,7 +222,8 @@
- + + {{"₹"}} {{ApproxInwords[i]}} Only
diff --git a/src/pages/pd-question/pd-question-assests/pd-question-assests.ts b/src/pages/pd-question/pd-question-assests/pd-question-assests.ts index 0a4147fd..06870c25 100755 --- a/src/pages/pd-question/pd-question-assests/pd-question-assests.ts +++ b/src/pages/pd-question/pd-question-assests/pd-question-assests.ts @@ -44,6 +44,7 @@ export class PdQuestionAssestsPage { PremiumPaidInwords: any=[]; SumAssuredInwords: any=[]; AmtInvestInwords: any=[]; + ApproxInwords:any =[]; existCompanyList: any=[]; mergeCompanyApplicant: any=[]; isOtherOwner: any = []; @@ -509,6 +510,7 @@ export class PdQuestionAssestsPage { const control = this.AssetsDetailsForm.controls['assets_details']; control.push(this.initDetailsWithdata(vals)); + this.inWords(+val.approximate_market_value,index,4); this.setAssetsDetailsWithData(vals.assets_mode, val.details, control.length-1) // this.setRequiredValidation(val.name_of_the_owner, index, '', 4); }); @@ -640,6 +642,9 @@ export class PdQuestionAssestsPage { case 3 : this.AmtInvestInwords[i] = this.constprovider.convertNumberToWords(e); break; + case 4 : + this.ApproxInwords[i] = this.constprovider.convertNumberToWords(e); + break; default: break; } diff --git a/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.html b/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.html index c6f4c24b..9f17f1b2 100755 --- a/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.html +++ b/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.html @@ -42,13 +42,16 @@

No of Years in Current Business

- + + {{yearErrorMessage[i]}} - + + {{monthErrorMessage[i]}} - + + {{errorMessageForExistTotalWorkExperience[i]}} @@ -146,7 +149,7 @@ - Within India" + Within India Export Both @@ -301,7 +304,7 @@ - Description of {{manufacturing.value.main_products}} + Description of {{manufacturing.value.main_products}} Manufacturing Process @@ -501,7 +504,8 @@ - Description of {{retail.value.main_products}} + Description of {{retail.value.main_products}} Retailing + process @@ -703,7 +707,8 @@ - Description of {{wholesale.value.main_products}} + Description of {{wholesale.value.main_products}} Wholesale + process @@ -906,7 +911,7 @@ - Description of {{serviceprovider.value.main_products}} + Description of {{serviceprovider.value.main_products}} Service Process diff --git a/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts b/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts index 460f38eb..c1cddcbc 100755 --- a/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts +++ b/src/pages/pd-question/pd-question-business-group/pd-question-business-info/pd-question-business-info.ts @@ -64,6 +64,10 @@ export class PdQuestionBusinessInfoPage { isreadonlymonth: any=[]; EntityTypeFlag:boolean=false + yearErrorMessage: any = []; + monthErrorMessage: any = []; + errorMessageForExistTotalWorkExperience : any = []; + constructor(public navCtrl: NavController, public navParams: NavParams,public aws:AwsServiceProvider,public toast:ToastProvider,public qustCat:QuestionCategoryProvider,public fb:FormBuilder,public cons:ConstantsProvider) { this.getStateCityDet(); this.pdDetails = this.navParams.get('pdDetails'); @@ -78,7 +82,8 @@ export class PdQuestionBusinessInfoPage { this.generalExistEntityType=this.pdDetails.business_entity_type this.generalExistEntityType_other=this.pdDetails.business_entity_type_other - this.generalExistBusinessYear=this.pdDetails.business_years + this.generalExistBusinessYear=this.pdDetails.business_years; + this.generalExistBusinessMonth = this.pdDetails.business_month; this.step=0 @@ -98,7 +103,7 @@ export class PdQuestionBusinessInfoPage { retail_trading_activity_details:this.fb.array([]), wholesale_trading_activity_details:this.fb.array([]), service_provider_activity_details:this.fb.array([]), - others_activity_details:this.fb.array([]), + // others_activity_details:this.fb.array([]), export_sale_of_total_sales:[''], // applicant_use_mobile_wallets:[''], // applicant_use_pos_machines:[''], @@ -247,7 +252,7 @@ changeOfStartedBusiness(members,i,e){ const retailControl: any = this.businessForm.controls['retail_trading_activity_details']; const wholesaleControl:any=this.businessForm.controls['wholesale_trading_activity_details']; const serviceProviderControl:any=this.businessForm.controls['service_provider_activity_details']; - const othersControl:any=this.businessForm.controls['others_activity_details']; + // const othersControl:any=this.businessForm.controls['others_activity_details']; const otherDoc = this.businessForm.controls['documents']; //retailControl.push(this.manufactureDetails()); //manufacture_details.push(this.manufactureDetails()) @@ -640,26 +645,26 @@ changeOfStartedBusiness(members,i,e){ } - if(data['records'].others_activity_details){ + // if(data['records'].others_activity_details){ - // update others activity details - let selectedOthers = Object.keys(data['records'].others_activity_details).map(function (key) { - return data['records'].others_activity_details[key]; - }); - if(selectedOthers.length > 0) { - selectedOthers.forEach((element,index)=>{ - othersControl.push(this.createOthersActivity()); - }); - businessVal.others_activity_details=selectedOthers; - } - else{ - businessVal.others_activity_details=[]; - } - } - else { - businessVal.others_activity_details=[]; + // // update others activity details + // let selectedOthers = Object.keys(data['records'].others_activity_details).map(function (key) { + // return data['records'].others_activity_details[key]; + // }); + // if(selectedOthers.length > 0) { + // selectedOthers.forEach((element,index)=>{ + // othersControl.push(this.createOthersActivity()); + // }); + // businessVal.others_activity_details=selectedOthers; + // } + // else{ + // businessVal.others_activity_details=[]; + // } + // } + // else { + // businessVal.others_activity_details=[]; - } + // } // dynamically add form group control if(data['dataStatus']){ @@ -770,14 +775,36 @@ changeOfStartedBusiness(members,i,e){ checkTotalEmployee(FormData){ this.businessForm.controls['employees_total'].setValue((+FormData.value.employees_permanent ||0)+(+FormData.value.employees_temporary||0)); } - checkWithExistBusinessYear(e,i){ - if(e > this.generalExistBusinessYear){ - this.errorMessage[i] = "Higher than Business Vintage"; +// checkWithExistBusinessYear(e,i){ +// if(e > this.generalExistBusinessYear){ +// this.errorMessage[i] = "Higher than Business Vintage"; +// } +// else{ +// this.errorMessage[i] = ''; +// } +// } + +checkWithExistBusinessYear(e, i, members) { + + if (+e > this.generalExistBusinessYear) { + this.yearErrorMessage[i] = "Higher than Business Vintage"; + members.controls.current_business_experiance_year.setValue(''); } - else{ - this.errorMessage[i] = ''; + else { + this.yearErrorMessage[i] = ''; } - } +} + +checkWithExistTotalWorkExperience(e, i, members) { + + if (+members.value.current_business_experiance_year > +e) { + this.errorMessageForExistTotalWorkExperience[i] = "Total Experience is Lower Than Experience in The Current Company"; + members.controls.total_business_experiance.setValue(''); + } + else { + this.errorMessageForExistTotalWorkExperience[i] = ''; + } +} // businees activity type change event changeBusinessActivity(event: any){ @@ -830,15 +857,15 @@ changeBusinessActivity(event: any){ serviceControl.push(this.manufactureDetails()); } - if(event.value.exist_status==true && event.value.type_of_activity_id==1){ - let othersControl = this.businessForm.controls['others_activity_details']; - othersControl.controls = []; - othersControl.setValue([]); - } - else if(event.value.exist_status==false && event.value.type_of_activity_id==1){ - let othersControl = this.businessForm.controls['others_activity_details']; - othersControl.push(this.createOthersActivity()); - } + // if(event.value.exist_status==true && event.value.type_of_activity_id==1){ + // let othersControl = this.businessForm.controls['others_activity_details']; + // othersControl.controls = []; + // othersControl.setValue([]); + // } + // else if(event.value.exist_status==false && event.value.type_of_activity_id==1){ + // let othersControl = this.businessForm.controls['others_activity_details']; + // othersControl.push(this.createOthersActivity()); + // } // check activity type for make dosument sighted filed dynamically this.businessForm.value.manufacturing_activity_details.length > 0 || this.businessForm.value.retail_trading_activity_details.length > 0 || this.businessForm.value.wholesale_trading_activity_details.length > 0 ? this.businessForm.addControl('export_import_cert', new FormControl(this.businessForm.value.export_import_cert, Validators.required)) : this.businessForm.removeControl('export_import_cert'); this.businessForm.value.manufacturing_activity_details.length > 0 ? this.businessForm.addControl('factory_cert', new FormControl(this.businessForm.value.factory_cert, Validators.required)) : this.businessForm.removeControl('factory_cert'); @@ -1079,8 +1106,9 @@ keyPress(event: any) { // this.businessForm.controls.business_years.updateValueAndValidity(); // } } -ConvertMonthintoYear(itemrow,e){ +ConvertMonthintoYear(itemrow,e,i){ +console.log('datas',e,i); let year = itemrow.controls.current_business_experiance_year.value; let converted_month : number = e%12; @@ -1088,6 +1116,27 @@ ConvertMonthintoYear(itemrow,e){ itemrow.controls.current_business_experiance_year.setValue(+year + +Math.floor(converted_year)); itemrow.controls.current_business_experiance_month.setValue(Math.floor(converted_month)); + + // if (year > this.generalExistBusinessYear) { + // console.log('data') + // this.yearErrorMessage[i] = "Higher than Business Vintage"; + // itemrow.controls.current_business_experiance_year.setValue(''); + // itemrow.controls.current_business_experiance_month.setValue(''); + + // } + // else { + // if (year == this.generalExistBusinessYear && +converted_month > this.generalExistBusinessMonth) { + // this.monthErrorMessage[i] = "Higher than Business Vintage"; + // itemrow.controls.current_business_experiance_year.setValue(''); + // itemrow.controls.current_business_experiance_month.setValue(''); + + // } else { + // this.monthErrorMessage[i] = ''; + // this.yearErrorMessage[i] = ''; + // itemrow.controls.current_business_experiance_year.setValue(year); + // itemrow.controls.current_business_experiance_month.setValue(Math.floor(converted_month)); + // } + // } } @@ -1256,10 +1305,10 @@ removeServiceProvider(index){ serviceControl.reset(); } } -addMoreOthersActivity(){ - let othersControl = this.businessForm.controls['others_activity_details']; - othersControl.push(this.createOthersActivity()); -} +// addMoreOthersActivity(){ +// let othersControl = this.businessForm.controls['others_activity_details']; +// othersControl.push(this.createOthersActivity()); +// } createCountrySale() { return this.fb.group({ country_name: ['',Validators.compose([Validators.required])], diff --git a/src/pages/pd-question/pd-question-business-group/pd-question-client-info/pd-question-client-info.html b/src/pages/pd-question/pd-question-business-group/pd-question-client-info/pd-question-client-info.html index ea6befe3..f9984ed2 100755 --- a/src/pages/pd-question/pd-question-business-group/pd-question-client-info/pd-question-client-info.html +++ b/src/pages/pd-question/pd-question-business-group/pd-question-client-info/pd-question-client-info.html @@ -220,7 +220,6 @@ type="number"> - diff --git a/src/pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info.html b/src/pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info.html index 9e51a191..5ad29c96 100755 --- a/src/pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info.html +++ b/src/pages/pd-question/pd-question-business-group/pd-question-financial-info/pd-question-financial-info.html @@ -49,10 +49,10 @@ {{"₹"}} {{FY_annualSalesInwords[i]}} Only
- - Sale Variation from Previous Year in % -   - - + + + +

No difference in Sales in FY {{details.get('financial_year').value}} over Sales in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} @@ -64,7 +64,6 @@ Decrease in Sales in FY {{details.get('financial_year').value}} over Sales in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} {{(details.get('financial_annualsales_variation').value).replace('-', '')}} %

-
@@ -91,9 +90,10 @@
- Profit Variation from Previous Year in %: -   - -

+ + + +

No difference in Profit in FY {{details.get('financial_year').value}} over Profit in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} @@ -104,10 +104,11 @@ Decrease in Profit in FY {{details.get('financial_year').value}} over Profit in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} {{(details.get('financial_variation').value).replace('-', '')}} %

- - - Variation of Profit % over sales -   - + + + +

No difference in Profit sales % in FY {{details.get('financial_year').value}} over Profit sales % in FY {{financialForm.controls.date_per_financial['controls'][i-1].get('financial_year').value}} diff --git a/src/pages/pd-question/pd-question-general-info/pd-question-general-info.html b/src/pages/pd-question/pd-question-general-info/pd-question-general-info.html index 1baa84e7..a9bd971c 100755 --- a/src/pages/pd-question/pd-question-general-info/pd-question-general-info.html +++ b/src/pages/pd-question/pd-question-general-info/pd-question-general-info.html @@ -96,7 +96,7 @@

- +