This commit is contained in:
MatthieuHR committed 2026-11-09 09:27:53 +00:00
1 parent fc961f6511
commit fb25e4586e
6 files changed
+99 -47

No files matched your search

+11 -1
View File
@@ -16,6 +16,8 @@ if TYPE_CHECKING:
class StockForm(forms.ModelForm): class StockForm(forms.ModelForm):
required_css_class = "required"
class Meta: class Meta:
model = models.Stock model = models.Stock
fields = ["name", "club"] fields = ["name", "club"]
@@ -34,6 +36,8 @@ class StockForm(forms.ModelForm):
class StockItemStockForm(forms.ModelForm): class StockItemStockForm(forms.ModelForm):
required_css_class = "required"
name = forms.CharField(max_length=64, label=_("name")) name = forms.CharField(max_length=64, label=_("name"))
description = forms.CharField( description = forms.CharField(
required=False, label=_("description"), widget=forms.Textarea required=False, label=_("description"), widget=forms.Textarea
@@ -107,6 +111,8 @@ HIDDEN_QUANTITY_ACTIONS = (
class StockActionForm(forms.ModelForm): class StockActionForm(forms.ModelForm):
required_css_class = "required"
class Meta: class Meta:
model = models.StockAction model = models.StockAction
fields = ["comment", "action"] fields = ["comment", "action"]
@@ -127,7 +133,7 @@ class StockActionForm(forms.ModelForm):
StockItemActionFormSet = forms.inlineformset_factory( StockItemActionFormSet = forms.inlineformset_factory(
models.StockAction, models.StockAction,
models.StockItemAction, models.StockItemAction,
fields=["quantity_after", "item"], fields=["item", "quantity_after"],
can_delete_extra=False, can_delete_extra=False,
can_delete=False, can_delete=False,
min_num=1, min_num=1,
@@ -147,6 +153,8 @@ StockItemActionFormSet = forms.inlineformset_factory(
class RefuelMetadataForm(forms.ModelForm): class RefuelMetadataForm(forms.ModelForm):
required_css_class = "required"
added_quantity = forms.DecimalField( added_quantity = forms.DecimalField(
required=True, required=True,
min_value=0, min_value=0,
@@ -171,6 +179,8 @@ class RefuelMetadataForm(forms.ModelForm):
class TransferMetadataForm(forms.ModelForm): class TransferMetadataForm(forms.ModelForm):
required_css_class = "required"
transfer_quantity = forms.DecimalField( transfer_quantity = forms.DecimalField(
required=True, required=True,
min_value=0, min_value=0,
+1 -1
View File
@@ -9,7 +9,7 @@ if TYPE_CHECKING:
def can_be_edited_by(user: User, club: Club): def can_be_edited_by(user: User, club: Club):
return user.groups.contains(club.stock_group) or user.is_root return user.is_in_group(pk=club.stock_group) or user.is_root
def can_be_view_by(user: User, club: Club, stock: Stock): def can_be_view_by(user: User, club: Club, stock: Stock):
+49 -26
View File
@@ -20,26 +20,35 @@
{% endmacro %} {% endmacro %}
{% macro action_row(f) %} {% macro action_row(f, removable=true) %}
<div class="action-row"> <div>
{% for h in f.hidden_fields() %}{{ h }}{% endfor %} <div class="action-row">
{{ f.non_field_errors() }} {% for h in f.hidden_fields() %}{{ h }}{% endfor %}
{% for field in f.visible_fields() %} {{ f.non_field_errors() }}
{{ field_row(field) }} {% for field in f.visible_fields() %}
{% endfor %} {{ field_row(field) }}
{% endfor %}
{% for b in f.blocks %} {% for b in f.blocks %}
<fieldset x-cloak <fieldset x-cloak
x-show="action === '{{ b.action }}'" x-show="action === '{{ b.action }}'"
:disabled="action !== '{{ b.action }}'"> :disabled="action !== '{{ b.action }}'">
<legend>{{ b.label }}</legend> {{ b.form.non_field_errors() }}
{{ b.form.non_field_errors() }} {% for h in b.form.hidden_fields() %}{{ h }}{% endfor %}
{% for h in b.form.hidden_fields() %}{{ h }}{% endfor %} {% for field in b.form.visible_fields() %}
{% for field in b.form.visible_fields() %} {{ field_row(field) }}
{{ field_row(field) }} {% endfor %}
{% endfor %} </fieldset>
</fieldset> {% endfor %}
{% endfor %} {% if removable %}
<button class="btn btn-grey" type="button"
@click.prevent="$el.closest('.action-row').parentElement.remove()">
<i class="fa fa-minus"></i>
{% trans %}Remove{% endtrans %}
</button>
{% endif %}
</div>
<hr class="margin-bottom">
</div> </div>
{% endmacro %} {% endmacro %}
@@ -59,9 +68,14 @@
</script> </script>
{% endblock %} {% endblock %}
{% block title %}
{% trans %}New stock action{% endtrans %}
{% endblock %}
{% block content %} {% block content %}
<h2>{% trans %}New stock action in {% endtrans %}{{ stock.name }}</h2>
{% set action_value = form["action"].value() %} {% set action_value = form["action"].value() %}
@@ -70,9 +84,12 @@
{% csrf_token %} {% csrf_token %}
{{ form.non_field_errors() }} {{ form.non_field_errors() }}
{% for field in form.visible_fields() %} <div class="margin-bottom">
{{ field_row(field) }} {% for field in form.visible_fields() %}
{% endfor %} {{ field_row(field) }}
{% endfor %}
<hr>
</div>
<div x-data="rows('{{ formset.prefix }}', {{ formset.total_form_count() }})"> <div x-data="rows('{{ formset.prefix }}', {{ formset.total_form_count() }})">
<input type="hidden" name="{{ formset.prefix }}-TOTAL_FORMS" :value="total"> <input type="hidden" name="{{ formset.prefix }}-TOTAL_FORMS" :value="total">
@@ -82,8 +99,10 @@
{{ formset.non_form_errors() }} {{ formset.non_form_errors() }}
<h3 class="margin-bottom">{% trans %}Items{% endtrans %}</h3>
{% for f in formset %} {% for f in formset %}
{{ action_row(f) }} {{ action_row(f, not loop.first) }}
{% endfor %} {% endfor %}
<template x-for="i in added" :key="i"> <template x-for="i in added" :key="i">
@@ -94,9 +113,13 @@
{{ action_row(empty_form) }} {{ action_row(empty_form) }}
</template> </template>
<button type="button" @click="add()">{% trans %}Ajouter{% endtrans %}</button> <div>
<button class="btn btn-grey" type="button" @click="add()">
<i class="fa fa-plus"></i>
{% trans %}Add{% endtrans %}
</button>
<button class="btn btn-blue" type="submit">{% trans %}Save{% endtrans %}</button>
</div>
</div> </div>
<button type="submit">{% trans %}Save{% endtrans %}</button>
</form> </form>
{% endblock %} {% endblock %}
+28 -12
View File
@@ -7,27 +7,43 @@
{% block title %}{% trans %}Create stock item{% endtrans %}{% endblock %} {% block title %}{% trans %}Create stock item{% endtrans %}{% endblock %}
{% block content %} {% block content %}
<h2>{% trans %}Create stock item{% endtrans %}</h2> <h2>{% trans %}Create stock items in{% endtrans %}{{ stock.name }}</h2>
<form method="post" x-data="dynamicFormSet({ prefix: '{{ formset.prefix }}' })"> <form method="post" x-data="dynamicFormSet({ prefix: '{{ formset.prefix }}' })">
{% csrf_token %} {% csrf_token %}
{{ formset.management_form }} {{ formset.management_form }}
<div x-ref="formContainer"> <div x-ref="formContainer" class="margin-bottom">
{% for item_form in formset.forms %} {% for item_form in formset.forms %}
<fieldset> <div>
<legend>{% trans %}Item{% endtrans %}</legend> <fieldset>
{{ item_form.as_p() }} {{ item_form.as_p() }}
</fieldset> {% if not loop.first %}
<button type="button" class="btn btn-grey"
@click.prevent="removeForm($event.target.closest('div'))">
<i class="fa fa-minus"></i> {% trans %}Remove{% endtrans %}
</button>
{% endif %}
</fieldset>
<hr>
</div>
{% endfor %} {% endfor %}
</div> </div>
<template x-ref="formTemplate"> <template x-ref="formTemplate" class="margin-bottom">
<fieldset> <div class="margin-bottom">
<legend>{% trans %}Item{% endtrans %}</legend> <fieldset>
{{ formset.empty_form.as_p() }} <div class="margin-bottom">
</fieldset> {{ formset.empty_form.as_p() }}
</div>
<button type="button" class="btn btn-grey"
@click.prevent="removeForm($event.target.closest('div'))">
<i class="fa fa-minus"></i> {% trans %}Remove{% endtrans %}
</button>
</fieldset>
<hr>
</div>
</template> </template>
<button type="button" class="btn btn-grey" @click.prevent="addForm()"> <button type="button" class="btn btn-grey" @click.prevent="addForm()">
<i class="fa fa-plus"></i> {% trans %}Add an item{% endtrans %} <i class="fa fa-plus"></i> {% trans %}Add an item{% endtrans %}
</button> </button>
<button type="submit">{% trans %}Save{% endtrans %}</button> <button type="submit" class="btn btn-blue">{% trans %}Save{% endtrans %}</button>
</form> </form>
{% endblock %} {% endblock %}
+9 -7
View File
@@ -5,16 +5,18 @@
{% block content %} {% block content %}
<h3>{% trans %}Items in {% endtrans %}{{ stock.name }}</h3> <h3>{% trans %}Items in {% endtrans %}{{ stock.name }}</h3>
{% if is_editor %} {% if is_editor %}
<a href="{{ url('stock:items_create', club_id=club.id, stock_id=stock.id) }}"> <div>
{% trans %}Create items{% endtrans %} <a href="{{ url('stock:items_create', club_id=club.id, stock_id=stock.id) }}" class="btn btn-blue">
</a> {% trans %}Create items{% endtrans %}
<a href="{{ url('stock:action_create', club_id=club.id, stock_id=stock.id) }}"> </a>
{% trans %}Create action{% endtrans %} <a href="{{ url('stock:action_create', club_id=club.id, stock_id=stock.id) }}" class="btn btn-blue">
</a> {% trans %}Create action{% endtrans %}
</a>
</div>
{% endif %} {% endif %}
{% if items %} {% if items %}
{% for item in items %} {% for item in items %}
<div> <div class="card card-row shadow">
<div> <div>
<p>{{ item.name }}</p> <p>{{ item.name }}</p>
<p>{% trans %}Last known quantity: {% endtrans %}{{ item.last_known_quantity }}</p> <p>{% trans %}Last known quantity: {% endtrans %}{{ item.last_known_quantity }}</p>
+1
View File
@@ -282,6 +282,7 @@ class ItemActionCreateView(UserPassesTestMixin, SuccessMessageMixin, CreateView)
if "formset" not in ctx: if "formset" not in ctx:
ctx["formset"] = self.build_formset() ctx["formset"] = self.build_formset()
ctx["empty_form"] = self.attach_metadata_forms(ctx["formset"].empty_form) ctx["empty_form"] = self.attach_metadata_forms(ctx["formset"].empty_form)
ctx["stock"] = self.stock
return ctx return ctx
def form_valid(self, form): def form_valid(self, form):