From 9d2c13e67c9bf5708b0a9afe95804a07e2c28a7d Mon Sep 17 00:00:00 2001
From: Quentin VERMANDE <quentin.vermande@ens.fr>
Date: Wed, 9 Dec 2020 22:03:54 +0100
Subject: [PATCH] kfetTriArticles

---
 kfet/forms.py                             |  2 +
 kfet/templates/kfet/inventory_create.html |  6 +++
 kfet/templates/kfet/order_create.html     | 54 +++++++++++++----------
 kfet/views.py                             |  6 ++-
 4 files changed, 43 insertions(+), 25 deletions(-)

diff --git a/kfet/forms.py b/kfet/forms.py
index a7637551..bc98a8ce 100644
--- a/kfet/forms.py
+++ b/kfet/forms.py
@@ -558,6 +558,7 @@ class InventoryArticleForm(forms.Form):
             self.category = kwargs["initial"]["category"]
             self.category_name = kwargs["initial"]["category__name"]
             self.box_capacity = kwargs["initial"]["box_capacity"]
+            self.is_sold = kwargs["initial"]["is_sold"]
 
 
 # -----
@@ -584,6 +585,7 @@ class OrderArticleForm(forms.Form):
             self.v_et = kwargs["initial"]["v_et"]
             self.v_prev = kwargs["initial"]["v_prev"]
             self.c_rec = kwargs["initial"]["c_rec"]
+            self.is_sold = kwargs["initial"]["is_sold"]
 
 
 class OrderArticleToInventoryForm(forms.Form):
diff --git a/kfet/templates/kfet/inventory_create.html b/kfet/templates/kfet/inventory_create.html
index c3084e71..45bd48ed 100644
--- a/kfet/templates/kfet/inventory_create.html
+++ b/kfet/templates/kfet/inventory_create.html
@@ -26,6 +26,12 @@
     </thead>
     <tbody>
       {% for form in formset %}
+		{% ifchanged form.is_sold %}
+        <tr class='section'>
+			  <td>{% if form.is_sold %} Vendu {% else %} Non vendu {% endif %}</td>
+          <td colspan="7"></td>
+        </tr>
+      {% endifchanged %}
       {% ifchanged form.category %}
         <tr class='section'>
           <td>{{ form.category_name }}</td>
diff --git a/kfet/templates/kfet/order_create.html b/kfet/templates/kfet/order_create.html
index 7cb4d1cb..20ae7b69 100644
--- a/kfet/templates/kfet/order_create.html
+++ b/kfet/templates/kfet/order_create.html
@@ -58,31 +58,39 @@
         {% endfor %}
       </tr>
     </thead>
-    {% regroup formset by category_name as category_list %}
-    {% for category in category_list %}
-      <tbody class="tablesorter-no-sort">
-        <tr class='section text-left'>
-          <td colspan="{{ scale|length|add:'8' }}">{{ category.grouper }}</td>
+    {% regroup formset by is_sold as is_sold_list %}
+	 {% for condition in is_sold_list %}
+		<tbody class="tablesorter-no-sort">
+        <tr class='section text-center'>
+			  <td colspan="{{ scale|length|add:'8' }}">{% if condition.grouper %} Vendu {% else %} Non vendu {% endif %}</td>
         </tr>
       </tbody>
-      <tbody>
-        {% for form in category.list %}
-          <tr>
-            {{ form.article }}
-            <td class="text-left">{{ form.name }}</td>
-            {% for v_chunk in form.v_all %}
-            <td>{{ v_chunk }}</td>
-            {% endfor %}
-            <td>{{ form.v_moy }}</td>
-            <td>{{ form.v_et }}</td>
-            <td>{{ form.v_prev }}</td>
-            <td>{{ form.stock }}</td>
-            <td>{{ form.box_capacity|default:"" }}</td>
-            <td>{{ form.c_rec }}</td>
-            <td class="nopadding">{{ form.quantity_ordered|add_class:"form-control" }}</td>
-          </tr>
-        {% endfor %}
-      </tbody>
+		{% regroup condition.list by category_name as category_list %}
+		{% for category in category_list %}
+			<tbody class="tablesorter-no-sort">
+			<tr class='section text-left'>
+				<td colspan="{{ scale|length|add:'8' }}">{{ category.grouper }}</td>
+			</tr>
+			</tbody>
+			<tbody>
+			{% for form in category.list %}
+				<tr>
+					{{ form.article }}
+					<td class="text-left">{{ form.name }}</td>
+					{% for v_chunk in form.v_all %}
+					<td>{{ v_chunk }}</td>
+					{% endfor %}
+					<td>{{ form.v_moy }}</td>
+					<td>{{ form.v_et }}</td>
+					<td>{{ form.v_prev }}</td>
+					<td>{{ form.stock }}</td>
+					<td>{{ form.box_capacity|default:"" }}</td>
+					<td>{{ form.c_rec }}</td>
+					<td class="nopadding">{{ form.quantity_ordered|add_class:"form-control" }}</td>
+				</tr>
+			{% endfor %}
+			</tbody>
+		{% endfor %}
     {% endfor %}
   </table>
   </div>
diff --git a/kfet/views.py b/kfet/views.py
index d42c6338..136d7bd0 100644
--- a/kfet/views.py
+++ b/kfet/views.py
@@ -1835,12 +1835,13 @@ class InventoryList(ListView):
 def inventory_create(request):
 
     articles = Article.objects.select_related("category").order_by(
-        "category__name", "name"
+        "-is_sold", "category__name", "name"
     )
     initial = []
     for article in articles:
         initial.append(
             {
+                "is_sold": article.is_sold,
                 "article": article.pk,
                 "stock_old": article.stock,
                 "name": article.name,
@@ -1960,7 +1961,7 @@ def order_create(request, pk):
         Article.objects.filter(suppliers=supplier.pk)
         .distinct()
         .select_related("category")
-        .order_by("category__name", "name")
+        .order_by("-is_sold", "category__name", "name")
     )
 
     # Force hit to cache
@@ -2017,6 +2018,7 @@ def order_create(request, pk):
                 "v_et": round(v_et),
                 "v_prev": round(v_prev),
                 "c_rec": article.box_capacity and c_rec or round(c_rec_tot),
+                "is_sold": article.is_sold
             }
         )