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

Fairoj : issue fixes and new requirement implemented

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2019-10-14 13:06:37 +05:30
parent c54d2199a7
commit e0f2b62023
18 changed files with 194 additions and 47 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

0
build.json Normal file → Executable file
View File

0
plugins/android.json Normal file → Executable file
View File

0
report.20190911.110857.4451.0.001.json Normal file → Executable file
View File

0
report.20190911.182022.17626.0.001.json Normal file → Executable file
View File

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

@ -350,8 +350,12 @@
<!-- <mat-label>Vintage</mat-label> -->
<mat-label>Age of Asset in Years</mat-label>
<input type="tel" matInput autocomplete="off" placeholder="eg.99" formControlName="vintage_personal" minlength="1" maxlength="2" (keypress)="keyPress($event)" (keyup)="calculateVintagePurchase($event.target.value,i,3)">
<!-- <mat-error> Invalid format</mat-error> -->
</mat-form-field>
<mat-form-field style="width:100%">
<mat-label>Age of Asset in Months</mat-label>
<input type="tel" matInput autocomplete="off" placeholder="eg.12" formControlName="asset_months" minlength="1" maxlength="2" (keypress)="keyPress($event)" (keyup)="calculateVintagePurchase($event.target.value,i,2)">
</mat-form-field>
<div fxLayout="row" fxLayoutGap="2px" fxLayoutAlign="start none">

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

@ -331,6 +331,7 @@ export class PdQuestionAssestsPage {
other_owner:[''],
purchase_year: [null,Validators.compose([Validators.minLength(4),Validators.maxLength(4)])],
vintage_personal : [''],
asset_months:[''],
emi: [null],
});
}
@ -581,6 +582,7 @@ export class PdQuestionAssestsPage {
name_of_the_owner: [data.name_of_the_owner],
other_owner:[data.other_owner || ''],
vintage_personal:[data.vintage_personal],
asset_months:[data.asset_months],
purchase_year: [data.purchase_year,Validators.compose([Validators.minLength(4),Validators.maxLength(4)])],
emi: [data.emi || 0],
});
@ -665,6 +667,7 @@ export class PdQuestionAssestsPage {
other_owner:val.other_owner,
purchase_year: val.purchase_year,
vintage_personal:val.vintage_personal,
asset_months:val.asset_months,
emi: val.emi,
};
@ -839,7 +842,35 @@ export class PdQuestionAssestsPage {
calculateVintagePurchase(value: any, controlKey: any, type: number) {
if (type == 1) { }
else if (type == 2) { }
else if (type == 2) {
let control: any = <FormArray>this.AssetsDetailsForm.controls['assets_details'];
let vintage_personal=control.controls[controlKey].controls['vintage_personal'].value
// control.controls[controlKey].controls['asset_months'].setValue('')
control.controls[controlKey].controls['vintage_personal'].setValue('')
control.controls[controlKey].controls['purchase_year'].setValue('');
if(value >= 12){
let years = Math.floor(value/12);
let months = value % 12;
console.log(years,months);
vintage_personal=parseInt(vintage_personal)+ years
control.controls[controlKey].controls['asset_months'].setValue(months)
}
control.controls[controlKey].controls['vintage_personal'].setValue(vintage_personal)
control.controls[controlKey].controls['purchase_year'].setValue(vintage_personal != '' ? parseInt(this.currentYear) - parseInt(vintage_personal) : '');
if(control.controls[controlKey].controls['asset_months'].value > 0 && (vintage_personal != '' || vintage_personal != 0)){
// vintage_personal=parseInt(vintage_personal)-1
control.controls[controlKey].controls['purchase_year'].setValue(control.controls[controlKey].controls['purchase_year'].value - 1);
}
else if(control.controls[controlKey].controls['asset_months'].value > 0 && control.controls[controlKey].controls['asset_months'].value <12 && (vintage_personal == '' || vintage_personal == 0)){
control.controls[controlKey].controls['purchase_year'].setValue(parseInt(this.currentYear));
}
}
else if (type == 3) {
let control: any = <FormArray>this.AssetsDetailsForm.controls['assets_details'];
control.controls[controlKey].controls['purchase_year'].setValue(value != '' ? parseInt(this.currentYear) - parseInt(value) : '');
@ -848,6 +879,7 @@ export class PdQuestionAssestsPage {
let control: any = <FormArray>this.AssetsDetailsForm.controls['assets_details'];
value != '' && value <= this.currentYear ? control.controls[controlKey].controls['purchase_year'].setValue(value) : control.controls[controlKey].controls['purchase_year'].setValue('');
value != '' && value <= this.currentYear ? control.controls[controlKey].controls['vintage_personal'].setValue(parseInt(this.currentYear) - parseInt(value)) : control.controls[controlKey].controls['vintage_personal'].setValue('')
control.controls[controlKey].controls['asset_months'].setValue('')
}
}

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

@ -165,7 +165,7 @@
<mat-form-field *ngIf="(itemrow.get('business_ownership_type').value == 'rented')">
<input matInput autocomplete="off" [placeholder]= "'Monthly ' + addressType + ' Rent Amount'"
formControlName="business_monthly_rented_amt" type='numbers' (keyup)="inWords($event,i,9)">
formControlName="business_monthly_rented_amt" type="number" (keyup)="inWords($event,i,9)">
<mat-hint align="end" style="font-size:12px"
*ngIf="itemrow.get('business_monthly_rented_amt').value != ''">{{"&#8377;"}}
{{RentAmtInwordsForAddress[i]}} Only</mat-hint>
@ -219,6 +219,10 @@
(keyup)="calculateVintagePurchase($event.target.value,i,3)">
<!-- <mat-error> Invalid format</mat-error> -->
</mat-form-field>
<mat-form-field style="width:100%">
<mat-label>Age of Asset in Months</mat-label>
<input type="tel" matInput autocomplete="off" placeholder="eg.12" formControlName="asset_months" minlength="1" maxlength="2" (keyup)="calculateVintagePurchase($event.target.value,i,5)">
</mat-form-field>
<mat-form-field>
<mat-label>Purchase Year</mat-label>
@ -426,6 +430,10 @@
formControlName="business_vintage" minlength="1" maxlength="2"
(keyup)="calculateVintagePurchase($event.target.value,i,1)">
</mat-form-field>
<mat-form-field style="width:100%">
<mat-label>Age of Asset in Months</mat-label>
<input type="tel" matInput autocomplete="off" placeholder="eg.12" formControlName="asset_months" minlength="1" maxlength="2" (keyup)="calculateVintagePurchase($event.target.value,i,6)">
</mat-form-field>
<mat-form-field>
<mat-label>Purchase Year</mat-label>
<input matInput autocomplete="off" type="number" placeholder="YYYY eg.2018"

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

@ -268,6 +268,7 @@ export class PdQuestionBusinessAssetsPage {
business_name_of_the_owner: '',
business_name_of_the_other_owner: '',
business_vintage: '',
asset_months:'',
business_purchase_year: '',
business_emi: ''
}
@ -318,6 +319,7 @@ export class PdQuestionBusinessAssetsPage {
business_name_of_the_owner: '',
business_name_of_the_other_owner: '',
business_vintage: '',
asset_months:'',
business_purchase_year: '',
business_emi: ''
}
@ -542,6 +544,7 @@ removeOptionOnAutoComplete(index){
business_name_of_the_owner: [],
business_name_of_the_other_owner: [],
business_vintage: [''],
asset_months:[''],
business_purchase_year: ['',Validators.compose([Validators.pattern("[1-9]{1}[0-9]{3}")])],
business_emi: [''],
@ -604,6 +607,7 @@ createBusinessAssetsForAddress(): FormGroup {
business_name_of_the_owner: [''],
business_name_of_the_other_owner: [''],
business_vintage: [''],
asset_months:[''],
business_purchase_year: ['', Validators.compose([Validators.pattern("[1-9]{1}[0-9]{3}")])],
business_emi: ['']
});
@ -717,6 +721,7 @@ createBusinessAssetsForAddress(): FormGroup {
business_name_of_the_owner: val.business_name_of_the_owner,
business_name_of_the_other_owner: val.business_name_of_the_other_owner,
business_vintage: val.business_vintage,
asset_months:val.asset_months,
business_purchase_year: val.business_purchase_year,
business_emi: val.business_emi
};
@ -757,6 +762,7 @@ createBusinessAssetsForAddress(): FormGroup {
business_name_of_the_other_owner: val.business_name_of_the_other_owner,
business_purchase_year: val. business_purchase_year,
business_vintage : val.business_vintage,
asset_months:val.asset_months,
business_emi: val.business_emi,
};
const control = <FormArray>this._businessAssetsQuesFrom.controls['business_assets_details'];
@ -783,6 +789,7 @@ createBusinessAssetsForAddress(): FormGroup {
business_name_of_the_owner: [data.business_name_of_the_owner],
business_name_of_the_other_owner: [data.business_name_of_the_other_owner],
business_vintage: [data.business_vintage],
asset_months:[data.asset_months],
business_purchase_year: [data.business_purchase_year, Validators.compose([Validators.pattern("[1-9]{1}[0-9]{3}")])],
business_emi: [data.business_emi]
});
@ -809,6 +816,7 @@ createBusinessAssetsForAddress(): FormGroup {
business_name_of_the_other_owner:[data.business_name_of_the_other_owner || ''],
// relation: [data.relation || ''],
business_vintage: [data. business_vintage],
asset_months:[data.asset_months],
business_purchase_year: [data. business_purchase_year,Validators.compose([Validators.pattern("[1-9]{1}[0-9]{3}")])],
// purchase_month: [data.purchase_month],
business_emi: [data.business_emi || ''],
@ -941,6 +949,42 @@ createBusinessAssetsForAddress(): FormGroup {
value != '' && value <= this.currentYear ? control.controls[controlKey].controls['business_purchase_year'].setValue(value) : control.controls[controlKey].controls['business_purchase_year'].setValue('');
value != '' && value <= this.currentYear ? control.controls[controlKey].controls['business_vintage'].setValue(parseInt(this.currentYear) - parseInt(value)) : control.controls[controlKey].controls['business_vintage'].setValue('')
}
else if(type == 5 || type == 6){
let control:any;
if(type == 5){
control = <FormArray>this._businessAssetsQuesFrom.controls['business_assets_for_address'];
}
else{
control = <FormArray>this._businessAssetsQuesFrom.controls['business_assets_details'];
}
let vintage_personal=control.controls[controlKey].controls['business_vintage'].value
// control.controls[controlKey].controls['asset_months'].setValue('')
control.controls[controlKey].controls['business_vintage'].setValue('')
control.controls[controlKey].controls['business_purchase_year'].setValue('');
if(value >= 12){
let years = Math.floor(value/12);
let months = value % 12;
console.log(years,months);
vintage_personal=parseInt(vintage_personal)+ years
control.controls[controlKey].controls['asset_months'].setValue(months)
}
control.controls[controlKey].controls['business_vintage'].setValue(vintage_personal)
control.controls[controlKey].controls['business_purchase_year'].setValue(vintage_personal != '' ? parseInt(this.currentYear) - parseInt(vintage_personal) : '');
if(control.controls[controlKey].controls['asset_months'].value > 0 && (vintage_personal != '' || vintage_personal != 0)){
// vintage_personal=parseInt(vintage_personal)-1
control.controls[controlKey].controls['business_purchase_year'].setValue(control.controls[controlKey].controls['business_purchase_year'].value - 1);
}
else if(control.controls[controlKey].controls['asset_months'].value > 0 && control.controls[controlKey].controls['asset_months'].value <12 && (vintage_personal == '' || vintage_personal == 0)){
control.controls[controlKey].controls['business_purchase_year'].setValue(parseInt(this.currentYear));
}
}
}

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

@ -115,8 +115,8 @@
</mat-form-field>
<div *ngIf="generalExistEntityType.value!=''">
<mat-form-field style="width:100%;"
*ngIf="!EntityTypeFlag && generalExistEntityType!='4' && generalExistEntityType!='9' && generalExistEntityType.value!=''">
<input matInput type="number" #shareholding
*ngIf="!EntityTypeFlag && generalExistEntityType!='4' && generalExistEntityType!='9' && generalExistEntityType.value!='' && customer_segment_abbr != 'SEP_INDV'">
<input matInput type="number" #shareholding
placeholder="Share of Profit / Shareholding (%)" formControlName="shareholding"
autocomplete="off">
</mat-form-field>
@ -260,6 +260,7 @@
More Relationship</button>
<br />
</div>
<div #businessActivityScroll></div>
<mat-card>
<mat-card-header>Type of Business Activity</mat-card-header>
<mat-card-content formArrayName="select_business_activity_type">
@ -1986,7 +1987,7 @@
<!-- </div> -->
</mat-card-content>
</mat-card>
<div #docsSightedScroll></div>
<mat-card>
<mat-card-header>
<mat-card-title>Documents Sighted </mat-card-title>

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

@ -90,6 +90,8 @@ export class PdQuestionBusinessInfoPage {
tab: string = '0';
complete_status: boolean = false;
customer_segment_abbr: any;
@ViewChild('businessActivityScroll') businessActivityScroll:ElementRef
@ViewChild('docsSightedScroll') docsSightedScroll: ElementRef
constructor(public navCtrl: NavController, public navParams: NavParams,
public aws: AwsServiceProvider, public toast: ToastProvider,
@ -1867,14 +1869,31 @@ export class PdQuestionBusinessInfoPage {
this.toast.pdTriggerappmessage("Please enter a value between 0 and 100 in export sale as a % total sales");
return;
}
if(this.businessForm.value.select_business_activity_type.length >0){
let activity_check=this.businessForm.value.select_business_activity_type.filter(val=>val.exist_status == true)
if(activity_check.length == 0){
this.toast.pdTriggerappmessage("Please choose atleast one Type of Business Activity");
this.businessActivityScroll.nativeElement.scrollIntoView({ behavior: "smooth", block: "start" })
return;
}
// if(this.businessForm.value.select_business_activity_type)
}
else{
this.toast.pdTriggerappmessage("Please choose atleast one Type of Business Activity");
this.businessActivityScroll.nativeElement.scrollIntoView({ behavior: "smooth", block: "start" })
return;
}
if (this.businessForm.controls['gst_Regn_cert'].invalid) {
this.toast.pdTriggerappmessage("GST Regn Cert is required");
this.docsSightedScroll.nativeElement.scrollIntoView({behavior:"smooth",block:"start"})
return;
}
if (this.businessForm.controls['gst_Regn_cert_pic'] && this.businessForm.value.gst_Regn_cert == 'yes') {
if (this.businessForm.controls['gst_Regn_cert_pic'].invalid) {
this.toast.pdTriggerappmessage("gst regn cert pic is required");
this.docsSightedScroll.nativeElement.scrollIntoView({behavior:"smooth",block:"start"})
return;
}
}
@ -1882,11 +1901,13 @@ export class PdQuestionBusinessInfoPage {
if (this.businessForm.controls['factory_cert'] && this.businessForm.controls['factory_cert'].invalid) {
this.toast.pdTriggerappmessage("Factory Cert is required");
this.docsSightedScroll.nativeElement.scrollIntoView({behavior:"smooth",block:"start"})
return;
}
if (this.businessForm.controls['factory_cert_pic'] && this.businessForm.value.factory_cert == 'yes') {
if (this.businessForm.controls['factory_cert_pic'].invalid) {
this.toast.pdTriggerappmessage("factory cert pic is required");
this.docsSightedScroll.nativeElement.scrollIntoView({behavior:"smooth",block:"start"})
return;
}
}
@ -1894,11 +1915,13 @@ export class PdQuestionBusinessInfoPage {
if (this.businessForm.controls['practice_cert'] && this.businessForm.controls['practice_cert'].invalid) {
this.toast.pdTriggerappmessage("Practice Cert is required");
this.docsSightedScroll.nativeElement.scrollIntoView({behavior:"smooth",block:"start"})
return;
}
if (this.businessForm.controls['practice_cert_pic'] && this.businessForm.value.practice_cert == 'yes') {
if (this.businessForm.controls['practice_cert_pic'].invalid) {
this.toast.pdTriggerappmessage(" practice cert pic is required");
this.docsSightedScroll.nativeElement.scrollIntoView({behavior:"smooth",block:"start"})
return;
}
}
@ -1906,55 +1929,65 @@ export class PdQuestionBusinessInfoPage {
if (this.businessForm.controls['shop_eat_act_cert'].invalid) {
this.toast.pdTriggerappmessage("shop eat act cert is required");
this.docsSightedScroll.nativeElement.scrollIntoView({behavior:"smooth",block:"start"})
return;
}
if (this.businessForm.controls['shop_eat_act_cert_pic'] && this.businessForm.value.shop_eat_act_cert == 'yes') {
if (this.businessForm.controls['shop_eat_act_cert_pic'].invalid) {
this.toast.pdTriggerappmessage("Shop eat act cert pic is required");
this.docsSightedScroll.nativeElement.scrollIntoView({behavior:"smooth",block:"start"})
return;
}
}
if (this.businessForm.controls['pf_regn'].invalid) {
this.toast.pdTriggerappmessage("PF Regn is required");
this.docsSightedScroll.nativeElement.scrollIntoView({behavior:"smooth",block:"start"})
return;
}
if (this.businessForm.controls['pf_regn_pic'] && this.businessForm.value.pf_regn == 'yes') {
if (this.businessForm.controls['pf_regn_pic'].invalid) {
this.toast.pdTriggerappmessage("PF Regn pic is required");
this.docsSightedScroll.nativeElement.scrollIntoView({behavior:"smooth",block:"start"})
return;
}
}
if (this.businessForm.controls['esic_regn'].invalid) {
this.toast.pdTriggerappmessage("ESIC Regn is required");
this.docsSightedScroll.nativeElement.scrollIntoView({behavior:"smooth",block:"start"})
return;
}
if (this.businessForm.controls['esic_regn_pic'] && this.businessForm.value.esic_regn == 'yes') {
if (this.businessForm.controls['esic_regn_pic'].invalid) {
this.toast.pdTriggerappmessage("ESIC Regn pic is required");
this.docsSightedScroll.nativeElement.scrollIntoView({behavior:"smooth",block:"start"})
return;
}
}
if (this.businessForm.controls['export_import_cert'] && this.businessForm.controls['export_import_cert'].invalid) {
this.toast.pdTriggerappmessage("Export Import Cert is required");
this.docsSightedScroll.nativeElement.scrollIntoView({behavior:"smooth",block:"start"})
return;
}
if (this.businessForm.controls['export_import_cert_pic'] && this.businessForm.value.export_import_cert == 'yes') {
if (this.businessForm.controls['export_import_cert_pic'].invalid) {
this.toast.pdTriggerappmessage("Export /Import Cert pic is required");
this.docsSightedScroll.nativeElement.scrollIntoView({behavior:"smooth",block:"start"})
return;
}
}
if (this.businessForm.controls['fire_noc'] && this.businessForm.controls['fire_noc'].invalid) {
this.toast.pdTriggerappmessage("Fire Noc is required");
this.docsSightedScroll.nativeElement.scrollIntoView({behavior:"smooth",block:"start"})
return;
}
if (this.businessForm.controls['fire_noc_pic'] && this.businessForm.value.fire_noc == 'yes') {
if (this.businessForm.controls['fire_noc_pic'].invalid) {
this.toast.pdTriggerappmessage("Fire Noc pic is required");
this.docsSightedScroll.nativeElement.scrollIntoView({behavior:"smooth",block:"start"})
return;
} }

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

@ -436,14 +436,14 @@ console.log("form values",this.clientInfoForm);
manufacturing_product_name: [''],
manufacturing_client_name: [''],
manufacturing_contact_person_name: [''],
manufacturing_contact_person_mobile_number: [''],//,Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],
manufacturing_contact_person_mobile_number: ['',Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],//,Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],
manufacturing_payment_type: [''],
manufacturing_payment_mode: [''],
// manufacturing_credit_days: [''],
person_title_name: [''],
person_designation: [''],
person_stdcode: [''],// Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
person_landline: [''],// Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
person_stdcode: ['',Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],// Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
person_landline: ['',Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],// Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
other_person_designation: [''],
manufacturing_credit_days_from: [''],
manufacturing_credit_days_to: ['']
@ -453,14 +453,14 @@ console.log("form values",this.clientInfoForm);
manufacturing_product_name: [records.manufacturing_product_name || null],
manufacturing_client_name: [records.manufacturing_client_name || null],
manufacturing_contact_person_name: [records.manufacturing_contact_person_name || null],
manufacturing_contact_person_mobile_number: [records.manufacturing_contact_person_mobile_number || null],//Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],
manufacturing_contact_person_mobile_number: [records.manufacturing_contact_person_mobile_number || null,Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],//Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],
manufacturing_payment_type: [records.manufacturing_payment_type || null],
manufacturing_payment_mode: [records.manufacturing_payment_mode || null],
manufacturing_credit_days: [records.manufacturing_credit_days || null],
person_title_name: [records.person_title_name || null],
person_designation: [records.person_designation || null],
person_stdcode: [records.person_stdcode || null],// Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
person_landline: [records.person_landline || null],// Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
person_stdcode: [records.person_stdcode || null,Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],// Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
person_landline: [records.person_landline || null,Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],// Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
other_person_designation: [records.other_person_designation || null],
manufacturing_credit_days_from: [records.manufacturing_credit_days_from || null],
manufacturing_credit_days_to: [records.manufacturing_credit_days_to || null]
@ -489,7 +489,7 @@ console.log("form values",this.clientInfoForm);
trade_product_name: [''],
trade_client_name: [''],
trade_product_contact_person_name: [''],
trade_product_contact_person_mobile_number: [''],//Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],
trade_product_contact_person_mobile_number: ['',Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],//Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],
trade_product_payment_type: [''],
trade_product_payment_mode: [''],
trade_product_frequency_of_purchase: [''],
@ -497,8 +497,8 @@ console.log("form values",this.clientInfoForm);
trade_product_credit_days_to: [''],
person_title_name: [''],
person_designation: [''],
person_stdcode: [''],// Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
person_landline: [''],// Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
person_stdcode: ['',Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],// Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
person_landline: ['',Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],// Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
other_person_designation: [''],
})
} else {
@ -506,7 +506,7 @@ console.log("form values",this.clientInfoForm);
trade_product_name: [records.trade_product_name],
trade_client_name: [records.trade_client_name],
trade_product_contact_person_name: [records.trade_product_contact_person_name],
trade_product_contact_person_mobile_number: [records.trade_product_contact_person_mobile_number],//Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],
trade_product_contact_person_mobile_number: [records.trade_product_contact_person_mobile_number,Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],//Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],
trade_product_payment_type: [records.trade_product_payment_type],
trade_product_payment_mode: [records.trade_product_payment_mode],
trade_product_frequency_of_purchase: [records.trade_product_frequency_of_purchase],
@ -514,8 +514,8 @@ console.log("form values",this.clientInfoForm);
trade_product_credit_days_to: [records.trade_product_credit_days_to],
person_title_name: [records.person_title_name || null],
person_designation: [records.person_designation || null],
person_stdcode: [records.person_stdcode || null],// Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
person_landline: [records.person_landline || null],// Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
person_stdcode: [records.person_stdcode || null,Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],// Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
person_landline: [records.person_landline || null,Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],// Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
other_person_designation: [records.other_person_designation || null],
})
}
@ -542,7 +542,7 @@ console.log("form values",this.clientInfoForm);
service_provider_product_name: [''],
service_provider_client_name: [''],
service_provider_product_contact_person_name: [''],
service_provider_product_contact_person_mobile_number: [''],//Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],
service_provider_product_contact_person_mobile_number: ['',Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],//Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],
service_provider_product_payment_type: [''],
service_provider_product_payment_mode: [''],
service_provider_product_frequency_of_purchase: [''],
@ -550,8 +550,8 @@ console.log("form values",this.clientInfoForm);
service_provider_product_credit_days_to: [''],
person_title_name: [''],
person_designation: [''],
person_stdcode: [''], //Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
person_landline: [''],// Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
person_stdcode: ['',Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])], //Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
person_landline: ['',Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],// Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
other_person_designation: [''],
})
} else {
@ -559,7 +559,7 @@ console.log("form values",this.clientInfoForm);
service_provider_product_name: [records.service_provider_product_name],
service_provider_client_name: [records.service_provider_client_name],
service_provider_product_contact_person_name: [records.service_provider_product_contact_person_name],
service_provider_product_contact_person_mobile_number: [records.service_provider_product_contact_person_mobile_number],//Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],
service_provider_product_contact_person_mobile_number: [records.service_provider_product_contact_person_mobile_number,Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],//Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],
service_provider_product_payment_type: [records.service_provider_product_payment_type],
service_provider_product_payment_mode: [records.service_provider_product_payment_mode],
service_provider_product_frequency_of_purchase: [records.service_provider_product_frequency_of_purchase],
@ -567,8 +567,8 @@ console.log("form values",this.clientInfoForm);
service_provider_product_credit_days_to: [records.service_provider_product_credit_days_to],
person_title_name: [records.person_title_name || null],
person_designation: [records.person_designation || null],
person_stdcode: [records.person_stdcode || null],// Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
person_landline: [records.person_landline || null],// Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
person_stdcode: [records.person_stdcode || null,Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],// Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
person_landline: [records.person_landline || null,Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],// Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
other_person_designation: [records.other_person_designation || null],
})
}
@ -652,6 +652,10 @@ console.log("form values",this.clientInfoForm);
// }
saveClientInfoWithImageCheck(answerFormValues){
console.log("forms",answerFormValues);
if(this.clientInfoForm.invalid){
this.toast.pdTriggerappmessage("Please Fill all the mandatory Fields");
return;
}
if(answerFormValues.client_info_available != true){
this.clientInfoForm.controls['supplier_info_form_remark'].setValidators(Validators.compose([Validators.required]))
console.log("form valid",this.clientInfoForm.valid)

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

@ -407,16 +407,16 @@ export class PdQuestionSupplierInfoPage {
person_designation: [''],
other_person_designation: [''],
manufacturing_contact_person_name: [''],
manufacturing_contact_person_mobile_number: [''],
manufacturing_contact_person_mobile_number: ['',Validators.compose([Validators.maxLength(10),Validators.minLength(10)])],
//,Validators.compose([Validators.minLength(10),Validators.maxLength(10)])
manufacturing_payment_type: [''],
manufacturing_payment_mode: [''],
manufacturing_credit_days_from: [''],
manufacturing_credit_days_to: [''],
manufacturing_frequency_of_purchase: [''],
person_stdcode: [''],
person_stdcode: ['', Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
//, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])
person_landline: [''],
person_landline: ['', Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
//, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])
})
@ -428,16 +428,16 @@ export class PdQuestionSupplierInfoPage {
person_designation: [records.person_designation || null],
other_person_designation: [records.other_person_designation || null],
manufacturing_contact_person_name: [records.manufacturing_contact_person_name || null],
manufacturing_contact_person_mobile_number: [records.manufacturing_contact_person_mobile_number || null],
manufacturing_contact_person_mobile_number: [records.manufacturing_contact_person_mobile_number || null,Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],
//Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],
manufacturing_payment_type: [records.manufacturing_payment_type || null],
manufacturing_payment_mode: [records.manufacturing_payment_mode],
manufacturing_credit_days_from: [records.manufacturing_credit_days_from || null],
manufacturing_credit_days_to: [records.manufacturing_credit_days_to || null],
manufacturing_frequency_of_purchase: [records.manufacturing_frequency_of_purchase || null],
person_stdcode: [records.person_stdcode || null],
person_stdcode: [records.person_stdcode || null, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
//, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])
person_landline: [records.person_landline || null],
person_landline: [records.person_landline || null, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
//, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])
})
}
@ -465,11 +465,11 @@ export class PdQuestionSupplierInfoPage {
person_designation: [''],
other_person_designation: [''],
trade_product_contact_person_name: [''],
trade_product_contact_person_mobile_number: [''],
trade_product_contact_person_mobile_number: ['',Validators.compose([Validators.maxLength(10),Validators.minLength(10)])],
//,Validators.compose([Validators.minLength(10),Validators.maxLength(10)])
person_stdcode: [null],
person_stdcode: [null,, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
//, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])
person_landline: [null],
person_landline: [null,, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
//, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])
trade_product_payment_type: [''],
trade_product_payment_mode: [''],
@ -485,11 +485,11 @@ export class PdQuestionSupplierInfoPage {
other_person_designation: [records.other_person_designation],
trade_supplier_name: [records.trade_supplier_name],
trade_product_contact_person_name: [records.trade_product_contact_person_name],
trade_product_contact_person_mobile_number: [records.trade_product_contact_person_mobile_number],
trade_product_contact_person_mobile_number: [records.trade_product_contact_person_mobile_number, Validators.compose([Validators.minLength(10),Validators.maxLength(10)])],
//, Validators.compose([Validators.minLength(10),Validators.maxLength(10)])
person_stdcode: [records.person_stdcode],
person_stdcode: [records.person_stdcode, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
//, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])
person_landline: [records.person_landline],
person_landline: [records.person_landline, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
//, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])
trade_product_payment_type: [records.trade_product_payment_type],
trade_product_payment_mode: [records.trade_product_payment_mode],
@ -527,9 +527,9 @@ export class PdQuestionSupplierInfoPage {
person_designation: [''],
other_person_designation: [''],
service_provider_contact_person_name: [''],
service_provider_contact_person_mobile_number: [''],
person_stdcode: [null],
person_landline: [null],
service_provider_contact_person_mobile_number: ['',Validators.compose([Validators.maxLength(10),Validators.minLength(10)])],
person_stdcode: [null, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
person_landline: [null, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
service_provider_payment_type: [''],
service_provider_payment_mode: [''],
service_provider_frequency_of_purchase: [''],
@ -545,9 +545,9 @@ export class PdQuestionSupplierInfoPage {
other_person_designation: [records.other_person_designation],
service_provider_supplier_name: [records.service_provider_supplier_name],
service_provider_contact_person_name: [records.service_provider_contact_person_name],
service_provider_contact_person_mobile_number: [records.service_provider_contact_person_mobile_number],
person_stdcode: [records.person_stdcode],
person_landline: [records.person_landline],
service_provider_contact_person_mobile_number: [records.service_provider_contact_person_mobile_number,,Validators.compose([Validators.maxLength(10),Validators.minLength(10)])],
person_stdcode: [records.person_stdcode, Validators.compose([Validators.minLength(3),Validators.maxLength(5),Validators.pattern('^[0-9]*$')])],
person_landline: [records.person_landline,, Validators.compose([Validators.minLength(6),Validators.maxLength(8),Validators.pattern('^[0-9]*$')])],
service_provider_payment_type: [records.service_provider_payment_type],
service_provider_payment_mode: [records.service_provider_payment_mode],
service_provider_frequency_of_purchase: [records.service_provider_frequency_of_purchase],
@ -689,9 +689,16 @@ export class PdQuestionSupplierInfoPage {
}
}
saveSupplierInfoWithImageCheck(answerFormValues) {
if(this.supplierInfoForm.invalid){
this.toast.pdTriggerappmessage("Please Fill all the mandatory fields");
return;
}
if(answerFormValues.supplier_info_available != true){
this.supplierInfoForm.controls['supplier_info_form_remark'].setValidators(Validators.compose([Validators.required]))
console.log("invalid",this.supplierInfoForm.invalid)
if(this.supplierInfoForm.controls['supplier_info_form_remark'].value != ''){
this.saveSupplierInfo(answerFormValues)
}
else{

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

@ -106,6 +106,7 @@
<form [formGroup]="currentLoans" *ngSwitchCase="'0'">
<mat-card>
<mat-form-field style="width: 100%">
<mat-label>Do you have any other Existing Loans</mat-label>
@ -116,7 +117,8 @@
<mat-option value="No">No</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field style="width:100% !important;" *ngIf="currentLoans.controls.existing_loan.value == 'Yes' && currentLoans.controls.existing_loan.value == 'Yes'">
<mat-form-field style="width:100% !important;" *ngIf="currentLoans.controls.existing_loan.value == 'Yes' && currentLoans.controls.existing_loan.value == 'Yes' && (productAbbr == 'LAEP' || productAbbr == 'BL')">
<mat-select (selectionChange)="exitsCheck($event.value)" placeholder="Details of all loan info available"
formControlName="loan_info_available">
<mat-option>Select</mat-option>

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

@ -56,6 +56,8 @@ applicants: any;
complete_status: boolean = false;
spinner_access:boolean=false;
productAbbr: any;
constructor(public navCtrl: NavController, public navParams: NavParams,public fb:FormBuilder,
public qustCat:QuestionCategoryProvider,public toast:ToastProvider,
public aws:AwsServiceProvider,public constant:ConstantsProvider,
@ -67,6 +69,7 @@ applicants: any;
this.pdid=this.pdDetails.pd_id;
this.FormId = this.navParams.get('FormId');
this.applicants = this.pdDetails.applicat_details.filter(val=>val.pd_co_applicant_id != 0);
this.productAbbr=this.pdDetails.product_abbr
this.applicants.push({'pd_co_applicant_id':'0','applicant_name':'Others'});
@ -78,7 +81,7 @@ applicants: any;
this.currentLoans = this.fb.group(
{
existing_loan: [null],
loan_info_available:[null],
loan_info_available:[this.productAbbr == 'LAEP' || this.productAbbr == 'BL' ? null : 'Yes'],
currentloan_remarks:[null],
loan_details: this.fb.array([])
});

2
src/pages/pd-question/pd-question-final-remark/pd-question-final-remark.html
View File

@ -179,7 +179,7 @@
</div>
</div>
</div><br/>
<mat-label float-right>Was the PD Address Outside Geographic Limit (OGL)
<mat-label float-right>Any additional visit (Godown /multiple rental properties) done?
<mat-slide-toggle float-right formControlName="was_the_pd_address_ogl" color="primary"></mat-slide-toggle>
</mat-label><br/>
<mat-form-field>

5
src/pages/queries-docs/queries-docs.html
View File

@ -31,7 +31,10 @@
<div *ngFor="let qu of docsCollectedForm.controls.addtional_requirements['controls'];let i=index;" [formGroupName]="i">
<div *ngFor="let item of queries_docs">
<mat-form-field style="width:100%">
<input matInput type="text" [formControlName]="item.add_req_id" [placeholder]="item.add_requirement">
<mat-placeholder>
{{item.add_requirement}}
</mat-placeholder>
<input matInput type="text" [formControlName]="item.add_req_id" >
</mat-form-field>
</div>
</div>

6
src/pages/queries-docs/queries-docs.scss
View File

@ -11,4 +11,10 @@ page-queries-docs {
.scroll-content{
background-color: #eee;
}
mat-placeholder{
font-size:15px;
}
input-placeholder{
margin:10px;
}
}