merging forward

 - Legacy-Id: 10738

Author: rjsparks

ietf/doc/mails.py

@@ -475,7 +475,8 @@ def email_charter_internal_review(request, charter):
                    charter_url=settings.IDTRACKER_BASE_URL + charter.get_absolute_url(),
                    chairs=charter.group.role_set.filter(name="chair"),
                    secr=charter.group.role_set.filter(name="secr"),
-                   ads=charter.group.role_set.filter(name='ad').values_list('person__name',flat=True),
+                   ads=charter.group.role_set.filter(name='ad'),
+                   parent_ads=charter.group.parent.role_set.filter(name='ad'),
                    techadv=charter.group.role_set.filter(name="techadv"),
                    milestones=charter.group.groupmilestone_set.filter(state="charter"),
               ),

ietf/doc/migrations/0011_add_missing_docaliases.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+from django.db.models import F
+
+def reverse(apps, schema_editor):
+    pass
+
+def forward(apps, schema_editor):
+    Document = apps.get_model('doc','Document')
+    for doc in Document.objects.filter(type__in=['recording','liaison','liai-att']).exclude(docalias__name=F('name')):
+        doc.docalias_set.create(name=doc.name)
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('doc', '0010_auto_20150930_0251'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward,reverse)
+    ]

ietf/doc/models.py

@@ -234,7 +234,7 @@ def active_ballot(self):
 
     def meeting_related(self):
         answer = False
-        if self.type_id in ("agenda","minutes","bluesheets","slides"):
+        if self.type_id in ("agenda","minutes","bluesheets","slides","recording"):
             answer =  (self.name.split("-")[1] == "interim"
                        or (self if isinstance(self, Document) else self.doc).session_set.exists())
             if self.type_id in ("slides",):

ietf/doc/tests.py

@@ -558,6 +558,9 @@ def test_document_primary_and_history_views(self):
                         "agenda-42-mars",
                         "minutes-42-mars",
                         "slides-42-mars-1",
+                        # TODO: add
+                        #"bluesheets-42-mars-1",
+                        #"recording-42-mars-1-00",
                        ]:
             doc = Document.objects.get(name=docname)
             # give it some history

ietf/doc/tests_charter.py

@@ -111,7 +111,7 @@ def find_event(t):
                 for word in ["Chairs", "Ames Man <ameschairman@ietf.org>",
                     "Secretaries", "Secretary <amessecretary@ietf.org>",
                     "Assigned Area Director", "Areað Irector <aread@ietf.org>",
-                    "Area Directors", "Mailing list", "ames-wg@ietf.org",
+                    "Mailing list", "ames-wg@ietf.org",
                     "Charter", "Milestones"]:
                     self.assertIn(word, body)
 

ietf/doc/utils_charter.py

@@ -111,6 +111,8 @@ def default_action_text(group, charter, by):
                                    chairs=group.role_set.filter(name="chair"),
                                    secr=group.role_set.filter(name="secr"),
                                    techadv=group.role_set.filter(name="techadv"),
+                                   ads=group.role_set.filter(name='ad'),
+                                   parent_ads=group.parent.role_set.filter(name='ad'),
                                    milestones=group.groupmilestone_set.filter(state="charter"),
                                    action_type=action,
                                    to=addrs.to,
@@ -145,6 +147,8 @@ def default_review_text(group, charter, by):
                                     charter_text=read_charter_text(charter),
                                     chairs=group.role_set.filter(name="chair"),
                                     secr=group.role_set.filter(name="secr"),
+                                    ads=group.role_set.filter(name='ad'),
+                                    parent_ads=group.parent.role_set.filter(name='ad'),
                                     techadv=group.role_set.filter(name="techadv"),
                                     milestones=group.groupmilestone_set.filter(state="charter"),
                                     review_date=(datetime.date.today() + datetime.timedelta(weeks=1)).isoformat(),

ietf/doc/views_doc.py

@@ -522,6 +522,8 @@ def document_main(request, name, rev=None):
                                        ),
                                   context_instance=RequestContext(request))
 
+    # TODO : Add "recording", and "bluesheets" here when those documents are appropriately
+    #        created and content is made available on disk
     if doc.type_id in ("slides", "agenda", "minutes"):
         can_manage_material = can_manage_materials(request.user, doc.group)
         presentations = None

ietf/doc/views_search.py

@@ -70,7 +70,7 @@ class SearchForm(forms.Form):
 
     sort = forms.ChoiceField(choices=(("document", "Document"), ("title", "Title"), ("date", "Date"), ("status", "Status"), ("ipr", "Ipr"), ("ad", "AD")), required=False, widget=forms.HiddenInput)
 
-    doctypes = DocTypeName.objects.exclude(slug='draft').order_by('name');
+    doctypes = DocTypeName.objects.filter(used=True).exclude(slug='draft').order_by('name');
 
     def __init__(self, *args, **kwargs):
         super(SearchForm, self).__init__(*args, **kwargs)

ietf/group/info.py

@@ -36,6 +36,7 @@
 import itertools
 import re
 from tempfile import mkstemp
+import datetime
 from collections import OrderedDict
 
 from django.shortcuts import render, redirect
@@ -333,6 +334,8 @@ def construct_group_menu_context(request, group, selected, group_type, others):
         entries.append(("About", urlreverse("group_about", kwargs=kwargs)))
     if group.features.has_materials and get_group_materials(group).exists():
         entries.append(("Materials", urlreverse("ietf.group.info.materials", kwargs=kwargs)))
+    if group.type_id in ('rg','wg'):
+        entries.append(("Meetings", urlreverse("ietf.group.info.meetings", kwargs=kwargs)))
     entries.append(("Email expansions", urlreverse("ietf.group.info.email", kwargs=kwargs)))
     entries.append(("History", urlreverse("ietf.group.info.history", kwargs=kwargs)))
     if group.features.has_documents:
@@ -724,3 +727,47 @@ def email_aliases(request, acronym=None, group_type=None):
 
     return render(request,'group/email_aliases.html',{'aliases':aliases,'ietf_domain':settings.IETF_DOMAIN,'group':group})
 
+def meetings(request, acronym=None, group_type=None):
+    group = get_group_or_404(acronym,group_type) if acronym else None
+
+    four_years_ago = datetime.datetime.now()-datetime.timedelta(days=4*365)
+
+    sessions = group.session_set.filter(status__in=['sched','schedw','appr','canceled'],meeting__date__gt=four_years_ago)
+
+    def sort_key(session):
+        if session.meeting.type.slug=='ietf':
+            official_sessions = session.timeslotassignments.filter(schedule=session.meeting.agenda)
+            if official_sessions:
+                return official_sessions.first().timeslot.time
+            elif session.meeting.date:
+                return datetime.datetime.combine(session.meeting.date,datetime.datetime.min.time())
+            else:
+                return session.requested
+        else: 
+            # TODO: use timeslots for interims once they have them
+            return datetime.datetime.combine(session.meeting.date,datetime.datetime.min.time())
+
+    for s in sessions:
+        s.time=sort_key(s)
+
+    sessions = sorted(sessions,key=lambda s:s.time,reverse=True)
+
+    today = datetime.date.today()
+    future = []
+    in_progress = []
+    past = []
+    for s in sessions:
+        if s.meeting.date > today:
+            future.append(s)
+        elif s.meeting.end_date() >= today:
+            in_progress.append(s)
+        else:
+            past.append(s)
+
+    return render(request,'group/meetings.html',
+                  construct_group_menu_context(request, group, "meetings", group_type, {
+                     'group':group,
+                     'future':future,
+                     'in_progress':in_progress,
+                     'past':past,
+                  }))

ietf/group/tests_info.py

@@ -22,6 +22,8 @@
 from ietf.utils.mail import outbox, empty_outbox
 from ietf.utils.test_data import make_test_data
 from ietf.utils.test_utils import login_testing_unauthorized
+from ietf.group.factories import GroupFactory
+from ietf.meeting.factories import SessionFactory
 
 class GroupPagesTests(TestCase):
     def setUp(self):
@@ -988,3 +990,29 @@ def test_group_menu_data(self):
         mars_wg = Group.objects.get(acronym="mars")
         self.assertEqual(mars_wg_data["name"], mars_wg.name)
 
+class MeetingInfoTests(TestCase):
+
+    def setUp(self):
+        self.group = GroupFactory.create(type_id='wg')
+        today = datetime.date.today()
+        SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=90))
+        self.inprog = SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today-datetime.timedelta(days=1))
+        SessionFactory.create(meeting__type_id='ietf',group=self.group,meeting__date=today+datetime.timedelta(days=90))
+        SessionFactory.create(meeting__type_id='interim',group=self.group,meeting__date=today+datetime.timedelta(days=45))
+
+
+    def test_meeting_info(self):
+        url = urlreverse('ietf.group.info.meetings',kwargs={'acronym':self.group.acronym})
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200) 
+        q = PyQuery(response.content)
+        self.assertTrue(q('#inprogressmeets'))
+        self.assertTrue(q('#futuremeets'))
+        self.assertTrue(q('#pastmeets'))
+
+        self.group.session_set.filter(id=self.inprog.id).delete()
+        response = self.client.get(url)
+        self.assertEqual(response.status_code, 200) 
+        q = PyQuery(response.content)
+        self.assertFalse(q('#inprogressmeets'))
+