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

AI Changes

Browse Source
This commit is contained in:
saravanakumarkandasami 2019-03-18 19:39:24 +05:30
commit e43e4c58c7
7 changed files with 124 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pages/pd-question/pd-question-assests/pd-question-assests.html
View File

@ -222,7 +222,8 @@
<div *ngIf="sup.get('assets_mode').value == 2 || sup.get('assets_mode').value == 5">
<div fxFlex="33">
<mat-form-field style="width:100%">
<input type="number" matInput placeholder="Approximate Market Value" formControlName="approximate_market_value">
<input type="number" matInput placeholder="Approximate Market Value" formControlName="approximate_market_value" (keyup)="inWords($event.target.value,i,4)">
<mat-hint align="end" style="font-size:12px" *ngIf="sup.get('approximate_market_value').value != ''">{{"&#8377;"}} {{ApproxInwords[i]}} Only</mat-hint>
</mat-form-field>
</div>
</div>

5
src/pages/pd-question/pd-question-assests/pd-question-assests.ts
View File

@ -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 = <FormArray>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;
}

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

@ -42,13 +42,16 @@
</mat-form-field>
<p *ngIf="!EntityTypeFlag" style="margin-left: 2% !important">No of Years in Current Business</p>
<mat-form-field *ngIf="!EntityTypeFlag">
<input matInput autocomplete="off" placeholder="Year" type="number" formControlName="current_business_experiance_year" (keyup)="getWorkExperience(member.value,i)" (keypress)="keyPress($event)" (change)="checkWithExistBusinessYear($event.target.value,i)" [readonly]="isreadonlyyear[i]">
<input matInput autocomplete="off" placeholder="Year" type="number" formControlName="current_business_experiance_year" (keyup)="getWorkExperience(member.value,i)" (keypress)="keyPress($event)" (change)="checkWithExistBusinessYear($event.target.value,i,member)" [readonly]="isreadonlyyear[i]">
<mat-hint style="color: red;" align="start" style="font-size:11px">{{yearErrorMessage[i]}}</mat-hint>
</mat-form-field>
<mat-form-field *ngIf="!EntityTypeFlag">
<input matInput autocomplete="off" placeholder="Month" type="number" formControlName="current_business_experiance_month" (keypress)="keyPress($event)" (change)="ConvertMonthintoYear(member,$event.target.value)" [readonly]="isreadonlymonth[i]">
<input matInput autocomplete="off" placeholder="Month" type="number" formControlName="current_business_experiance_month" (keypress)="keyPress($event)" (change)="ConvertMonthintoYear(member,$event.target.value,i)" [readonly]="isreadonlymonth[i]">
<mat-hint style="color: red;" align="start" style="font-size:11px">{{monthErrorMessage[i]}}</mat-hint>
</mat-form-field >
<mat-form-field *ngIf="!EntityTypeFlag">
<input matInput autocomplete="off" placeholder="Total Work Experience" type="number" formControlName="total_business_experiance" (keypress)="keyPress($event)" (keyup)="getWorkExperience(member.value,i)">
<input matInput autocomplete="off" placeholder="Total Work Experience" type="number" formControlName="total_business_experiance" (keypress)="keyPress($event)" (keyup)="getWorkExperience(member.value,i)" (change)="checkWithExistTotalWorkExperience($event.target.value,i,member)">
<mat-hint style="color: red;" align="start" style="font-size:11px">{{errorMessageForExistTotalWorkExperience[i]}}</mat-hint>
</mat-form-field>
<mat-form-field *ngIf="!EntityTypeFlag && member.value.total_business_previous_experience!=undefined" >
<input matInput autocomplete="off" placeholder="Previous Work Experience" formControlName="total_business_previous_experience">
@ -146,7 +149,7 @@
</mat-form-field>
<mat-form-field>
<mat-select placeholder="Area of Sale" formControlName="area_of_sale" (selectionChange)="changeManufacturingAreaSale(manufacturing,i);CheckExport($event.value,'MActivity',i);">
<mat-option value="Within India">Within India"</mat-option>
<mat-option value="Within India">Within India</mat-option>
<mat-option value="Export">Export</mat-option>
<mat-option value="Both">Both</mat-option>
</mat-select>
@ -301,7 +304,7 @@
</ng-container>
<mat-form-field >
<mat-label>Description of {{manufacturing.value.main_products}}</mat-label>
<mat-label>Description of {{manufacturing.value.main_products}} Manufacturing Process</mat-label>
<textarea matInput placeholder="Description" formControlName="description"></textarea>
</mat-form-field>
<ion-buttons end>
@ -501,7 +504,8 @@
</ng-container>
<mat-form-field >
<mat-label>Description of {{retail.value.main_products}}</mat-label>
<mat-label>Description of {{retail.value.main_products}} Retailing
process</mat-label>
<textarea matInput placeholder="Description" formControlName="description"></textarea>
</mat-form-field>
<ion-buttons end>
@ -703,7 +707,8 @@
</mat-card-content>
<mat-card-actions>
<mat-form-field >
<mat-label>Description of {{wholesale.value.main_products}}</mat-label>
<mat-label>Description of {{wholesale.value.main_products}} Wholesale
process </mat-label>
<textarea matInput placeholder="Description" formControlName="description"></textarea>
</mat-form-field>
</mat-card-actions>
@ -906,7 +911,7 @@
<mat-card-actions>
<mat-form-field >
<mat-label>Description of {{serviceprovider.value.main_products}}</mat-label>
<mat-label>Description of {{serviceprovider.value.main_products}} Service Process</mat-label>
<textarea matInput placeholder="Description" formControlName="description"></textarea>
</mat-form-field>
</mat-card-actions>

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

@ -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 = <FormArray>this.businessForm.controls['retail_trading_activity_details'];
const wholesaleControl:any=<FormArray>this.businessForm.controls['wholesale_trading_activity_details'];
const serviceProviderControl:any=<FormArray>this.businessForm.controls['service_provider_activity_details'];
const othersControl:any=<FormArray>this.businessForm.controls['others_activity_details'];
// const othersControl:any=<FormArray>this.businessForm.controls['others_activity_details'];
const otherDoc = <FormArray>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 = <FormArray>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 = <FormArray>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 = <FormArray>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 = <FormArray>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 = <FormArray>this.businessForm.controls['others_activity_details'];
othersControl.push(this.createOthersActivity());
}
// addMoreOthersActivity(){
// let othersControl = <FormArray>this.businessForm.controls['others_activity_details'];
// othersControl.push(this.createOthersActivity());
// }
createCountrySale() {
return this.fb.group({
country_name: ['',Validators.compose([Validators.required])],

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

@ -220,7 +220,6 @@
type="number">
</mat-form-field>
</span>
<!-- </div> -->
</div>
<ion-buttons end>
<ion-col col-3 offset-3>

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

@ -49,10 +49,10 @@
<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>
<!-- <mat-label>Sale Variation from Previous Year in %</mat-label>&nbsp;&nbsp;- -->
<mat-form-field>
<input matInput placeholder="Sale Variation from Previous Year in %" formControlName="financial_annualsales_variation" (keypress)="keyPress($event)" readonly>
</mat-form-field>
<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>
@ -64,7 +64,6 @@
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)">
@ -91,9 +90,10 @@
</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)}" >
<mat-form-field>
<input matInput placeholder="Profit Variation from Previous Year in %" 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>
</mat-form-field>
<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>
@ -104,10 +104,11 @@
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>
<!-- <mat-label>Variation of Profit % over sales</mat-label>
&nbsp;&nbsp;- -->
<mat-form-field>
<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>
</mat-form-field>
<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>

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

@ -96,7 +96,7 @@
</mat-form-field>
<!-- {{indi.get('qualification').value}} -->
<div *ngIf="indi.get('qualification').value !== ''">
<mat-form-field style="width:100%" *ngIf="indi.get('qualification').value != '4'">
<mat-form-field style="width:100%" *ngIf="indi.get('qualification').value != '4' && indi.get('qualification').value != '6'">
<input matInput placeholder="Qualification Details" formControlName="course_name">
</mat-form-field>
</div>