diff --git a/ietf/nomcom/tests.py b/ietf/nomcom/tests.py index f7535650a..80c5b8e9e 100644 --- a/ietf/nomcom/tests.py +++ b/ietf/nomcom/tests.py @@ -90,6 +90,7 @@ class NomcomViewsTest(TestCase): # 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 @@ class NomcomViewsTest(TestCase): """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( diff --git a/ietf/nomcom/urls.py b/ietf/nomcom/urls.py index 1e06ce79b..0b66d7695 100644 --- a/ietf/nomcom/urls.py +++ b/ietf/nomcom/urls.py @@ -6,6 +6,7 @@ from ietf.utils.urls import url urlpatterns = [ url(r'^$', views.index), url(r'^ann/$', views.announcements), + url(r'^history/$', views.history), url(r'^(?P\d{4})/private/$', views.private_index), url(r'^(?P\d{4})/private/key/$', views.private_key), url(r'^(?P\d{4})/private/help/$', views.configuration_help), diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py index 649bc3d1c..d57e9545a 100644 --- a/ietf/nomcom/views.py +++ b/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) diff --git a/ietf/templates/nomcom/announcements.html b/ietf/templates/nomcom/announcements.html index 4205d3f54..e692e6f28 100644 --- a/ietf/templates/nomcom/announcements.html +++ b/ietf/templates/nomcom/announcements.html @@ -56,7 +56,7 @@

Historical information

diff --git a/ietf/templates/nomcom/history.html b/ietf/templates/nomcom/history.html new file mode 100644 index 000000000..948ba7958 --- /dev/null +++ b/ietf/templates/nomcom/history.html @@ -0,0 +1,811 @@ +{% extends "base.html" %} +{# Copyright The IETF Trust 2015-2020, All Rights Reserved #} +{% load origin %} +{% load ietf_filters static %} +{% load group_filters %} + +{% block pagehead %} + +{% endblock %} + +{% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %} + +{% block title %}NomCom{% endblock %} + +{% block content %} + {% origin %} +
+
+ + +

NomCom Membership History

+ +

Note: The data for concluded NomComs is occasionally incorrect.

+ {% for regime in regimes %} + + + +

{{ regime.label }}

+ {% for slug, label, roles in regime.nomcom.personnel %} + + + + + + {% endfor %} + +
{{ label }} + {% for r in roles %} + {% role_person_link r %} +
+ {% endfor %} +
+ {% endfor %} + + + + +

2012/2013

+ + + + + + + + + + + + + + + + + +
ChairMatt Lepinski
AdvisorSuresh Krishnan
MembersDhruv Dhody
+ Yi (Aaron) Ding
+ Toerless Eckert
+ Jeff Haas
+ David Meyer
+ Michael Richardson
+ Teemu Savolainen
+ Karen Seo
+ Steven White
+ Leaf Yeh
+
Liaison MembersMarc Blanchet (IAB Liaison)
+ Scott Bradner (IAOC Liaison)
+ Sean Turner (IESG Liaison)
+ Rudi Vansnick (ISOC Liaison)
+
+ + +

2011/2012

+ + + + + + + + + + + + + + + + + +
ChairSuresh Krishnan
AdvisorsTom Walsh
+ Henrik Levkowetz (Tools Advisor)
+
MembersJaap Akkerhuis
+ Stephen Hanna
+ Sheng Jiang
+ Dapeng Liu
+ Rifaat Shekh-Yuse
+ Pascal Thubert
+ Olivier Vautrin
+ Simo Veikkolainen
+ Ijsbrand Wijnands
+ Lianshu Zheng
+
Liaison MembersDave Thaler (IAB Liaison)
+ Dave Crocker (IAOC Liaison)
+ Ralph Droms (IESG Liaison)
+ Jason Livingood (ISOC Liaison)
+
+ + + +

2010/2011

+ + + + + + + + + + + + + + + + + +
ChairTom Walsh
AdvisorsMary Barnes
+ Henrik Levkowetz (Tools Advisor)
+
MembersGregory Cauchie
+ Mehmet Ersue
+ Dorothy Gellert
+ Tony Hansen
+ Suresh Krishnan
+ Dirk Kroeselberg
+ Jan Seedorf
+ Pete St. Pierre
+ Rolf Winter
+
Liaison MembersSpencer Dawkins (IAB Liaison)
+ Ole Jacobsen (IAOC Liaison)
+ Dan Romascanu (IESG Liaison)
+ Eric Burger (ISOC Liaison)
+
+ + + +

2009/2010

+ + + + + + + + + + + + + + + + + +
ChairMary Barnes
AdvisorsJoel Halpern
+ Henrik Levkowetz (Tools Advisor)
+
MembersScott Brim
+ David H. Crocker
+ Roque Gagliano
+ Randall Gellens
+ Dorothy Gellert
+ Wassim Haddad
+ Stephen Kent
+ Simo Veikkolainen
+ Dimitri Papadimitriou
+ Lucy Yong
+
Liaison MembersJon Peterson (IAB Liaison)
+ Tim Polk (IESG Liaison)
+ Henk Uijterwall (IAOC liaison)
+ TBA (ISOC Liaison)
+
+ + + +

2008/2009

+ + + + + + + + + + + + + + + + + +
ChairJoel Halpern
AdvisorLakshminath Dondeti
+
MembersBernard Aboba
+ Stephen Hanna
+ Sam Hartman
+ Bernie Hoeneisen
+ Markus Isomaki
+ Matt Lepinski
+ Jason Livingood
+ Hannes Tschofenig
+ Russ White
+ Margaret Wasserman
+
Liaison MembersDave Oran (IAB Liaison)
+ Ross Callon (IESG Liaison)
+ Bert Wijnen (ISOC Liaison)
+
+ + + +

2007/2008

+ + + + + + + + + + + + + + + + + +
ChairLakshminath Dondeti
AdvisorAndrew Lange
+
MembersSimon Leinen
+ Christopher Boulton
+ Dan Wing
+ Derek Atkins
+ Steven Blake
+ Ian Chakeres
+ Thomas Walsh
+ Attila Takacs
+ Ole Jacobsen
+ Craig White
+
Liaison MembersDanny McPherson (IAB Liaison)
+ Lars Eggert (IESG Liaison)
+ Fred Baker (ISOC Liaison)
+
+ + + + +

2006/2007

+ + + + + + + + + + + + + + + + + +
ChairAndrew Lange
AdvisorRalph Droms (Previous Chair)
+
MembersCengiz Alaettinoglu
+ Dan Li
+ Brian Haberman
+ John Drake
+ Stephen Kent
+ Vidya Narayanan
+ Hao Zhou
+ Kurt Zeilenga
+ Martin Stiemerling
+ Juergen Quittek
+
Liaison MembersOlaf Kolkman (IAB Liaison)
+ Cullen Jennings (IESG Liaison)
+ Fred Baker (ISOC Liaison)
+
+ + + +

2005/2006

+ + + + + + + + + + + + + + + + + +
ChairRalph Droms
AdvisorDanny McPherson (Previous Chair)
+
MembersSam Weiler
+ Lakshminath Dondeti
+ Stewart Bryant
+ Alan Hawrylyshen
+ Wassim Haddad
+ Joao Luis Silva Damas
+ Dinesh Mohan
+ Ron Bonica
+ Jozef Babiarz
+ Vijay K. Gurbani
+
Liaison MembersDavid Meyer (IAB Liaison)
+ Russ Housley (IESG Liaison)
+ Steve Crocker (ISOC Liaison)
+
+ + + +

2004/2005

+ + + + + + + + + + + + + + + + + +
ChairDanny McPherson
AdvisorRichard Draves (Previous Chair)
+
MembersAlia Atlas
+ Stewart Bryant
+ Lakshminath Dondeti
+ Markus Isomaki
+ Andrew Lange
+ Matt Larson
+ Chris Liljenstolpe
+ Magnus Westerlund
+ Russ White
+ Juha Wiljakka
+
Liaison MembersEric Rescorla (IAB Liaison)
+ Alex Zinin (IESG Liaison)
+ Steve Crocker (ISOC Liaison)
+ Richard Draves (Previous Chair/Advisor)
+
+ + + +

2003/2004

+ + + + + + + + + + + + + + + + + +
ChairRich Draves
AdvisorPhil Roberts (Previous Chair)
+
MembersAbdul-jabbar Asiri
+ Jin Seek Choi
+ Ralph Droms
+ Dan Forsberg
+ Ole J. Jacobsen
+ Kireeti Kompella
+ David E. Martin
+ Basavaraj Patil
+ Richard Shockey
+ Andrew Thiessen
+
Liaison MembersGeoff Huston (IAB Liaison)
+ Bill Fenner (IESG liaison)
+
+ + + +

2002/2003

+ + + + + + + + + + + + + + + + + +
ChairPhil Roberts
AdvisorTheodore Ts'o (Previous Chair)
+
MembersFrank Alfano
+ Dennis Beard
+ Alec Brusilovsky
+ Richard Draves
+ Eva Gustafsson
+ Eva Jonsson
+ Thomas Kurien
+ Edward Lewis
+ Michael Richardson
+ Stephen Trowbridge
+
Liaison MembersEric Rescorla (IAB liaison)
+ Allison Mankin (IETF liaison)
+
+ + + +

2001/2002

+ + + + + + + + + + + + + + + + + +
ChairTheodore Ts'o
AdvisorBernard Aboba (Previous Chair)
+
MembersRon Bonica
+ Dave Crocker
+ Eric Gray
+ Bob Hinden
+ Matt Holdrege
+ Danny McPherson
+ Ersue Mehmet
+ Radia Perlman
+ Hal Sandick
+ Russ White
+
Liaison MembersFred Baker (IAB liaison)
+ Thomas Narten (IESG Liaison)
+
+ + + +

2000/2001

+ + + + + + + + + + + + + + + + + +
ChairBernard Aboba
AdvisorAvri Doria (Previous Chair)
+
MembersDavid Allan
+ Stuart Cheshire
+ Alain Durand
+ Hadriel Kaplan
+ Perry E. Metzger
+ Phil Roberts
+ David Robinson
+ Hal Sandick
+ Vijay Srinivasan
+ Bill Woodcock
+
Liaison MembersLeslie Daigle (IAB Liaison)
+ Allison Mankin (IESG Liaison)
+
+ + + +

1999/2000

+ + + + + + + + + + + + + + + + + +
ChairAvri Doria
AdvisorDonald E. Eastlake (Previous Chair)
+
MembersBernard Aboba
+ Michael W. Condry
+ Paul Hoffman
+ Jim Luciani
+ Greg Minshall
+ William B. Norton
+ Basavaraj Patil
+ Yakov Rekhter
+ Bill Sommerfeld
+ Walter Weiss
+
Liaison MembersGeoff Huston (IAB Liaison)
+ Thomas Narten (IESG Liaison)
+
+ + + +

1998/1999

+ + + + + + + + + + + + + + + + + +
ChairDonald Eastlake 3rd
AdvisorMichael St Johns (Previous Chair)
+
MembersAvri Doria
+ Randall Gellens
+ Stephen R. Hanna
+ Bob Hinden
+ R A Lichtensteiger
+ Bob Mahoney
+ Keith McCloghrie
+ David Meyer
+ Lixia Zhang
+ Glen Zorn
+
Liaison MembersSteven Bellovin (IAB Liaison)
+ Bert Wijnen (IESG Liaison)
+ Michael St Johns (Previous Chair)
+
+ + + +

1997/1998

+ + + + + + + + + + + + + + + + + +
ChairMichael StJohns
AdvisorGeoff Huston (Previous Chair)
+
MembersBernard Aboba
+ Uri Blumenthal
+ John Boudreaux
+ Avri Doria
+ Rik Drummond
+ Donald Eastlake
+ Steve Hole
+ Steve Kent
+ Keith McClogrie
+ Lixia Zhang
+
Liaison MembersTony Hain (IAB Liaison)
+ Scott Bradner (IESG Liaison)
+
+ + + +

1996/1997

+ + + + + + + + + + + + + + + + + +
ChairGeoff Huston
AdvisorGuy Almes (Previous Chair)
+
MembersGuy Almes
+ Jim Bound
+ Matt Crawford
+ Phill Gross
+ Bob Hinden
+ Dorian Kim
+ Bill Manning
+ Marshall Rose
+ Mike StJohns
+ Glen Zorn
+
Liaison MembersRadia Perlman (IAB Liaison)
+ Joyce Reynolds (IESG Liaison)
+ Christian Huitema (ISOC Liaison)
+ Guy Almes (Previous Chair)
+
+ + + +

1995/1996

+ + + + + + + + + + + + + + + + + +
ChairGuy Almes
AdvisorJohn Curran (Previous Chair)
+
MembersUri Blumenthal
+ Jeff Case
+ Noel Chiappa
+ Dave Crocker
+ Donald Eastlake
+ Ned Freed
+ David Meyer
+ Mark Prior
+ Bob Steen
+ Paul Traina
+
Liaison MembersBob Moskowitz (IAB Liaison)
+ Harald Alvestrand (IESG Liaison)
+
+ + + +

1994/1995

+ + + + + + + + + + + + + +
ChairJohn Curran
AdvisorFred Baker (Previous Chair)
+
MembersFred Baker
+ Roxana Bradescu
+ Peter S. Ford
+ Tony Genovese
+ Michael Mealling
+ Charlie Perkins
+ Marshall Rose
+ Greg Ruth
+ Paul Traina
+ Steven Waldbusser
+
+ + + +

1993/1994

+ + + + + + + + + + + + + +
ChairFred Baker
MembersJeff Case
+ Noel Chiappa
+ Alan Clegg
+ Jeroen Houttuin
+ Daniel Karrenberg
+ Andy Nicholson
+ Dr. Marshall T. Rose
+
Liaison MembersBob Braden (IAB Liaison)
+ Stev Knowles (IESG Liaison)
+ Jon Postel (IRSG Liaison)
+
+ + + +

1992/1993

+ + + + + + + + + +
MembersJack Brown
+ Peter S. Ford
+ Steve Kent
+ Paul Mockapetris
+ Craig Partridge
+ Jim Romaguera
+ Claudio Topolcic
+
Liaison MembersBarry Leiner (IAB Liaison)
+ Erik Huizer (IESG Liaison)
+ Jon Postel (IRSG Liaison)
+ Geoff Huston (ISOC Liaison)
+
+ + +
+ +
+{% endblock %} + +{% block js %} + +{% endblock %}