From 5aea9386383fd3fa7573ab4ae9c0bfd5954a8c29 Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Tue, 7 Jun 2022 14:13:24 +0200 Subject: [PATCH] agendas: export time period weekday indexes (#65941) --- chrono/agendas/models.py | 1 + tests/test_import_export.py | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/chrono/agendas/models.py b/chrono/agendas/models.py index 53f1b008..346acbab 100644 --- a/chrono/agendas/models.py +++ b/chrono/agendas/models.py @@ -1121,6 +1121,7 @@ class TimePeriod(models.Model): def export_json(self): return { 'weekday': self.weekday, + 'weekday_indexes': self.weekday_indexes, 'start_time': self.start_time.strftime('%H:%M'), 'end_time': self.end_time.strftime('%H:%M'), } diff --git a/tests/test_import_export.py b/tests/test_import_export.py index c81cfb96..30cfa29f 100644 --- a/tests/test_import_export.py +++ b/tests/test_import_export.py @@ -61,6 +61,9 @@ def test_import_export(app): tpx_end = make_aware(datetime.datetime(2017, 5, 22, 12, 30)) TimePeriodException.objects.create(desk=desk, start_datetime=tpx_start, end_datetime=tpx_end) TimePeriodException.objects.create(desk=exceptions_desk, start_datetime=tpx_start, end_datetime=tpx_end) + TimePeriod.objects.create( + desk=desk, weekday=2, start_time=tpx_start.time(), end_time=tpx_end.time(), weekday_indexes=[1, 3] + ) output = get_output_of_command('export_site') assert len(json.loads(output)['agendas']) == 2 @@ -90,6 +93,7 @@ def test_import_export(app): assert TimePeriodException.objects.get(desk__agenda__kind='meetings').end_datetime == tpx_end assert TimePeriodException.objects.get(desk__agenda__kind='events').start_datetime == tpx_start assert TimePeriodException.objects.get(desk__agenda__kind='events').end_datetime == tpx_end + assert TimePeriod.objects.get().weekday_indexes == [1, 3] agenda1 = Agenda.objects.get(label='Events Agenda') agenda2 = Agenda.objects.get(label='Meetings Agenda') -- 2.30.2