merged forward. Adjusted new proceedings code to new models. Found bug in earlier work on proceedings code exposing places that tests are not covering.

 - Legacy-Id: 8589

Author: rjsparks

ietf/doc/migrations/0024_archive_slides.py

@@ -186,10 +186,37 @@ def active_ballot(self):
             return None
 
     def meeting_related(self):
+        if self.type_id in ("agenda","minutes",):
+            return (self.name.split("-")[1] == "interim"
+                   or (self.session_set.exists() if isinstance(self, Document) else self.doc.session_set.exists()))
+        elif self.type_id in ("slides",):
+            return (self.name.split("-")[1] == "interim"
+                   or (self.get_state('slides') in ("sessonly","archived") ))
+        else:
+            return False
+
         return(self.type_id in ("agenda", "minutes", "slides") and (
             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/models.py

@@ -448,12 +448,29 @@ def format_history_text(text):
     if text.startswith("This was part of a ballot set with:"):
         full = urlize_ietf_docs(full)
 
-    full = mark_safe(keep_spacing(linebreaksbr(urlize(sanitize_html(full)))))
+    return format_snippet(full)
+
+@register.filter
+def format_snippet(text): 
+    full = mark_safe(keep_spacing(linebreaksbr(urlize(sanitize_html(text)))))
     snippet = truncatewords_html(full, 25)
     if snippet != full:
         return mark_safe(u'<div class="snippet">%s<span class="show-all">[show all]</span></div><div style="display:none" class="full">%s</div>' % (snippet, full))
     return full
 
+@register.filter
+def format_editable_snippet(text,link): 
+    full = mark_safe(keep_spacing(linebreaksbr(urlize(sanitize_html(text)))))
+    snippet = truncatewords_html(full, 25)
+    if snippet != full:
+        return mark_safe(u'<div class="snippet">%s<span class="show-all">[show all]</span></div><div style="display:none" class="full">%s' % (format_editable(snippet,link),format_editable(full,link)) )
+    else:
+        return format_editable(full,link)
+
+@register.filter
+def format_editable(text,link): 
+    return mark_safe(u'<a class="editlink" href="%s">%s</a>' % (link,text))
+
 @register.filter
 def textify(text):
     text = re.sub("</?b>", "*", text)

ietf/doc/templatetags/ietf_filters.py

@@ -66,6 +66,7 @@ def test_upload_slides(self):
 
         # post
         r = self.client.post(url, dict(title="Test File - with fancy title",
+                                       abstract = "Test Abstract",
                                        name="slides-%s-test-file" % group.acronym,
                                        state=State.objects.get(type="slides", slug="active").pk,
                                        material=test_file))
@@ -125,6 +126,7 @@ def test_revise(self):
 
         # post
         r = self.client.post(url, dict(title="New title",
+                                       abstract="New abstract",
                                        state=State.objects.get(type="slides", slug="active").pk,
                                        material=test_file))
         self.assertEqual(r.status_code, 302)

ietf/doc/tests_material.py

@@ -1,6 +1,13 @@
 from django.conf.urls import patterns, url
 
 urlpatterns = patterns('ietf.doc.views_material',
-    url(r'^(?P<action>state|title|revise)/$', "edit_material", name="material_edit"),
+    url(r'^(?P<action>state|title|abstract|revise)/$', "edit_material", name="material_edit"),
+    url(r'^sessions/$', "material_presentations", name="material_presentations"),
+    (r'^sessions/(?P<seq>\d+)/$',  "material_presentations"),
+    (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/$',  "material_presentations"),
+    (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<seq>\d+)/$',  "material_presentations"),
+    (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<week_day>[a-zA-Z]+)/$',  "material_presentations"),
+    (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<date>\d{4}-\d{2}-\d{2}(-\d{4})?)/$',  "material_presentations"),
+    (r'^sessions/(?P<acronym>[A-Za-z0-9_\-\+]+)/(?P<date>\d{4}-\d{2}-\d{2}(-\d{4})?)/(?P<seq>\d+)/$',  "material_presentations"),
 )
 

ietf/doc/urls_material.py

@@ -497,6 +497,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
@@ -534,6 +537,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_doc.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):
@@ -32,8 +33,9 @@ def choose_material_type(request, acronym):
 class UploadMaterialForm(forms.Form):
     title = forms.CharField(max_length=Document._meta.get_field("title").max_length)
     name = forms.CharField(max_length=Document._meta.get_field("name").max_length)
+    abstract = forms.CharField(max_length=Document._meta.get_field("abstract").max_length,widget=forms.Textarea)
     state = forms.ModelChoiceField(State.objects.all(), empty_label=None)
-    material = forms.FileField(label='File', help_text="PDF or text file (ASCII/UTF-8)")
+    material = forms.FileField(label='File')
 
     def __init__(self, doc_type, action, group, doc, *args, **kwargs):
         super(UploadMaterialForm, self).__init__(*args, **kwargs)
@@ -53,16 +55,15 @@ def __init__(self, doc_type, action, group, doc, *args, **kwargs):
             del self.fields["name"]
 
             self.fields["title"].initial = doc.title
+            self.fields["abstract"].initial = doc.abstract
             self.fields["state"].initial = doc.get_state().pk if doc.get_state() else None
             if doc.get_state_slug() == "deleted":
                 self.fields["state"].help_text = "Note: If you wish to revise this document, you may wish to change the state so it's not deleted."
 
-            if action == "title":
-                del self.fields["state"]
-                del self.fields["material"]
-            elif action == "state":
-                del self.fields["title"]
-                del self.fields["material"]
+            if action in ["title","state","abstract"]:
+                for fieldname in ["title","state","material","abstract"]: 
+                    if fieldname != action:
+                        del self.fields[fieldname]
 
     def clean_name(self):
         name = self.cleaned_data["name"].strip().rstrip("-")
@@ -120,6 +121,9 @@ def edit_material(request, name=None, acronym=None, action=None, doc_type=None):
             if "title" in form.cleaned_data:
                 doc.title = form.cleaned_data["title"]
 
+            if "abstract" in form.cleaned_data:
+                doc.abstract = form.cleaned_data["abstract"]
+
             doc.time = datetime.datetime.now()
 
             if "material" in form.fields:
@@ -168,3 +172,120 @@ 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 MaterialVersionForm(forms.Form):
+
+    version = forms.ChoiceField(required=False,
+                                label='Which version of this document will be presented at this session')
+
+    def __init__(self, *args, **kwargs):
+        choices = kwargs.pop('choices')
+        super(MaterialVersionForm,self).__init__(*args,**kwargs)
+        self.fields['version'].choices = choices
+
+@login_required
+def material_presentations(request, name, acronym=None, date=None, seq=None, week_day=None):
+
+    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.exclude(status__in=['canceled','disappr','notmeet','deleted']).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()]
+
+    if acronym:
+        refined_candidates = [ sess for sess in refined_candidates if sess.group.acronym==acronym]
+
+    if date:
+        if len(date)==15:
+            start = datetime.datetime.strptime(date,"%Y-%m-%d-%H%M")
+            refined_candidates = [ sess for sess in refined_candidates if sess.scheduledsession_set.filter(schedule=sess.meeting.agenda,timeslot__time=start) ]
+        else:
+            start = datetime.datetime.strptime(date,"%Y-%m-%d").date()
+            end = start+datetime.timedelta(days=1)
+            refined_candidates = [ sess for sess in refined_candidates if sess.scheduledsession_set.filter(schedule=sess.meeting.agenda,timeslot__time__range=(start,end)) ]
+
+    if week_day:
+        try:
+            dow = ['sun','mon','tue','wed','thu','fri','sat'].index(week_day.lower()[:3]) + 1
+        except ValueError:
+            raise Http404
+        refined_candidates = [ sess for sess in refined_candidates if sess.scheduledsession_set.filter(schedule=sess.meeting.agenda,timeslot__time__week_day=dow) ]
+
+    changeable_sessions = [ sess for sess in refined_candidates if can_manage_materials(request.user, sess.group) ]
+
+    if not changeable_sessions:
+        raise Http404
+
+    for sess in changeable_sessions:
+        sess.has_presentation = bool(sess.sessionpresentation_set.filter(document=doc))
+        if sess.has_presentation:
+            sess.version = sess.sessionpresentation_set.get(document=doc).rev
+
+    # Since Python 2.2 sorts are stable, so this series results in a list sorted first by whether
+    # the session has any presentations, then by the meeting 'number', then by session's group 
+    # acronym, then by scheduled time (or the time of the session request if the session isn't 
+    # scheduled).
+    
+    def time_sort_key(session):
+        official_sessions = session.scheduledsession_set.filter(schedule=session.meeting.agenda)
+        if official_sessions:
+            return official_sessions.first().timeslot.time
+        else:
+            return session.requested
+
+    time_sorted = sorted(changeable_sessions,key=time_sort_key)
+    acronym_sorted = sorted(time_sorted,key=lambda x: x.group.acronym)
+    meeting_sorted = sorted(acronym_sorted,key=lambda x: x.meeting.number)
+    sorted_sessions = sorted(meeting_sorted,key=lambda x: '0' if x.has_presentation else '1')
+    
+    if seq:
+        iseq = int(seq) - 1
+        if not iseq in range(0,len(sorted_sessions)):
+            raise Http404
+        else:
+            sorted_sessions = [sorted_sessions[iseq]]
+
+    for index,session in enumerate(sorted_sessions):
+        session.sequence = index+1
+
+    if len(sorted_sessions)==1:
+        session = sorted_sessions[0]
+        choices = [('notpresented','Not Presented')]
+        choices.extend([(x,x) for x in doc.docevent_set.filter(type='new_revision').values_list('newrevisiondocevent__rev',flat=True)])
+        initial = {'version' : session.version if hasattr(session,'version') else 'notpresented'}
+
+        if request.method == 'POST':
+            form = MaterialVersionForm(request.POST,choices=choices)
+            if form.is_valid():
+                if request.POST.get("action", "") == "Save":
+                    new_selection = form.cleaned_data['version']
+                    if initial['version'] != new_selection:
+                        if initial['version'] == 'notpresented':
+                            doc.sessionpresentation_set.create(session=session,rev=new_selection)
+                        elif new_selection == 'notpresented':
+                            doc.sessionpresentation_set.filter(session=session).delete()
+                        else:
+                            doc.sessionpresentation_set.filter(session=session).update(rev=new_selection)
+                return redirect('doc_view',name=doc.name)
+        else:
+            form = MaterialVersionForm(choices=choices,initial=initial)
+
+        return render(request, 'doc/material/edit_material_presentations.html', {
+            'session': session,
+            'doc': doc,
+            'form': form,
+            })
+
+    else:
+        return render(request, 'doc/material/material_presentations.html', {
+            'sessions' : sorted_sessions,
+            'doc': doc,
+        })

ietf/doc/views_material.py

@@ -267,7 +267,8 @@ def concluded_groups(request):
                   dict(group_types=group_types))
 
 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, session=None).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."""