Chore: Upgrade to Angular v18

Chore: Upgrade to Python 3.12
Chore: Upgrade to psycopg3

bookie/src/app/beer-sale-report/beer-sale-report-resolver.service.ts

@@ -1,23 +0,0 @@
-import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs';
-
-import { BeerSaleReport } from './beer-sale-report';
-import { BeerSaleReportService } from './beer-sale-report.service';
-
-@Injectable({
-  providedIn: 'root',
-})
-export class BeerSaleReportResolver {
-  constructor(private ser: BeerSaleReportService) {}
-
-  resolve(route: ActivatedRouteSnapshot): Observable<BeerSaleReport> {
-    const startDate = route.queryParamMap.get('startDate') ?? null;
-    const finishDate = route.queryParamMap.get('finishDate') ?? 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 this.ser.get(startDate, finishDate, regular, happy, staff, nc);
-  }
-}

bookie/src/app/beer-sale-report/beer-sale-report-routing.module.spec.ts

@@ -1,13 +0,0 @@
-import { BeerSaleReportRoutingModule } from './beer-sale-report-routing.module';
-
-describe('BeerSaleReportRoutingModule', () => {
-  let beerSaleReportRoutingModule: BeerSaleReportRoutingModule;
-
-  beforeEach(() => {
-    beerSaleReportRoutingModule = new BeerSaleReportRoutingModule();
-  });
-
-  it('should create an instance', () => {
-    expect(beerSaleReportRoutingModule).toBeTruthy();
-  });
-});

bookie/src/app/beer-sale-report/beer-sale-report-routing.module.ts

@@ -1,30 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
-
-import { AuthGuard } from '../auth/auth-guard.service';
-
-import { BeerSaleReportResolver } from './beer-sale-report-resolver.service';
-import { BeerSaleReportComponent } from './beer-sale-report.component';
-
-const beerSaleReportRoutes: Routes = [
-  {
-    path: '',
-    component: BeerSaleReportComponent,
-    canActivate: [AuthGuard],
-    data: {
-      permission: 'Beer Sale Report',
-    },
-    resolve: {
-      info: BeerSaleReportResolver,
-    },
-    runGuardsAndResolvers: 'always',
-  },
-];
-
-@NgModule({
-  imports: [CommonModule, RouterModule.forChild(beerSaleReportRoutes)],
-  exports: [RouterModule],
-  providers: [BeerSaleReportResolver],
-})
-export class BeerSaleReportRoutingModule {}

bookie/src/app/beer-sale-report/beer-sale-report.component.html

@@ -51,10 +51,12 @@
       </ng-container>
 
       <!-- Name Column -->
-      <ng-container *ngFor="let col of info.headers" matColumnDef="{{ col }}">
-        <mat-header-cell *matHeaderCellDef class="right">{{ col }}</mat-header-cell>
-        <mat-cell *matCellDef="let row" class="right">{{ row[col] }}</mat-cell>
-      </ng-container>
+      @for (col of info.headers; track col) {
+        <ng-container matColumnDef="{{ col }}">
+          <mat-header-cell *matHeaderCellDef class="right">{{ col }}</mat-header-cell>
+          <mat-cell *matCellDef="let row" class="right">{{ row[col] }}</mat-cell>
+        </ng-container>
+      }
 
       <mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
       <mat-row *matRowDef="let row; columns: displayedColumns"></mat-row>

bookie/src/app/beer-sale-report/beer-sale-report.component.spec.ts

@@ -8,7 +8,7 @@ describe('BeerSaleReportComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      declarations: [BeerSaleReportComponent],
+      imports: [BeerSaleReportComponent],
     }).compileComponents();
   }));
 

bookie/src/app/beer-sale-report/beer-sale-report.component.ts

@@ -1,7 +1,26 @@
 import { Component, OnInit } from '@angular/core';
-import { FormControl, FormGroup } from '@angular/forms';
+import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
+import { MatIconButton, MatButton } from '@angular/material/button';
+import { MatCard, MatCardHeader, MatCardTitleGroup, MatCardTitle, MatCardContent } from '@angular/material/card';
+import { MatCheckbox } from '@angular/material/checkbox';
+import { MatDatepickerInput, MatDatepickerToggle, MatDatepicker } from '@angular/material/datepicker';
+import { MatFormField, MatLabel, MatSuffix } from '@angular/material/form-field';
+import { MatIcon } from '@angular/material/icon';
+import { MatInput } from '@angular/material/input';
+import {
+  MatTable,
+  MatColumnDef,
+  MatHeaderCellDef,
+  MatHeaderCell,
+  MatCellDef,
+  MatCell,
+  MatHeaderRowDef,
+  MatHeaderRow,
+  MatRowDef,
+  MatRow,
+} from '@angular/material/table';
 import { ActivatedRoute, Router } from '@angular/router';
-import * as moment from 'moment';
+import moment from 'moment';
 
 import { ToCsvService } from '../shared/to-csv.service';
 
@@ -13,6 +32,36 @@ import { BeerSaleReportDataSource } from './beer-sale-report-datasource';
   selector: 'app-beer-sale-report',
   templateUrl: './beer-sale-report.component.html',
   styleUrls: ['./beer-sale-report.component.css'],
+  standalone: true,
+  imports: [
+    MatCard,
+    MatCardHeader,
+    MatCardTitleGroup,
+    MatCardTitle,
+    MatIconButton,
+    MatIcon,
+    MatCardContent,
+    ReactiveFormsModule,
+    MatFormField,
+    MatLabel,
+    MatInput,
+    MatDatepickerInput,
+    MatDatepickerToggle,
+    MatSuffix,
+    MatDatepicker,
+    MatButton,
+    MatCheckbox,
+    MatTable,
+    MatColumnDef,
+    MatHeaderCellDef,
+    MatHeaderCell,
+    MatCellDef,
+    MatCell,
+    MatHeaderRowDef,
+    MatHeaderRow,
+    MatRowDef,
+    MatRow,
+  ],
 })
 export class BeerSaleReportComponent implements OnInit {
   info: BeerSaleReport = new BeerSaleReport();

bookie/src/app/beer-sale-report/beer-sale-report.module.spec.ts

@@ -1,13 +0,0 @@
-import { BeerSaleReportModule } from './beer-sale-report.module';
-
-describe('BeerSaleReportModule', () => {
-  let beerSaleReportModule: BeerSaleReportModule;
-
-  beforeEach(() => {
-    beerSaleReportModule = new BeerSaleReportModule();
-  });
-
-  it('should create an instance', () => {
-    expect(beerSaleReportModule).toBeTruthy();
-  });
-});

bookie/src/app/beer-sale-report/beer-sale-report.module.ts

@@ -1,60 +0,0 @@
-import { A11yModule } from '@angular/cdk/a11y';
-import { CdkTableModule } from '@angular/cdk/table';
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { ReactiveFormsModule } from '@angular/forms';
-import { MatAutocompleteModule } from '@angular/material/autocomplete';
-import { MatButtonModule } from '@angular/material/button';
-import { MatCardModule } from '@angular/material/card';
-import { MatCheckboxModule } from '@angular/material/checkbox';
-import { DateAdapter, MAT_DATE_FORMATS, MAT_DATE_LOCALE, MatNativeDateModule } from '@angular/material/core';
-import { MatDatepickerModule } from '@angular/material/datepicker';
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatIconModule } from '@angular/material/icon';
-import { MatInputModule } from '@angular/material/input';
-import { MatTableModule } from '@angular/material/table';
-import { MomentDateAdapter } from '@angular/material-moment-adapter';
-
-import { SharedModule } from '../shared/shared.module';
-
-import { BeerSaleReportRoutingModule } from './beer-sale-report-routing.module';
-import { BeerSaleReportComponent } from './beer-sale-report.component';
-
-export const MY_FORMATS = {
-  parse: {
-    dateInput: 'DD-MMM-YYYY',
-  },
-  display: {
-    dateInput: 'DD-MMM-YYYY',
-    monthYearLabel: 'MMM YYYY',
-    dateA11yLabel: 'DD-MMM-YYYY',
-    monthYearA11yLabel: 'MMM YYYY',
-  },
-};
-
-@NgModule({
-  imports: [
-    A11yModule,
-    CommonModule,
-    CdkTableModule,
-    MatAutocompleteModule,
-    MatButtonModule,
-    MatCardModule,
-    MatDatepickerModule,
-    MatFormFieldModule,
-    MatIconModule,
-    MatInputModule,
-    MatNativeDateModule,
-    MatTableModule,
-    ReactiveFormsModule,
-    SharedModule,
-    BeerSaleReportRoutingModule,
-    MatCheckboxModule,
-  ],
-  declarations: [BeerSaleReportComponent],
-  providers: [
-    { provide: DateAdapter, useClass: MomentDateAdapter, deps: [MAT_DATE_LOCALE] },
-    { provide: MAT_DATE_FORMATS, useValue: MY_FORMATS },
-  ],
-})
-export class BeerSaleReportModule {}

bookie/src/app/beer-sale-report/beer-sale-report.resolver.ts

@@ -0,0 +1,15 @@
+import { inject } from '@angular/core';
+import { ResolveFn } from '@angular/router';
+
+import { BeerSaleReport } from './beer-sale-report';
+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 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, regular, happy, staff, nc);
+};

bookie/src/app/beer-sale-report/beer-sale-report.routes.ts

@@ -0,0 +1,21 @@
+import { Routes } from '@angular/router';
+
+import { authGuard } from '../auth/auth-guard.service';
+
+import { BeerSaleReportComponent } from './beer-sale-report.component';
+import { beerSaleReportResolver } from './beer-sale-report.resolver';
+
+export const routes: Routes = [
+  {
+    path: '',
+    component: BeerSaleReportComponent,
+    canActivate: [authGuard],
+    data: {
+      permission: 'Beer Sale Report',
+    },
+    resolve: {
+      info: beerSaleReportResolver,
+    },
+    runGuardsAndResolvers: 'always',
+  },
+];