0001-agendas-display-start-datetime-of-recurring-event-54.patch

Valentin Deniaud, 30 juin 2021 17:52

Voir les différences: en ligne côte à côte

Subject: [PATCH] agendas: display start datetime of recurring event (#54655)

 chrono/agendas/models.py |  7 +++++++
 tests/test_agendas.py    | 16 ++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

                     'every_x_weeks': every_x_weeks,
+                }
             if self.start_datetime > now():
                 start_date = date_format(self.start_datetime, 'DATE_FORMAT')
                 recurrence_display = _('%(Every_x_days)s, from %(date)s') % {
                     'Every_x_days': recurrence_display,
                     'date': start_date,
+                }
             if self.recurrence_end_date:
                 end_date = date_format(self.recurrence_end_date, 'DATE_FORMAT')
                 recurrence_display = _('%(Every_x_days)s, until %(date)s') % {

         freezer.move_to('2021-01-06 12:30')
         agenda = Agenda.objects.create(label='Agenda', kind='events')
         event = Event.objects.create(
             agenda=agenda, start_datetime=now(), recurrence_days=list(range(7)), places=5
             agenda=agenda,
             start_datetime=now() + datetime.timedelta(days=1),
             recurrence_days=list(range(7)),
             places=5,
+        )
         assert event.get_recurrence_display() == 'Daily at 1:30 p.m., from Jan. 7, 2021'
         freezer.move_to('2021-01-07 12:30')
         assert event.get_recurrence_display() == 'Daily at 1:30 p.m.'
         event.recurrence_days = [1, 2, 3, 4]
-...
         event.save()
         assert (
             event.get_recurrence_display()
             == 'On Monday at 1:30 p.m., once every three weeks, until Jan. 13, 2021'
             == 'On Monday at 1:30 p.m., once every three weeks, until Jan. 14, 2021'
+        )
         freezer.move_to('2021-01-06 12:30')
         assert (
             event.get_recurrence_display()
             == 'On Monday at 1:30 p.m., once every three weeks, from Jan. 7, 2021, until Jan. 14, 2021'
+        )
+    -

Produits Entr'ouvert » Chrono