0001-manager-use-slug-instead-of-start_datetime-to-identi.patch

Valentin Deniaud, 16 March 2021 06:22 PM

View differences: inline side by side

Subject: [PATCH 1/2] manager: use slug instead of start_datetime to identify
 event recurrence (#52112)

 chrono/agendas/models.py | 11 +++++++++--
 chrono/manager/forms.py  |  5 +----
 2 files changed, 10 insertions(+), 6 deletions(-)

             excluded_datetimes = collections.defaultdict(list)
             for event in events:
                 if event.primary_event_id:
                     excluded_datetimes[event.primary_event_id].append(make_naive(event.start_datetime))
                     excluded_datetimes[event.primary_event_id].append(event.datetime_slug)
             events = [
                 e for e in events if (not e.cancelled or include_cancelled) and (not e.full or include_full)
-...
             report.events.set(events)
             # add recurrences
             excluded_datetimes = [make_naive(dt) for dt in recurrences.values_list('start_datetime', flat=True)]
             excluded_datetimes = [event.datetime_slug for event in recurrences]
             Event.create_events_recurrences(
                 recurring_events.filter(recurrence_end_date__isnull=False), excluded_datetimes
+            )
-...
+                )
             Event.objects.bulk_create(recurrences)
         @property
         def datetime_slug(self):
             assert self.primary_event is not None, 'only for event recurrence'
             datetime_part = self.slug.rsplit('--')[-1]
             return datetime.datetime.strptime(datetime_part, '%Y-%m-%d-%H%M')
     class BookingColor(models.Model):
         COLOR_COUNT = 8

                     self.instance.recurrences.filter(
                         start_datetime__gt=self.instance.recurrence_end_date
                     ).delete()
                     excluded_datetimes = [
                         make_naive(dt)
                         for dt in self.instance.recurrences.values_list('start_datetime', flat=True)
+                    ]
                     excluded_datetimes = [event.datetime_slug for event in self.instance.recurrences.all()]
                     self.instance.create_all_recurrences(excluded_datetimes)
             return self.instance
+    -

Produits Entr'ouvert » Chrono