Merged in ^/branch/amsl/interim@11230, which provides interim meeting management support. Also fixes issues ietf-tools#1961, ietf-tools#1962 and ietf-tools#1964.

 - Legacy-Id: 11402

Author: levkowetz

ietf/bin/interim_minutes_reminder

@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+# -*- Python -*-
+#
+'''
+This script calls ietf.meeting.helpers.check_interim_minutes() which sends
+a reminder email for interim meetings that occurred 10 days ago but still
+don't have minutes.
+'''
+
+# Set PYTHONPATH and load environment variables for standalone script -----------------
+import os, sys
+basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
+sys.path = [ basedir ] + sys.path
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
+
+import django
+django.setup()
+# -------------------------------------------------------------------------------------
+
+from ietf.meeting.helpers import check_interim_minutes
+
+check_interim_minutes()

ietf/doc/models.py

@@ -120,7 +120,7 @@ def href(self):
 
         meeting = None
         if meeting_related:
-            meeting = self.name.split("-")[1]
+            meeting = self.session_set.first().meeting
 
         return format.format(doc=self,meeting=meeting)
 
@@ -388,15 +388,7 @@ def get_absolute_url(self):
                     filename = os.path.splitext(self.external_url)[0]
                 else:
                     filename = self.external_url
-                if meeting.type_id == 'ietf':
-                    url = '%sproceedings/%s/%s/%s' % (settings.IETF_HOST_URL,meeting.number,self.type_id,filename)
-                elif meeting.type_id == 'interim':
-                    url = "%sproceedings/interim/%s/%s/%s/%s" % (
-                        settings.IETF_HOST_URL,
-                        meeting.date.strftime('%Y/%m/%d'),
-                        session.group.acronym,
-                        self.type_id,
-                        filename)
+                url = '%sproceedings/%s/%s/%s' % (settings.IETF_HOST_URL,meeting.number,self.type_id,filename)
                 return url
         return urlreverse('doc_view', kwargs={ 'name': name }, urlconf="ietf.urls")
 

ietf/doc/templatetags/ietf_filters.py

@@ -3,12 +3,14 @@
 import textwrap
 import re
 import datetime
+import os
 import types
 from email.utils import parseaddr
 
 import debug                            # pyflakes:ignore
 
 from ietf.doc.models import ConsensusDocEvent
+from ietf.doc.utils import get_document_content
 from django import template
 from django.conf import settings
 from django.utils.html import escape, fix_ampersands
@@ -590,3 +592,27 @@ def urlize_html(html, autoescape=False):
 def emailwrap(email):
     email = str(email)
     return mark_safe(email.replace('@', '<wbr>@'))
+
+@register.filter
+def document_content(doc):
+    if doc is None:
+        return None
+    path = os.path.join(doc.get_file_path(),doc.filename_with_rev())
+    return get_document_content(doc.name,path,markup=False)
+
+@register.filter
+def session_start_time(session):
+    timeslot = session.official_timeslotassignment().timeslot
+    return timeslot.time
+
+@register.filter
+def session_end_time(session):
+    timeslot = session.official_timeslotassignment().timeslot
+    return timeslot.time + timeslot.duration
+
+@register.filter
+def format_timedelta(timedelta):
+    s = timedelta.seconds
+    hours, remainder = divmod(s, 3600)
+    minutes, seconds = divmod(remainder, 60)
+    return '{hours:02d}:{minutes:02d}'.format(hours=hours,minutes=minutes)

ietf/mailtrigger/migrations/0004_auto_20160516_1659.py

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+def make_recipients(apps):
+    Recipient = apps.get_model('mailtrigger', 'Recipient')
+
+    rc = Recipient.objects.create
+
+    rc(slug='group_secretaries',
+       desc="The group's secretaries",
+       template=None)
+
+
+def make_mailtriggers(apps):
+    Recipient = apps.get_model('mailtrigger','Recipient')
+    MailTrigger = apps.get_model('mailtrigger','MailTrigger')
+
+    def mt_factory(slug,desc,to_slugs,cc_slugs=[]):
+
+        # Try to protect ourselves from typos
+        all_slugs = to_slugs[:]
+        all_slugs.extend(cc_slugs)
+        for recipient_slug in all_slugs:
+            try:
+                Recipient.objects.get(slug=recipient_slug)
+            except Recipient.DoesNotExist:
+                print "****Some rule tried to use",recipient_slug
+                raise
+
+        m = MailTrigger.objects.create(slug=slug, desc=desc)
+        m.to = Recipient.objects.filter(slug__in=to_slugs)
+        m.cc = Recipient.objects.filter(slug__in=cc_slugs)
+
+    mt_factory(slug='session_minutes_reminder',
+               desc="Recipients when a group is sent a reminder "
+                    "to submit minutes for a session",
+               to_slugs=['group_chairs','group_secretaries'],
+               cc_slugs=['group_responsible_directors']
+              )
+
+def forward(apps, schema_editor):
+    make_recipients(apps)
+    make_mailtriggers(apps)
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('mailtrigger', '0003_merge_request_trigger'),
+    ]
+
+    operations = [migrations.RunPython(forward)]

ietf/mailtrigger/models.py

@@ -157,6 +157,14 @@ def gather_group_responsible_directors(self, **kwargs):
                 addrs.extend(Recipient.objects.get(slug='stream_managers').gather(**{'streams':['irtf']}))
         return addrs
 
+    def gather_group_secretaries(self, **kwargs):
+        addrs = []
+        if 'group' in kwargs:
+            group = kwargs['group']
+            if not group.acronym=='none':
+                addrs.extend(group.role_set.filter(name='secr').values_list('email__address',flat=True))
+        return addrs
+
     def gather_doc_group_responsible_directors(self, **kwargs):
         addrs = []
         if 'doc' in kwargs: