tanshu/barker
1
0
Fork 0
Code Issues 1 Pull Requests Releases 4 Activity

Fix: Accidentally used menu category instead of sale category

Browse Source
This commit is contained in:
Amritanshu Agrawal
2026-02-14 06:00:09 +00:00
parent 061dd1310d
commit c9fa83e8ac
8 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bookie/src/app/beer-sale-report/beer-sale-report.component.html
View File

@ -32,11 +32,11 @@
<mat-datepicker #finishDate></mat-datepicker>
</mat-form-field>
<mat-form-field class="flex-auto">
<mat-label>Menu Category</mat-label>
<mat-select formControlName="menuCategory" (selectionChange)="filterOn($event.value)">
@for (mc of menuCategories; track mc) {
<mat-option [value]="mc.id">
{{ mc.name }}
<mat-label>Sale Category</mat-label>
<mat-select formControlName="saleCategory" (selectionChange)="filterOn($event.value)">
@for (sc of saleCategories; track sc) {
<mat-option [value]="sc.id">
{{ sc.name }}
</mat-option>
}
</mat-select>

22
bookie/src/app/beer-sale-report/beer-sale-report.component.ts
View File

@ -12,7 +12,7 @@ import { MatTableModule } from '@angular/material/table';
import { ActivatedRoute, Router } from '@angular/router';
import moment from 'moment';
import { MenuCategory } from '../core/menu-category';
import { SaleCategory } from '../core/sale-category';
import { ToCsvService } from '../shared/to-csv.service';
import { BeerSaleExportHeaderInterface } from './beer-sale-export-header-interface';
import { BeerSaleReport } from './beer-sale-report';
@ -40,13 +40,13 @@ export class BeerSaleReportComponent implements OnInit {
private router = inject(Router);
private toCsv = inject(ToCsvService);
menuCategories: MenuCategory[] = [];
saleCategories: SaleCategory[] = [];
info: BeerSaleReport = new BeerSaleReport();
dataSource: BeerSaleReportDataSource = new BeerSaleReportDataSource(this.info.data);
form: FormGroup<{
startDate: FormControl<Date>;
finishDate: FormControl<Date>;
menuCategory: FormControl<string>;
saleCategory: FormControl<string>;
regular: FormControl<boolean>;
happy: FormControl<boolean>;
staff: FormControl<boolean>;
@ -61,7 +61,7 @@ export class BeerSaleReportComponent implements OnInit {
this.form = new FormGroup({
startDate: new FormControl(new Date(), { nonNullable: true }),
finishDate: new FormControl(new Date(), { nonNullable: true }),
menuCategory: new FormControl('', { nonNullable: true }),
saleCategory: new FormControl('', { nonNullable: true }),
regular: new FormControl<boolean>(true, { nonNullable: true }),
happy: new FormControl<boolean>(true, { nonNullable: true }),
staff: new FormControl<boolean>(true, { nonNullable: true }),
@ -71,14 +71,14 @@ export class BeerSaleReportComponent implements OnInit {
ngOnInit() {
this.route.data.subscribe((value) => {
const data = value as { info: BeerSaleReport; menuCategories: MenuCategory[] };
const data = value as { info: BeerSaleReport; saleCategories: SaleCategory[] };
this.info = data.info;
this.menuCategories = data.menuCategories;
this.saleCategories = data.saleCategories;
this.displayedColumns = ['date'].concat(this.info.headers);
this.form.setValue({
startDate: moment(this.info.startDate, 'DD-MMM-YYYY').toDate(),
finishDate: moment(this.info.finishDate, 'DD-MMM-YYYY').toDate(),
menuCategory: this.info.menuCategory?.id ?? '',
saleCategory: this.info.saleCategory?.id ?? '',
regular: this.info.regular,
happy: this.info.happy,
staff: this.info.staff,
@ -94,7 +94,7 @@ export class BeerSaleReportComponent implements OnInit {
queryParams: {
startDate: info.startDate,
finishDate: info.finishDate,
menuCategory: info.menuCategory?.id ?? '',
saleCategory: info.saleCategory?.id ?? '',
regular: info.regular,
happy: info.happy,
staff: info.staff,
@ -104,8 +104,8 @@ export class BeerSaleReportComponent implements OnInit {
}
filterOn(id: string) {
const mc = this.menuCategories.find((x) => x.id === id);
this.info.menuCategory = mc ? mc : new MenuCategory({ id });
const sc = this.saleCategories.find((x) => x.id === id);
this.info.saleCategory = sc ? sc : new SaleCategory({ id });
}
getInfo(): BeerSaleReport {
@ -114,7 +114,7 @@ export class BeerSaleReportComponent implements OnInit {
return new BeerSaleReport({
startDate: moment(formModel.startDate).format('DD-MMM-YYYY'),
finishDate: moment(formModel.finishDate).format('DD-MMM-YYYY'),
menuCategory: this.info.menuCategory,
saleCategory: this.info.saleCategory,
regular: formModel.regular,
happy: formModel.happy,
staff: formModel.staff,

4
bookie/src/app/beer-sale-report/beer-sale-report.resolver.ts
View File

@ -7,10 +7,10 @@ import { BeerSaleReportService } from './beer-sale-report.service';
export const beerSaleReportResolver: ResolveFn<BeerSaleReport> = (route) => {
const startDate = route.queryParamMap.get('startDate') ?? null;
const finishDate = route.queryParamMap.get('finishDate') ?? null;
const menuCategory = route.queryParamMap.get('menuCategory') ?? null;
const saleCategory = route.queryParamMap.get('saleCategory') ?? null;
const regular = route.queryParamMap.get('regular') !== 'false';
const happy = route.queryParamMap.get('happy') !== 'false';
const staff = route.queryParamMap.get('staff') !== 'false';
const nc = route.queryParamMap.get('nc') !== 'false';
return inject(BeerSaleReportService).get(startDate, finishDate, menuCategory, regular, happy, staff, nc);
return inject(BeerSaleReportService).get(startDate, finishDate, saleCategory, regular, happy, staff, nc);
};

4
bookie/src/app/beer-sale-report/beer-sale-report.routes.ts
View File

@ -1,7 +1,7 @@
import { Routes } from '@angular/router';
import { authGuard } from '../auth/auth-guard.service';
import { menuCategoryListResolver } from '../menu-category/menu-category-list.resolver';
import { saleCategoryListResolver } from '../sale-category/sale-category-list.resolver';
import { BeerSaleReportComponent } from './beer-sale-report.component';
import { beerSaleReportResolver } from './beer-sale-report.resolver';
@ -15,7 +15,7 @@ export const routes: Routes = [
},
resolve: {
info: beerSaleReportResolver,
menuCategories: menuCategoryListResolver,
saleCategories: saleCategoryListResolver,
},
runGuardsAndResolvers: 'always',
},

6
bookie/src/app/beer-sale-report/beer-sale-report.service.ts
View File

@ -19,7 +19,7 @@ export class BeerSaleReportService {
get(
startDate: string | null,
finishDate: string | null,
menuCategory: string | null,
saleCategory: string | null,
regular: boolean,
happy: boolean,
staff: boolean,
@ -32,8 +32,8 @@ export class BeerSaleReportService {
if (finishDate !== null) {
options.params = options.params.set('f', finishDate);
}
if (menuCategory != null) {
options.params = options.params.set('m', menuCategory);
if (saleCategory != null) {
options.params = options.params.set('sc', saleCategory);
}
options.params = options.params.set('r', regular);
options.params = options.params.set('h', happy);

6
bookie/src/app/beer-sale-report/beer-sale-report.ts
View File

@ -1,10 +1,10 @@
import { MenuCategory } from '../core/menu-category';
import { SaleCategory } from '../core/sale-category';
import { BeerSaleReportItem } from './beer-sale-report-item';
export class BeerSaleReport {
startDate: string;
finishDate: string;
menuCategory: MenuCategory;
saleCategory: SaleCategory;
regular: boolean;
happy: boolean;
staff: boolean;
@ -15,7 +15,7 @@ export class BeerSaleReport {
public constructor(init?: Partial<BeerSaleReport>) {
this.startDate = '';
this.finishDate = '';
this.menuCategory = new MenuCategory();
this.saleCategory = new SaleCategory();
this.regular = true;
this.happy = true;
this.staff = true;