0001-agendas-export-time-period-weekday-indexes-65941.patch
chrono/agendas/models.py | ||
---|---|---|
1121 | 1121 |
def export_json(self): |
1122 | 1122 |
return { |
1123 | 1123 |
'weekday': self.weekday, |
1124 |
'weekday_indexes': self.weekday_indexes, |
|
1124 | 1125 |
'start_time': self.start_time.strftime('%H:%M'), |
1125 | 1126 |
'end_time': self.end_time.strftime('%H:%M'), |
1126 | 1127 |
} |
tests/test_import_export.py | ||
---|---|---|
61 | 61 |
tpx_end = make_aware(datetime.datetime(2017, 5, 22, 12, 30)) |
62 | 62 |
TimePeriodException.objects.create(desk=desk, start_datetime=tpx_start, end_datetime=tpx_end) |
63 | 63 |
TimePeriodException.objects.create(desk=exceptions_desk, start_datetime=tpx_start, end_datetime=tpx_end) |
64 |
TimePeriod.objects.create( |
|
65 |
desk=desk, weekday=2, start_time=tpx_start.time(), end_time=tpx_end.time(), weekday_indexes=[1, 3] |
|
66 |
) |
|
64 | 67 | |
65 | 68 |
output = get_output_of_command('export_site') |
66 | 69 |
assert len(json.loads(output)['agendas']) == 2 |
... | ... | |
90 | 93 |
assert TimePeriodException.objects.get(desk__agenda__kind='meetings').end_datetime == tpx_end |
91 | 94 |
assert TimePeriodException.objects.get(desk__agenda__kind='events').start_datetime == tpx_start |
92 | 95 |
assert TimePeriodException.objects.get(desk__agenda__kind='events').end_datetime == tpx_end |
96 |
assert TimePeriod.objects.get().weekday_indexes == [1, 3] |
|
93 | 97 | |
94 | 98 |
agenda1 = Agenda.objects.get(label='Events Agenda') |
95 | 99 |
agenda2 = Agenda.objects.get(label='Meetings Agenda') |
96 |
- |