Fix meeting agenda

- Legacy-Id: 551

ietf/meeting/views.py

@@ -19,7 +19,7 @@ def show_html_materials(request, meeting_num=None):
     if now > begin_date:
         sub_began = 1
     # List of WG sessions and Plenary sessions
-    queryset_list = WgMeetingSession.objects.filter(Q(meeting=meeting_num, group_acronym_id__gte = -2, status_id=4), Q(irtf__isnull=True) | Q(irtf=0))
+    queryset_list = WgMeetingSession.objects.filter(Q(meeting=meeting_num, group_acronym_id__gte = -3, status_id=4), Q(irtf__isnull=True) | Q(irtf=0))
     queryset_irtf = WgMeetingSession.objects.filter(meeting=meeting_num, group_acronym_id__gte = -2, status_id=4, irtf__gt=0)
     queryset_interim = []
     queryset_training = []

ietf/proceedings/models.py

@@ -234,8 +234,8 @@ class MeetingTime(models.Model):
     def morning_br_info(self):
 	br_info = NonSession.objects.get(models.Q(day_id=self.day_id) | models.Q(day_id__isnull=True), meeting=self.meeting, non_session_ref=2)
         # Hack, hack.  Please update the database instead!
-        #return "%s %s" % (br_info.time_desc, br_info.non_session_ref)
-        return "%s %s" % (br_info.time_desc, "Continental Breakfast")
+        return "%s %s" % (br_info.time_desc, br_info.non_session_ref)
+        #return "%s %s" % (br_info.time_desc, "Continental Breakfast")
     def lunch_br_info(self):
         return NonSession.objects.get(meeting=self.meeting, non_session_ref=3).time_desc
     def an_br1_info(self):

ietf/templates/meeting/agenda.html

@@ -37,10 +37,10 @@ Updated as of {% now "F j, Y, H:i:s (T)" %}
 	 {{ day.list.0.lunch_br_info }} Break<br>
       {% endifequal %}
       {% ifequal item.session_name_id 4 %}
-	 {{ day.list.0.an_br1_info }}<br>
+	 {{ day.list.0.an_br1_info }} - {{ meetingvenue_info.break_area_name }}<br>
       {% endifequal %}
       {% ifequal item.session_name_id 5 %}
-	 {{ day.list.0.an_br2_info }}<br>
+	 {{ day.list.0.an_br2_info }} - {{ meetingvenue_info.break_area_name }}<br>
       {% endifequal %}
       <b>{{ item.time_desc }} {{ item.session_name }} </b>
       {% ifequal item.sessions.0.acronym "plenaryw" %}