0006-manager-display-date-time-period-in-calendar-views-7.patch

Valentin Deniaud, 25 octobre 2022 10:53

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

Subject: [PATCH 6/7] manager: display date time period in calendar views
 (#70185)

 chrono/agendas/models.py   | 14 ++++----
 chrono/manager/views.py    |  7 ++--
 tests/manager/test_all.py  | 58 +++++++++++++++++++++++++++++++
 tests/test_agendas.py      |  2 +-
 tests/test_time_periods.py | 71 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 143 insertions(+), 9 deletions(-)

                 end_datetime__gt=min_start,
+            )
         def prefetch_desks_and_exceptions(self, with_sources=False, min_date=None):
         def prefetch_desks_and_exceptions(self, min_date, max_date=None, with_sources=False):
             if self.kind == 'meetings':
                 desks = self.desk_set.all()
             elif self.kind == 'virtual':
-...
             else:
                 raise ValueError('does not work with kind %r' % self.kind)
             if min_date:
                 past_date_time_periods = TimePeriod.objects.filter(desk=OuterRef('pk'), date__lt=min_date)
                 desks = desks.annotate(has_past_date_time_periods=Exists(past_date_time_periods))
             past_date_time_periods = TimePeriod.objects.filter(desk=OuterRef('pk'), date__lt=min_date)
             desks = desks.annotate(has_past_date_time_periods=Exists(past_date_time_periods))
                 time_period_queryset = TimePeriod.objects.filter(Q(date__isnull=True) | Q(date__gte=min_date))
             time_period_queryset = TimePeriod.objects.filter(Q(date__isnull=True) | Q(date__gte=min_date))
             if max_date:
                 time_period_queryset = time_period_queryset.filter(Q(date__isnull=True) | Q(date__lte=max_date))
             self.prefetched_desks = desks.prefetch_related(
                 'unavailability_calendars', Prefetch('timeperiod_set', queryset=time_period_queryset)
-...
         def get_opening_hours(self, date):
             openslots = IntervalSet()
             weekday_index = get_weekday_index(date)
             real_date = date.date() if isinstance(date, datetime.datetime) else date
             for timeperiod in self.timeperiod_set.all():
                 if timeperiod.weekday_indexes and weekday_index not in timeperiod.weekday_indexes:
                     continue
                 # timeperiod_set.all() are prefetched, do not filter in queryset
                 if timeperiod.weekday != date.weekday():
                 if timeperiod.date != real_date and timeperiod.weekday != date.weekday():
                     continue
                 start_datetime = make_aware(datetime.datetime.combine(date, timeperiod.start_time))
                 end_datetime = make_aware(datetime.datetime.combine(date, timeperiod.end_time))

             if self.agenda.kind == 'events':
                 queryset = self.agenda.event_set.filter(recurrence_days__isnull=True)
             else:
                 self.agenda.prefetch_desks_and_exceptions()
                 self.agenda.prefetch_desks_and_exceptions(
                     min_date=self.date, max_date=self.get_next_month(self.date.date())
+                )
                 if self.agenda.kind == 'meetings':
                     queryset = self.agenda.event_set.select_related('meeting_type').prefetch_related(
                         'booking_set'
-...
             timeperiods = [
+                t
                 for t in timeperiods
                 if t.weekday == self.date.weekday()
                 if t.date == self.date.date()
                 or t.weekday == self.date.weekday()
                 and (not t.weekday_indexes or get_weekday_index(self.date) in t.weekday_indexes)
+            ]

         assert resp.text.count('height:400.0%') == 1
         assert resp.text.count('height:700.0%') == 1
         assert resp.text.count('height:300.0%') == 1
     @freezegun.freeze_time('2022-11-15 14:00')
     def test_agenda_day_and_month_views_date_time_period(app, admin_user):
         agenda = Agenda.objects.create(label='New Example', kind='meetings')
         desk = Desk.objects.create(agenda=agenda, label='New Desk')
         MeetingType.objects.create(agenda=agenda, label='Bar', duration=30)
         today = datetime.date.today()
         TimePeriod.objects.create(
             desk=desk,
             date=today,
             start_time=datetime.time(10, 0),
             end_time=datetime.time(14, 0),
+        )
         login(app)
         # check day view
         resp = app.get('/manage/agendas/%s/%s/%s/%s/' % (agenda.pk, today.year, today.month, today.day))
         assert resp.text.count('<tr') == 5  # 10->14
         assert 'style="height: 400%; top: 0%;"' in resp.text
         resp = app.get('/manage/agendas/%s/%s/%s/%s/' % (agenda.pk, today.year, today.month, today.day + 7))
         assert 'No opening hours this day.' in resp.text
         # check month view
         resp = app.get('/manage/agendas/%s/%s/%s/' % (agenda.pk, today.year, today.month))
         assert resp.text.count('height:400.0%') == 1
         # check boundaries
         TimePeriod.objects.create(
             desk=desk,
             date=today.replace(day=1),
             start_time=datetime.time(10, 0),
             end_time=datetime.time(14, 0),
+        )
         TimePeriod.objects.create(
             desk=desk,
             date=today.replace(day=30),
             start_time=datetime.time(10, 0),
             end_time=datetime.time(14, 0),
+        )
         resp = app.get('/manage/agendas/%s/%s/%s/' % (agenda.pk, today.year, today.month))
         assert resp.text.count('height:400.0%') == 3
         TimePeriod.objects.create(
             desk=desk,
             date=today.replace(day=31, month=10),
             start_time=datetime.time(10, 0),
             end_time=datetime.time(14, 0),
+        )
         TimePeriod.objects.create(
             desk=desk,
             date=today.replace(day=1, month=12),
             start_time=datetime.time(10, 0),
             end_time=datetime.time(14, 0),
+        )
         resp = app.get('/manage/agendas/%s/%s/%s/' % (agenda.pk, today.year, today.month))
         assert resp.text.count('height:400.0%') == 3

         def check_is_available(result, use_prefetch=True):
             agenda = Agenda.objects.get()
             if with_prefetch and use_prefetch:
                 agenda.prefetch_desks_and_exceptions(with_sources=True)
                 agenda.prefetch_desks_and_exceptions(with_sources=True, min_date=now())
             assert agenda.is_available_for_simple_management() == result
         agenda = Agenda.objects.create(label='Agenda', kind='meetings')

         assert len(hours) == 0
     def test_desk_opening_hours_date_time_period():
         def set_prefetched_exceptions(desk):
             desk.prefetched_exceptions = TimePeriodException.objects.filter(
                 Q(desk=desk) | Q(unavailability_calendar__desks=desk)
+            )
         agenda = Agenda.objects.create(label='Foo bar', slug='bar')
         desk = Desk.objects.create(label='Desk 1', agenda=agenda)
         # morning
         TimePeriod.objects.create(
             desk=desk,
             date=datetime.date(2022, 10, 24),
             start_time=datetime.time(9, 0),
             end_time=datetime.time(12, 0),
+        )
         set_prefetched_exceptions(desk)
         hours = desk.get_opening_hours(datetime.date(2022, 10, 24))
         assert len(hours) == 1
         assert hours[0].begin.time() == datetime.time(9, 0)
         assert hours[0].end.time() == datetime.time(12, 0)
         # and afternoon
         TimePeriod.objects.create(
             desk=desk,
             date=datetime.date(2022, 10, 24),
             start_time=datetime.time(14, 0),
             end_time=datetime.time(17, 0),
+        )
         set_prefetched_exceptions(desk)
         previous_hours = hours
         hours = desk.get_opening_hours(datetime.date(2022, 10, 24))
         assert len(hours) == 2
         assert hours[0] == previous_hours[0]
         assert hours[1].begin.time() == datetime.time(14, 0)
         assert hours[1].end.time() == datetime.time(17, 0)
         # mix with repeating period
         TimePeriod.objects.create(
             desk=desk,
             weekday=0,
             start_time=datetime.time(19, 0),
             end_time=datetime.time(20, 0),
+        )
         previous_hours = hours
         hours = desk.get_opening_hours(datetime.date(2022, 10, 24))
         assert len(hours) == 3
         assert hours[:2] == previous_hours[:2]
         assert hours[2].begin.time() == datetime.time(19, 0)
         assert hours[2].end.time() == datetime.time(20, 0)
         # full day exception
         TimePeriodException.objects.create(
             desk=desk,
             start_datetime=make_aware(datetime.datetime(2022, 10, 24)),
             end_datetime=make_aware(datetime.datetime(2022, 10, 25)),
+        )
         set_prefetched_exceptions(desk)
         hours = desk.get_opening_hours(datetime.date(2022, 10, 24))
         assert len(hours) == 0
         # next week
         hours = desk.get_opening_hours(datetime.date(2022, 10, 31))
         assert len(hours) == 1
         assert hours[0].begin.time() == datetime.time(19, 0)
         assert hours[0].end.time() == datetime.time(20, 0)
     def test_timeperiod_midnight_overlap_time_slots():
         # https://dev.entrouvert.org/issues/29142
         agenda = Agenda(label='Foo bar', slug='bar')
+    -

Projet

Général

Profil

Produits Entr'ouvert » Chrono

0006-manager-display-date-time-period-in-calendar-views-7.patch