Proposition V1

This commit is contained in:
MarrhieuHR authored and MatthieuHR committed 2026-11-09 09:19:41 +01:00
1 parent bfa5fa45b8
commit fc961f6511
36 files changed
+1984

No files matched your search

+2
View File
@@ -32,3 +32,5 @@ site/
# Ignore redis binary dump (dump.rdb) files
*.rdb
.devenv
+47
View File
@@ -0,0 +1,47 @@
# Generated by Django 5.2.18 on 2026-11-09 06:57
import django.db.models.deletion
from django.db import migrations, models
def add_stock_groups(apps, schema_editor):
Club = apps.get_model("club", "Club")
Group = apps.get_model("core", "Group")
for club in Club.objects.all():
new_group = Group.objects.create(
name=f"{club.name} - Stock",
is_manually_manageable=False,
)
club.stock_group = new_group
club.save()
class Migration(migrations.Migration):
dependencies = [
('club', '0019_remove_mailingsubscription_mailing_and_more'),
]
operations = [
migrations.AddField(
model_name="club",
name="stock_group",
field=models.OneToOneField(
null=True,
editable=False,
on_delete=django.db.models.deletion.PROTECT,
related_name="club_stock",
to="core.group",
),
),
migrations.RunPython(add_stock_groups),
migrations.AlterField(
model_name="club",
name="stock_group",
field=models.OneToOneField(
editable=False,
on_delete=django.db.models.deletion.PROTECT,
related_name="club_stock",
to="core.group",
),
),
]
+6
View File
@@ -98,6 +98,9 @@ class Club(models.Model):
board_group = models.OneToOneField(
Group, related_name="club_board", on_delete=models.PROTECT, editable=False
)
stock_group = models.OneToOneField(
Group, related_name="club_stock", on_delete=models.PROTECT, editable=False
)
objects = ClubQuerySet.as_manager()
@@ -129,6 +132,9 @@ class Club(models.Model):
self.members_group = Group.objects.create(
name=f"{self.name} - Membres", is_manually_manageable=False
)
self.stock_group = Group.objects.create(
name=f"{self.name} - Stock", is_manually_manageable=False
)
self.make_home()
self.make_page()
super().save(*args, **kwargs)
+6
View File
@@ -508,6 +508,12 @@ class ClubRoleBoardCreateView(ClubRoleBaseCreateView):
role_description = _("club role \u2013 board")
class ClubRoleMemberCreateView(ClubRoleBaseCreateView):
is_presidency = False
is_board = True
role_description = _("club role \u2013 stock manager")
class ClubRoleMemberCreateView(ClubRoleBaseCreateView):
is_presidency = False
is_board = False
@@ -0,0 +1,31 @@
# Generated by Django 5.2.18 on 2026-11-09 01:33
from django.db import migrations
import antispam.models.fields
class Migration(migrations.Migration):
dependencies = [
("core", "0052_preferences_show_my_timetable"),
]
operations = [
migrations.AlterField(
model_name="user",
name="email",
field=antispam.models.fields.AntiSpamEmailField(
max_length=254, unique=True, verbose_name="email address"
),
),
migrations.AlterField(
model_name="user",
name="second_email",
field=antispam.models.fields.AntiSpamEmailField(
blank=True,
max_length=254,
null=True,
verbose_name="second email address",
),
),
]
+65
View File
@@ -0,0 +1,65 @@
{
"nodes": {
"devenv": {
"locked": {
"dir": "src/modules",
"lastModified": 1790181305,
"narHash": "sha256-0L4uJEyhPImq8GsiDki5AtpOcCT2O7q0V1yXB1ZAbgg=",
"owner": "cachix",
"repo": "devenv",
"rev": "9272f920ccb6bfc72e87b3c712caffcf3cacecd8",
"type": "github"
},
"original": {
"dir": "src/modules",
"owner": "cachix",
"repo": "devenv",
"type": "github"
}
},
"nixpkgs": {
"inputs": {
"nixpkgs-src": "nixpkgs-src"
},
"locked": {
"lastModified": 1789506231,
"narHash": "sha256-vNkJbtmqyBfFhn/HnzQo4ROuoyYWuy/allqTfJb4kMY=",
"owner": "cachix",
"repo": "devenv-nixpkgs",
"rev": "c2f38fe7f9e04d9aadd354d380f2bd40531d9737",
"type": "github"
},
"original": {
"owner": "cachix",
"ref": "rolling",
"repo": "devenv-nixpkgs",
"type": "github"
}
},
"nixpkgs-src": {
"flake": false,
"locked": {
"lastModified": 1789370336,
"narHash": "sha256-6RSEDHIWQtesQKWSu5qRai8L2h4KgCgMEfJHstW99G4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c7def046b9a883d46974757852106483d741586f",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"devenv": "devenv",
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}
+335
View File
@@ -0,0 +1,335 @@
# devenv.nix
{ pkgs, lib, config, inputs, ... }:
let
pythonVersion = pkgs.python314;
xapian2 = import ./nix/xapian-2.nix {
inherit pkgs;
python3 = pythonVersion;
};
# Make a package
xapianPythonPkg = pkgs.python314Packages.buildPythonPackage {
pname = "xapian";
version = "2.1.0";
format = "other";
src = xapian2.xapianBindings;
installPhase = ''
mkdir -p $out/lib/python3.14/site-packages
cp -r $src/lib/python3.14/site-packages/* $out/lib/python3.14/site-packages/
'';
};
pythonWithXapian = pythonVersion.withPackages (ps: [
xapianPythonPkg
]);
in
{
# https://devenv.sh/basics/
env.GREET = "devenv";
env.HTTPS = "off";
env.SITH_DEBUG = "true";
env.SECRET_KEY = "(4sjxvhz@m5$0a$j0_pqicnc$s!vbve)z+&++m%g%bjhlz4+g2";
env.REDIS_PORT = toString config.services.redis.port;
env.CACHE_URL = "redis://127.0.0.1:${toString config.services.redis.port}/0";
env.TASK_BROKER_URL = "redis://127.0.0.1:${toString config.services.redis.port}/1";
# https://devenv.sh/packages/
packages = [
pkgs.git
pkgs.pkg-config
pkgs.openssl
pkgs.libjpeg
pkgs.zlib
pkgs.gettext
pkgs.gnumake
pkgs.gcc
];
languages.python = {
enable = true;
package = pythonWithXapian; # use custom package.
lsp.enable = true;
venv.enable = true;
uv = {
enable = true;
sync = {
enable = true;
groups = [
"dev"
"tests"
"docs"
];
};
};
};
languages.javascript = {
enable = true;
lsp.enable = true;
package = pkgs.nodejs_24;
npm = {
enable = true;
install.enable = true;
};
};
services.redis = {
enable = true;
};
processes = {
server = {
ports = {
sith.allocate = 8000;
};
exec = "uv run $DEVENV_ROOT/manage.py runserver 0.0.0.0:${toString config.processes.server.ports.sith.value}";
restart = {
on = "always";
};
after = [ "devenv:processes:redis" ];
};
celery = {
exec = "uv run celery -A sith worker --beat -l INFO";
restart = {
on = "always";
};
after = [ "devenv:processes:redis" ];
};
};
profiles.dev = {
module = {
env.DATABASE_URL = "sqlite:///db.sqlite3";
env.PROCFILE_STATIC = "Procfile.static";
};
};
profiles.full = {
module = {
packages = [
pkgs.libpq
pkgs.postgrest
];
languages.python.package = lib.mkForce (pythonVersion.withPackages (ps: [
xapianPythonPkg
ps.psycopg
]));
env.PROCFILE_STATIC = "";
# Postgress
services.postgres = {
enable = true;
initialDatabases = [
{
name = "sith";
}
];
initialScript = ''
CREATE USER sith WITH PASSWORD 'password';
ALTER ROLE sith SET client_encoding TO 'utf8';
ALTER ROLE sith SET default_transaction_isolation TO 'read committed';
ALTER ROLE sith SET timezone TO 'UTC';
GRANT ALL PRIVILEGES ON DATABASE sith TO sith;
GRANT ALL PRIVILEGES ON SCHEMA public TO sith;
'';
settings = {
listen_addresses = lib.mkForce "127.0.0.1";
};
};
env.DATABASE_URL = "postgres://sith:password@127.0.0.1:${toString config.services.postgres.port}/sith";
processes.server.after = [ "devenv:processes:redis" "devenv:processes:postgres" ];
# Nginx
services.nginx = {
enable = true;
eventsConfig = ''
worker_connections 1024;
'';
httpConfig = ''
server {
listen 127.0.0.1:8001;
server_name localhost;
# Gestion des fichiers statiques
location /static/ {
root ${config.devenv.root};
}
# Fichiers médias publics
location ~ ^/data/(products|com|club_logos|upload)/ {
root ${config.devenv.root};
}
# Fichiers médias privés/protégés
location ~ ^/data/(SAS|profiles|users|.compressed|.thumbnails)/ {
internal;
root ${config.devenv.root};
}
# On redirige tout le reste vers Django (sur le port 8001)
location / {
proxy_pass http://127.0.0.1:${toString config.processes.server.ports.sith.value};
proxy_set_header Host $http_host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
}
}
'';
};
# Watcher for statics
processes = {
"watcher" = {
exec = "uv run $DEVENV_ROOT/manage.py collectstatic --noinput";
watch = {
paths = [
./.
];
extensions = [
"js"
"css"
"scss"
"ts"
];
ignore = [
".devenv/*"
".git/*"
"node_modules/*"
"staticfiles/*"
"static/*"
];
};
};
};
enterShell = ''
psql -d sith -c "GRANT ALL PRIVILEGES ON SCHEMA public to sith";
'';
};
};
tasks = {
# Init Prject
"project:init" = {
exec = ''
uv run $DEVENV_ROOT/manage.py setup
'';
before = [ "tras:compile" ];
};
# Install Translations
"tras:compile" = {
exec = ''
uv run $DEVENV_ROOT/manage.py compilemessages
'';
};
};
scripts = {
"db:migrate" = {
exec = ''
uv run $DEVENV_ROOT/manage.py migrate "$@"
'';
};
"db:make-migration" = {
exec = ''
uv run $DEVENV_ROOT/manage.py makemigrations "$@"
'';
};
"db:squash" = {
exec = ''
uv run $DEVENV_ROOT/manage.py squasmigrations "$@"
'';
};
"db:create-su" = {
exec = ''
uv run $DEVENV_ROOT/manage.py createsuperuser "$@"
'';
};
"db:populate" = {
exec = ''
uv run $DEVENV_ROOT/manage.py populate "$@"
'';
};
"db:populate-more" = {
exec = ''
uv run $DEVENV_ROOT/manage.py populate_more "$@"
'';
};
"trans:make" = {
exec = ''
uv run $DEVENV_ROOT/manage.py makemessages --locale=fr -e py,jinja --ignore=.venv --ignore=node_modules --add-location=file
uv run $DEVENV_ROOT/manage.py makemessages --locale=fr -d djangojs -e js,ts --ignore=.venv --ignore=node_modules --ignore=staticfiles/generated --add-location=file
'';
};
"trans:compile" = {
exec = ''
uv run $DEVENV_ROOT/manage.py compilemessages "$@"
'';
};
"project:line-cont" = {
exec = ''
cloc $DEVENV_ROOT --exclude-dir=doc,env "$@"
'';
packages = [ pkgs.cloc ];
};
"project:pre-commit" = {
exec = ''
uv run pre-commit run
'';
};
"test:run" = {
exec = ''
uv run pytest "$@"
'';
};
"server:anti-spam-update" = {
exec = ''
uv run $DEVENV_ROOT/manage.py update_spam_database "$@"
'';
};
"start-pycharm" = {
exec = ''
2>/dev/null 1>&2 pycharm &
'';
};
};
enterTest = ''
'';
enterShell = ''
# Create a symlink to the Python virtual environment for IDE compatibility
if [ ! -L "$DEVENV_ROOT/venv" ]; then
ln -s "$DEVENV_STATE/venv/" "$DEVENV_ROOT/venv"
fi
'';
}
+20
View File
@@ -0,0 +1,20 @@
# yaml-language-server: $schema=https://devenv.sh/devenv.schema.json
inputs:
nixpkgs:
url: github:cachix/devenv-nixpkgs/rolling
# If you're using non-OSS software, you can set allow_unfree to true.
allow_unfree: true
# If you're not willing to allow unsupported packages:
# allow_unsupported_system: false
# If you're willing to use a package that's vulnerable
# permitted_insecure_packages:
# - "openssl-1.1.1w"
# If you have more than one devenv you can merge them
#imports:
# - ./backend
profile: "dev"
+56
View File
@@ -0,0 +1,56 @@
{ pkgs, python3 }:
let
version = "2.1.0";
pythonEnv = python3.withPackages (ps: [
ps.sphinx
]);
xapianCore = pkgs.stdenv.mkDerivation rec {
pname = "xapian-core";
inherit version;
src = pkgs.fetchurl {
url = "https://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz";
sha256 = "8e1259586d342e3d12b5e1f772e9185a10f2ba16e541566b5c3c239f71b8aacc";
};
nativeBuildInputs = [ pkgs.pkg-config ];
buildInputs = [ pkgs.zlib pkgs.util-linux ];
configureFlags = [ "--enable-shared" ];
};
xapianBindings = pkgs.stdenv.mkDerivation rec {
pname = "xapian-bindings";
inherit version;
src = pkgs.fetchurl {
url = "https://oligarchy.co.uk/xapian/${version}/xapian-bindings-${version}.tar.xz";
sha256 = "f52ec189f13b4fa66ea625a6eb94bb32dd651b9ec806be6a911dda54cbe3875c";
};
nativeBuildInputs = [ pkgs.pkg-config pythonEnv ];
buildInputs = [ xapianCore pythonEnv ];
# Create the output site-packages directory before configuring
preConfigure = ''
mkdir -p "$out/lib/python3.14/site-packages"
'';
# Tell Autotools exactly where to put the Python binding files
configureFlags = [
"--with-python3"
"XAPIAN_CONFIG=${xapianCore}/bin/xapian-config"
"PYTHON3_LIB=$(out)/lib/python3.14/site-packages"
];
installPhase = ''
make install
'';
};
in
{
inherit xapianCore xapianBindings;
}
+1
View File
@@ -136,6 +136,7 @@ INSTALLED_APPS = (
"antispam",
"timetable",
"api",
"stock",
)
MIDDLEWARE = (
+1
View File
@@ -55,6 +55,7 @@ urlpatterns = [
path("jsi18n/", JavaScriptCatalog.as_view(), name="javascript-catalog"),
path("captcha/", include("captcha.urls")),
path("edt/", include(("timetable.urls", "timetable"), namespace="timetable")),
path("stock/", include(("stock.urls", "stock"), namespace="stock")),
]
if settings.DEBUG:
View File
Whitespace-only changes.
+46
View File
@@ -0,0 +1,46 @@
from django.contrib import admin
from stock.models import Stock, StockAction, StockItem, StockItemAction, StockItemStock
@admin.register(Stock)
class StockAdmin(admin.ModelAdmin):
list_display = ("name", "club", "can_be_view_by_board", "created_at", "updated_at")
search_fields = ("name",)
autocomplete_fields = ("club",)
@admin.register(StockAction)
class StockActionAdmin(admin.ModelAdmin):
list_display = ("action", "comment", "user", "created_at")
search_fields = ("action",)
autocomplete_fields = ("user",)
@admin.register(StockItem)
class StockItemAdmin(admin.ModelAdmin):
list_display = (
"name",
"description",
"is_hidden",
"is_allow_negative",
"created_at",
)
search_fields = ("name",)
@admin.register(StockItemStock)
class StockItemStockAdmin(admin.ModelAdmin):
list_display = ("stock", "item", "quantity")
autocomplete_fields = ("stock", "item")
@admin.register(StockItemAction)
class StockItemActionAdmin(admin.ModelAdmin):
list_display = (
"action",
"item",
"quantity_before",
"quantity_after",
)
search_fields = ("item",)
View File
Whitespace-only changes.
+6
View File
@@ -0,0 +1,6 @@
from django.apps import AppConfig
class StockConfig(AppConfig):
default_auto_field = "django.db.models.BigAutoField"
name = "stock"
+203
View File
@@ -0,0 +1,203 @@
from __future__ import annotations
from typing import TYPE_CHECKING
from django import forms
from django.utils.translation import gettext_lazy as _
from core.views.widgets.ajax_select import (
AutoCompleteSelect,
)
from stock import models
from stock.widgets.ajax_select import StockItemSelect
if TYPE_CHECKING:
from club.models import Club
class StockForm(forms.ModelForm):
class Meta:
model = models.Stock
fields = ["name", "club"]
widgets = {"club": forms.HiddenInput}
def __init__(self, *args, club: Club, **kwargs):
instance = kwargs.get("instance")
if instance is not None:
instance.club = club
super().__init__(*args, **kwargs)
self.initial["club"] = club.pk
def clean(self):
self.instance.clean()
return super().clean()
class StockItemStockForm(forms.ModelForm):
name = forms.CharField(max_length=64, label=_("name"))
description = forms.CharField(
required=False, label=_("description"), widget=forms.Textarea
)
is_hidden = forms.BooleanField(
required=False,
label=_("is hidden"),
widget=forms.CheckboxInput(attrs={"class": "switch"}),
)
is_allow_negative = forms.BooleanField(
required=False,
label=_("can be negative"),
widget=forms.CheckboxInput(attrs={"class": "switch"}),
)
class Meta:
model = models.StockItemStock
fields = ["name", "description", "is_hidden", "is_allow_negative"]
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
if self.instance.pk:
for name in self.fields:
self.initial[name] = getattr(self.instance.item, name)
def save(self, commit=True): # noqa: FBT002
if self.instance.pk:
stock_item = self.instance.item
for name in ("name", "description", "is_hidden", "is_allow_negative"):
setattr(stock_item, name, self.cleaned_data[name])
if commit:
stock_item.save()
else:
stock_item, _ = models.StockItem.objects.get_or_create(
name=self.cleaned_data["name"],
defaults={
name: self.cleaned_data[name]
for name in ("description", "is_hidden", "is_allow_negative")
},
)
self.instance.item = stock_item
return super().save(commit=commit)
ItemLineForm = forms.inlineformset_factory(
models.Stock,
models.StockItemStock,
form=StockItemStockForm,
fields=["name", "description", "is_hidden", "is_allow_negative"],
widgets={
"is_hidden": forms.CheckboxInput(attrs={"class": "switch"}),
"is_allow_negative": forms.CheckboxInput(attrs={"class": "switch"}),
},
can_delete_extra=False,
can_delete=False,
min_num=1,
validate_min=True,
extra=0,
)
AUTHORIZED_OPERATION_TYPES = [
models.OperationType.Refuel,
models.OperationType.TransferTo,
models.OperationType.Overwrite,
]
HIDDEN_QUANTITY_ACTIONS = (
models.OperationType.Refuel,
models.OperationType.TransferTo,
)
class StockActionForm(forms.ModelForm):
class Meta:
model = models.StockAction
fields = ["comment", "action"]
widgets = {
"action": forms.Select,
}
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
# Alpine
self.fields["action"].choices = [
(operation_type.value, operation_type.label)
for operation_type in AUTHORIZED_OPERATION_TYPES
]
self.fields["action"].widget.attrs["x-model"] = "action"
StockItemActionFormSet = forms.inlineformset_factory(
models.StockAction,
models.StockItemAction,
fields=["quantity_after", "item"],
can_delete_extra=False,
can_delete=False,
min_num=1,
validate_min=True,
extra=0,
widgets={
"quantity_after": forms.NumberInput(
attrs={
"x-show": "!"
+ str([str(action.value) for action in HIDDEN_QUANTITY_ACTIONS])
+ ".includes(action)"
}
),
"item": StockItemSelect,
},
)
class RefuelMetadataForm(forms.ModelForm):
added_quantity = forms.DecimalField(
required=True,
min_value=0,
label=_("Quantity added"),
widget=forms.NumberInput(),
)
def get_initial_for_field(self, field, field_name):
if field_name == "added_quantity" and self.instance.pk:
return self.instance.added_quantity
return super().get_initial_for_field(field, field_name)
def clean(self):
cleaned = super().clean()
if cleaned.get("added_quantity") is not None:
self.instance.added_quantity = cleaned["added_quantity"]
return cleaned
class Meta:
model = models.StockRefuelMetadata
fields = ["unit_price"]
class TransferMetadataForm(forms.ModelForm):
transfer_quantity = forms.DecimalField(
required=True,
min_value=0,
label=_("Quantity transferred"),
widget=forms.NumberInput(),
)
def get_initial_for_field(self, field, field_name):
if field_name == "transfer_quantity" and self.instance.pk:
return self.instance.remove_quantity
return super().get_initial_for_field(field, field_name)
def clean(self):
cleaned = super().clean()
if cleaned.get("transfer_quantity") is not None:
self.instance.added_quantity = cleaned["transfer_quantity"]
return cleaned
class Meta:
model = models.StockTransferMetadata
fields = ["new_stock"]
widgets = {
"new_stock": AutoCompleteSelect,
}
METADATA_FORMS = {
models.OperationType.Refuel: RefuelMetadataForm,
models.OperationType.TransferTo: TransferMetadataForm,
}
+18
View File
@@ -0,0 +1,18 @@
from __future__ import annotations
from typing import TYPE_CHECKING
if TYPE_CHECKING:
from club.models import Club
from core.models import User
from stock.models import Stock
def can_be_edited_by(user: User, club: Club):
return user.groups.contains(club.stock_group) or user.is_root
def can_be_view_by(user: User, club: Club, stock: Stock):
return can_be_edited_by(user, club) or (
stock.can_be_view_by_board and user.is_in_group(pk=club.stock_group)
)
+105
View File
@@ -0,0 +1,105 @@
# Generated by Django 5.2.18 on 2026-11-09 06:57
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
initial = True
dependencies = [
('club', '0020_club_stock_group'),
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
]
operations = [
migrations.CreateModel(
name='Stock',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=64, verbose_name='name')),
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='created at')),
('updated_at', models.DateTimeField(auto_now_add=True, verbose_name='updated at')),
('can_be_view_by_board', models.BooleanField(default=False, verbose_name='can be view by board members')),
('club', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='club.club')),
],
),
migrations.CreateModel(
name='StockAction',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('action', models.IntegerField(choices=[(1, 'overwrite'), (2, 'refuel'), (3, 'transfer to'), (4, 'transfer from')], default=1, verbose_name='action type')),
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='created at')),
('comment', models.TextField(default='', verbose_name='comment')),
('user', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),
],
),
migrations.CreateModel(
name='StockItem',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=64, verbose_name='name')),
('description', models.TextField(default='', verbose_name='description')),
('created_at', models.DateTimeField(auto_now_add=True, verbose_name='created at')),
('is_hidden', models.BooleanField(default=False, verbose_name='is hidden')),
('is_allow_negative', models.BooleanField(default=False, verbose_name='can be negative')),
],
options={
'constraints': [models.UniqueConstraint(fields=('name',), name='unique_item_name')],
},
),
migrations.CreateModel(
name='StockItemStock',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('quantity', models.DecimalField(decimal_places=2, default=0, max_digits=15, verbose_name='quantity')),
('item', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='stock_links', to='stock.stockitem')),
('stock', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='item_links', to='stock.stock')),
],
),
migrations.CreateModel(
name='StockItemAction',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('quantity_before', models.DecimalField(decimal_places=2, default=0, max_digits=15, verbose_name='quantity before')),
('quantity_after', models.DecimalField(decimal_places=2, default=0, max_digits=15, verbose_name='quantity after')),
('action', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='stock.stockaction')),
('item', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='stock.stockitemstock')),
],
),
migrations.CreateModel(
name='StockRefuelMetadata',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('unit_price', models.DecimalField(decimal_places=2, max_digits=20, verbose_name='unit price')),
('item_action', models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, related_name='%(class)s_metadata', to='stock.stockitemaction')),
],
),
migrations.CreateModel(
name='StockTransferMetadata',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('item_action', models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, related_name='%(class)s_metadata', to='stock.stockitemaction')),
('new_stock', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='incoming_transfers', to='stock.stock')),
('old_stock', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='outgoing_transfers', to='stock.stock')),
('other_item_action', models.OneToOneField(on_delete=django.db.models.deletion.PROTECT, related_name='transfer_other_item_metadata', to='stock.stockitemaction')),
],
options={
'abstract': False,
},
),
migrations.AddConstraint(
model_name='stock',
constraint=models.UniqueConstraint(fields=('name', 'club'), name='unique_name_club', violation_error_message='errere'),
),
migrations.AddConstraint(
model_name='stockitemstock',
constraint=models.UniqueConstraint(fields=('item', 'stock'), name='unique_item_stock'),
),
migrations.AddConstraint(
model_name='stockrefuelmetadata',
constraint=models.CheckConstraint(condition=models.Q(('unit_price__gt', 0)), name='unit_price_gt_0'),
),
]
View File
Whitespace-only changes.
+211
View File
@@ -0,0 +1,211 @@
from django.db import models
from django.utils.translation import gettext_lazy as _
from club.models import Club
from core.models import User
class OperationType(models.IntegerChoices):
Overwrite = 1, _("overwrite")
Refuel = 2, _("refuel")
TransferTo = 3, _("transfer to")
TransferFrom = 4, _("transfer from")
class Stock(models.Model):
name = models.CharField(_("name"), max_length=64)
created_at = models.DateTimeField(_("created at"), auto_now_add=True)
updated_at = models.DateTimeField(_("updated at"), auto_now_add=True)
club = models.ForeignKey(Club, on_delete=models.PROTECT)
can_be_view_by_board = models.BooleanField(
_("can be view by board members"), default=False
)
class Meta:
constraints = [
models.UniqueConstraint(
fields=["name", "club"],
name="unique_name_club",
violation_error_message="errere",
)
]
def __str__(self):
return self.name
class StockAction(models.Model):
action = models.IntegerField(
_("action type"), choices=OperationType, default=OperationType.Overwrite
)
created_at = models.DateTimeField(_("created at"), auto_now_add=True)
comment = models.TextField(_("comment"), default="")
user = models.ForeignKey(User, on_delete=models.PROTECT)
def __str__(self):
return str(OperationType(self.action).label)
class StockItem(models.Model):
name = models.CharField(_("name"), max_length=64)
description = models.TextField(_("description"), default="")
created_at = models.DateTimeField(_("created at"), auto_now_add=True)
is_hidden = models.BooleanField(_("is hidden"), default=False)
is_allow_negative = models.BooleanField(_("can be negative"), default=False)
class Meta:
constraints = [
models.UniqueConstraint(fields=["name"], name="unique_item_name")
]
def __str__(self):
return self.name
class StockItemStock(models.Model):
item = models.ForeignKey(
StockItem, on_delete=models.PROTECT, related_name="stock_links"
)
stock = models.ForeignKey(
Stock, on_delete=models.PROTECT, related_name="item_links"
)
quantity = models.DecimalField(
_("quantity"), max_digits=15, decimal_places=2, default=0
)
class Meta:
constraints = [
models.UniqueConstraint(fields=["item", "stock"], name="unique_item_stock")
]
def __str__(self):
return self.item.name
@property
def name(self):
return self.item.name
@property
def description(self):
return self.item.description
@property
def is_hidden(self):
return self.item.is_hidden
@property
def is_allow_negative(self):
return self.item.is_allow_negative
@property
def last_known_quantity(self):
return self.quantity
class StockItemAction(models.Model):
quantity_before = models.DecimalField(
_("quantity before"), max_digits=15, decimal_places=2, default=0
)
quantity_after = models.DecimalField(
_("quantity after"), max_digits=15, decimal_places=2, default=0
)
action = models.ForeignKey(StockAction, on_delete=models.PROTECT)
item = models.ForeignKey(StockItemStock, on_delete=models.PROTECT)
def __str__(self):
return str(self.quantity_after - self.quantity_before)
class LinkedModel(models.Model):
class Meta:
abstract = True
def link(self, **ids):
for name, pk in ids.items():
field = self._meta.get_field(name)
if not (field.many_to_one or field.one_to_one) or not field.concrete:
raise ValueError(f"{name} is not a forward FK/OneToOne")
setattr(self, field.attname, pk)
class StockItemActionMetadataBase(LinkedModel):
item_action = models.OneToOneField(
StockItemAction,
on_delete=models.PROTECT,
related_name="%(class)s_metadata",
)
class Meta:
abstract = True
def set_relations(self, item_action_pk, **ids):
self.item_action_id = item_action_pk
return super().link(**ids)
class StockRefuelMetadata(StockItemActionMetadataBase):
unit_price = models.DecimalField(_("unit price"), max_digits=20, decimal_places=2)
class Meta:
constraints = [
models.CheckConstraint(
condition=models.Q(unit_price__gt=0), name="unit_price_gt_0"
)
]
def __str__(self):
return _("refuel with unit price %s") % self.unit_price
@property
def added_quantity(self):
if hasattr(self, "_added_quantity"):
return self._added_quantity
return self.item_action.quantity_after - self.item_action.quantity_before
@added_quantity.setter
def added_quantity(self, value):
self._added_quantity = value
@added_quantity.deleter
def added_quantity(self):
self.__dict__.pop("_added_quantity", None)
class StockTransferMetadata(StockItemActionMetadataBase):
old_stock = models.ForeignKey(
Stock, related_name="outgoing_transfers", on_delete=models.PROTECT
)
new_stock = models.ForeignKey(
Stock, related_name="incoming_transfers", on_delete=models.PROTECT
)
other_item_action = models.OneToOneField(
StockItemAction,
on_delete=models.PROTECT,
related_name="transfer_other_item_metadata",
)
def __str__(self):
return _("transfer %s to stock of id %s") % (
self.transfer_quantity,
self.new_stock_id,
)
@property
def added_quantity(self):
if hasattr(self, "_added_quantity"):
return self._added_quantity
return self.item_action.quantity_before - self.item_action.quantity_after
@added_quantity.setter
def added_quantity(self, value):
self._added_quantity = value
@added_quantity.deleter
def added_quantity(self):
self.__dict__.pop("_added_quantity", None)
@property
def remove_quantity(self):
if hasattr(self, "_added_quantity"):
return self._added_quantity
return self.item_action.quantity_before - self.item_action.quantity_after
+102
View File
@@ -0,0 +1,102 @@
{% extends "core/base.jinja" %}
{% macro field_row(field) %}
<div
{% if field.name == "item" %}
x-data="{ existingQuantity: null }"
x-init="existingQuantity = $el.querySelector('select')?.selectedOptions[0]?.dataset.quantity ?? null"
@change="existingQuantity = $event.target.selectedOptions[0]?.dataset.quantity ?? null"
{% endif %}
{% if field.field.widget.attrs.get("x-show") %} x-show="{{ field.field.widget.attrs.get("x-show") }}"{% endif %}
>
{{ field.label_tag() }} {{ field }} {{ field.errors }}
{% if field.name == "item" %}
<div x-show="existingQuantity !== null">
Quantité actuelle :
<span x-text="existingQuantity"></span>
</div>
{% endif %}
</div>
{% endmacro %}
{% macro action_row(f) %}
<div class="action-row">
{% for h in f.hidden_fields() %}{{ h }}{% endfor %}
{{ f.non_field_errors() }}
{% for field in f.visible_fields() %}
{{ field_row(field) }}
{% endfor %}
{% for b in f.blocks %}
<fieldset x-cloak
x-show="action === '{{ b.action }}'"
:disabled="action !== '{{ b.action }}'">
<legend>{{ b.label }}</legend>
{{ b.form.non_field_errors() }}
{% for h in b.form.hidden_fields() %}{{ h }}{% endfor %}
{% for field in b.form.visible_fields() %}
{{ field_row(field) }}
{% endfor %}
</fieldset>
{% endfor %}
</div>
{% endmacro %}
{% block script %}
<script>
document.addEventListener("alpine:init", () => {
Alpine.data("rows", (prefix, base) => ({
prefix, base, added: [],
get total() { return this.base + this.added.length },
add() { this.added.push(this.base + this.added.length) },
html(i) {
return this.$refs.tpl.innerHTML.replaceAll(
`${this.prefix}-__prefix__`, `${this.prefix}-${i}`)
},
}))
})
</script>
{% endblock %}
{% block content %}
{% set action_value = form["action"].value() %}
<form method="post" enctype="multipart/form-data"
x-data="{ action: '{{ action_value if action_value is not none else '' }}' }">
{% csrf_token %}
{{ form.non_field_errors() }}
{% for field in form.visible_fields() %}
{{ field_row(field) }}
{% endfor %}
<div x-data="rows('{{ formset.prefix }}', {{ formset.total_form_count() }})">
<input type="hidden" name="{{ formset.prefix }}-TOTAL_FORMS" :value="total">
{{ formset.management_form["INITIAL_FORMS"] }}
{{ formset.management_form["MIN_NUM_FORMS"] }}
{{ formset.management_form["MAX_NUM_FORMS"] }}
{{ formset.non_form_errors() }}
{% for f in formset %}
{{ action_row(f) }}
{% endfor %}
<template x-for="i in added" :key="i">
<div x-html="html(i)"></div>
</template>
<template x-ref="tpl">
{{ action_row(empty_form) }}
</template>
<button type="button" @click="add()">{% trans %}Ajouter{% endtrans %}</button>
</div>
<button type="submit">{% trans %}Save{% endtrans %}</button>
</form>
{% endblock %}
+12
View File
@@ -0,0 +1,12 @@
{% extends "core/base.jinja" %}
{% block title %}{% trans %}Create stock{% endtrans %}{% endblock %}
{% block content %}
<h2>{% trans %}Create stock{% endtrans %}</h2>
<form method="post" action="">
{% csrf_token %}
{{ form.as_p() }}
<button type="submit">{% trans %}Save{% endtrans %}</button>
</form>
{% endblock %}
+12
View File
@@ -0,0 +1,12 @@
{% extends "core/base.jinja" %}
{% block title %}{% trans %}Edit stock{% endtrans %}{% endblock %}
{% block content %}
<h2>{% trans %}Edit stock{% endtrans %}</h2>
<form method="post">
{% csrf_token %}
{{ form.as_p() }}
<button type="submit">{% trans %}Save{% endtrans %}</button>
</form>
{% endblock %}
+38
View File
@@ -0,0 +1,38 @@
{% extends "core/base.jinja" %}
{% block title %}
{% trans %}Stock{% endtrans %}
{% endblock %}
{% block content %}
<h2>{% trans %}Stock{% endtrans %}</h2>
{% if is_editor %}
<p>
<a href="{{ url('stock:create', club_id=club.id) }}">
{% trans %}Create a stock{% endtrans %}
</a>
</p>
{% endif %}
{% if stocks %}
<ul>
{% for stock in stocks %}
{% if stock.can_be_view_by_board or is_editor %}
<li>
<a href="{{ url('stock:items_list', club_id=club.id, stock_id=stock.id) }}">
{{ stock.name }}
</a>
{% if is_editor %}
<a href="{{ url('stock:edit', club_id=club.id, stock_id=stock.id) }}">
{% trans %}Edit{% endtrans %}
</a>
{% endif %}
{% endif %}
</li>
{% endfor %}
</ul>
{% else %}
<p>{% trans %}No stock has been created yet.{% endtrans %}</p>
{% endif %}
{% endblock %}
+12
View File
@@ -0,0 +1,12 @@
{% extends "core/base.jinja" %}
{% block title %}{% trans %}Edit stock item{% endtrans %}{% endblock %}
{% block content %}
<h2>{% trans %}Edit stock item{% endtrans %}</h2>
<form method="post">
{% csrf_token %}
{{ form.as_p() }}
<button type="submit">{% trans %}Save{% endtrans %}</button>
</form>
{% endblock %}
+33
View File
@@ -0,0 +1,33 @@
{% extends "core/base.jinja" %}
{% block additional_js %}
<script type="module" src="{{ static("bundled/core/dynamic-formset-index.ts") }}"></script>
{% endblock %}
{% block title %}{% trans %}Create stock item{% endtrans %}{% endblock %}
{% block content %}
<h2>{% trans %}Create stock item{% endtrans %}</h2>
<form method="post" x-data="dynamicFormSet({ prefix: '{{ formset.prefix }}' })">
{% csrf_token %}
{{ formset.management_form }}
<div x-ref="formContainer">
{% for item_form in formset.forms %}
<fieldset>
<legend>{% trans %}Item{% endtrans %}</legend>
{{ item_form.as_p() }}
</fieldset>
{% endfor %}
</div>
<template x-ref="formTemplate">
<fieldset>
<legend>{% trans %}Item{% endtrans %}</legend>
{{ formset.empty_form.as_p() }}
</fieldset>
</template>
<button type="button" class="btn btn-grey" @click.prevent="addForm()">
<i class="fa fa-plus"></i> {% trans %}Add an item{% endtrans %}
</button>
<button type="submit">{% trans %}Save{% endtrans %}</button>
</form>
{% endblock %}
+34
View File
@@ -0,0 +1,34 @@
{% extends "core/base.jinja" %}
{% block title %}{% trans %}Stock items{% endtrans %}{% endblock %}
{% block content %}
<h3>{% trans %}Items in {% endtrans %}{{ stock.name }}</h3>
{% if is_editor %}
<a href="{{ url('stock:items_create', club_id=club.id, stock_id=stock.id) }}">
{% trans %}Create items{% endtrans %}
</a>
<a href="{{ url('stock:action_create', club_id=club.id, stock_id=stock.id) }}">
{% trans %}Create action{% endtrans %}
</a>
{% endif %}
{% if items %}
{% for item in items %}
<div>
<div>
<p>{{ item.name }}</p>
<p>{% trans %}Last known quantity: {% endtrans %}{{ item.last_known_quantity }}</p>
</div>
<div>
{% if is_editor %}
<a href="{{ url('stock:item_edit', club_id=club.id, stock_id=stock.id, item_id=item.id) }}">
{% trans %}Edit{% endtrans %}
</a>
{% endif %}
</div>
</div>
{% endfor %}
{% else %}
<p>{% trans %}No item has been created yet.{% endtrans %}</p>
{% endif %}
{% endblock %}
+1
View File
@@ -0,0 +1 @@
# Create your tests here.
+39
View File
@@ -0,0 +1,39 @@
from django.urls import path
from stock.views.core import (
StockCreateView,
StockHomeView,
StockUpdateView,
)
from stock.views.items import (
ItemActionCreateView,
ItemCreateView,
ItemListView,
ItemUpdateView,
)
urlpatterns = [
path("<int:club_id>/create/", StockCreateView.as_view(), name="create"),
path("<int:club_id>/edit/<int:stock_id>", StockUpdateView.as_view(), name="edit"),
path("<int:club_id>/home/", StockHomeView.as_view(), name="home"),
path(
"<int:club_id>/stock/<int:stock_id>/items/create/",
ItemCreateView.as_view(),
name="items_create",
),
path(
"<int:club_id>/stock/<int:stock_id>/items/",
ItemListView.as_view(),
name="items_list",
),
path(
"<int:club_id>/stock/<int:stock_id>/items/<int:item_id>/edit/",
ItemUpdateView.as_view(),
name="item_edit",
),
path(
"<int:club_id>/stock/<int:stock_id>/actions/create",
ItemActionCreateView.as_view(),
name="action_create",
),
]
View File
Whitespace-only changes.
+83
View File
@@ -0,0 +1,83 @@
from django.contrib.auth.mixins import UserPassesTestMixin
from django.contrib.messages.views import SuccessMessageMixin
from django.shortcuts import get_object_or_404
from django.urls import reverse
from django.utils.translation import gettext_lazy as _
from django.views.generic import TemplateView
from django.views.generic.edit import CreateView, UpdateView
from club.models import Club
from stock.forms import StockForm
from stock.heper import can_be_edited_by
from stock.models import Stock
class StockHomeView(UserPassesTestMixin, TemplateView):
pk_url_kwarg = "club_id"
template_name = "stock/home.jinja"
def dispatch(self, request, *args, **kwargs):
self.club = get_object_or_404(Club, pk=self.kwargs.get(self.pk_url_kwarg))
self.is_editor = can_be_edited_by(self.request.user, self.club)
return super().dispatch(request, *args, **kwargs)
def test_func(self):
return (
self.club in self.request.user.clubs_with_rights
or self.request.user.is_root
)
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context["club"] = self.club
context["stocks"] = Stock.objects.filter(club=self.club)
context["is_editor"] = self.is_editor
return context
class StockCreateView(UserPassesTestMixin, SuccessMessageMixin, CreateView):
model = Stock
form_class = StockForm
template_name = "stock/create.jinja"
def dispatch(self, request, *args, **kwargs):
self.club = get_object_or_404(Club, pk=kwargs["club_id"])
return super().dispatch(request, *args, **kwargs)
def test_func(self):
return can_be_edited_by(self.request.user, self.club)
def get_form_kwargs(self):
return super().get_form_kwargs() | {"club": self.club}
def get_success_url(self):
return reverse("stock:home", kwargs={"club_id": self.club.id})
def get_success_message(self, cleaned_data):
return cleaned_data["name"] + _(" created.")
class StockUpdateView(UserPassesTestMixin, SuccessMessageMixin, UpdateView):
model = Stock
form_class = StockForm
pk_url_kwarg = "stock_id"
template_name = "stock/edit.jinja"
def dispatch(self, request, *args, **kwargs):
self.club = get_object_or_404(Club, pk=kwargs["club_id"])
return super().dispatch(request, *args, **kwargs)
def test_func(self):
return can_be_edited_by(self.request.user, self.club)
def get_queryset(self):
return Stock.objects.filter(club=self.club)
def get_form_kwargs(self):
return super().get_form_kwargs() | {"club": self.club}
def get_success_url(self):
return reverse("stock:home", kwargs={"club_id": self.club.id})
def get_success_message(self, cleaned_data):
return cleaned_data["name"] + _(" edited.")
+414
View File
@@ -0,0 +1,414 @@
from csv import Error
from django import forms
from django.contrib.auth.mixins import UserPassesTestMixin
from django.contrib.messages.views import SuccessMessageMixin
from django.db import transaction
from django.http import HttpResponseRedirect
from django.shortcuts import get_object_or_404
from django.urls import reverse
from django.utils.translation import gettext_lazy as _
from django.views.generic import ListView
from django.views.generic.edit import CreateView, FormView, UpdateView
from club.models import Club
from stock.forms import (
METADATA_FORMS,
ItemLineForm,
StockActionForm,
StockItemActionFormSet,
StockItemStockForm,
)
from stock.heper import can_be_edited_by, can_be_view_by
from stock.models import (
OperationType,
Stock,
StockAction,
StockItemAction,
StockItemStock,
)
class ItemListView(UserPassesTestMixin, ListView):
model = StockItemStock
template_name = "stock/items_list.jinja"
context_object_name = "items"
def dispatch(self, request, *args, **kwargs):
self.club = get_object_or_404(Club, pk=kwargs["club_id"])
self.stock = get_object_or_404(Stock, pk=kwargs["stock_id"], club=self.club)
self.is_editor = can_be_edited_by(self.request.user, self.club)
return super().dispatch(request, *args, **kwargs)
def test_func(self):
return can_be_view_by(self.request.user, self.club, self.stock)
def get_queryset(self):
return (
StockItemStock.objects.filter(stock=self.stock)
.select_related("item")
.order_by("item__name")
)
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs) | {
"club": self.club,
"stock": self.stock,
"is_editor": self.is_editor,
}
return context
class ItemCreateView(UserPassesTestMixin, SuccessMessageMixin, FormView):
form_class = ItemLineForm
template_name = "stock/items_create.jinja"
success_message = _("Item(s) created.")
def dispatch(self, request, *args, **kwargs):
self.club = get_object_or_404(Club, pk=kwargs["club_id"])
self.stock = get_object_or_404(Stock, pk=kwargs["stock_id"], club=self.club)
return super().dispatch(request, *args, **kwargs)
def test_func(self):
return can_be_edited_by(self.request.user, self.club)
def get_form_kwargs(self):
return super().get_form_kwargs() | {
"instance": self.stock,
"queryset": StockItemStock.objects.none(),
}
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context.update(
{
"club": self.club,
"stock": self.stock,
"formset": context["form"],
}
)
return context
def form_valid(self, form):
form.save()
return super().form_valid(form)
def get_success_url(self):
return reverse(
"stock:items_list",
kwargs={"club_id": self.club.id, "stock_id": self.stock.id},
)
class ItemUpdateView(UserPassesTestMixin, SuccessMessageMixin, UpdateView):
model = StockItemStock
form_class = StockItemStockForm
pk_url_kwarg = "item_id"
template_name = "stock/item_edit.jinja"
def dispatch(self, request, *args, **kwargs):
self.club = get_object_or_404(Club, pk=kwargs["club_id"])
self.stock = get_object_or_404(Stock, pk=kwargs["stock_id"], club=self.club)
return super().dispatch(request, *args, **kwargs)
def test_func(self):
return can_be_edited_by(self.request.user, self.club)
def get_queryset(self):
return StockItemStock.objects.filter(stock=self.stock).select_related("item")
def get_success_url(self):
return reverse(
"stock:items_list",
kwargs={"club_id": self.club.id, "stock_id": self.stock.id},
)
def get_success_message(self, cleaned_data):
return cleaned_data["name"] + _(" edited.")
def update_quantities(stock_items, item_actions, metadata_entries, operation_type):
match operation_type:
case OperationType.TransferFrom | OperationType.Refuel:
for item_action, metadata_entry in zip(
item_actions, metadata_entries, strict=True
):
item = stock_items[item_action.item_id]
item_action.quantity_before = item.quantity
item_action.quantity_after = (
item_action.quantity_before + metadata_entry.added_quantity
)
item.quantity = item_action.quantity_after
case _:
for item_action in item_actions:
item = stock_items[item_action.item_id]
item_action.quantity_before = item.quantity
item.quantity = item_action.quantity_after
def apply_transfer(stock_items, item_actions, metadata_entries, user, source_stock):
destinations = {}
for item_action, metadata_entry in zip(
item_actions, metadata_entries, strict=True
):
key = (item_action.item.item_id, metadata_entry.new_stock_id)
if key not in destinations:
destinations[key], _created = (
StockItemStock.objects.select_for_update().get_or_create(
item_id=key[0],
stock_id=key[1],
defaults={"quantity": 0},
)
)
destination_stock_action = StockAction(
action=OperationType.TransferFrom,
comment=_("Transferred from stock %s") % source_stock.name,
user=user,
)
destination_item_actions = []
for item_action, metadata_entry in zip(
item_actions, metadata_entries, strict=True
):
source_item = stock_items[item_action.item_id]
destination = destinations[(source_item.item_id, metadata_entry.new_stock_id)]
quantity = metadata_entry.remove_quantity
if source_item.quantity - quantity < 0:
raise forms.ValidationError(
_("The new quantity cannot be less than zero for item %s.")
% source_item.name,
code="lesser_than_zero",
)
item_action.quantity_before = source_item.quantity
source_item.quantity -= quantity
item_action.quantity_after = source_item.quantity
destination_item_actions.append(
StockItemAction(
action=destination_stock_action,
item=destination,
quantity_before=destination.quantity,
quantity_after=destination.quantity + quantity,
)
)
destination.quantity += quantity
metadata_entry.other_item_action = destination_item_actions[-1]
return destination_stock_action, list(destinations.values()), destination_item_actions
class ItemActionCreateView(UserPassesTestMixin, SuccessMessageMixin, CreateView):
model = StockAction
form_class = StockActionForm
template_name = "stock/action_form.jinja"
metadata_required = True
success_message = _("Action complete")
def test_func(self):
return can_be_edited_by(self.request.user, self.club)
def posted_operation_type(self):
try:
return int(self.request.POST.get("action"))
except (TypeError, ValueError):
return None
def attach_metadata_forms(self, form, active_operation_type=None):
form.blocks = []
for operation_type, metadata_form_class in METADATA_FORMS.items():
kwargs = {
"prefix": f"{form.prefix}-{operation_type.name.lower()}",
"empty_permitted": not self.metadata_required,
}
if active_operation_type == operation_type.value:
kwargs.update(data=self.request.POST, files=self.request.FILES)
metadata_form = metadata_form_class(**kwargs)
if operation_type == OperationType.TransferTo:
metadata_form.fields["new_stock"].queryset = Stock.objects.filter(
club=self.club
).exclude(pk=self.stock.pk)
form.blocks.append(
{
"action": operation_type.value,
"label": operation_type.label,
"form": metadata_form,
}
)
return form
def build_formset(self, instance=None, *, bound=False, active_operation_type=None):
kwargs = {"instance": instance, "prefix": "item_action"}
if bound:
kwargs.update(data=self.request.POST, files=self.request.FILES)
formset = StockItemActionFormSet(**kwargs)
item_queryset = (
StockItemStock.objects.filter(stock=self.stock)
.select_related("item")
.order_by("item__name")
)
for item_action_form in (*formset.forms, formset.empty_form):
item_action_form.fields["item"].queryset = item_queryset
self.attach_metadata_forms(
item_action_form, active_operation_type if bound else None
)
return formset
def live_forms(self, formset):
return [
f
for f in formset.forms
if f not in formset.deleted_forms and f.has_changed()
]
def active_metadata_form(self, item_action_form, operation_type):
return next(
(
block["form"]
for block in item_action_form.blocks
if block["action"] == operation_type
),
None,
)
def render_form(self, form, formset):
empty = self.attach_metadata_forms(formset.empty_form)
return self.render_to_response(
self.get_context_data(form=form, formset=formset, empty_form=empty)
)
def get_context_data(self, **kwargs):
ctx = super().get_context_data(**kwargs)
if "formset" not in ctx:
ctx["formset"] = self.build_formset()
ctx["empty_form"] = self.attach_metadata_forms(ctx["formset"].empty_form)
return ctx
def form_valid(self, form):
self.object = form.save(commit=False)
operation_type = self.object.action
formset = self.build_formset(
self.object,
bound=True,
active_operation_type=operation_type,
)
ok = formset.is_valid()
if ok:
for item_action_form in self.live_forms(formset):
metadata_form = self.active_metadata_form(
item_action_form, operation_type
)
if metadata_form is not None:
ok = metadata_form.is_valid() and ok
if ok:
stock_actions, item_actions, metadata_entries = self.serialize_forms(
form, formset, operation_type
)
with transaction.atomic():
stock_items = (
StockItemStock.objects.select_for_update()
.select_related("item")
.in_bulk(item_action.item_id for item_action in item_actions)
)
for item_action in item_actions:
item_action.item = stock_items[item_action.item_id]
try:
if operation_type == OperationType.TransferTo:
(
destination_stock_action,
destination_stock_items,
destination_item_actions,
) = apply_transfer(
stock_items,
item_actions,
metadata_entries,
user=stock_actions[0].user,
source_stock=self.stock,
)
stock_actions.append(destination_stock_action)
item_actions.extend(destination_item_actions)
stock_items.update(
{item.pk: item for item in destination_stock_items}
)
else:
update_quantities(
stock_items, item_actions, metadata_entries, operation_type
)
except forms.ValidationError as error:
error.message = error.message + _(
" Check if the quantity has not changed."
)
form.add_error(None, error)
transaction.set_rollback(True)
return self.render_form(form, formset)
self.save_all(
list(stock_items.values()),
stock_actions,
item_actions,
metadata_entries,
)
return HttpResponseRedirect(self.get_success_url())
return self.render_form(form, formset)
def form_invalid(self, form):
formset = self.build_formset(
form.instance,
bound=True,
active_operation_type=self.posted_operation_type(),
)
return self.render_form(form, formset)
def save_all(self, stock_items, stock_actions, item_actions, metadata_entries):
# MariaDB dosen't populate IDs after bulk_create, But we dont use it
StockAction.objects.bulk_create(stock_actions, batch_size=1000)
StockItemAction.objects.bulk_create(item_actions, batch_size=1000)
if metadata_entries:
type(metadata_entries[0]).objects.bulk_create(
metadata_entries, batch_size=1000
)
StockItemStock.objects.bulk_update(stock_items, ["quantity"], batch_size=1000)
def serialize_forms(self, form, formset, operation_type):
stock_action = form.save(commit=False)
stock_action.user = self.request.user
item_action_forms = self.live_forms(formset)
item_actions = [
item_action_form.save(commit=False)
for item_action_form in item_action_forms
]
for _item_action_form, item_action in zip(
item_action_forms, item_actions, strict=True
):
item_action.action = stock_action
metadata_entries = []
for item_action_form, item_action in zip(
item_action_forms, item_actions, strict=True
):
metadata_form = self.active_metadata_form(item_action_form, operation_type)
if metadata_form is None or (
not self.metadata_required and not metadata_form.has_changed()
):
continue
metadata_entry = metadata_form.save(commit=False)
metadata_entry.item_action = item_action
if operation_type == OperationType.TransferTo:
metadata_entry.old_stock = self.stock
metadata_entries.append(metadata_entry)
return [stock_action], item_actions, metadata_entries
def dispatch(self, request, *args, **kwargs):
self.club = get_object_or_404(Club, pk=kwargs["club_id"])
self.stock = get_object_or_404(Stock, pk=kwargs["stock_id"], club=self.club)
return super().dispatch(request, *args, **kwargs)
def get_success_url(self):
return reverse(
"stock:items_list",
kwargs={"club_id": self.club.id, "stock_id": self.stock.id},
)
View File
Whitespace-only changes.
+21
View File
@@ -0,0 +1,21 @@
from core.views.widgets.ajax_select import AutoCompleteSelect
class StockItemSelect(AutoCompleteSelect):
def get_context(self, name, value, attrs):
self._quantities = {
str(item.pk): item.quantity
for item in self.choices.queryset.only("pk", "quantity", "item__name")
}
return super().get_context(name, value, attrs)
def create_option(
self, name, value, label, selected, index, subindex=None, attrs=None
):
option = super().create_option(
name, value, label, selected, index, subindex=subindex, attrs=attrs
)
quantity = self._quantities.get(str(value))
if quantity is not None:
option["attrs"]["data-quantity"] = str(quantity)
return option
@@ -0,0 +1,23 @@
# Generated by Django 5.2.18 on 2026-11-09 01:33
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
("timetable", "0001_initial"),
]
operations = [
migrations.AlterField(
model_name="timetableslot",
name="week_group",
field=models.CharField(
blank=True,
choices=[("A", "A"), ("B", "B"), ("", "Both")],
default="",
max_length=1,
verbose_name="week group",
),
),
]
Symlink
+1
View File
@@ -0,0 +1 @@
/home/matt/Code/sith/.devenv/profiles/dev/state/venv/