altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Reverted materials.html and the view that drives it to before the 4.70 merge.

Browse source 
Tweaked the view to get (I hope) the right things.
 - Legacy-Id: 6580
This commit is contained in:
Robert Sparks 2013-10-31 17:16:53 +00:00
parent 45b9b45f28
commit 7a84ffe197
2 changed files with 20 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ietf/meeting/views.py
View file

@ -46,9 +46,8 @@ from ietf.meeting.helpers import get_modified_from_scheduledsessions
from ietf.meeting.helpers import get_wg_list, find_ads_for_meeting
from ietf.meeting.helpers import get_meeting, get_schedule, agenda_permissions
@decorator_from_middleware(GZipMiddleware)
def materials(request, meeting_num=None, schedule_name=None):
def materials(request, meeting_num=None):
proceeding = get_object_or_404(Proceeding, meeting_num=meeting_num)
begin_date = proceeding.sub_begin_date
cut_off_date = proceeding.sub_cut_off_date
@ -61,17 +60,15 @@ def materials(request, meeting_num=None, schedule_name=None):
sub_began = 0
if now > begin_date:
sub_began = 1
#sessions = Session.objects.filter(meeting__number=meeting_num, timeslot__isnull=False)
meeting = get_meeting(meeting_num)
schedule = get_schedule(meeting, schedule_name)
scheduledsessions = get_scheduledsessions_from_schedule(schedule)
plenaries = scheduledsessions.filter(session__name__icontains='plenary')
ietf = scheduledsessions.filter(session__group__parent__type__slug = 'area').exclude(session__group__acronym='edu')
irtf = scheduledsessions.filter(session__group__parent__acronym = 'irtf')
training = scheduledsessions.filter(session__group__acronym='edu')
iab = scheduledsessions.filter(session__group__parent__acronym = 'iab')
schedule = get_schedule(meeting,None )
sessions = Session.objects.filter(meeting__number=meeting_num,scheduledsession__schedule=schedule )
plenaries = sessions.filter(name__icontains='plenary')
ietf = sessions.filter(group__parent__type__slug = 'area').exclude(group__acronym='edu')
irtf = sessions.filter(group__parent__acronym = 'irtf')
training = sessions.filter(group__acronym='edu')
iab = sessions.filter(group__parent__acronym = 'iab')
cache_version = Document.objects.filter(session__meeting__number=meeting_num).aggregate(Max('time'))["time__max"]
#

27
ietf/templates/meeting/materials.html
View file

@ -15,7 +15,7 @@ table.ietf-materials td { padding:0.5em 0; }
Corrections to submissions cutoff date: {{ cor_cut_off_date|date:"F j, Y" }}</p>
{% endif %}
<ul>
<li><a href="https://datatracker.ietf.org/cgi-bin/wg/wg_proceedings.cgi">Meeting Materials Manager</a> (for session chairs only; password required)</li>
<li><a href="https://pub.ietf.org/proceedings/">Meeting Materials Manager</a> (for session chairs only; password required)</li>
<li><a href="/meeting/{{meeting_num}}/requests">Meeting Request/Conflict Table</a></li>
</ul>
@ -25,7 +25,7 @@ Corrections to submissions cutoff date: {{ cor_cut_off_date|date:"F j, Y" }}</p>
<a href="#plenaries"><b>Plenaries</b></a> &nbsp;|&nbsp;
{% endif %}
{% if ietf %}
{% regroup ietf|dictsort:"session.group.parent.acronym" by session.group.parent.acronym as areas %}
{% regroup ietf|dictsort:"group.parent.acronym" by group.parent.acronym as areas %}
{% for area in areas %}
{% if not forloop.first %}&nbsp;|&nbsp;{% endif %}
<a href="#{{area.grouper}}"><b>{{ area.grouper.upper }}</b></a>
@ -55,15 +55,13 @@ Corrections to submissions cutoff date: {{ cor_cut_off_date|date:"F j, Y" }}</p>
{% if plenaries %}
<a name="plenaries"></a>
<h2 class="ietf-divider">Plenaries</h2>
{% for scheduledsession in plenaries %}
{% with scheduledsession.session as session %}
{% include "meeting/group_materials.html" %}
{% endwith %}
{% for session in plenaries %}
{% include "meeting/group_materials.html" %}
{% endfor %}
{% endif %}
<!-- Working groups -->
{% regroup ietf|dictsort:"session.group.parent.acronym" by session.group.parent.name as areas %}
{% regroup ietf|dictsort:"group.parent.acronym" by group.parent.name as areas %}
{% for sessions in areas %}
<a name="{{sessions.list.0.group.parent.acronym}}"></a>
<h2 class="ietf-divider">{{ sessions.grouper }}</h2>
@ -79,11 +77,9 @@ Corrections to submissions cutoff date: {{ cor_cut_off_date|date:"F j, Y" }}</p>
{% with "False" as show_agenda %}
<a name="training"></a>
<h2 class="ietf-divider">Training</h2>
{% for scheduledsession in training %}
{% for session in training %}
{% ifchanged %}
{% with scheduledsession.session as session %}
{% include "meeting/group_materials.html" %}
{% endwith %}
{% include "meeting/group_materials.html" %}
{% endifchanged %}
{% endfor %}
{% endwith %}
@ -104,12 +100,11 @@ Corrections to submissions cutoff date: {{ cor_cut_off_date|date:"F j, Y" }}</p>
<!-- IRTF Sessions -->
{% if irtf %}
<h2 class="ietf-divider">IRTF</h2>
{% for scheduledsession in irtf|dictsort:"group.acronym" %}
<a name="irtf"></a>
<h2 class="ietf-divider">IRTF</h2>
{% for session in irtf|dictsort:"group.acronym" %}
{% ifchanged %}
{% with scheduledsession.session as session %}
{% include "meeting/group_materials.html" %}
{% endwith %}
{% include "meeting/group_materials.html" %}
{% endifchanged %}
{% endfor %}
{% endif %}