-
+
+
+ Select
+ {{ prod.name }}
+ Others
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{footer.month_message}} {{footer.year_message}}
+
+
+
+
+
+
+
+
+
+
{{eachItem.header}}
+
+
+ | Date |
+ {{itemValue.purchase_date | date:'dd-MM-yyyy'}} |
+ Total |
+
+
+ Amount |
+ {{itemValue.purchase_value}} |
+ {{getTotalCost(eachItem.value)}} |
+
+
+ |
+ |
+ |
+
+
+
+ {{expandDetails.comments}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-purchase-details/daily-purchase-details.component.scss b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-purchase-details/daily-purchase-details.component.scss
new file mode 100644
index 000000000..470c26551
--- /dev/null
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-purchase-details/daily-purchase-details.component.scss
@@ -0,0 +1,37 @@
+.example-container {
+ max-height: 500px;
+ overflow: auto;
+ }
+
+ table {
+ width: 100%;
+ }
+
+ tr.mat-footer-row {
+ font-weight: bold;
+ }
+
+ .mat-table-sticky {
+ border-top: 1px solid #e0e0e0;
+ }
+ .expan_footer{
+ font-size: 18px;
+ direction: rtl;
+ }
+ .expan_table_header {
+ font-size: 18px;
+ //text-align: center;
+ }
+ .h4_font {
+ font-size: 18px;
+ }
+ .subtitle_message {
+ color:#e00201 !important;
+ }
+ .delete-margin {
+ margin-left: 3%;
+ }
+ .mat-footer-cell {
+ font-weight: bold;
+ font-size: 1.2rem !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/daily-purchase-details/daily-purchase-details.component.spec.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-purchase-details/daily-purchase-details.component.spec.ts
new file mode 100644
index 000000000..d3011c751
--- /dev/null
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-purchase-details/daily-purchase-details.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { DailyPurchaseDetailsComponent } from './daily-purchase-details.component';
+
+describe('DailyPurchaseDetailsComponent', () => {
+ let component: DailyPurchaseDetailsComponent;
+ let fixture: ComponentFixture
;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ DailyPurchaseDetailsComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(DailyPurchaseDetailsComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-purchase-details/daily-purchase-details.component.ts b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-purchase-details/daily-purchase-details.component.ts
new file mode 100644
index 000000000..0d8992182
--- /dev/null
+++ b/ng6-seed/src/app/personal-discussion/manage-pd/list-pd/start-pd/forms/assessed-income/daily-purchase-details/daily-purchase-details.component.ts
@@ -0,0 +1,107 @@
+import { Component, OnInit, Input, Output, Inject, OnChanges,SimpleChanges, EventEmitter, DoCheck } from '@angular/core';
+import { PdTrigerService } from './../../../../../../pd-service/pd-triger.service';
+import {MatDialog,MatDialogRef,MAT_DIALOG_DATA, MatTableDataSource} from '@angular/material';
+import { ManageDailyPurchaseComponent } from './../AI-diologue/manage-daily-purchase/manage-daily-purchase.component';
+import { NotifierService } from 'angular-notifier';
+
+@Component({
+ selector: 'app-daily-purchase-details',
+ templateUrl: './daily-purchase-details.component.html',
+ styleUrls: ['./daily-purchase-details.component.scss']
+})
+
+export class DailyPurchaseDetailsComponent implements OnInit , DoCheck {
+
+ public purchaseBillWiseItemColumns = ['Date','Amount'];
+ public purchaseBillWiseDetails: any[]=[];
+ @Input() parentData: any;
+ @Input() masterData: { UOMList: any; frequencyList: any; pdid:number,company_id:number, grossProfitTypeList:any,purchaseDeclaredCustomer: any};
+ @Output() loadAssessedForms = new EventEmitter();
+
+ private notifier:NotifierService;
+
+ constructor(notifier:NotifierService, private _pd: PdTrigerService, private dialog: MatDialog) {
+ this.notifier = notifier;
+ }
+
+ ngOnInit() {}
+
+ getTotalCost(getItems:any) {
+ return getItems.map(t => t.purchase_value).reduce((acc, value) => acc + Number(value), 0);
+ }
+
+ // add more item details
+ addMoreItem():void {
+ let passValues: any = {
+ manage_status:1,
+ masterData: this.masterData,
+ }
+ const dialogRef = this.dialog.open(ManageDailyPurchaseComponent, {
+ data: passValues,
+ position: { right: '0'},
+ width:'80%',
+ disableClose: true
+ });
+ dialogRef.afterClosed()
+ .subscribe(dataresult => {
+ if(dataresult.update_status==true){
+ this.loadAssessedForms.next('1');
+ }
+ });
+
+ }
+
+editPurchaseBillWise(value:any) {
+ let transformData: any = value.expandElements.map(val=>val.value);
+ transformData = [].concat.apply([], transformData);
+ let editValue: any = {
+ "fk_pd_id":this.masterData.pdid,
+ "pbw_id":value.pbw_id,
+ "purchaseItem":value.purchaseItem,
+ "otherPurchaseItem":value.otherPurchaseItem,
+ "comments":value.comments,
+ "annual_purchase_value":value.annual_purchase_value,
+ "values":transformData,
+ }
+ let passValues: any = {
+ manage_status:2,
+ masterData: this.masterData,
+ editData:editValue,
+ }
+ const dialogRef = this.dialog.open(ManageDailyPurchaseComponent, {
+ data: passValues,
+ position: { right: '0'},
+ width:'80%',
+ disableClose: true
+ });
+ dialogRef.afterClosed()
+ .subscribe(dataresult => {
+ if(dataresult.update_status==true){
+ this.loadAssessedForms.next('1');
+ }
+ });
+}
+
+// remove purchase item
+removePurchaseBillWise(value: any) : void{
+ let deleteRecords: any =[{
+ "fk_pd_id":this.masterData.pdid,
+ "pbw_id":value.pbw_id,
+ "company_id":this.masterData.company_id,
+ "isactive":false,
+ "child":[]
+ }];
+ this._pd.saveAssessedDetails('saveAssessedIncomePurchaseBillwise',deleteRecords).subscribe(data => {
+ this.notifier.notify('success','Removed Successfully');
+ this.loadAssessedForms.next('1');
+ }, error => {
+ this.notifier.notify('warning', 'Something Wents Wrong Try Again.!');
+ });
+}
+
+ // do check component bases
+ ngDoCheck() {
+ this.purchaseBillWiseDetails = this.parentData;
+ }
+
+}
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 5d16057d5..99297c7ad 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
@@ -6,7 +6,7 @@
- Sales Calculate Daily Wise
+ Sales Calculation as per Kutcha Records / Bills