From f6b75b30230a7f5f85b48536eba5b4a8fe5d00fe Mon Sep 17 00:00:00 2001 From: MatthieuHR Date: Mon, 9 Nov 2026 11:34:26 +0000 Subject: [PATCH] Random UI --- stock/migrations/0001_initial.py | 306 +++++++++++++++++++---- stock/static/stock/css/forms.scss | 3 + stock/templates/stock/action_form.jinja | 24 +- stock/templates/stock/create.jinja | 8 +- stock/templates/stock/edit.jinja | 8 +- stock/templates/stock/home.jinja | 10 +- stock/templates/stock/item_edit.jinja | 8 +- stock/templates/stock/items_create.jinja | 21 +- stock/templates/stock/items_list.jinja | 34 +-- stock/views/items.py | 18 +- 10 files changed, 337 insertions(+), 103 deletions(-) create mode 100644 stock/static/stock/css/forms.scss diff --git a/stock/migrations/0001_initial.py b/stock/migrations/0001_initial.py index bcfc3512..2cb5e4c5 100644 --- a/stock/migrations/0001_initial.py +++ b/stock/migrations/0001_initial.py @@ -6,100 +6,304 @@ from django.db import migrations, models class Migration(migrations.Migration): - initial = True dependencies = [ - ('club', '0020_club_stock_group'), + ("club", "0020_club_stock_group"), migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ migrations.CreateModel( - name='Stock', + 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')), + ( + "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', + 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)), + ( + "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', + 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')), + ( + "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')], + "constraints": [ + models.UniqueConstraint(fields=("name",), name="unique_item_name") + ], }, ), migrations.CreateModel( - name='StockItemStock', + 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')), + ( + "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', + 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')), + ( + "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', + 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')), + ( + "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', + 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')), + ( + "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, + "abstract": False, }, ), migrations.AddConstraint( - model_name='stock', - constraint=models.UniqueConstraint(fields=('name', 'club'), name='unique_name_club', violation_error_message='errere'), + 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'), + 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'), + model_name="stockrefuelmetadata", + constraint=models.CheckConstraint( + condition=models.Q(("unit_price__gt", 0)), name="unit_price_gt_0" + ), ), ] diff --git a/stock/static/stock/css/forms.scss b/stock/static/stock/css/forms.scss new file mode 100644 index 00000000..fd84b4c8 --- /dev/null +++ b/stock/static/stock/css/forms.scss @@ -0,0 +1,3 @@ +.stock-form label { + text-transform: capitalize; +} diff --git a/stock/templates/stock/action_form.jinja b/stock/templates/stock/action_form.jinja index 7cf186c6..4bad4599 100644 --- a/stock/templates/stock/action_form.jinja +++ b/stock/templates/stock/action_form.jinja @@ -1,18 +1,22 @@ {% extends "core/base.jinja" %} +{% block additional_css %} + +{% endblock %} + {% macro field_row(field) %} -
{{ field.label_tag() }} {{ field }} {{ field.errors }} {% if field.name == "item" %}
- Quantité actuelle : + {% trans %}Current quantity:{% endtrans %}
{% endif %} @@ -79,7 +83,7 @@ {% set action_value = form["action"].value() %} -
{% csrf_token %} {{ form.non_field_errors() }} @@ -113,7 +117,7 @@ {{ action_row(empty_form) }} -
+
+

{% endblock %} \ No newline at end of file diff --git a/stock/templates/stock/edit.jinja b/stock/templates/stock/edit.jinja index beb8d5ee..db4fa33b 100644 --- a/stock/templates/stock/edit.jinja +++ b/stock/templates/stock/edit.jinja @@ -1,12 +1,16 @@ {% extends "core/base.jinja" %} +{% block additional_css %} + +{% endblock %} + {% block title %}{% trans %}Edit stock{% endtrans %}{% endblock %} {% block content %}

{% trans %}Edit stock{% endtrans %}

-
+ {% csrf_token %} {{ form.as_p() }} - +

{% endblock %} \ No newline at end of file diff --git a/stock/templates/stock/home.jinja b/stock/templates/stock/home.jinja index 4274c618..b5821582 100644 --- a/stock/templates/stock/home.jinja +++ b/stock/templates/stock/home.jinja @@ -5,12 +5,13 @@ {% endblock %} {% block content %} -

{% trans %}Stock{% endtrans %}

+

{% trans %}Stock{% endtrans %}

{% if is_editor %} -

- +

+ {% trans %}Create a stock{% endtrans %} +

{% endif %} @@ -24,12 +25,13 @@ {{ stock.name }} {% if is_editor %} + - {% trans %}Edit{% endtrans %} {% endif %} + {% endif %} - {% endfor %} {% else %} diff --git a/stock/templates/stock/item_edit.jinja b/stock/templates/stock/item_edit.jinja index ad220ced..1f67198b 100644 --- a/stock/templates/stock/item_edit.jinja +++ b/stock/templates/stock/item_edit.jinja @@ -1,12 +1,16 @@ {% extends "core/base.jinja" %} +{% block additional_css %} + +{% endblock %} + {% block title %}{% trans %}Edit stock item{% endtrans %}{% endblock %} {% block content %}

{% trans %}Edit stock item{% endtrans %}

-
+ {% csrf_token %} {{ form.as_p() }} - +

{% endblock %} \ No newline at end of file diff --git a/stock/templates/stock/items_create.jinja b/stock/templates/stock/items_create.jinja index 1d71b18c..900a0073 100644 --- a/stock/templates/stock/items_create.jinja +++ b/stock/templates/stock/items_create.jinja @@ -1,5 +1,9 @@ {% extends "core/base.jinja" %} +{% block additional_css %} + +{% endblock %} + {% block additional_js %} {% endblock %} @@ -8,7 +12,8 @@ {% block content %}

{% trans %}Create stock items in{% endtrans %}{{ stock.name }}

-
+ {% csrf_token %} {{ formset.management_form }}
@@ -18,7 +23,7 @@ {{ item_form.as_p() }} {% if not loop.first %} {% endif %} @@ -34,16 +39,18 @@ {{ formset.empty_form.as_p() }}

- - +
+ + +
{% endblock %} \ No newline at end of file diff --git a/stock/templates/stock/items_list.jinja b/stock/templates/stock/items_list.jinja index 842cd010..0561c22a 100644 --- a/stock/templates/stock/items_list.jinja +++ b/stock/templates/stock/items_list.jinja @@ -1,35 +1,39 @@ {% extends "core/base.jinja" %} +{% block additional_css %} + +{% endblock %} + {% block title %}{% trans %}Stock items{% endtrans %}{% endblock %} {% block content %} -

{% trans %}Items in {% endtrans %}{{ stock.name }}

+

{% trans %}Items in {% endtrans %}{{ stock.name }}

{% if is_editor %} -
+ {% endif %} {% if items %} - {% for item in items %} -
-
-

{{ item.name }}

-

{% trans %}Last known quantity: {% endtrans %}{{ item.last_known_quantity }}

-
-
+
+ {% for item in items %} +
+
+ {{ item.item.name }} +

{% trans %}Last known quantity:{% endtrans %} {{ item.last_known_quantity }}

+
{% if is_editor %} - - {% trans %}Edit{% endtrans %} + + {% trans %}Edit{% endtrans %} {% endif %}
-
- {% endfor %} + {% endfor %} +
{% else %}

{% trans %}No item has been created yet.{% endtrans %}

{% endif %} diff --git a/stock/views/items.py b/stock/views/items.py index eb955313..f14defe3 100644 --- a/stock/views/items.py +++ b/stock/views/items.py @@ -1,5 +1,3 @@ -from csv import Error - from django import forms from django.contrib.auth.mixins import UserPassesTestMixin from django.contrib.messages.views import SuccessMessageMixin @@ -148,9 +146,7 @@ def update_quantities(stock_items, item_actions, metadata_entries, operation_typ 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 - ): + 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 = ( @@ -168,9 +164,7 @@ def apply_transfer(stock_items, item_actions, metadata_entries, user, source_sto ) destination_item_actions = [] - for item_action, metadata_entry in zip( - item_actions, metadata_entries, strict=True - ): + 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 @@ -195,7 +189,11 @@ def apply_transfer(stock_items, item_actions, metadata_entries, user, source_sto destination.quantity += quantity metadata_entry.other_item_action = destination_item_actions[-1] - return destination_stock_action, list(destinations.values()), destination_item_actions + return ( + destination_stock_action, + list(destinations.values()), + destination_item_actions, + ) class ItemActionCreateView(UserPassesTestMixin, SuccessMessageMixin, CreateView): @@ -211,7 +209,7 @@ class ItemActionCreateView(UserPassesTestMixin, SuccessMessageMixin, CreateView) def posted_operation_type(self): try: return int(self.request.POST.get("action")) - except (TypeError, ValueError): + except TypeError, ValueError: return None def attach_metadata_forms(self, form, active_operation_type=None):