Create multiple tabs for full delivery reports

copanier/models.py

@@ -188,9 +188,13 @@ class Delivery(Base):
     def total(self):
         return round(sum(o.total(self.products) for o in self.orders.values()), 2)
 
+    @property
+    def producers(self):
+        return list(set([p.producer for p in self.products]))
+
     @property
     def has_multiple_producers(self):
-        return len(set([p.producer for p in self.products])) > 1
+        return len(self.producers) > 1
 
     @property
     def is_open(self):

copanier/reports.py

@@ -5,35 +5,52 @@ from openpyxl.writer.excel import save_virtual_workbook
 
 from .models import Product
 
+def summary_for_products(wb, title, delivery, total=None, products=None):
+    if products == None:
+        products = delivery.products
+    if total == None:
+        total = delivery.total
 
-def summary(delivery):
+    ws = wb.create_sheet(title)
-    wb = Workbook()
+    ws.append([
-    ws = wb.active
-    ws.title = f"{delivery.name} {delivery.from_date.date()}"
-    headers = [
         "ref",
         "produit",
         "prix unitaire",
         "quantité commandée",
         "unité",
         "total",
-    ]
+    ])
-    ws.append(headers)
+    for product in products:
-    for product in delivery.products:
         wanted = delivery.product_wanted(product)
         if not wanted:
             continue
-        ws.append(
+        ws.append([
-            [
+            product.ref,
-                product.ref,
+            str(product),
-                str(product),
+            product.price,
-                product.price,
+            wanted,
-                wanted,
+            product.unit,
-                product.unit,
+            round(product.price * wanted, 2),
-                round(product.price * wanted, 2),
+        ])
-            ]
+    ws.append(["", "", "", "", "Total", total])
-        )
+
-    ws.append(["", "", "", "", "Total", delivery.total])
+
+
+def summary(delivery):
+    wb = Workbook()
+    wb.remove(wb.active)
+    if delivery.has_multiple_producers:
+        for producer in delivery.producers:
+            summary_for_products(
+                wb,
+                producer,
+                delivery,
+                total=delivery.total_for_producer(producer),
+                products=delivery.get_products_by(producer)
+            )
+    else:
+        summary_for_products(wb, f"{delivery.name} {delivery.from_date.date()}", delivery)
+    
     return save_virtual_workbook(wb)
 
 
@@ -41,10 +58,14 @@ def full(delivery):
     wb = Workbook()
     ws = wb.active
     ws.title = f"{delivery.name} {delivery.from_date.date()}"
-    headers = ["ref", "produit", "prix", "producer"] + [e for e in delivery.orders] + ["total"]
+    headers = ["ref", "produit", "prix"] + [e for e in delivery.orders] + ["total"]
+    if delivery.has_multiple_producers:
+        headers.insert(1, "producer")
     ws.append(headers)
     for product in delivery.products:
-        row = [product.ref, str(product), product.price, product.producer]
+        row = [product.ref, str(product), product.price]
+        if delivery.has_multiple_producers:
+            row.insert(1, product.producer)
         for order in delivery.orders.values():
             wanted = order.products.get(product.ref)
             row.append(wanted.quantity if wanted else 0)
@@ -55,6 +76,9 @@ def full(delivery):
         + [round(o.total(delivery.products),2) for o in delivery.orders.values()]
         + [round(delivery.total, 2)]
     )
+    if delivery.has_multiple_producers:
+        footer.insert(1, "")
+
     ws.append(footer)
     return save_virtual_workbook(wb)