From 57e06537dc5a287ebf0eb9dd1c5f45b75c589625 Mon Sep 17 00:00:00 2001 From: Laetitia Date: Sun, 22 Oct 2023 15:53:41 +0200 Subject: [PATCH] add delivery slot to calendar export --- .../test_views/test_grouped_order_event_view.py | 3 +++ la_chariotte/order/views/grouped_order.py | 14 ++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/la_chariotte/order/tests/test_views/test_grouped_order_event_view.py b/la_chariotte/order/tests/test_views/test_grouped_order_event_view.py index ade25ed..c22018e 100644 --- a/la_chariotte/order/tests/test_views/test_grouped_order_event_view.py +++ b/la_chariotte/order/tests/test_views/test_grouped_order_event_view.py @@ -13,6 +13,9 @@ def test_get_ical(client, other_user): name="gr order test", orga_user=other_user, ) + grouped_order.delivery_slot = "le matin" + grouped_order.description = "apportez vos tup" + grouped_order.save() detail_url = reverse( "order:grouped_order_event", diff --git a/la_chariotte/order/views/grouped_order.py b/la_chariotte/order/views/grouped_order.py index e0fe825..9200fc4 100644 --- a/la_chariotte/order/views/grouped_order.py +++ b/la_chariotte/order/views/grouped_order.py @@ -77,9 +77,19 @@ class GroupedOrderEventView(generic.DetailView): event = Event() event.add("summary", self.object.name) event.add("dtstart", self.object.delivery_date) - event.add("dtend", self.object.delivery_date + timedelta(days=1)) + event.add("dtend", self.object.delivery_date) + event.add("date", self.object.delivery_date) event.add("location", vText(self.object.place)) - event.add("description", vText(self.object.description)) + + description = "" + if self.object.delivery_slot: + description += "Heure de livraison : " + self.object.delivery_slot + "\n" + if self.object.description: + description += ( + "Note de l'organisateur.ice : " + "\n" + self.object.description + ) + event.add("description", vText(description)) + organizer = vCalAddress("MAILTO:" + self.object.orga.email) organizer.params["cn"] = vText( self.object.orga.first_name + " " + self.object.orga.last_name