snapshot before SIPit - have a working session presentation edit form

 - Legacy-Id: 8358

Author: rjsparks

ietf/doc/models.py

@@ -184,6 +184,24 @@ def meeting_related(self):
             self.name.split("-")[1] == "interim"
             or (self.session_set.exists() if isinstance(self, Document) else self.doc.session_set.exists())))
 
+    def future_presentations(self):
+        """ returns related SessionPresentation objects for meetings that
+            have not yet ended. This implementation allows for 2 week meetings """
+        candidate_presentations = self.sessionpresentation_set.filter(session__meeting__date__gte=datetime.date.today()-datetime.timedelta(days=15))
+        return [pres for pres in candidate_presentations if pres.session.meeting.end_date()>=datetime.date.today()]
+
+    def last_presented(self):
+        """ returns related SessionPresentation objects for the most recent meeting in the past"""
+        # Assumes no two meetings have the same start date - if the assumption is violated, one will be chosen arbitrariy
+        candidate_presentations = self.sessionpresentation_set.filter(session__meeting__date__lte=datetime.date.today())
+        candidate_meetings = set([p.session.meeting for p in candidate_presentations if p.session.meeting.end_date()<datetime.date.today()])
+        if candidate_meetings:
+            mtg = sorted(list(candidate_meetings),key=lambda x:x.date,reverse=True)[0]
+            return self.sessionpresentation_set.filter(session__meeting=mtg)
+        else:
+            return None
+
+
     class Meta:
         abstract = True
 

ietf/doc/urls_material.py

@@ -2,5 +2,6 @@
 
 urlpatterns = patterns('ietf.doc.views_material',
     url(r'^(?P<action>state|title|revise)/$', "edit_material", name="material_edit"),
+    url(r'^sessions/$', "material_presentations", name="material_presentations"),
 )
 

ietf/doc/views_doc.py

@@ -493,6 +493,9 @@ def document_main(request, name, rev=None):
 
     if doc.type_id in ("slides", "agenda", "minutes"):
         can_manage_material = can_manage_materials(request.user, doc.group)
+        presentations = None
+        if doc.type_id=='slides' and doc.get_state_slug('slides') in ['sessonly','active']:
+            presentations = doc.future_presentations()
         if doc.meeting_related():
             # disallow editing meeting-related stuff through this
             # interface for the time being
@@ -530,6 +533,7 @@ def document_main(request, name, rev=None):
                                        snapshot=snapshot,
                                        can_manage_material=can_manage_material,
                                        other_types=other_types,
+                                       presentations=presentations,
                                        ),
                                   context_instance=RequestContext(request))
 

ietf/doc/views_material.py

@@ -17,6 +17,7 @@
 from ietf.doc.utils import add_state_change_event, check_common_doc_name_rules
 from ietf.group.models import Group
 from ietf.group.utils import can_manage_materials
+from ietf.meeting.models import Session
 
 @login_required
 def choose_material_type(request, acronym):
@@ -168,3 +169,56 @@ def edit_material(request, name=None, acronym=None, action=None, doc_type=None):
         'document_type': document_type,
         'doc_name': doc.name if doc else "",
     })
+
+class MaterialPresentationForm(forms.Form):
+
+    sesspres = forms.MultipleChoiceField(required=False,widget=forms.CheckboxSelectMultiple,label='Place this document on the agenda for the selected sessions')
+
+    def __init__(self,*args,**kwargs):
+        choices = kwargs.pop('choices')
+        super(MaterialPresentationForm,self).__init__(*args,**kwargs)
+        self.fields['sesspres'].choices=choices
+
+@login_required
+def material_presentations(request, name):
+
+    doc = get_object_or_404(Document, name=name)
+    if not (doc.type_id=='slides' and doc.get_state('slides').slug=='active'):
+        raise Http404
+
+    group = doc.group
+    if not (group.features.has_materials and can_manage_materials(request.user,group)):
+        raise Http404
+
+    # Find all the sessions for meetings that haven't ended that the user could affect
+    # This motif is also in Document.future_presentations - it would be nice to consolodate it somehow
+    candidate_sessions = Session.objects.filter(meeting__date__gte=datetime.date.today()-datetime.timedelta(days=15))
+    refined_candidates = [ sess for sess in candidate_sessions if sess.meeting.end_date()>=datetime.date.today()]
+    changeable_sessions = [ sess for sess in refined_candidates if can_manage_materials(request.user, sess.group) ]
+    for sess in changeable_sessions:
+        sess.has_presentation = sess.sessionpresentation_set.filter(document=doc)
+    sorted_sessions = sorted(changeable_sessions,key=lambda x:'%s%s%s'%('0' if x.has_presentation else '1',x.meeting,x.short_name))
+
+    choices=[(sess.pk,'%s: %s'%(sess.meeting,sess.short_name)) for sess in sorted_sessions]
+    initial = {'sesspres': [sess.pk for sess in sorted_sessions if sess.has_presentation]}
+
+    if request.method == 'POST':
+        form = MaterialPresentationForm(request.POST,choices=choices)
+        if form.is_valid():
+            print "STUFF",request.POST.get("action","nothing to be gotten")
+            if request.POST.get("action", "") == "Save":
+                new_selections = form.cleaned_data['sesspres']
+                doc.sessionpresentation_set.filter(session_id__in=(set(initial['sesspres'])-set(new_selections))).delete()
+                for sess_pk in set(new_selections)-set(initial['sesspres']):
+                    doc.sessionpresentation_set.create(session_id=sess_pk,rev=doc.rev)
+            return redirect('doc_view',name=doc.name)
+    else:
+        form = MaterialPresentationForm(choices=choices,
+                                        initial=initial,
+                                       )
+
+    return render(request, 'doc/material/material_presentations.html', {
+        'sessions' : sorted_sessions,
+        'doc': doc,
+        'form': form,
+    })

ietf/group/info.py

@@ -268,7 +268,7 @@ def concluded_groups(request):
 
 def get_group_materials(group):
 #   return Document.objects.filter(group=group, type__in=group.features.material_types, session=None).exclude(states__slug="deleted")
-    return Document.objects.filter(group=group, type__in=group.features.material_types).exclude(states__slug="deleted")
+    return Document.objects.filter(group=group, type__in=group.features.material_types).exclude(states__slug__in=['deleted','archived'])
 
 def construct_group_menu_context(request, group, selected, group_type, others):
     """Return context with info for the group menu filled in."""
@@ -451,8 +451,6 @@ def materials(request, acronym, group_type=None):
         if d.type not in doc_types:
             doc_types[d.type] = []
         doc_types[d.type].append(d)
-        # This needs to be better - probably looking at ScheduledSession, and perhaps ignoring future Sessions
-        d.last_presented = d.sessionpresentation_set.order_by('-session__meeting__date').first()
 
     return render(request, 'group/materials.html',
                   construct_group_menu_context(request, group, "materials", group_type, {

ietf/templates/doc/document_material.html

@@ -26,6 +26,13 @@
       </td>
     </tr>
 
+    {% if doc.abstract %}
+    <tr>
+     <td>Abstract:</td>
+     <td> {{ doc.abstract | format_snippet }} </td>
+    </tr>
+    {% endif %}
+
     <tr>
       <td>State:</td>
       <td>
@@ -44,6 +51,21 @@
     </tr>
     {% endif %}
 
+    {% if presentations or can_manage_material %}
+    <tr>
+      <td>On Agenda:</td>
+      <td>
+         <a {% if not snapshot and can_manage_material %} class="editlink" href="{% url "material_presentations" name=doc.name %}"{%endif%}>
+         {% if presentations %}
+           {% for pres in presentations %}{{pres.session.short_name}} at {{pres.session.meeting}} {% if pres.rev != doc.rev %}(version -{{pres.rev}}){% endif %}{% if not forloop.last %}, {% endif %}{% endfor %}
+        {% else %}
+           None
+        {% endif %}
+        </a>
+      </td>        
+    </tr>
+    {% endif %}
+
     <tr>
       <td>Last updated:</td>
       <td>{{ doc.time|date:"Y-m-d" }}</td>
@@ -74,3 +96,6 @@ <h3>{{ doc.title }}</h3>
 
 {% endblock %}
 
+{% block content_end %}
+<script src="/js/snippet.js" type="text/javascript"></script>
+{% endblock %}

ietf/templates/doc/material/material_presentations.html

@@ -0,0 +1,23 @@
+{% extends "base.html" %}
+
+{% block title %}
+Edit Upcoming Presentations
+{% endblock %}
+
+{% block morecss %}
+{{ block.super }}
+ul#id_sesspres { list-style-type: none; padding: 0px; margin: 0px; }
+{% endblock %}
+
+{% block content %}
+{% load ietf_filters %}
+
+<h1>Edit Upcoming Presentations of<br/>{{doc.title}}<br/>{{doc.name}}</h1>
+
+<form class="session-presentations" action="" method="post">{% csrf_token %}
+{{form.as_p}}
+<input style="button" type="submit" name="action" value="Save">
+<input style="button" type="submit" name="action" value="Cancel">
+</form>
+
+{% endblock content %}

ietf/templates/group/materials.html

@@ -24,6 +24,7 @@ <h2>{{ doc_type.name }}</h2>
           <th>Curr. Rev.</th>
           <th>Date</th>
           <th>Last Presented</th>
+          <th>On Agenda</th>
         </tr>
 
         {% for d in docs %}
@@ -32,7 +33,8 @@ <h2>{{ doc_type.name }}</h2>
             <td class='snippable'>{{ d.abstract|format_snippet }} </td>
             <td>{{ d.rev }}</td>
             <td>{{ d.time|date:"Y-m-d" }}</td>
-            <td>{% if d.last_presented %}-{{ d.last_presented.rev }} at {{d.last_presented.session.meeting}}{% endif %}</td>
+            <td>{% for p in  d.last_presented %}{{p.session.meeting}}{% if d.rev != p.rev %} (-{{ p.rev }}){% endif %}{%if not forloop.last%}, {% endif %}{% endfor %}</td>
+            <td>{% for p in d.future_presentations %}{{p.session.meeting}}{% if d.rev != p.rev %} (-{{p.rev}}){%endif%}{%if not forloop.last%}, {%endif%}{%endfor%}</td>
           </tr>
         {% endfor %}
       </table>