Skip to content

Commit 67e1678

Browse files
committed
Fixes Ticket ietf-tools#1806. Legacy session scheduling view broken. Commit ready for merge.
- Legacy-Id: 10338
1 parent 0b829e6 commit 67e1678

2 files changed

Lines changed: 14 additions & 4 deletions

File tree

ietf/secr/meetings/forms.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def get_times(meeting,day):
4646
The label is [start_time]-[end_time].
4747
'''
4848
# pick a random room
49-
rooms = Room.objects.filter(meeting=meeting)
49+
rooms = Room.objects.filter(meeting=meeting,session_types='session')
5050
if rooms:
5151
room = rooms[0]
5252
else:

ietf/secr/meetings/tests.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
from ietf.meeting.models import Meeting, Room, TimeSlot, SchedTimeSessAssignment
1212
from ietf.meeting.test_data import make_meeting_test_data
1313
from ietf.person.models import Person
14+
from ietf.secr.meetings.forms import get_times
1415
from ietf.utils.mail import outbox
1516
from ietf.utils.test_utils import TestCase
1617

@@ -244,6 +245,15 @@ def test_meetings_select_group(self):
244245
self.assertEqual(response.status_code, 200)
245246
q = PyQuery(response.content)
246247
self.assertEqual(len(q("#id_scheduled_sessions")),1)
247-
248-
# def test_meetings_schedule():
249-
248+
249+
# ----------------------
250+
# Unit Tests
251+
# -----------------------
252+
def test_get_times(self):
253+
meeting = make_meeting_test_data()
254+
timeslot = meeting.timeslot_set.filter(type='session').first()
255+
day = timeslot.time.weekday() + 2 # add 2 to match django __week_day filter
256+
times = get_times(meeting,day)
257+
values = [ x[0] for x in times ]
258+
self.assertTrue(times)
259+
self.assertTrue(timeslot.time.strftime('%H%M') in values)

0 commit comments

Comments
 (0)