entrouvert
/
chrono
14
1
Fork 0
Code Issues Pull Requests 5 Releases Wiki Activity

agendas: export time period weekday indexes (#65941)

This commit is contained in:
Valentin Deniaud 2022-06-07 14:13:24 +02:00
parent 4617dbdebb
commit 0b7ff2444d
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
chrono/agendas/models.py
View File

@ -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'),
}

4
tests/test_import_export.py
View File

@ -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')