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

misc: ignore timezone offset when exporting events (#36408)

This commit is contained in:
Frédéric Péters 2019-09-24 15:43:54 +02:00
parent 268aca3d0f
commit f95b3033e1
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chrono/agendas/models.py
View File

@ -349,7 +349,7 @@ class Event(models.Model):
def export_json(self):
return {
'start_datetime': self.start_datetime.strftime('%Y-%m-%d %H:%M:%S'),
'start_datetime': make_naive(self.start_datetime).strftime('%Y-%m-%d %H:%M:%S'),
'places': self.places,
'waiting_list_places': self.waiting_list_places,
'label': self.label

4
tests/test_import_export.py
View File

@ -34,6 +34,8 @@ def get_output_of_command(command, *args, **kwargs):
def test_import_export(app, some_data, meetings_agenda):
first_event = Agenda.objects.get(label='Foo bar').event_set.first()
# add exception to meeting agenda
desk = meetings_agenda.desk_set.first()
tpx_start = make_aware(datetime.datetime(2017, 5, 22, 8, 0))
@ -64,6 +66,8 @@ def test_import_export(app, some_data, meetings_agenda):
call_command('import_site', f.name)
assert Agenda.objects.count() == 3
first_imported_event = Agenda.objects.get(label='Foo bar').event_set.first()
assert first_imported_event.start_datetime == first_event.start_datetime
assert TimePeriodException.objects.get().start_datetime == tpx_start
assert TimePeriodException.objects.get().end_datetime == tpx_end