From 67e1678b1383014fed7e41f0ba5c4ec0a31c9d0c Mon Sep 17 00:00:00 2001 From: Ryan Cross Date: Sat, 31 Oct 2015 04:27:12 +0000 Subject: [PATCH] Fixes Ticket #1806. Legacy session scheduling view broken. Commit ready for merge. - Legacy-Id: 10338 --- ietf/secr/meetings/forms.py | 2 +- ietf/secr/meetings/tests.py | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ietf/secr/meetings/forms.py b/ietf/secr/meetings/forms.py index 6d4ba3aad..9d646e976 100644 --- a/ietf/secr/meetings/forms.py +++ b/ietf/secr/meetings/forms.py @@ -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: diff --git a/ietf/secr/meetings/tests.py b/ietf/secr/meetings/tests.py index 52869be71..500284c50 100644 --- a/ietf/secr/meetings/tests.py +++ b/ietf/secr/meetings/tests.py @@ -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) \ No newline at end of file