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 ad769393e..6e4636b35 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 @@ -13,52 +13,95 @@ - + - - - - - - {{"₹"}} {{sales.value.margin_value | numberToWords}} Only - - - - -
+ + {{types.type_name}} + + +
+ +
+
+ + + + + + + + {{"₹"}} {{childItem.value.sales_value | numberToWords}} Only + + +
+ +
+
+ +
+ +
+ + +
+
- - - - + + + {{frq.name}} + - - + + + {{"₹"}} {{childItem.value.frequency_value | numberToWords}} Only + + + {{"₹"}} {{childItem.value.sales_value | numberToWords}} Only - + -->
-
+ +
+
+
+
+ + + + + + {{"₹"}} {{sales.value.margin_value | numberToWords}} Only +
- + + + + - + 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.scss 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.scss index 2db8a5604..b884adf57 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.scss +++ 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.scss @@ -20,3 +20,12 @@ margin-left:4%; margin-top:2%; } +.example-radio-group { + display: flex; + flex-direction: row; + flex-wrap: wrap; +} +.example-radio-button { + margin: 0 2%; + color: #000 !important +} \ No newline at end of file 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 e28592ca3..abcc2c7f8 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,9 +20,11 @@ export class ManageDailySalesComponent implements OnInit { frequencyData: any[]=[]; marginAmtInwords: any[]=[]; 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) { this.pageTitle = this.data.manage_status==1 ? 'Add Daily Sales Item' : 'Update Daily Sales Item'; this.notifier = notifier; + this.frequencyData=this.data.masterData.frequencyList; } ngOnInit() { @@ -39,10 +41,27 @@ export class ManageDailySalesComponent implements OnInit { sales_product: this._fb.array([this.createSalesItemWithData(this.data.editData)]), }); let control: any = this.salesItemForm.controls['sales_product']; - control = control.controls[0].get('child') as FormArray; + let innercontrol: any = control.controls[0].get('child') as FormArray; this.data.editData.values.forEach((elementVal,inx) => { - control.push(this.createDailySalesWithData(elementVal,this.data.editData.sim_id)) - }); + innercontrol.push(this.createDailySalesWithData(elementVal,this.data.editData)) + }); + + if(this.data.editData.sales_type=="2"){ + innercontrol.controls[innercontrol.value.length-1].controls['sales_date'].setValue(""); + innercontrol.controls[innercontrol.value.length-1].controls['sales_date'].clearValidators(); + innercontrol.controls[innercontrol.value.length-1].controls['sales_date'].updateValueAndValidity(); + + innercontrol.controls[innercontrol.value.length-1].controls['fk_frequency_id'].setValidators([Validators.required]); + innercontrol.controls[innercontrol.value.length-1].controls['fk_frequency_id'].updateValueAndValidity(); + + innercontrol.controls[innercontrol.value.length-1].controls['frequency_value'].setValidators([Validators.required]); + innercontrol.controls[innercontrol.value.length-1].controls['frequency_value'].updateValueAndValidity(); + + control.controls[control.value.length-1].controls['comments'].setValidators([Validators.required]); + control.controls[control.value.length-1].controls['comments'].updateValueAndValidity(); + + } + } else{ this.salesItemForm = this._fb.group({ @@ -64,7 +83,8 @@ export class ManageDailySalesComponent implements OnInit { margin_per: [''], margin_value: [''], comments: [''], - isactive:[true] + sales_type:["1"], + isactive:[true], }); } // create daily list empty @@ -74,6 +94,8 @@ createDailySalesData(sim_id: string) { fk_sim_id: [sim_id], sales_date: [''], sales_value: ['', Validators.compose([Validators.required])], + fk_frequency_id:[''], + frequency_value:[''], isactive:[true], }) } @@ -89,16 +111,19 @@ createSalesItemWithData(values: any) { margin_per: [this.data.margin_calculation_status===true ? values.margin_per: ''], margin_value: [this.data.margin_calculation_status===true ? values.margin_value: ''], comments: [values.comments], - isactive:[true] + sales_type:[values.sales_type], + isactive:[true], }); } // create daily list -createDailySalesWithData(values: any, sim_id: string) { +createDailySalesWithData(values: any, parent: any) { return this._fb.group({ simc_id: [values.simc_id], - fk_sim_id: [sim_id], - sales_date: [new Date(this.pipe.transform(values.sales_date, 'yyyy-MM-dd')), Validators.compose([Validators.required])], + fk_sim_id: [parent.sim_id], + sales_date: [parent.sales_type=='2' ? '' :new Date(this.pipe.transform(values.sales_date, 'yyyy-MM-dd')), Validators.compose([Validators.required])], sales_value: [values.sales_value, Validators.compose([Validators.required])], + fk_frequency_id:[values.fk_frequency_id], + frequency_value:[values.frequency_value], isactive:[true] }) } @@ -148,7 +173,7 @@ closeDialogue(){ } salesCalculation(indexVal: number,values: any): void { - if(this.data.margin_calculation_status===true){ + if(this.data.margin_calculation_status===true && values.sales_type=="1"){ let control:any = this.salesItemForm.controls['sales_product']; if(values.child.length>0 && values.margin_per!=''){ let transformData = values.child.filter(val=>val.sales_date!='' && val.sales_date!=null && val.sales_date!=undefined && val.sales_value!='' && val.isactive===true).map(mval=>{ @@ -165,7 +190,7 @@ salesCalculation(indexVal: number,values: any): void { control.controls[indexVal].controls['margin_value'].setValue(parseInt(getTotalValueCounts) * (parseInt(values.margin_per)/100) * (12 / parseInt(getUniqueMonthCounts.length))); } else{ - control.controls[indexVal].controls['margin_value'].setValue(''); + control.controls[indexVal].controls['margin_value'].setValue(""); } } @@ -174,8 +199,88 @@ salesCalculation(indexVal: number,values: any): void { } } + else if(this.data.margin_calculation_status===true && values.sales_type=="2"){ + let control:any = this.salesItemForm.controls['sales_product']; + let innercontrol: any = control.controls[indexVal].get('child') as FormArray; + + if(values.child[values.child.length-1].fk_frequency_id!='' && values.child[values.child.length-1].frequency_value!=''){ + let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.child[values.child.length-1].fk_frequency_id); + innercontrol.controls[innercontrol.value.length-1].controls['sales_value'].setValue(parseInt(filterFrequencyValue[0].mutiple_factor) * parseInt(values.child[values.child.length-1].frequency_value)); + + let getTotalValueCounts =parseInt(filterFrequencyValue[0].mutiple_factor) * parseInt(values.child[values.child.length-1].frequency_value) + values.margin_per!='' ? control.controls[indexVal].controls['margin_value'].setValue( getTotalValueCounts * (parseInt(values.margin_per)/100)) : ''; + } + else { + innercontrol.controls[innercontrol.value.length-1].controls['sales_value'].setValue(""); + control.controls[indexVal].controls['margin_value'].setValue(""); + + } + } + else if(this.data.margin_calculation_status===false && values.sales_type=="2"){ + let control:any = this.salesItemForm.controls['sales_product']; + let innercontrol: any = control.controls[indexVal].get('child') as FormArray; + + if(values.child[values.child.length-1].fk_frequency_id!='' && values.child[values.child.length-1].frequency_value!=''){ + let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.child[values.child.length-1].fk_frequency_id); + innercontrol.controls[innercontrol.value.length-1].controls['sales_value'].setValue(parseInt(filterFrequencyValue[0].mutiple_factor) * parseInt(values.child[values.child.length-1].frequency_value)); + } + else { + innercontrol.controls[innercontrol.value.length-1].controls['sales_value'].setValue(""); + } + } } + +// change options for either Date/Frequency Information +changeOptions(indexVal: any,event: any): void{ + let control: any = this.salesItemForm.controls['sales_product']; + let innercontrol: any = control.controls[indexVal].get('child') as FormArray; + if(event.value==1){ + for (let i = 0; i < innercontrol.value.length-1; i++) { + innercontrol.removeAt(i); + } + innercontrol.controls[innercontrol.value.length-1].controls['sales_date'].setValidators([Validators.required]); + innercontrol.controls[innercontrol.value.length-1].controls['sales_date'].updateValueAndValidity(); + + innercontrol.controls[innercontrol.value.length-1].controls['fk_frequency_id'].setValue(""); + innercontrol.controls[innercontrol.value.length-1].controls['fk_frequency_id'].clearValidators(); + innercontrol.controls[innercontrol.value.length-1].controls['fk_frequency_id'].updateValueAndValidity(); + + innercontrol.controls[innercontrol.value.length-1].controls['frequency_value'].setValue(""); + innercontrol.controls[innercontrol.value.length-1].controls['frequency_value'].clearValidators(); + innercontrol.controls[innercontrol.value.length-1].controls['frequency_value'].updateValueAndValidity(); + + innercontrol.controls[innercontrol.value.length-1].controls['sales_value'].setValue(""); + + control.controls[indexVal].controls['comments'].setValue(""); + control.controls[indexVal].controls['comments'].clearValidators(); + control.controls[indexVal].controls['comments'].updateValueAndValidity(); + } + else if(event.value==2){ + for (let i = 0; i < innercontrol.value.length-1; i++) { + innercontrol.removeAt(i); + } + innercontrol.controls[innercontrol.value.length-1].controls['sales_date'].setValue(""); + innercontrol.controls[innercontrol.value.length-1].controls['sales_date'].clearValidators(); + innercontrol.controls[innercontrol.value.length-1].controls['sales_date'].updateValueAndValidity(); + + innercontrol.controls[innercontrol.value.length-1].controls['fk_frequency_id'].setValidators([Validators.required]); + innercontrol.controls[innercontrol.value.length-1].controls['fk_frequency_id'].updateValueAndValidity(); + + innercontrol.controls[innercontrol.value.length-1].controls['frequency_value'].setValidators([Validators.required]); + innercontrol.controls[innercontrol.value.length-1].controls['frequency_value'].updateValueAndValidity(); + + innercontrol.controls[innercontrol.value.length-1].controls['sales_value'].setValue(""); + + control.controls[indexVal].controls['comments'].setValue(""); + control.controls[indexVal].controls['comments'].setValidators([Validators.required]); + control.controls[indexVal].controls['comments'].updateValueAndValidity(); + + } + control.controls[indexVal].controls['margin_per'].setValue(""); + control.controls[indexVal].controls['margin_value'].setValue(""); + + } // save sales details submitDetails(records) { if (this.salesItemForm.invalid) { diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.html index 185eaa1e8..29d385f15 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.html @@ -13,7 +13,7 @@
- +
-
+ +
+ + {{types.type_name}} + +
+
- + {{uom.name}} @@ -35,31 +41,55 @@
+ +
+ +
+ + + {{"₹"}} {{sales.value.rate_per_unit | numberToWords}} Only + + + + {{frq.name}} + + + + + {{"₹"}} {{sales.value.annual_sale_value | numberToWords}} Only + +
+ +
+ + + {{frq.name}} + + + + + {{"₹"}} {{sales.value.rate_per_unit | numberToWords}} Only + + + + + {{"₹"}} {{sales.value.annual_sale_value | numberToWords}} Only + +
+
+ + -
- - - {{"₹"}} {{sales.value.rate_per_unit | numberToWords}} Only - - - - {{frq.name}} - - - - - {{"₹"}} {{sales.value.annual_sale_value | numberToWords}} Only - -
+
- + {{"₹"}} {{sales.value.margin_per_uom | numberToWords}} Only - + {{"₹"}} {{sales.value.margin_final_value | numberToWords}} Only diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.scss index 76e439914..dfbb6890a 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.scss +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.scss @@ -21,3 +21,13 @@ margin-top:2%; } +.example-radio-group { + display: flex; + flex-direction: row; + flex-wrap: wrap; +} +.example-radio-button { + margin: 0 2%; + color: #000 !important +} + diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.ts index 0c98ea39d..4f186fcf0 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/AI-diologue/manage-sales/manage-sales.component.ts @@ -3,6 +3,7 @@ import { FormBuilder, FormGroup, Validators, FormControl, FormArray } from '@ang import { MatDialog, MatDialogRef, MAT_DIALOG_DATA , DialogPosition} from '@angular/material'; import { PdTrigerService } from './../../../../../../../pd-service/pd-triger.service'; import { NotifierService } from 'angular-notifier'; +import { AnyAaaaRecord } from 'dns'; @Component({ selector: 'app-manage-sales', @@ -21,6 +22,7 @@ export class ManageSalesComponent implements OnInit { marginAmtInwords: any[]=[]; marginFinalAmtInwords: any[]=[]; ratePerUnitAmtInwords: any[]=[]; + check_type:any=[{'type_id':"1",'type_name':'Quantity and Rate Information'},{'type_id':"2",'type_name':'Value Information'}] private notifier: NotifierService; constructor(notifier: NotifierService,private _fb: FormBuilder, private _pd: PdTrigerService, @Inject(MAT_DIALOG_DATA) public data: any, private dialogRef: MatDialogRef) { @@ -37,7 +39,17 @@ export class ManageSalesComponent implements OnInit { }); let control: any = this.salesItemForm.controls['salesCalItemwise']; this.data.editData.fk_uom_id=="1" ? control.controls[0].addControl('uom_other', new FormControl(this.data.editData.uom_other ? this.data.editData.uom_other : '', Validators.required)) : control.controls[0].removeControl('uom_other'); - + if(this.data.editData.sales_type && this.data.editData.sales_type=="2"){ + control.controls[0].controls['sales_qty'].setValue(""); + control.controls[0].controls['sales_qty'].clearValidators(); + control.controls[0].controls['sales_qty'].updateValueAndValidity(); + + control.controls[0].controls['fk_uom_id'].setValue(""); + control.controls[0].controls['fk_uom_id'].clearValidators(); + control.controls[0].controls['fk_uom_id'].updateValueAndValidity(); + control.controls[0].controls['margin_per_uom'].setValue(""); + + } } else{ this.salesItemForm = this._fb.group({ @@ -64,6 +76,7 @@ export class ManageSalesComponent implements OnInit { margin_per_uom:[''], margin_final_value:[''], comments:[], + sales_type:["1"] }); } @@ -83,6 +96,7 @@ createSalesItemWithData(values: any) { margin_per_uom:[this.data.margin_calculation_status===true ? values.margin_per_uom :''], margin_final_value:[this.data.margin_calculation_status===true ? values.margin_final_value: ''], comments:[values.comments], + sales_type:[values.sales_type] }); } @@ -100,11 +114,14 @@ closeDialogue(){ salesCalculation(indexVal: number,values: any): void { let control:any = this.salesItemForm.controls['salesCalItemwise']; - if(values.sales_qty!='' && values.rate_per_unit!='' && values.fk_frequency_id!='') { + if(values.sales_type=="1" && values.sales_qty!='' && values.rate_per_unit!='' && values.fk_frequency_id!='') { let filterFrequencyValue: any = this.frequencyData.filter(val =>val.frequency_id==values.fk_frequency_id); - let AnnualSalesValue = parseInt(values.sales_qty) * parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor) control.controls[indexVal].controls['annual_sale_value'].setValue(parseInt(values.sales_qty) * parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); } + else if(values.sales_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_sale_value'].setValue(parseInt(values.rate_per_unit) * parseInt(filterFrequencyValue[0].mutiple_factor)); + } else { control.controls[indexVal].controls['annual_sale_value'].setValue(''); } @@ -125,16 +142,48 @@ salesMarginPerCalculation(indexVal: number,values: any): void { salesMarginAmtCalculation(indexVal: number,values: any): void { let control:any = this.salesItemForm.controls['salesCalItemwise']; control.controls[indexVal].controls['margin_per'].setValue(''); - - - if(values.margin_per_uom!='' && values.sales_qty!='') { - let MarginFinalValue = parseInt(values.sales_qty) * parseInt(values.margin_per_uom); + + if(values.sales_type=="1" && values.margin_per_uom!='' && values.sales_qty!='') { control.controls[indexVal].controls['margin_final_value'].setValue(parseInt(values.sales_qty) * parseInt(values.margin_per_uom)); } + else if(values.sales_type=="2" && values.margin_per_uom!='' && values.rate_per_unit!='') { + control.controls[indexVal].controls['margin_final_value'].setValue(parseInt(values.rate_per_unit) * parseInt(values.margin_per_uom)); + } else { control.controls[indexVal].controls['margin_final_value'].setValue(''); } } +// generate other UOM +generateOtherUOM(index: number, values: any): void { + let control: any = this.salesItemForm.controls['salesCalItemwise']; + values.fk_uom_id=="1" ? control.controls[index].addControl('uom_other', new FormControl('', Validators.required)) : control.controls[index].removeControl('uom_other'); +} + +// change options for either Quantity and Rate Information / Value Information +changeOptions(indexVal: any,event: any): void{ +let control: any = this.salesItemForm.controls['salesCalItemwise']; + if(event.value==1){ + control.controls[indexVal].controls['sales_qty'].setValidators([Validators.required]); + control.controls[indexVal].controls['sales_qty'].updateValueAndValidity(); + + control.controls[indexVal].controls['fk_uom_id'].setValidators([Validators.required]); + control.controls[indexVal].controls['fk_uom_id'].updateValueAndValidity(); + this.salesCalculation(indexVal,control.controls[indexVal].value); + } + else if(event.value==2){ + control.controls[indexVal].controls['sales_qty'].setValue(""); + control.controls[indexVal].controls['sales_qty'].clearValidators(); + control.controls[indexVal].controls['sales_qty'].updateValueAndValidity(); + + control.controls[indexVal].controls['fk_uom_id'].setValue(""); + control.controls[indexVal].controls['fk_uom_id'].clearValidators(); + control.controls[indexVal].controls['fk_uom_id'].updateValueAndValidity(); + + control.controls[indexVal].controls['margin_per_uom'].setValue(""); + + this.salesCalculation(indexVal,control.controls[indexVal].value); + } +} removeItem(indexVal: number) : void { let control = this.salesItemForm.controls['salesCalItemwise']; @@ -158,11 +207,7 @@ submitDetails(records) { this.notifier.notify('warning', 'Something Wents Wrong Try Again.!'); }); } -// generate other UOM -generateOtherUOM(index: number, values: any): void { - let control: any = this.salesItemForm.controls['salesCalItemwise']; - values.fk_uom_id=="1" ? control.controls[index].addControl('uom_other', new FormControl('', Validators.required)) : control.controls[index].removeControl('uom_other'); -} + // validate all form group and form array fields validateAllFormFields(formGroup: any) { 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 49b95e006..0efb55fac 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 @@ -46,12 +46,12 @@ public businessExpenseList: any=[]; public businessIncomeList: any=[]; public grossProfitTypeList: any=[]; public salesDeclaredCustomer: any=[]; -public getCustomValues:any = { UOMList: this.UOMList,frequencyList: this.frequencyList,businessExpenseList: this.businessExpenseList,businessIncomeList:this.businessIncomeList,pdid:'',company_id:'',grossProfitTypeList:this.grossProfitTypeList}; +public getCustomValues:any = { UOMList: this.UOMList,frequencyList: this.frequencyList,businessExpenseList: this.businessExpenseList,businessIncomeList:this.businessIncomeList,pdid:'',company_id:'',grossProfitTypeList:this.grossProfitTypeList,salesDeclaredCustomer:this.salesDeclaredCustomer}; //public finalData: any; constructor(notifier: NotifierService, private route: ActivatedRoute, private router: Router, private _pd: PdTrigerService, private dialog: MatDialog, - @Inject(MAT_DIALOG_DATA) public pd_all_details: any) { + @Inject(MAT_DIALOG_DATA) public pd_all_details: any, private dialogRef: MatDialogRef,) { this.pdid = this.pd_all_details.pdmaster_details.pd_id; this.company_id = this.pd_all_details.company_id; this.notifier = notifier; @@ -105,6 +105,8 @@ public viewerOptions: any = { } if(value.records.sales_declared_by_customer){ this.salesDeclaredCustomer = value.records.sales_declared_by_customer; + this.getCustomValues.salesDeclaredCustomer=this.salesDeclaredCustomer; + } if(value.records.sales_calculated_by_itemwise){ this.salesCaluatedItem = value.records.sales_calculated_by_itemwise; @@ -119,7 +121,7 @@ public viewerOptions: any = { listItems.push({items:expnadElement, itemsTotal:calculateItems}) }) let calculateAllItemsTotal:number=listItems.reduce((racc, rcalculate) => racc + Number(rcalculate.itemsTotal), 0); - + let convertYear : number = 12 / listItems.length; let footerMessage: any=[]; footerMessage.push({ @@ -132,7 +134,7 @@ public viewerOptions: any = { // message: ' Yearly ' + itemElement.sales_item + ' Sales Arrived', // value: calculateAllItemsTotal * convertYear, // }) - this.salesMonthWiseExpandedItems.push({sim_id:itemElement.sim_id,salesItem:itemElement.sales_item,comments:itemElement.comments,margin_per:itemElement.margin_per,margin_value:itemElement.margin_value, expandElements:expandBodyContent, footerMessage: footerMessage}); + this.salesMonthWiseExpandedItems.push({sim_id:itemElement.sim_id,salesItem:itemElement.sales_item,sales_type:itemElement.sales_type,comments:itemElement.comments,margin_per:itemElement.margin_per,margin_value:itemElement.margin_value, expandElements:expandBodyContent, footerMessage: footerMessage}); }); } if(value.records.purchase_details){ @@ -310,16 +312,19 @@ public viewerOptions: any = { // complete AI detailscomplete AI details completeAI(): void{ - const dialogRef = this.dialog.open(ConfirmAiDetailsComponent, { + const completeDialogRef = this.dialog.open(ConfirmAiDetailsComponent, { data: { pdid: this.pdid, company_id: this.company_id ,calc_type_id:this.grossProfitTypeList.length > 0 ? this.grossProfitTypeList[0].calc_type_id : ''}, disableClose: true, minWidth:'30%', maxWidth:'40%', }); - dialogRef.afterClosed() + completeDialogRef.afterClosed() .subscribe(dataresult => { if(dataresult.update_status==true){ - this.loadAIDetails(); + // this.loadAIDetails(); + setTimeout(() =>{ + this.dialogRef.close(); + },3000); } }); diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-sales-details/daily-sales-details.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-sales-details/daily-sales-details.component.html index 12dc5ca30..2a4025e4c 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-sales-details/daily-sales-details.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-sales-details/daily-sales-details.component.html @@ -1,4 +1,4 @@ - + +
+ + + {{expandDetails.salesItem}} +  ( Margin Percentage : {{expandDetails.margin_per}} %   Margin Value : {{expandDetails.margin_value}} ) + + + +
+ {{footer.month_message}}   {{footer.year_message}} +
+ + + + + + +
+ +

{{eachItem.header}}

+ + + + + + + + + + + + + + + +
Date{{itemValue.sales_date | date: 'dd-MM-yyyy'}} Total Amount{{itemValue.sales_value}} {{getTotalCost(eachItem.value)}}
+
+ + +
+ +
+ + + {{expandDetails.salesItem}} +  ( Margin Percentage : {{expandDetails.margin_per}} %   Margin Value : {{expandDetails.margin_value}} ) + + + + + + + +
+ + + + + + + + + + + + + + + + + +
Frequency{{itemValue.frequency_name ? itemValue.frequency_name : '' }} Total Amount{{itemValue.frequency_value}} {{getTotalCost(eachItem.value)}}
+
+ + +
+
+
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-sales-details/daily-sales-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-sales-details/daily-sales-details.component.ts index 861744e94..eda055aad 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-sales-details/daily-sales-details.component.ts +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-sales-details/daily-sales-details.component.ts @@ -14,13 +14,15 @@ export class DailySalesDetailsComponent implements OnInit, DoCheck { public salesMonthItemColumns = ['Date','Amount']; public salesMonthWiseExpandedItems: any[]=[]; @Input() parentData: any; - @Input() masterData: { UOMList: any; frequencyList: any; pdid:number,company_id:number, grossProfitTypeList:any}; + @Input() masterData: { UOMList: any; frequencyList: any; pdid:number,company_id:number, grossProfitTypeList:any,salesDeclaredCustomer: any}; @Output() loadAssessedForms = new EventEmitter(); activateMariginCalculation: boolean; private notifier:NotifierService; + enableDailySalesSection: boolean; constructor(notifier:NotifierService, private _pd: PdTrigerService, private dialog: MatDialog) { this.activateMariginCalculation=false; this.notifier = notifier; + this.enableDailySalesSection = false; } ngOnInit() { @@ -59,10 +61,11 @@ editSalesItem(value:any) { "fk_pd_id":this.masterData.pdid, "sim_id":value.sim_id, "salesItem":value.salesItem, + "sales_type":value.sales_type, "comments":value.comments, "margin_value":value.margin_value, "margin_per":value.margin_per, - "values":transformData + "values":transformData, } let passValues: any = { manage_status:2, @@ -109,6 +112,8 @@ ngDoCheck() { if(this.masterData.grossProfitTypeList.length>0){ this.activateMariginCalculation = this.masterData.grossProfitTypeList[this.masterData.grossProfitTypeList.length-1].margin==2 && this.masterData.grossProfitTypeList[this.masterData.grossProfitTypeList.length-1].mode==2 ? true : false; + this.enableDailySalesSection = this.masterData.salesDeclaredCustomer.length>0 ? true : false; + }} // detect chnges from parent diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-calculation/sales-calculation.component.html b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-calculation/sales-calculation.component.html index e260c2766..98dd20928 100644 --- a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-calculation/sales-calculation.component.html +++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/sales-calculation/sales-calculation.component.html @@ -1,23 +1,23 @@ -
+ Sales Calculation - + - {{"₹"}} {{SaleAmtInwords}} Only + {{"₹"}} {{salesCalculationForm.value.sales_declared_by_customer | numberToWords}} Only - + {{"₹"}} {{salesCalculationForm.value.margin_value | numberToWords}} Only - +