diff --git a/kfet/statistic.py b/kfet/statistic.py index 8ffb7db5..3f32807e 100644 --- a/kfet/statistic.py +++ b/kfet/statistic.py @@ -86,7 +86,10 @@ class Scale(object): def get_labels(self, label_fmt=None): if label_fmt is None: label_fmt = self.label_fmt - return [begin.strftime(label_fmt) for begin, end in self] + return [ + begin.strftime(label_fmt.format(i=i, rev_i=len(self)-i)) + for i, (begin, end) in enumerate(self) + ] def chunkify_qs(self, qs, field=None): if field is None: diff --git a/kfet/templates/kfet/base_form.html b/kfet/templates/kfet/base_form.html index a36be175..9fe79e32 100644 --- a/kfet/templates/kfet/base_form.html +++ b/kfet/templates/kfet/base_form.html @@ -1,3 +1,5 @@ +{% load kfet_tags %} +
{% include "kfet/base_messages.html" %} diff --git a/kfet/templates/kfet/inventory_create.html b/kfet/templates/kfet/inventory_create.html index 20dd4006..e358a4e7 100644 --- a/kfet/templates/kfet/inventory_create.html +++ b/kfet/templates/kfet/inventory_create.html @@ -17,7 +17,7 @@ {% include 'kfet/base_messages.html' %}
-
+
@@ -77,7 +77,7 @@
-
+
{{ formset.management_form }} {% if not perms.kfet.add_inventory %}
diff --git a/kfet/templates/kfet/order_create.html b/kfet/templates/kfet/order_create.html index 8cce84bb..ab8e9165 100644 --- a/kfet/templates/kfet/order_create.html +++ b/kfet/templates/kfet/order_create.html @@ -36,11 +36,9 @@ Commande - S1 - S2 - S3 - S4 - S5 + {% for label in scale.get_labels %} + {{ label }} + {% endfor %} diff --git a/kfet/views.py b/kfet/views.py index 19cf0655..2a8dcdd2 100644 --- a/kfet/views.py +++ b/kfet/views.py @@ -1910,9 +1910,12 @@ def order_create(request, pk): else: formset = cls_formset(initial=initial) + scale.label_fmt = "S-{rev_i}" + return render(request, 'kfet/order_create.html', { 'supplier': supplier, 'formset': formset, + 'scale': scale, })