diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.html index 24e2bc006..d81c0c7bc 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.html @@ -34,7 +34,7 @@
- + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts index 4714986fd..54c9d508c 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-purchase/manage-daily-purchase.component.ts @@ -21,7 +21,7 @@ export class ManageDailyPurchaseComponent implements OnInit { marginAmtInwords: any[]=[]; productListData : any[]=[]; private notifier: NotifierService; - + todaydate:Date = new Date(); constructor(notifier: NotifierService,private _fb: FormBuilder, private _pd: PdTrigerService, @Inject(MAT_DIALOG_DATA) public data: any, private dialogRef: MatDialogRef) { this.pageTitle = this.data.manage_status==1 ? 'Add Daily Purchase Item' : 'Update Daily Purchase Item'; this.notifier = notifier; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.html index 49aa54c6a..e6ec0618b 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.html @@ -38,7 +38,8 @@
- + + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.ts index 6519c75b1..e434009bc 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-daily-sales/manage-daily-sales.component.ts @@ -20,6 +20,15 @@ export class ManageDailySalesComponent implements OnInit { frequencyData: any[]=[]; marginAmtInwords: any[]=[]; productandservice : any[]=[]; + name = 'Angular'; + + now = new Date(); + year = this.now.getFullYear(); + month = this.now.getMonth(); + day = this.now.getDay(); + + todaydate:Date = new Date(); + private notifier: NotifierService; check_type:any=[{'type_id':"1",'type_name':'Date Information'},{'type_id':"2",'type_name':'Frequency Information'}] constructor(notifier: NotifierService,private _fb: FormBuilder, private _pd: PdTrigerService, @Inject(MAT_DIALOG_DATA) public data: any, private dialogRef: MatDialogRef) { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.html index 0483642e5..76a617f74 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.html @@ -34,54 +34,67 @@ {{types.type_name}}
+
- + {{uom.name}} - - + + - - +
-
- - - {{"₹"}} {{item.value.rate_per_unit | numberToWords}} Only - +
+ +
+ + + + {{"₹"}} {{item.value.rate_per_unit | numberToWords}} Only + - - - {{frq.name}} - - - - - {{"₹"}} {{item.value.annual_purchase_value | numberToWords}} Only - - -
-
- - - {{frq.name}} - - - - + + + + {{frq.name}} + + + + + + + {{"₹"}} {{item.value.annual_purchase_value | numberToWords}} Only + + +
+ +
+ + + + {{frq.name}} + + + + + {{"₹"}} {{item.value.rate_per_unit | numberToWords}} Only - - - - + + + + + + {{"₹"}} {{item.value.annual_purchase_value | numberToWords}} Only - -
+ + +
+
@@ -107,4 +120,4 @@ - + s diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts index 2ceadcc9c..19f7d9823 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-purchase/manage-purchase.component.ts @@ -116,36 +116,8 @@ closeDialogue(){ this.dialogRef.close({update_status:false}); } -purchaseCalculation(indexVal: number,values: any): void { - let control:any = this.purchaseItemForm.controls['purchase']; - - if(values.purchase_type=="1" &&values.purchase_qty!='' && values.rate_per_unit!='' && values.fk_frequency_id!='') { - let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); - control.controls[indexVal].controls['annual_purchase_value'].setValue(parseInt(values.purchase_qty) * parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); - } - else if(values.purchase_type=="2" && values.rate_per_unit!='' && values.fk_frequency_id!='') { - - let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); - control.controls[indexVal].controls['annual_purchase_value'].setValue(parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); - } - else { - control.controls[indexVal].controls['annual_purchase_value'].setValue(''); - } -} - -removeItem(indexVal: number) : void { - let control = this.purchaseItemForm.controls['purchase']; - control.removeAt(indexVal); - -} -// generate other UOM -generateOtherUOM(index: number, values: any): void { - let control: any = this.purchaseItemForm.controls['purchase']; - values.fk_uom_id=="1" ? control.controls[index].addControl('uom_other', new FormControl('', Validators.required)) : control.controls[index].removeControl('uom_other'); -} - changeOptions(indexVal: any,event: any): void{ - + console.log('indexVal: any,event: any',indexVal,event); let control: any = this.purchaseItemForm.controls['purchase']; if(event.value=="1"){ control.controls[indexVal].controls['purchase_qty'].setValidators([Validators.required]); @@ -167,6 +139,36 @@ changeOptions(indexVal: any,event: any): void{ } } +purchaseCalculation(indexVal: number,values: any): void { + console.log('indexVal: number,values: any',indexVal,values); + let control:any = this.purchaseItemForm.controls['purchase']; + + if(values.purchase_type=="1" &&values.purchase_qty!='' && values.rate_per_unit!='' && values.fk_frequency_id!='') { + let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); + control.controls[indexVal].controls['annual_purchase_value'].setValue(parseInt(values.purchase_qty) * parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); + } + else if(values.purchase_type=="2" && values.rate_per_unit!='' && values.fk_frequency_id!='') { + console.log('purchaseCalculation else if'); + let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); + control.controls[indexVal].controls['annual_purchase_value'].setValue(parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); + } + else { + control.controls[indexVal].controls['annual_purchase_value'].setValue(''); + } +} + +removeItem(indexVal: number) : void { + let control = this.purchaseItemForm.controls['purchase']; + control.removeAt(indexVal); + +} +// generate other UOM +generateOtherUOM(index: number, values: any): void { + let control: any = this.purchaseItemForm.controls['purchase']; + values.fk_uom_id=="1" ? control.controls[index].addControl('uom_other', new FormControl('', Validators.required)) : control.controls[index].removeControl('uom_other'); +} + + // save purchase details submitDetails(records) { if (this.purchaseItemForm.invalid) { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html index 7236948df..7e3aa97f8 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.html @@ -37,7 +37,7 @@ - Declared by customer + Declared by Customer {{ i==7 ? element.declared_by_customer : i==9 ? element.declared_by_customer : element.declared_by_customer | rupeeCurrencyFormat}} @@ -74,7 +74,7 @@ - + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts index 6decd1d47..658a0b146 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/assessed-income.component.ts @@ -14,6 +14,7 @@ import { RupeeCurrencyFormatPipe } from './../../../../../pd-pipes/rupee-currenc providers: [RupeeCurrencyFormatPipe] }) export class AssessedIncomeComponent implements OnInit { + displayedSummaryColumns: any =[]; summaryItemSource:any = []; customer_segment_abbr: any; @@ -213,6 +214,7 @@ public viewerOptions: any = { } if(value.records.final_data.length >0 && (value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.cost_of_goods_sold) || (value.records.final_data[0].sales_calculated_by_itemwise &&value.records.final_data[0].sales_calculated_by_itemwise.cost_of_goods_sold)|| (value.records.final_data[0].sales_calculated_by_monthwise &&value.records.final_data[0].sales_calculated_by_monthwise.cost_of_goods_sold) ){ + let get_sumary: any=[]; // set sales and revenue get_sumary.push({"sno":'a. ',"label":'Sales / Revenue ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.sales_revenue) ? value.records.final_data[0].sales_declared_by_customer.sales_revenue:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.sales_revenue) ? value.records.final_data[0].sales_calculated_by_itemwise.sales_revenue:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.sales_revenue) ? value.records.final_data[0].sales_calculated_by_monthwise.sales_revenue:0 }); @@ -250,7 +252,8 @@ public viewerOptions: any = { : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit Amount ',"declared_by_customer":'', "derived_item_wise":value.records.final_data[0].consolidated_report.consolidated_nerprofit ,"derived_sales_book":'' }) : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit Amount ',"declared_by_customer":'', "derived_item_wise":'' ,"derived_sales_book":value.records.final_data[0].consolidated_report.consolidated_nerprofit }) :''; - + + // get conslidate net margin details (value.records.final_data[0].consolidated_report && value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit to Sales %',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin +'%', "derived_item_wise":'' ,"derived_sales_book":'' }) : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit to Sales % ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin +'%', "derived_item_wise":'' ,"derived_sales_book":'' }) @@ -277,6 +280,7 @@ public viewerOptions: any = { // this.sumary_details.net_disable_income_value = Number(this.sumary_details.net_profit) - Number(this.sumary_details.household_expenses); } else if(value.records.final_data.length >0 && (value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.purchases) || (value.records.final_data[0].sales_calculated_by_itemwise &&value.records.final_data[0].sales_calculated_by_itemwise.purchases)|| (value.records.final_data[0].sales_calculated_by_monthwise &&value.records.final_data[0].sales_calculated_by_monthwise.purchases)){ + let get_sumary: any=[]; // set sales and revenue get_sumary.push({"sno":'a. ',"label":'Sales / Revenue ',"declared_by_customer":(value.records.final_data[0].sales_declared_by_customer && value.records.final_data[0].sales_declared_by_customer.sales_revenue) ? value.records.final_data[0].sales_declared_by_customer.sales_revenue:0, "derived_item_wise":(value.records.final_data[0].sales_calculated_by_itemwise && value.records.final_data[0].sales_calculated_by_itemwise.sales_revenue) ? value.records.final_data[0].sales_calculated_by_itemwise.sales_revenue:0 ,"derived_sales_book":(value.records.final_data[0].sales_calculated_by_monthwise && value.records.final_data[0].sales_calculated_by_monthwise.sales_revenue) ? value.records.final_data[0].sales_calculated_by_monthwise.sales_revenue:0 }); @@ -314,6 +318,8 @@ public viewerOptions: any = { : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer==null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Profit ',"declared_by_customer":'', "derived_item_wise":'' ,"derived_sales_book":value.records.final_data[0].consolidated_report.consolidated_nerprofit }) :''; // get conslidate net margin details + + (value.records.final_data[0].consolidated_report && value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin +'%', "derived_item_wise":'' ,"derived_sales_book":'' }) : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise!=null && value.records.final_data[0].sales_calculated_by_monthwise==null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin +'%', "derived_item_wise":'' ,"derived_sales_book":'' }) : (value.records.final_data[0].consolidated_report &&value.records.final_data[0].sales_declared_by_customer!=null && value.records.final_data[0].sales_calculated_by_itemwise==null && value.records.final_data[0].sales_calculated_by_monthwise!=null) ? get_sumary.push({"sno":'',"label":'Considered Net Margin % ',"declared_by_customer":value.records.final_data[0].consolidated_report.consolidated_nermagin +'%', "derived_item_wise":'' ,"derived_sales_book":'' }) diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/gross-profit-calculation/gross-profit-calculation.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/gross-profit-calculation/gross-profit-calculation.component.html index 77b9664b1..c2efa2f4d 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/gross-profit-calculation/gross-profit-calculation.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/gross-profit-calculation/gross-profit-calculation.component.html @@ -15,7 +15,7 @@ {{getSale.name}} --> -
+
- 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 ebc1d4fea..a6f32ba02 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,8 +49,13 @@ Age - +
+ + Age Required + + +
@@ -59,13 +64,17 @@ {{qual.qualification_name}} + Qualification Required + + Qualification Details Required + @@ -103,7 +112,8 @@ - Please Enter Correct Year + Please Enter Correct Year + {{entity.business_entity_type_name}} + Business Entity Type Required - + Please Specify Others Required

Number of Years For Which The Business Has Been Running

- Please Enter Correct Year + Please Enter Correct Year * { + width: 100%; + } + mat-header-cell mat-cell { display:flex; justify-content:flex-end; diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts index c9d6860a3..41d67c7ff 100755 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/general-info/general-info.component.ts @@ -603,7 +603,65 @@ export class GeneralInfoComponent implements OnInit { // submit form details temp: number = 0; submitGeneralForm(formData: any) { -// console.log('formData',formData); + // console.log('formData',formData); + + if (formData.individuals.length > 0) { + + formData.individuals.forEach((val, index) => { + + if (val.is_person_met == false) { + + this.temp++; + } + + }); + + if (this.temp == formData.individuals.length) { + this.notifier.notify('warning', 'Please Choose Name of Person Met.!'); + + this.temp = 0; + + return; + } + + let individualCtrl: any = this._generalForm.get('individuals') as FormArray; + let individualCtrlLength: any = individualCtrl.controls.length; + + if (individualCtrlLength > 0) { + + let icnt = 0; + while (icnt < individualCtrlLength) { + + let individualChildCtrl: any = individualCtrl.controls[icnt]; + + + individualChildCtrl.controls.age.clearValidators(); + individualChildCtrl.controls.qualification.clearValidators(); + individualChildCtrl.controls.course_name.clearValidators(); + + if (individualChildCtrl.controls.is_person_met.value == false && individualChildCtrl.controls.is_applicant.value == true) { + + individualChildCtrl.controls.age.setValidators(Validators.compose([Validators.required])); + individualChildCtrl.controls.qualification.setValidators(Validators.compose([Validators.required])); + + } + if (individualChildCtrl.controls.is_person_met.value == true && individualChildCtrl.controls.is_applicant.value == true) { + + individualChildCtrl.controls.age.setValidators(Validators.compose([Validators.required])); + individualChildCtrl.controls.qualification.setValidators(Validators.compose([Validators.required])); + + } + if(individualChildCtrl.controls.qualification.value == '' || individualChildCtrl.controls.qualification.value == '4' || individualChildCtrl.controls.qualification.value == '6') + {individualChildCtrl.controls.course_name.setValue(''); individualChildCtrl.controls.course_name.clearValidators();}else{ individualChildCtrl.controls.course_name.setValidators(Validators.compose([Validators.required]));} + + individualChildCtrl.controls.age.updateValueAndValidity(); + individualChildCtrl.controls.qualification.updateValueAndValidity(); + individualChildCtrl.controls.course_name.updateValueAndValidity(); + + icnt++; + } + } + } if (this.customer_segment_abbr != 'SE-RI') { this._generalForm.controls['rental_income_rcv_in_years'].clearValidators(); this._generalForm.controls['rental_income_rcv_in_years'].updateValueAndValidity(); @@ -611,28 +669,28 @@ export class GeneralInfoComponent implements OnInit { // SE-RI means Companies Control Required Removed. if (this.customer_segment_abbr == 'SE-RI') { let CompanyCtrl: any = this._generalForm.get('companies') as FormArray; - let CompanyCtrlLength : any = CompanyCtrl.controls.length; + let CompanyCtrlLength: any = CompanyCtrl.controls.length; if (CompanyCtrlLength > 0) { let cnt = 0; - while(cnt < CompanyCtrlLength){ + while (cnt < CompanyCtrlLength) { - let CompanyChildCtrl : any = CompanyCtrl.controls[cnt]; + let CompanyChildCtrl: any = CompanyCtrl.controls[cnt]; - CompanyChildCtrl.controls.company_name.clearValidators(); - CompanyChildCtrl.controls.company_name.updateValueAndValidity(); - - CompanyChildCtrl.controls.business_entity_type.clearValidators(); - CompanyChildCtrl.controls.business_entity_type.updateValueAndValidity(); - - // CompanyChildCtrl.controls.business_entity_type_other.clearValidators(); - // CompanyChildCtrl.controls.business_entity_type_other.updateValueAndValidity(); - - CompanyChildCtrl.controls.business_years.clearValidators(); - CompanyChildCtrl.controls.business_years.updateValueAndValidity(); - - cnt++; + CompanyChildCtrl.controls.company_name.clearValidators(); + CompanyChildCtrl.controls.company_name.updateValueAndValidity(); + + CompanyChildCtrl.controls.business_entity_type.clearValidators(); + CompanyChildCtrl.controls.business_entity_type.updateValueAndValidity(); + + // CompanyChildCtrl.controls.business_entity_type_other.clearValidators(); + // CompanyChildCtrl.controls.business_entity_type_other.updateValueAndValidity(); + + CompanyChildCtrl.controls.business_years.clearValidators(); + CompanyChildCtrl.controls.business_years.updateValueAndValidity(); + + cnt++; } - } + } } if (this._generalForm.invalid) { @@ -642,25 +700,7 @@ export class GeneralInfoComponent implements OnInit { return; } else { - if (formData.individuals.length > 0) { - formData.individuals.forEach((val, index) => { - - if (val.is_person_met == false) { - - this.temp++; - } - - }); - - if (this.temp == formData.individuals.length) { - this.notifier.notify('warning', 'Please Choose Name of Person Met.!'); - - this.temp = 0; - - return; - } - } this.disableAfterSubmit = true; let saveRecords: any = {} saveRecords.pdid = formData.pdid;