From f242870d50c10a44f5cfc65a2b84114cc1ed039e Mon Sep 17 00:00:00 2001
From: Laetitia <laetitia.getti@hotmail.fr>
Date: Sat, 25 May 2024 14:49:38 +0200
Subject: [PATCH] feat: modification du format de date et heure dans le csv

---
 la_chariotte/order/views/grouped_order.py         |  8 +++++---
 .../tests/test_order_views_grouped_order.py       | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/la_chariotte/order/views/grouped_order.py b/la_chariotte/order/views/grouped_order.py
index 75e9eb3..fc960f2 100644
--- a/la_chariotte/order/views/grouped_order.py
+++ b/la_chariotte/order/views/grouped_order.py
@@ -374,8 +374,9 @@ class ExportGroupedOrderToCSVView(GroupedOrderExportView):
         row.append("Prix de la commande")
         row.append("Mail")
         row.append("Téléphone")
-        row.append("Date et Heure")
         row.append("Note")
+        row.append("Date")
+        row.append("Heure")
         writer.writerow(row)
 
         row = ["", "Prix unitaire TTC (€)"]
@@ -395,8 +396,9 @@ class ExportGroupedOrderToCSVView(GroupedOrderExportView):
             row.append(str(order.price).replace(".", ","))
             row.append(order.author.email)
             row.append(f"'{order.author.phone}")
-            row.append(f'\'{order.created_date.strftime("%d %B %Y %H:%M")}')
-            row.append(f"'{order.note}")
+            row.append(order.note)
+            row.append(order.created_date.strftime("%d/%m/%Y"))
+            row.append(order.created_date.strftime("%H:%M"))
             writer.writerow(row)
 
         # write total row
diff --git a/la_chariotte/tests/test_order_views_grouped_order.py b/la_chariotte/tests/test_order_views_grouped_order.py
index 01de073..d171ae1 100644
--- a/la_chariotte/tests/test_order_views_grouped_order.py
+++ b/la_chariotte/tests/test_order_views_grouped_order.py
@@ -1631,7 +1631,8 @@ class TestExportGroupedOrderToCSVView:
         content = response.content.decode("utf-8")
         csv_reader = csv.reader(StringIO(content))
         body = list(csv_reader)
-        created_date = f'\'{timezone.now().strftime("%d %B %Y %H:%M")}'
+        created_date = f"{timezone.now().strftime('%d/%m/%Y')}"
+        created_time = f"{timezone.now().strftime('%H:%M')}"
         assert body == [
             [
                 "",
@@ -1641,8 +1642,9 @@ class TestExportGroupedOrderToCSVView:
                 "Prix de la commande",
                 "Mail",
                 "Téléphone",
-                "Date et Heure",
                 "Note",
+                "Date",
+                "Heure",
             ],
             ["", "Prix unitaire TTC (€)", "2,00", "9,00"],
             ["Nom", "Prénom"],
@@ -1654,8 +1656,9 @@ class TestExportGroupedOrderToCSVView:
                 "2,00",
                 "bob2@escargot.fr",
                 "'000",
+                "",
                 created_date,
-                "'None",
+                created_time,
             ],
             [
                 "alescargot",
@@ -1665,8 +1668,9 @@ class TestExportGroupedOrderToCSVView:
                 "9,00",
                 "bob3@escargot.fr",
                 "'000",
+                "",
                 created_date,
-                "'None",
+                created_time,
             ],
             [
                 "lescargot",
@@ -1676,8 +1680,9 @@ class TestExportGroupedOrderToCSVView:
                 "24,00",
                 "bob@escargot.fr",
                 "'000",
+                "",
                 created_date,
-                "'None",
+                created_time,
             ],
             ["", "TOTAL", "4", "3", "35,00"],
         ]