0001-manager-adapt-December-view-to-work-when-last-week-i.patch

Frédéric Péters, 30 octobre 2018 15:03

Voir les différences: en ligne côte à côte

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

 chrono/manager/views.py | 3 +++
 tests/test_manager.py   | 6 ++++++
 2 files changed, 9 insertions(+)

             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)

         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),
-...
         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.
+    -

Produits Entr'ouvert » Chrono