Added comment docevents when changing SessionPresentation objects. Reworked group materials page to be more helpful when there are multiple SessionPresentations withing a given Meeting

 - Legacy-Id: 8705

Author: rjsparks

ietf/doc/models.py

@@ -203,7 +203,7 @@ 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()]
+        return sorted([pres for pres in candidate_presentations if pres.session.meeting.end_date()>=datetime.date.today()], key=lambda x:x.session.meeting.date)
 
     def last_presented(self):
         """ returns related SessionPresentation objects for the most recent meeting in the past"""

ietf/doc/views_material.py

@@ -270,10 +270,19 @@ def time_sort_key(session):
                     if initial['version'] != new_selection:
                         if initial['version'] == 'notpresented':
                             doc.sessionpresentation_set.create(session=session,rev=new_selection)
+                            c = DocEvent(type="added_comment", doc=doc, by=request.user.person)
+                            c.desc = "Added version %s to session: %s" % (new_selection,session)
+                            c.save()
                         elif new_selection == 'notpresented':
                             doc.sessionpresentation_set.filter(session=session).delete()
+                            c = DocEvent(type="added_comment", doc=doc, by=request.user.person)
+                            c.desc = "Removed from session: %s" % (session)
+                            c.save()
                         else:
                             doc.sessionpresentation_set.filter(session=session).update(rev=new_selection)
+                            c = DocEvent(type="added_comment", doc=doc, by=request.user.person)
+                            c.desc = "Revision for session %s changed to  %s" % (session,new_selection)
+                            c.save()
                 return redirect('doc_view',name=doc.name)
         else:
             form = MaterialVersionForm(choices=choices,initial=initial)

ietf/templates/group/materials.html

@@ -33,8 +33,35 @@ <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>{% 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>
+            <td>{% regroup d.last_presented by session.meeting as past_pres_list %}
+                {% for p in past_pres_list %}
+                  {{ p.grouper }}
+                   {% if p.list|length > 1 %}
+                       ( {{ p.list|length }} sessions )
+                   {% else %}
+                       {% for pr in p.list %}
+                         {% if pr.rev != d.rev %}
+                           (-{{ pr.rev }})
+                         {% endif %}
+                       {% endfor %}
+                   {% endif %}
+                   {% if not forloop.last %}, {% endif %}
+               {% endfor %}
+            <td>{% regroup d.future_presentations by session.meeting as meeting_pres_list %} 
+                {% for p in meeting_pres_list %}
+                   {{ p.grouper }}
+                   {% if p.list|length > 1 %}
+                       ( {{ p.list|length }} sessions )
+                   {% else %}
+                       {% for pr in p.list %}
+                         {% if pr.rev != d.rev %}
+                           (-{{ pr.rev }})
+                         {% endif %}
+                       {% endfor %}
+                   {% endif %}
+                   {% if not forloop.last %}, {% endif %}
+                {% endfor %}
+            </td>
           </tr>
         {% endfor %}
       </table>