Merged in [18508] from rjsparks@nostrum.com:

Refine day edges on weekview. Fixes #3071.
 - Legacy-Id: 18509
Note: SVN reference [18508] has been migrated to Git commit 750c41a829da416f28cb3c5dc47532bf8fbb4ea6
This commit is contained in:
Henrik Levkowetz 2020-09-22 11:57:37 +00:00
parent 6c86e96bdf
commit 3023139c03

View file

@ -1637,7 +1637,7 @@ def week_view(request, num=None, name=None, owner=None):
# We'll determine this using the saturday before the first scheduled regular session.
first_regular_session = meeting.schedule.qs_assignments_with_sessions.filter(session__type_id='regular').order_by('timeslot__time').first()
first_regular_session_time = first_regular_session.timeslot.time if first_regular_session else date2datetime(meeting.date)
saturday_before = first_regular_session_time - datetime.timedelta(days=(first_regular_session_time.weekday() - 5)%7)
saturday_before = first_regular_session_time.replace(hour=0, minute=0, second=0, microsecond=0) - datetime.timedelta(days=(first_regular_session_time.weekday() - 5)%7)
# saturday_after = saturday_before + datetime.timedelta(days=7)
# filtered_assignments = filtered_assignments.filter(timeslot__time__gte=saturday_before,timeslot__time__lt=saturday_after)
filtered_assignments = preprocess_assignments_for_agenda(filtered_assignments, meeting)