Merged in [18601] from fenton@bluepopcorn.net:

    Added NomCom membership history page. Fixes issue ietf-tools#3006. Branch
 - Legacy-Id: 18614
Note: SVN reference [18601] has been migrated to Git commit 431a112

Author: levkowetz

ietf/nomcom/tests.py

@@ -90,6 +90,7 @@ def setUp(self):
 
         # public urls
         self.index_url = reverse('ietf.nomcom.views.year_index', kwargs={'year': self.year})
+        self.history_url = reverse('ietf.nomcom.views.history')
         self.requirements_url = reverse('ietf.nomcom.views.requirements', kwargs={'year': self.year})
         self.questionnaires_url = reverse('ietf.nomcom.views.questionnaires', kwargs={'year': self.year})
         self.public_feedback_url = reverse('ietf.nomcom.views.public_feedback', kwargs={'year': self.year})
@@ -492,6 +493,10 @@ def test_index_view(self):
         """Verify home view"""
         self.check_url_status(self.index_url, 200)
 
+    def test_history_view(self):
+        """Verify history view"""
+        self.check_url_status(self.history_url, 200)
+
     def test_announcements_view(self):
         nomcom = Group.objects.get(acronym="nomcom%s" % self.year, type="nomcom")
         msg = Message.objects.create(

ietf/nomcom/urls.py

@@ -6,6 +6,7 @@
 urlpatterns = [
     url(r'^$', views.index),
     url(r'^ann/$', views.announcements),
+    url(r'^history/$', views.history),
     url(r'^(?P<year>\d{4})/private/$', views.private_index),
     url(r'^(?P<year>\d{4})/private/key/$', views.private_key),
     url(r'^(?P<year>\d{4})/private/help/$', views.configuration_help),

ietf/nomcom/views.py

@@ -112,6 +112,40 @@ def announcements(request):
                            },
                        )
 
+def history(request):
+    nomcom_list = Group.objects.filter(type__slug='nomcom').order_by('acronym')
+
+    regimes = []
+
+    for nomcom in nomcom_list:
+        year = int(nomcom.acronym[6:])
+        if year > 2012:
+            personnel = {}
+            for r in Role.objects.filter(group=nomcom).order_by('person__name').select_related("email", "person", "name"):
+                if r.name_id not in personnel:
+                    personnel[r.name_id] = []
+                personnel[r.name_id].append(r)
+
+            nomcom.personnel = []
+            for role_name_slug, roles in personnel.items():
+                label = roles[0].name.name
+                if len(roles) > 1:
+                    if label.endswith("y"):
+                        label = label[:-1] + "ies"
+                    else:
+                        label += "s"
+
+                nomcom.personnel.append((role_name_slug, label, roles))
+
+            nomcom.personnel.sort(key=lambda t: t[2][0].name.order)
+
+            regimes.append(dict(year=year, label="%s/%s" % (year, year+1), nomcom=nomcom))
+
+    regimes.sort(key=lambda x: x['year'], reverse=True)
+
+    return render(request, "nomcom/history.html", {'nomcom_list': nomcom_list,
+                            'regimes': regimes})
+
 @role_required("Nomcom")
 def private_key(request, year):
     nomcom = get_nomcom_by_year(year)

ietf/templates/nomcom/announcements.html

@@ -56,7 +56,7 @@ <h2 class="anchor-target" id="{{ regime.group.start_year }}">Messages from {{ re
 
       <h2 class="anchor-target" id="historical">Historical information</h2>
       <ul>
-	<li><a href="https://www.ietf.org/nomcom/committee.html">NomCom Members (by year)</a></li>
+	<li><a href="{% url "ietf.nomcom.views.history" %}">NomCom Members (by year)</a></li>
       </ul>