From 8d643fc6b449dab32f8b0e6f1e61de149e99ba3d Mon Sep 17 00:00:00 2001
From: imperosol <thgirod@hotmail.com>
Date: Tue, 17 Dec 2024 17:23:13 +0100
Subject: [PATCH] Apply review comments

---
 counter/api.py                                |  2 +-
 .../templates/counter/producttype_list.jinja  | 26 ++++++++++++-------
 counter/tests/test_product_type.py            |  2 +-
 locale/fr/LC_MESSAGES/django.po               | 20 +++++++++++---
 locale/fr/LC_MESSAGES/djangojs.po             |  4 +--
 5 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/counter/api.py b/counter/api.py
index 43fada5a..dd7b75f0 100644
--- a/counter/api.py
+++ b/counter/api.py
@@ -109,7 +109,7 @@ class ProductController(ControllerBase):
 
 @api_controller("/product-type", permissions=[IsCounterAdmin])
 class ProductTypeController(ControllerBase):
-    @route.get("", response=list[ProductTypeSchema], url_name="fetch-product-types")
+    @route.get("", response=list[ProductTypeSchema], url_name="fetch_product_types")
     def fetch_all(self):
         return ProductType.objects.order_by("order")
 
diff --git a/counter/templates/counter/producttype_list.jinja b/counter/templates/counter/producttype_list.jinja
index 5d7ddc26..042925df 100644
--- a/counter/templates/counter/producttype_list.jinja
+++ b/counter/templates/counter/producttype_list.jinja
@@ -13,8 +13,24 @@
 {% endblock %}
 
 {% block content %}
-  <p><a href="{{ url('counter:new_producttype') }}">{% trans %}New product type{% endtrans %}</a></p>
+  <p>
+    <a href="{{ url('counter:new_producttype') }}" class="btn btn-blue">
+      {% trans %}New product type{% endtrans %}
+      <i class="fa fa-plus"></i>
+    </a>
+  </p>
   {% if producttype_list %}
+    <aside>
+      <p>
+        {% trans %}Product types are in the same order on this page and on the eboutic.{% endtrans %}
+      </p>
+      <p>
+        {% trans trimmed %}
+          You can reorder them here by drag-and-drop.
+          The changes will then be applied globally immediately.
+        {% endtrans %}
+      </p>
+    </aside>
     <div x-data="productTypesList">
       <p
         class="alert snackbar"
@@ -42,11 +58,3 @@
     {% trans %}There is no product types in this website.{% endtrans %}
   {% endif %}
 {% endblock %}
-
-
-{% block script %}
-
-{% endblock %}
-
-
-
diff --git a/counter/tests/test_product_type.py b/counter/tests/test_product_type.py
index 45ed5797..7976ef85 100644
--- a/counter/tests/test_product_type.py
+++ b/counter/tests/test_product_type.py
@@ -87,5 +87,5 @@ def test_move_above_product_type(product_types: list[ProductType]):
 )
 def test_controller_permissions(client: Client, user_factory, status_code):
     client.force_login(user_factory())
-    response = client.get(reverse("api:fetch-product-types"))
+    response = client.get(reverse("api:fetch_product_types"))
     assert response.status_code == status_code
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index fdfef6b9..98b4fbd7 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-17 13:10+0100\n"
+"POT-Creation-Date: 2024-12-17 17:04+0100\n"
 "PO-Revision-Date: 2016-07-18\n"
 "Last-Translator: Maréchal <thomas.girod@utbm.fr\n"
 "Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -4198,15 +4198,27 @@ msgid "There is no products in this website."
 msgstr "Il n'y a pas de produits dans ce site web."
 
 #: counter/templates/counter/producttype_list.jinja:4
-#: counter/templates/counter/producttype_list.jinja:26
+#: counter/templates/counter/producttype_list.jinja:42
 msgid "Product type list"
 msgstr "Liste des types de produit"
 
-#: counter/templates/counter/producttype_list.jinja:16
+#: counter/templates/counter/producttype_list.jinja:18
 msgid "New product type"
 msgstr "Nouveau type de produit"
 
-#: counter/templates/counter/producttype_list.jinja:42
+#: counter/templates/counter/producttype_list.jinja:25
+msgid "Product types are in the same order on this page and on the eboutic."
+msgstr "Les types de produit sont dans le même ordre sur cette page et sur l'eboutic."
+
+#: counter/templates/counter/producttype_list.jinja:28
+msgid ""
+"You can reorder them here by drag-and-drop. The changes will then be applied "
+"globally immediately."
+msgstr ""
+"Vous pouvez les réorganiser ici. Les changements seront alors immédiatement "
+"appliqués globalement."
+
+#: counter/templates/counter/producttype_list.jinja:58
 msgid "There is no product types in this website."
 msgstr "Il n'y a pas de types de produit dans ce site web."
 
diff --git a/locale/fr/LC_MESSAGES/djangojs.po b/locale/fr/LC_MESSAGES/djangojs.po
index c89f7eb1..414bb603 100644
--- a/locale/fr/LC_MESSAGES/djangojs.po
+++ b/locale/fr/LC_MESSAGES/djangojs.po
@@ -123,8 +123,8 @@ msgid "captured.%s"
 msgstr "capture.%s"
 
 #: counter/static/bundled/counter/product-type-index.ts:36
-msgid "Products types successfully reordered"
-msgstr "Types de produits réordonnés."
+msgid "Products types reordered!"
+msgstr "Types de produits réordonnés !"
 
 #: counter/static/bundled/counter/product-type-index.ts:40
 #, javascript-format