Fixes Ticket #1806. Legacy session scheduling view broken. Commit ready for merge.
- Legacy-Id: 10338
This commit is contained in:
parent
0b829e6ef2
commit
67e1678b13
|
@ -46,7 +46,7 @@ def get_times(meeting,day):
|
|||
The label is [start_time]-[end_time].
|
||||
'''
|
||||
# pick a random room
|
||||
rooms = Room.objects.filter(meeting=meeting)
|
||||
rooms = Room.objects.filter(meeting=meeting,session_types='session')
|
||||
if rooms:
|
||||
room = rooms[0]
|
||||
else:
|
||||
|
|
|
@ -11,6 +11,7 @@ from ietf.group.models import Group, GroupEvent
|
|||
from ietf.meeting.models import Meeting, Room, TimeSlot, SchedTimeSessAssignment
|
||||
from ietf.meeting.test_data import make_meeting_test_data
|
||||
from ietf.person.models import Person
|
||||
from ietf.secr.meetings.forms import get_times
|
||||
from ietf.utils.mail import outbox
|
||||
from ietf.utils.test_utils import TestCase
|
||||
|
||||
|
@ -244,6 +245,15 @@ class MainTestCase(TestCase):
|
|||
self.assertEqual(response.status_code, 200)
|
||||
q = PyQuery(response.content)
|
||||
self.assertEqual(len(q("#id_scheduled_sessions")),1)
|
||||
|
||||
# def test_meetings_schedule():
|
||||
|
||||
|
||||
# ----------------------
|
||||
# Unit Tests
|
||||
# -----------------------
|
||||
def test_get_times(self):
|
||||
meeting = make_meeting_test_data()
|
||||
timeslot = meeting.timeslot_set.filter(type='session').first()
|
||||
day = timeslot.time.weekday() + 2 # add 2 to match django __week_day filter
|
||||
times = get_times(meeting,day)
|
||||
values = [ x[0] for x in times ]
|
||||
self.assertTrue(times)
|
||||
self.assertTrue(timeslot.time.strftime('%H%M') in values)
|
Loading…
Reference in a new issue