Feature: Adding recipe templates to print recipes.

Feautre: Recipe export to xlsx
Chore: Python 11 style type annotations
Chore: Moved to sqlalchemy 2.0
Chore: Minimum python is 3.11
Fix: Fix nullability of a lot of fields in the database.

overlord/src/app/period/period-list-resolver.service.ts

@@ -1,5 +1,4 @@
 import { Injectable } from '@angular/core';
-import { Resolve } from '@angular/router';
 import { Observable } from 'rxjs/internal/Observable';
 
 import { Period } from './period';
@@ -8,7 +7,7 @@ import { PeriodService } from './period.service';
 @Injectable({
   providedIn: 'root',
 })
-export class PeriodListResolver implements Resolve<Period[]> {
+export class PeriodListResolver {
   constructor(private ser: PeriodService) {}
 
   resolve(): Observable<Period[]> {

overlord/src/app/period/period-resolver.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, Router } from '@angular/router';
+import { ActivatedRouteSnapshot } from '@angular/router';
 import { Observable } from 'rxjs/internal/Observable';
 
 import { Period } from './period';
@@ -8,8 +8,8 @@ import { PeriodService } from './period.service';
 @Injectable({
   providedIn: 'root',
 })
-export class PeriodResolver implements Resolve<Period> {
-  constructor(private ser: PeriodService, private router: Router) {}
+export class PeriodResolver {
+  constructor(private ser: PeriodService) {}
 
   resolve(route: ActivatedRouteSnapshot): Observable<Period> {
     const id = route.paramMap.get('id');

overlord/src/app/period/period-routing.module.ts

@@ -1,49 +1,58 @@
 import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { RouterModule, Routes } from '@angular/router';
+import { NgModule, inject } from '@angular/core';
+import { ActivatedRouteSnapshot, RouterModule, RouterStateSnapshot, Routes } from '@angular/router';
 
 import { AuthGuard } from '../auth/auth-guard.service';
 import { CostCentreListResolver } from '../cost-centre/cost-centre-list-resolver.service';
 
 import { PeriodDetailComponent } from './period-detail/period-detail.component';
-import { PeriodListResolver } from './period-list-resolver.service';
 import { PeriodListComponent } from './period-list/period-list.component';
+import { PeriodListResolver } from './period-list-resolver.service';
 import { PeriodResolver } from './period-resolver.service';
 
 const periodRoutes: Routes = [
   {
     path: '',
     component: PeriodListComponent,
-    canActivate: [AuthGuard],
+    canActivate: [
+      (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) =>
+        inject(AuthGuard).canActivate(route, state),
+    ],
     data: {
       permission: 'Recipes',
     },
     resolve: {
-      list: PeriodListResolver,
+      list: () => inject(PeriodListResolver).resolve(),
     },
   },
   {
     path: 'new',
     component: PeriodDetailComponent,
-    canActivate: [AuthGuard],
+    canActivate: [
+      (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) =>
+        inject(AuthGuard).canActivate(route, state),
+    ],
     data: {
       permission: 'Recipes',
     },
     resolve: {
-      item: PeriodResolver,
-      costCentres: CostCentreListResolver,
+      item: (route: ActivatedRouteSnapshot) => inject(PeriodResolver).resolve(route),
+      costCentres: () => inject(CostCentreListResolver).resolve(),
     },
   },
   {
     path: ':id',
     component: PeriodDetailComponent,
-    canActivate: [AuthGuard],
+    canActivate: [
+      (route: ActivatedRouteSnapshot, state: RouterStateSnapshot) =>
+        inject(AuthGuard).canActivate(route, state),
+    ],
     data: {
       permission: 'Recipes',
     },
     resolve: {
-      item: PeriodResolver,
-      costCentres: CostCentreListResolver,
+      item: (route: ActivatedRouteSnapshot) => inject(PeriodResolver).resolve(route),
+      costCentres: () => inject(CostCentreListResolver).resolve(),
     },
   },
 ];

overlord/src/app/period/period.module.ts

@@ -2,7 +2,6 @@ import { CdkTableModule } from '@angular/cdk/table';
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
-import { MomentDateAdapter } from '@angular/material-moment-adapter';
 import { MatButtonModule } from '@angular/material/button';
 import { MatCardModule } from '@angular/material/card';
 import { MatCheckboxModule } from '@angular/material/checkbox';
@@ -17,6 +16,7 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import { MatSelectModule } from '@angular/material/select';
 import { MatSortModule } from '@angular/material/sort';
 import { MatTableModule } from '@angular/material/table';
+import { MomentDateAdapter } from '@angular/material-moment-adapter';
 
 import { PeriodDetailComponent } from './period-detail/period-detail.component';
 import { PeriodListComponent } from './period-list/period-list.component';