Version Bump v15.2.4

.dockerignore

@@ -0,0 +1,61 @@
+# Version control & IDEs
+.git
+.gitignore
+.vscode
+.idea
+.agents
+.gemini
+
+# Build artifacts & compiled outputs
+frontend
+dist
+**/dist
+out-tsc
+**/out-tsc
+bazel-out
+
+# Dependencies & framework caches
+node_modules
+**/node_modules
+.angular
+**/.angular
+.nx
+**/.nx
+.sass-cache
+**/.sass-cache
+
+# Python virtual environments & caches
+.venv
+**/__pycache__
+**/.mypy_cache
+**/.ruff_cache
+**/.pytest_cache
+*.py[cod]
+*$py.class
+*.egg-info
+
+# Testing & coverage
+coverage
+**/coverage
+.coverage
+htmlcov
+
+# Logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Environment & local deployment/dev files
+.env*
+!.env.example
+ansible
+deploy.sh
+lint.sh
+version_bump.sh
+Makefile
+README.md
+CHANGES.md
+typings
+.DS_Store
+Thumbs.db

.gitignore

@@ -1,5 +1,51 @@
+# IDEs & System Files
 .idea/
-frontend
+.DS_Store
+Thumbs.db
+
+# Build outputs
+frontend/
+dist/
+**/dist/
+out-tsc/
+**/out-tsc/
+bazel-out/
+
+# Angular & Nx caches
+.angular/
+**/.angular/
+.nx/
+**/.nx/
+.sass-cache/
+
+# Dependencies
+node_modules/
+**/node_modules/
+
+# Python & Virtual Environments
+.venv/
+**/__pycache__/
+*.py[cod]
+*$py.class
+*.egg-info/
+.mypy_cache/
+**/.mypy_cache/
+.ruff_cache/
+**/.ruff_cache/
+.pytest_cache/
+**/.pytest_cache/
+
+# Testing & Coverage
+coverage/
+**/coverage/
+.coverage
+htmlcov/
+
+# Logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
 
 # Ignore Pyright-generated stubs
 *.pyi

.vscode/settings.json

@@ -27,19 +27,36 @@
   "files.exclude": {
     "**/__pycache__": true,
     "**/.mypy_cache": true,
+    "**/.ruff_cache": true,
+    "**/.pytest_cache": true,
     ".idea": true,
     "**/node_modules": true,
     "typings": true,
+    "frontend": true,
+    "**/.angular": true,
+    "**/.nx": true,
+    "**/out-tsc": true,
+    "**/dist": true,
+    "**/.sass-cache": true,
+    "**/coverage": true
   },
   "search.exclude": {
     "**/__pycache__": true,
     "**/.mypy_cache": true,
+    "**/.ruff_cache": true,
+    "**/.pytest_cache": true,
     ".idea": true,
     "**/node_modules": true,
     "**/poetry.lock": true,
     "**/package-lock.json": true,
-    "/overlord/.angular/**": true,
     "typings": true,
+    "frontend/**": true,
+    "**/.angular/**": true,
+    "**/.nx/**": true,
+    "**/out-tsc/**": true,
+    "**/dist/**": true,
+    "**/.sass-cache/**": true,
+    "**/coverage/**": true
   },
   "editor.codeActionsOnSave": {
     "source.fixAll.ruff": "always",

Dockerfile

@@ -29,7 +29,6 @@ RUN \
   else echo "Lockfile not found." && exit 1; \
   fi
 
-
 FROM python:3.14-slim AS runner
 LABEL maintainer="Amritanshu <docker@tanshu.com>"
 

brewman/brewman/__version__.py

@@ -1 +1 @@
-__version__ = "15.2.1"
+__version__ = "15.2.4"

brewman/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "brewman"
-version = "15.2.1"
+version = "15.2.4"
 description = "Accounting plus inventory management for a restaurant."
 requires-python = ">=3.14"
 authors = [{ name = "tanshu", email = "git@tanshu.com" }]

brewman/uv.lock

@@ -211,7 +211,7 @@ wheels = [
 
 [[package]]
 name = "brewman"
-version = "15.2.1"
+version = "15.2.4"
 source = { editable = "." }
 dependencies = [
     { name = "alembic" },

lint.sh

@@ -7,10 +7,10 @@ parent_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" || exit ; pwd -P )
 cd "$parent_path/overlord" || exit
 npx prettier --write src/app
 npx ng lint --fix
-cd "$parent_path/brewman" || exit
 
-uvx ruff format .
-uvx ruff check .                        # Lint all files in the current directory (and any subdirectories)
-uvx bandit --recursive brewman
-uvx bandit --recursive .
-uvx safety check
+cd "$parent_path/brewman" || exit
+uv run ruff format .
+uv run ruff check .                        # Lint all files in the current directory (and any subdirectories)
+uv run bandit --recursive brewman
+uv run bandit --recursive .
+uv run safety check

overlord/package.json

@@ -1,6 +1,6 @@
 {
   "name": "overlord",
-  "version": "15.2.1",
+  "version": "15.2.4",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

overlord/src/app/app.environment.ts

@@ -1,6 +1,6 @@
 export const environment = {
   ACCESS_TOKEN_REFRESH_MINUTES: 10, // refresh token 10 minutes before expiry
-  version: '15.2.1',
+  version: '15.2.4',
   title: 'HnG / TGB',
 };
 

overlord/src/app/closing-stock/closing-stock.component.html

@@ -13,7 +13,7 @@
       <mat-label>Department</mat-label>
       <mat-select [formField]="form.costCentre">
         @for (at of costCentres(); track at) {
-          <mat-option [value]="at.id">
+          <mat-option [value]="at">
             {{ at.name }}
           </mat-option>
         }

overlord/src/app/closing-stock/closing-stock.component.ts

@@ -1,6 +1,6 @@
 import { CurrencyPipe, DecimalPipe } from '@angular/common';
 import { Component, inject, computed, input, linkedSignal, signal, afterNextRender } from '@angular/core';
-import { form as createForm, FormField, FormRoot } from '@angular/forms/signals';
+import { form as createForm, FormField, FormRoot, required } from '@angular/forms/signals';
 import { MatButtonModule } from '@angular/material/button';
 import { MatOptionModule } from '@angular/material/core';
 import { MatDatepickerModule } from '@angular/material/datepicker';
@@ -72,11 +72,11 @@ export class ClosingStockComponent {
   pageIndex = signal(0);
   sortActive = signal('');
   sortDirection = signal('');
-  id = input(null, { transform: (v: string | null | undefined) => v ?? null });
+  date = input(null, { transform: (v: string | null | undefined) => v ?? null });
   d = input(null, { transform: (v: string | null | undefined) => v ?? null });
   startDate = input(null, { transform: (v: string | null | undefined) => v ?? null });
   finishDate = input(null, { transform: (v: string | null | undefined) => v ?? null });
-  infoResource = this.ser.list(this.id, this.d);
+  infoResource = this.ser.list(this.date, this.d);
   info = computed(() => this.infoResource.value() ?? new ClosingStock());
   costCentresResource = this.costCentreSer.list();
 
@@ -94,7 +94,10 @@ export class ClosingStockComponent {
     }),
   });
 
-  form = createForm(this.model);
+  form = createForm(this.model, (f) => {
+    required(f.costCentre);
+    required(f.date);
+  });
 
   sortedList = computed(() => {
     const data = this.info().items ?? [];
@@ -144,6 +147,9 @@ export class ClosingStockComponent {
   }
 
   show() {
+    if (this.form().invalid()) {
+      return;
+    }
     const info = this.getInfo();
     this.router.navigate(['closing-stock', info.date], {
       queryParams: {
@@ -180,7 +186,7 @@ export class ClosingStockComponent {
 
     return new ClosingStock({
       date: moment(formModel.date).format('DD-MMM-YYYY'),
-      costCentre: new CostCentre({ id: formModel.costCentre?.id ?? '' }),
+      costCentre: formModel.costCentre ?? new CostCentre(),
     });
   }
 

overlord/src/app/core/voucher.service.ts

@@ -73,10 +73,6 @@ export class VoucherService {
     });
   }
 
-  getIncentive(date: Signal<string>): ResourceRef<Voucher | undefined> {
-    return httpResource<Voucher>(() => `${url}/incentive?d=${date()}`);
-  }
-
   post(id: string): Observable<Voucher> {
     return this.http
       .post<Voucher>(`${url}/post-voucher/${id}`, {})

overlord/src/app/incentive/incentive.component.html

@@ -21,7 +21,7 @@
     <strong>{{ totalPoints() | number: '1.2-2' }}</strong> Point Value:
     <strong>{{ pointValue() | number: '1.2-2' }}</strong>
   </div>
-  <mat-table #table [dataSource]="incentives()">
+  <mat-table #table [dataSource]="model().incentives">
     <!-- Name Column -->
     <ng-container matColumnDef="name">
       <mat-header-cell *matHeaderCellDef>Name</mat-header-cell>

overlord/src/app/incentive/incentive.component.ts

@@ -1,5 +1,5 @@
 import { CurrencyPipe, DecimalPipe } from '@angular/common';
-import { signal, Component, inject, input, computed, linkedSignal } from '@angular/core';
+import { signal, Component, inject, input, computed, linkedSignal, effect } from '@angular/core';
 import { form as createForm, FormField, FormRoot } from '@angular/forms/signals';
 import { MatButtonModule } from '@angular/material/button';
 import { MatDatepickerModule } from '@angular/material/datepicker';
@@ -23,8 +23,8 @@ import { ConfirmDialogComponent } from '../shared/confirm-dialog/confirm-dialog.
 import { LocalTimePipe } from '../shared/local-time.pipe';
 
 export interface IncentiveFormData {
-  date: Date;
-  incentives: { points: number }[];
+  date: moment.Moment;
+  incentives: Incentive[];
 }
 
 @Component({
@@ -55,19 +55,28 @@ export class IncentiveComponent {
   auth = inject(AuthService);
   private ser = inject(VoucherService);
   id = input(null, { transform: (v: string | null | undefined) => v ?? null });
-  voucherResource = this.ser.getVoucher(this.id, signal('Incentive'), signal(null), signal(null));
-  voucher = computed(() => this.voucherResource.value() ?? new Voucher());
+  d = input(null, { transform: (v: string | null | undefined): string | null => v ?? null });
+  voucherResource = this.ser.getVoucher(this.id, signal('Incentive'), signal(null), this.d);
+  voucher = computed(() => this.voucherResource.value() ?? new Voucher({ date: this.d() as string }));
+
   model = linkedSignal({
     source: this.voucher,
     computation: (v): IncentiveFormData => ({
-      date: moment(v.date, 'DD-MMM-YYYY').toDate(),
-      incentives: v.incentives.map((x) => ({ points: x.points })),
+      date: v.date ? moment(v.date, 'DD-MMM-YYYY') : moment(new Date()),
+      incentives: v.incentives.map((x) => new Incentive({ ...x })),
     }),
   });
 
   form = createForm(this.model);
 
-  incentives = linkedSignal(() => this.voucher().incentives);
+  constructor() {
+    effect(async () => {
+      const date = this.form.date().value().format('DD-MMM-YYYY');
+      if (date !== this.d() && !this.id()) {
+        this.router.navigate(['/incentive'], { queryParams: { d: date }, replaceUrl: true });
+      }
+    });
+  }
 
   account: Account = new Account();
   accBal: AccountBalance | null = null;
@@ -80,9 +89,10 @@ export class IncentiveComponent {
   }
 
   totalPoints = computed(() => {
-    return this.incentives()
-      .map((item: Incentive, i: number) => item.daysWorked * (this.model().incentives[i]?.points ?? 0))
-      .reduce((sum: number, item: number) => sum + item, 0);
+    return this.model().incentives.reduce(
+      (sum: number, item: Incentive) => sum + item.daysWorked * (item.points ?? 0),
+      0,
+    );
   });
 
   pointValue = computed(() => {
@@ -97,7 +107,7 @@ export class IncentiveComponent {
       this.model.update((m) => {
         const arr = [...m.incentives];
         if (arr[i]) {
-          arr[i] = { ...arr[i], points: currentPoints - 1 };
+          arr[i] = new Incentive({ ...arr[i], points: currentPoints - 1 });
         }
         return { ...m, incentives: arr };
       });
@@ -109,7 +119,7 @@ export class IncentiveComponent {
     this.model.update((m) => {
       const arr = [...m.incentives];
       if (arr[i]) {
-        arr[i] = { ...arr[i], points: currentPoints + 1 };
+        arr[i] = new Incentive({ ...arr[i], points: currentPoints + 1 });
       }
       return { ...m, incentives: arr };
     });
@@ -158,11 +168,7 @@ export class IncentiveComponent {
     const formModel = this.model();
     const v = this.voucher();
     v.date = moment(formModel.date).format('DD-MMM-YYYY');
-    const array = formModel.incentives;
-
-    v.incentives.forEach((item: Incentive, index: number) => {
-      item.points = array[index]?.points ?? 0;
-    });
+    v.incentives = formModel.incentives;
     return v;
   }
 

overlord/src/app/issue/issue.component.html

@@ -134,9 +134,9 @@
     <span class="flex">
       Created on&nbsp;<strong>{{ form.creationDate().value() | localTime }}</strong
       >&nbsp;and Last Edited on&nbsp; <strong>{{ form.lastEditDate().value() | localTime }}</strong
-      >&nbsp;by&nbsp; <strong>{{ form.userName() }}</strong
+      >&nbsp;by&nbsp;<strong>{{ form.userName().value().name }}</strong
       >.
-      {{ form.posted() ? 'Posted by ' + form.poster() : '' }}
+      {{ form.posted().value() ? 'Posted by ' + form.poster().value() : '' }}
     </span>
   }
 </div>

overlord/src/app/issue/issue.component.ts

@@ -58,7 +58,7 @@ export interface IssueFormModel {
   posted: boolean;
   creationDate: string;
   lastEditDate: string;
-  userName: string;
+  userName: User;
   poster: string;
 }
 
@@ -139,7 +139,7 @@ export class IssueComponent {
         posted: voucher.posted,
         creationDate: voucher.creationDate,
         lastEditDate: voucher.lastEditDate,
-        userName: voucher.user?.name ?? '',
+        userName: voucher.user ?? new User(),
         poster: voucher.poster ?? '',
       };
     },

overlord/src/app/journal/journal.component.html

@@ -174,8 +174,8 @@
     <span class="flex">
       Created on&nbsp;<strong>{{ form.creationDate().value() | localTime }}</strong
       >&nbsp;and Last Edited on&nbsp; <strong>{{ form.lastEditDate().value() | localTime }}</strong
-      >&nbsp;by&nbsp; <strong>{{ form.userName() }}</strong
-      >. {{ form.posted() ? 'Posted by ' + form.poster() : '' }}
+      >&nbsp;by&nbsp;<strong>{{ form.userName().value().name }}</strong
+      >. {{ form.posted().value() ? 'Posted by ' + form.poster().value() : '' }}
     </span>
   }
 </div>

overlord/src/app/journal/journal.component.ts

@@ -26,6 +26,7 @@ import { AccountService } from '../core/account.service';
 import { CostCentre } from '../core/cost-centre';
 import { DbFile } from '../core/db-file';
 import { Journal } from '../core/journal';
+import { User } from '../core/user';
 import { Voucher } from '../core/voucher';
 import { VoucherService } from '../core/voucher.service';
 import { AccountingPipe } from '../shared/accounting.pipe';
@@ -64,7 +65,7 @@ export interface JournalFormModel {
   posted: boolean;
   creationDate: string;
   lastEditDate: string;
-  userName: string;
+  userName: User;
   poster: string;
 }
 
@@ -194,7 +195,7 @@ export class JournalComponent {
       posted: voucher.posted,
       creationDate: voucher.creationDate,
       lastEditDate: voucher.lastEditDate,
-      userName: voucher.user?.name ?? '',
+      userName: voucher.user ?? new User(),
       poster: voucher.poster,
     }),
   });

overlord/src/app/payment/payment.component.html

@@ -182,9 +182,9 @@
     <span class="flex">
       Created on&nbsp;<strong>{{ form.creationDate().value() | localTime }}</strong
       >&nbsp;and Last Edited on&nbsp; <strong>{{ form.lastEditDate().value() | localTime }}</strong
-      >&nbsp;by&nbsp; <strong>{{ form.userName() }}</strong
+      >&nbsp;by&nbsp;<strong>{{ form.userName().value().name }}</strong
       >.
-      {{ form.posted() ? 'Posted by ' + form.poster() : '' }}
+      {{ form.posted().value() ? 'Posted by ' + form.poster().value() : '' }}
     </span>
   }
 </div>

overlord/src/app/payment/payment.component.ts

@@ -65,7 +65,7 @@ export interface PaymentFormModel {
   posted: boolean;
   creationDate: string;
   lastEditDate: string;
-  userName: string;
+  userName: User;
   poster: string;
 }
 
@@ -153,7 +153,7 @@ export class PaymentComponent {
         posted: voucher.posted,
         creationDate: voucher.creationDate,
         lastEditDate: voucher.lastEditDate,
-        userName: voucher.user?.name ?? '',
+        userName: voucher.user ?? new User(),
         poster: voucher.poster ?? '',
       };
     },

overlord/src/app/purchase-return/purchase-return.component.html

@@ -207,9 +207,9 @@
     <span class="flex">
       Created on&nbsp;<strong>{{ form.creationDate().value() | localTime }}</strong
       >&nbsp;and Last Edited on&nbsp; <strong>{{ form.lastEditDate().value() | localTime }}</strong
-      >&nbsp;by&nbsp; <strong>{{ form.userName() }}</strong
+      >&nbsp;by&nbsp;<strong>{{ form.userName().value().name }}</strong
       >.
-      {{ form.posted() ? 'Posted by ' + form.poster() : '' }}
+      {{ form.posted().value() ? 'Posted by ' + form.poster().value() : '' }}
     </span>
   }
 </div>

overlord/src/app/purchase-return/purchase-return.component.ts

@@ -68,7 +68,7 @@ export interface PurchaseReturnFormModel {
   posted: boolean;
   creationDate: string;
   lastEditDate: string;
-  userName: string;
+  userName: User;
   poster: string;
 }
 
@@ -157,7 +157,7 @@ export class PurchaseReturnComponent {
         posted: voucher.posted,
         creationDate: voucher.creationDate,
         lastEditDate: voucher.lastEditDate,
-        userName: voucher.user?.name ?? '',
+        userName: voucher.user ?? null,
         poster: voucher.poster ?? '',
       };
     },

overlord/src/app/purchase/purchase.component.html

@@ -227,9 +227,9 @@
     <span class="flex">
       Created on&nbsp;<strong>{{ form.creationDate().value() | localTime }}</strong
       >&nbsp;and Last Edited on&nbsp; <strong>{{ form.lastEditDate().value() | localTime }}</strong
-      >&nbsp;by&nbsp; <strong>{{ form.userName() }}</strong
+      >&nbsp;by&nbsp;<strong>{{ form.userName().value().name }}</strong
       >.
-      {{ form.posted() ? 'Posted by ' + form.poster() : '' }}
+      {{ form.posted().value() ? 'Posted by ' + form.poster().value() : '' }}
     </span>
   }
 </div>

overlord/src/app/purchase/purchase.component.ts

@@ -73,7 +73,7 @@ export interface PurchaseFormModel {
   posted: boolean;
   creationDate: string;
   lastEditDate: string;
-  userName: string;
+  userName: User;
   poster: string;
 }
 
@@ -165,7 +165,7 @@ export class PurchaseComponent {
         posted: voucher.posted,
         creationDate: voucher.creationDate,
         lastEditDate: voucher.lastEditDate,
-        userName: voucher.user?.name ?? '',
+        userName: voucher.user ?? null,
         poster: voucher.poster ?? '',
       };
     },

overlord/src/app/receipt/receipt.component.html

@@ -177,8 +177,8 @@
     <span class="flex">
       Created on&nbsp;<strong>{{ form.creationDate().value() | localTime }}</strong
       >&nbsp;and Last Edited on&nbsp; <strong>{{ form.lastEditDate().value() | localTime }}</strong
-      >&nbsp;by&nbsp; <strong>{{ form.userName() }}</strong
-      >. {{ form.posted() ? 'Posted by ' + form.poster() : '' }}
+      >&nbsp;by&nbsp;<strong>{{ form.userName().value().name }}</strong
+      >. {{ form.posted().value() ? 'Posted by ' + form.poster().value() : '' }}
     </span>
   }
 </div>

overlord/src/app/receipt/receipt.component.ts

@@ -65,7 +65,7 @@ export interface ReceiptFormModel {
   posted: boolean;
   creationDate: string;
   lastEditDate: string;
-  userName: string;
+  userName: User;
   poster: string;
 }
 
@@ -155,7 +155,7 @@ export class ReceiptComponent {
         posted: voucher.posted,
         creationDate: voucher.creationDate,
         lastEditDate: voucher.lastEditDate,
-        userName: voucher.user?.name ?? '',
+        userName: voucher.user ?? null,
         poster: voucher.poster ?? '',
       };
     },

version_bump.sh

@@ -3,6 +3,12 @@ set -euo pipefail
 parent_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" || exit ; pwd -P )
 cd "$parent_path" || exit
 
+last_commit_subject=$(git log -1 --format=%s)
+if [[ "$last_commit_subject" =~ ^Version\ Bump ]]; then
+  echo "Last commit is already a version bump (\"$last_commit_subject\"). Nothing to do."
+  exit 0
+fi
+
 if [ 1 -eq "$#" ]
 then
   current_version=$(grep -m 1 '^version = ' brewman/pyproject.toml | sed -E 's/version = "([^"]+)"/\1/')