Random UI

This commit is contained in:
MatthieuHR committed 2026-11-09 11:34:26 +00:00
1 parent 04b200cdc5
commit f6b75b3023
10 files changed
+337 -103

No files matched your search

+255 -51
View File
@@ -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"
),
),
]
+3
View File
@@ -0,0 +1,3 @@
.stock-form label {
text-transform: capitalize;
}
+14 -10
View File
@@ -1,18 +1,22 @@
{% extends "core/base.jinja" %}
{% block additional_css %}
<link rel="stylesheet" href="{{ static("stock/css/forms.scss") }}">
{% endblock %}
{% 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 %}
<div class="form-group"
{% 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 :
{% trans %}Current quantity:{% endtrans %}
<span x-text="existingQuantity"></span>
</div>
{% endif %}
@@ -79,7 +83,7 @@
{% set action_value = form["action"].value() %}
<form method="post" enctype="multipart/form-data"
<form method="post" class="stock-form" enctype="multipart/form-data"
x-data="{ action: '{{ action_value if action_value is not none else '' }}' }">
{% csrf_token %}
{{ form.non_field_errors() }}
@@ -113,7 +117,7 @@
{{ action_row(empty_form) }}
</template>
<div>
<div class="row gap margin-bottom">
<button class="btn btn-grey" type="button" @click="add()">
<i class="fa fa-plus"></i>
{% trans %}Add{% endtrans %}
+6 -2
View File
@@ -1,12 +1,16 @@
{% extends "core/base.jinja" %}
{% block additional_css %}
<link rel="stylesheet" href="{{ static("stock/css/forms.scss") }}">
{% endblock %}
{% block title %}{% trans %}Create stock{% endtrans %}{% endblock %}
{% block content %}
<h2>{% trans %}Create stock{% endtrans %}</h2>
<form method="post" action="">
<form method="post" action="" class="stock-form">
{% csrf_token %}
{{ form.as_p() }}
<button type="submit">{% trans %}Save{% endtrans %}</button>
<p><button class="btn btn-blue" type="submit">{% trans %}Save{% endtrans %}</button></p>
</form>
{% endblock %}
+6 -2
View File
@@ -1,12 +1,16 @@
{% extends "core/base.jinja" %}
{% block additional_css %}
<link rel="stylesheet" href="{{ static("stock/css/forms.scss") }}">
{% endblock %}
{% block title %}{% trans %}Edit stock{% endtrans %}{% endblock %}
{% block content %}
<h2>{% trans %}Edit stock{% endtrans %}</h2>
<form method="post">
<form method="post" class="stock-form">
{% csrf_token %}
{{ form.as_p() }}
<button type="submit">{% trans %}Save{% endtrans %}</button>
<p><button class="btn btn-blue" type="submit">{% trans %}Save{% endtrans %}</button></p>
</form>
{% endblock %}
+6 -4
View File
@@ -5,12 +5,13 @@
{% endblock %}
{% block content %}
<h2>{% trans %}Stock{% endtrans %}</h2>
<h2 class="margin-bottom">{% trans %}Stock{% endtrans %}</h2>
{% if is_editor %}
<p>
<a href="{{ url('stock:create', club_id=club.id) }}">
<p class="margin-bottom">
<a class="btn btn-blue" href="{{ url('stock:create', club_id=club.id) }}">
{% trans %}Create a stock{% endtrans %}
<i class="fa fa-plus"></i>
</a>
</p>
{% endif %}
@@ -24,12 +25,13 @@
{{ stock.name }}
</a>
{% if is_editor %}
-
<a href="{{ url('stock:edit', club_id=club.id, stock_id=stock.id) }}">
{% trans %}Edit{% endtrans %}
</a>
{% endif %}
</li>
{% endif %}
</li>
{% endfor %}
</ul>
{% else %}
+6 -2
View File
@@ -1,12 +1,16 @@
{% extends "core/base.jinja" %}
{% block additional_css %}
<link rel="stylesheet" href="{{ static("stock/css/forms.scss") }}">
{% endblock %}
{% block title %}{% trans %}Edit stock item{% endtrans %}{% endblock %}
{% block content %}
<h2>{% trans %}Edit stock item{% endtrans %}</h2>
<form method="post">
<form method="post" class="stock-form">
{% csrf_token %}
{{ form.as_p() }}
<button type="submit">{% trans %}Save{% endtrans %}</button>
<p><button class="btn btn-blue" type="submit">{% trans %}Save{% endtrans %}</button></p>
</form>
{% endblock %}
+14 -7
View File
@@ -1,5 +1,9 @@
{% extends "core/base.jinja" %}
{% block additional_css %}
<link rel="stylesheet" href="{{ static("stock/css/forms.scss") }}">
{% endblock %}
{% block additional_js %}
<script type="module" src="{{ static("bundled/core/dynamic-formset-index.ts") }}"></script>
{% endblock %}
@@ -8,7 +12,8 @@
{% block content %}
<h2>{% trans %}Create stock items in{% endtrans %}{{ stock.name }}</h2>
<form method="post" x-data="dynamicFormSet({ prefix: '{{ formset.prefix }}' })">
<form method="post" class="stock-form"
x-data="dynamicFormSet({ prefix: '{{ formset.prefix }}' })">
{% csrf_token %}
{{ formset.management_form }}
<div x-ref="formContainer" class="margin-bottom">
@@ -18,7 +23,7 @@
{{ item_form.as_p() }}
{% if not loop.first %}
<button type="button" class="btn btn-grey"
@click.prevent="removeForm($event.target.closest('div'))">
@click.prevent="removeForm($event.target.closest('div'))">
<i class="fa fa-minus"></i> {% trans %}Remove{% endtrans %}
</button>
{% endif %}
@@ -34,16 +39,18 @@
{{ formset.empty_form.as_p() }}
</div>
<button type="button" class="btn btn-grey"
@click.prevent="removeForm($event.target.closest('div'))">
@click.prevent="removeForm($event.target.closest('div'))">
<i class="fa fa-minus"></i> {% trans %}Remove{% endtrans %}
</button>
</fieldset>
<hr>
</div>
</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" class="btn btn-blue">{% trans %}Save{% endtrans %}</button>
<div class="row gap margin-bottom">
<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" class="btn btn-blue">{% trans %}Save{% endtrans %}</button>
</div>
</form>
{% endblock %}
+19 -15
View File
@@ -1,35 +1,39 @@
{% extends "core/base.jinja" %}
{% block additional_css %}
<link rel="stylesheet" href="{{ static("core/components/card.scss") }}">
{% endblock %}
{% block title %}{% trans %}Stock items{% endtrans %}{% endblock %}
{% block content %}
<h3>{% trans %}Items in {% endtrans %}{{ stock.name }}</h3>
<h2 class="margin-bottom">{% trans %}Items in {% endtrans %}{{ stock.name }}</h2>
{% if is_editor %}
<div>
<div class="row gap margin-bottom">
<a href="{{ url('stock:items_create', club_id=club.id, stock_id=stock.id) }}" class="btn btn-blue">
{% trans %}Create items{% endtrans %}
{% trans %}Create items{% endtrans %} <i class="fa fa-plus"></i>
</a>
<a href="{{ url('stock:action_create', club_id=club.id, stock_id=stock.id) }}" class="btn btn-blue">
{% trans %}Create action{% endtrans %}
{% trans %}Create action{% endtrans %} <i class="fa fa-plus"></i>
</a>
</div>
{% endif %}
{% if items %}
{% for item in items %}
<div class="card card-row shadow">
<div>
<p>{{ item.name }}</p>
<p>{% trans %}Last known quantity: {% endtrans %}{{ item.last_known_quantity }}</p>
</div>
<div>
<div>
{% for item in items %}
<div class="card card-row shadow margin-bottom">
<div class="card-content">
<strong class="card-title">{{ item.item.name }}</strong>
<p>{% trans %}Last known quantity:{% endtrans %} {{ item.last_known_quantity }}</p>
</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 class="btn btn-grey" href="{{ url('stock:item_edit', club_id=club.id, stock_id=stock.id, item_id=item.id) }}">
<i class="fa fa-pen"></i> {% trans %}Edit{% endtrans %}
</a>
{% endif %}
</div>
</div>
{% endfor %}
{% endfor %}
</div>
{% else %}
<p>{% trans %}No item has been created yet.{% endtrans %}</p>
{% endif %}
+8 -10
View File
@@ -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):