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.
This commit is contained in:
@ -1,5 +1,4 @@
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Resolve } from '@angular/router';
|
||||
import { Observable } from 'rxjs/internal/Observable';
|
||||
|
||||
import { Account } from '../core/account';
|
||||
@ -8,7 +7,7 @@ import { AccountService } from '../core/account.service';
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class ReceiptAccountsResolver implements Resolve<Account[]> {
|
||||
export class ReceiptAccountsResolver {
|
||||
constructor(private ser: AccountService) {}
|
||||
|
||||
resolve(): Observable<Account[]> {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
import { Injectable } from '@angular/core';
|
||||
import { ActivatedRouteSnapshot, Resolve } from '@angular/router';
|
||||
import { ActivatedRouteSnapshot } from '@angular/router';
|
||||
import { Observable } from 'rxjs/internal/Observable';
|
||||
|
||||
import { Voucher } from '../core/voucher';
|
||||
@ -8,7 +8,7 @@ import { VoucherService } from '../core/voucher.service';
|
||||
@Injectable({
|
||||
providedIn: 'root',
|
||||
})
|
||||
export class ReceiptResolver implements Resolve<Voucher> {
|
||||
export class ReceiptResolver {
|
||||
constructor(private ser: VoucherService) {}
|
||||
|
||||
resolve(route: ActivatedRouteSnapshot): Observable<Voucher> {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
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';
|
||||
|
||||
@ -12,26 +12,32 @@ const receiptRoutes: Routes = [
|
||||
{
|
||||
path: '',
|
||||
component: ReceiptComponent,
|
||||
canActivate: [AuthGuard],
|
||||
canActivate: [
|
||||
(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) =>
|
||||
inject(AuthGuard).canActivate(route, state),
|
||||
],
|
||||
data: {
|
||||
permission: 'journal',
|
||||
},
|
||||
resolve: {
|
||||
receiptAccounts: ReceiptAccountsResolver,
|
||||
voucher: ReceiptResolver,
|
||||
receiptAccounts: () => inject(ReceiptAccountsResolver).resolve(),
|
||||
voucher: (route: ActivatedRouteSnapshot) => inject(ReceiptResolver).resolve(route),
|
||||
},
|
||||
runGuardsAndResolvers: 'paramsChange',
|
||||
},
|
||||
{
|
||||
path: ':id',
|
||||
component: ReceiptComponent,
|
||||
canActivate: [AuthGuard],
|
||||
canActivate: [
|
||||
(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) =>
|
||||
inject(AuthGuard).canActivate(route, state),
|
||||
],
|
||||
data: {
|
||||
permission: 'journal',
|
||||
},
|
||||
resolve: {
|
||||
receiptAccounts: ReceiptAccountsResolver,
|
||||
voucher: ReceiptResolver,
|
||||
receiptAccounts: () => inject(ReceiptAccountsResolver).resolve(),
|
||||
voucher: (route: ActivatedRouteSnapshot) => inject(ReceiptResolver).resolve(route),
|
||||
},
|
||||
runGuardsAndResolvers: 'paramsChange',
|
||||
},
|
||||
|
||||
@ -3,7 +3,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 { MatAutocompleteModule } from '@angular/material/autocomplete';
|
||||
import { MatButtonModule } from '@angular/material/button';
|
||||
import { MatCardModule } from '@angular/material/card';
|
||||
@ -24,6 +23,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 { HotkeyModule } from 'angular2-hotkeys';
|
||||
|
||||
import { SharedModule } from '../shared/shared.module';
|
||||
|
||||
Reference in New Issue
Block a user