diff options
-rw-r--r-- | lps_gen.py | 11 | ||||
-rw-r--r-- | tests/test_lps_gen.py | 12 |
2 files changed, 17 insertions, 6 deletions
@@ -215,7 +215,8 @@ class LPiCal(object): return attendee - def add_event(self, month, day, t_start, t_end, session, session_info): + def add_event(self, month, day, t_start, t_end, t_name, session, + session_info): """Adds event to calendar. """ event = Event() @@ -225,7 +226,11 @@ class LPiCal(object): event['status'] = vText('CONFIRMED') event['method'] = vText('PUBLISH') - event['summary'] = session + if session == 'st-from-ts': + event['summary'] = t_name + else: + event['summary'] = session + event['location'] = vText(session_info['room']) # Get rid of HTML in 'desc' @@ -268,7 +273,7 @@ class LPiCal(object): # this timeslot continue for session, session_info in sessions.iteritems(): - self.add_event(month, day, t_start, t_end, + self.add_event(month, day, t_start, t_end, t_name, session, session_info) return self.cal.to_ical() diff --git a/tests/test_lps_gen.py b/tests/test_lps_gen.py index b1333f0..5448424 100644 --- a/tests/test_lps_gen.py +++ b/tests/test_lps_gen.py @@ -279,8 +279,9 @@ class TestLPiCal(object): for timeslot_str, sessions in timeslots.iteritems(): t_start, t_end, t_name = self.lp_ical.get_timeslot(timeslot_str) for session, session_info in sessions.iteritems(): - event = self.lp_ical.add_event(month, day, t_start, t_end, - session, session_info) + event = self.lp_ical.add_event(month, day, + t_start, t_end, t_name, + session, session_info) assert event['uid'] not in uids uids.append(event['uid']) @@ -288,7 +289,12 @@ class TestLPiCal(object): assert event['class'] == 'PUBLIC' assert event['status'] == 'CONFIRMED' assert event['method'] == 'PUBLISH' - assert event['summary'] == session + + if session == 'st-from-ts': + assert event['summary'] == t_name + else: + assert event['summary'] == session + assert event['location'] == session_info['room'] assert event['description'] == BeautifulSoup(' '.join( session_info['desc']).replace( |