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

manager: adapt December view to work when last week is week 1 (#27670)

This commit is contained in:
Frédéric Péters 2018-10-30 15:03:09 +01:00
parent 07402527c2
commit 5f042b7ee5
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chrono/manager/views.py
View File

@ -338,6 +338,9 @@ class AgendaMonthView(AgendaDateView, MonthArchiveView):
last_month_day = self.get_next_month(self.date.date()) - datetime.timedelta(days=1)
last_week_number = last_month_day.isocalendar()[1]
if last_week_number < first_week_number: # new year
last_week_number = 53
for week_number in range(first_week_number, last_week_number + 1):
yield self.get_week_timetable_infos(week_number-first_week_number, timeperiods)

6
tests/test_manager.py
View File

@ -1390,6 +1390,7 @@ def test_agenda_month_view(app, admin_user, manager_user, api_user):
assert 'Day view' in resp.text # date view link should be present
assert 'No opening hours this month.' in resp.text
today = datetime.date(2018, 11, 10) # fixed day
timeperiod_weekday = today.weekday()
timeperiod = TimePeriod(desk=desk, weekday=timeperiod_weekday,
start_time=datetime.time(10, 0),
@ -1459,6 +1460,11 @@ def test_agenda_month_view(app, admin_user, manager_user, api_user):
resp = app.get('/manage/agendas/%s/%s/%s/' % (agenda.id, today.year, today.month))
assert resp.text.count('<div class="booking"') == 0
# check December is correctly displayed
today = datetime.date(2018, 12, 10)
resp = app.get('/manage/agendas/%s/%s/%s/' % (agenda.id, today.year, today.month))
assert not 'No opening hours this month.' in resp.text
def test_import_agenda_as_manager(app, manager_user):
# open /manage/ access to manager_user, and check agenda import is not
# allowed.