From bb8cf21bd169eaf5f0eef9b15a727d338c3326a7 Mon Sep 17 00:00:00 2001
From: Rich Salz <rsalz@akamai.com>
Date: Tue, 7 Nov 2023 03:57:19 -0500
Subject: [PATCH] fix: show nomcoms by convening year only (#6585)

* ci: Update build-base-app.yml workflow

* fix: Relabel NomCom to show start year, not range

Show just the year that a NomCom started, because showing
the start/end years is confusing.

Fixes: #3419

* fix: Shwo Nomcoms year convened only

Fix the main nomcom index page and the announcement archive page

---------

Co-authored-by: Nicolas Giard <github@ngpixel.com>
Co-authored-by: Robert Sparks <rjsparks@nostrum.com>
---
 .github/workflows/build-base-app.yml     |  1 +
 ietf/nomcom/views.py                     |  2 +-
 ietf/templates/nomcom/announcements.html |  2 +-
 ietf/templates/nomcom/history.html       | 44 ++++++++++++------------
 ietf/templates/nomcom/index.html         |  2 +-
 5 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build-base-app.yml b/.github/workflows/build-base-app.yml
index 161752cb5..85842d9dc 100644
--- a/.github/workflows/build-base-app.yml
+++ b/.github/workflows/build-base-app.yml
@@ -6,6 +6,7 @@ on:
       - 'main'
     paths:
       - 'docker/base.Dockerfile'
+      - 'requirements.txt'
 
   workflow_dispatch:
 
diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py
index 71f76679c..ce7ca9a82 100644
--- a/ietf/nomcom/views.py
+++ b/ietf/nomcom/views.py
@@ -57,7 +57,7 @@ def index(request):
     for nomcom in nomcom_list:
         year = int(nomcom.acronym[6:])
         nomcom.year = year
-        nomcom.label = "%s/%s" % (year, year+1)
+        nomcom.label = str(year)
         if year > 2012:
             nomcom.url = "/nomcom/%04d" % year
         else:
diff --git a/ietf/templates/nomcom/announcements.html b/ietf/templates/nomcom/announcements.html
index 668f48e81..771f2b4fb 100644
--- a/ietf/templates/nomcom/announcements.html
+++ b/ietf/templates/nomcom/announcements.html
@@ -15,7 +15,7 @@
     </p>
     {% for regime in regimes %}
         <h2 class="mt-5" id="nomcom-{{ regime.group.start_year }}">
-            Messages from {{ regime.group.start_year }}/{{ regime.group.end_year }}
+            Messages from {{ regime.group.start_year }} NomCom
         </h2>
         {# use person email address here rather than the generic nomcom-chair@ietf.org #}
         <p>
diff --git a/ietf/templates/nomcom/history.html b/ietf/templates/nomcom/history.html
index 09cdeae98..8262876b1 100644
--- a/ietf/templates/nomcom/history.html
+++ b/ietf/templates/nomcom/history.html
@@ -11,7 +11,7 @@
         <b>Note:</b> The data for concluded NomComs is occasionally incorrect.
     </p>
     {% for regime in regimes %}
-        <h2 class="mt-5" id="y{{ regime.year }}">{{ regime.label }}</h2>
+        <h2 class="mt-5" id="y{{ regime.year }}">{{ regime.year }} NomCom</h2>
         <dl class="row">
             {% for slug, label, roles in regime.nomcom.personnel %}
                 <dt class="col-sm-2">
@@ -25,7 +25,7 @@
             {% endfor %}
         </dl>
     {% endfor %}
-    <h2 class="mt-5" id="y2012">2012/2013</h2>
+    <h2 class="mt-5" id="y2012">2012 NomCom</h2>
     <dl class="row">
         <dt class="col-sm-2">
             Chair
@@ -64,7 +64,7 @@
             Rudi Vansnick <span class="text-body-secondary">(ISOC Liaison)</span>
         </dd>
     </dl>
-    <h2 class="mt-5" id="y2011">2011/2012</h2>
+    <h2 class="mt-5" id="y2011">2011 NomCom</h2>
     <dl class="row">
         <dt class="col-sm-2">
             Chair
@@ -104,7 +104,7 @@
             Jason Livingood <span class="text-body-secondary">(ISOC Liaison)</span>
         </dd>
     </dl>
-    <h2 class="mt-5" id="y2010">2010/2011</h2>
+    <h2 class="mt-5" id="y2010">2010 NomCom</h2>
     <dl class="row">
         <dt class="col-sm-2">
             Chair
@@ -143,7 +143,7 @@
             Eric Burger <span class="text-body-secondary">(ISOC Liaison)</span>
         </dd>
     </dl>
-    <h2 class="mt-5" id="y2009">2009/2010</h2>
+    <h2 class="mt-5" id="y2009">2009 NomCom</h2>
     <dl class="row">
         <dt class="col-sm-2">
             Chair
@@ -184,7 +184,7 @@
         </dd>
     </dl>
     <h2 class="mt-5" id="y2008">
-        2008/2009
+        2008 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -224,7 +224,7 @@
         </dd>
     </dl>
     <h2 class="mt-5" id="y2007">
-        2007/2008
+        2007 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -264,7 +264,7 @@
         </dd>
     </dl>
     <h2 class="mt-5" id="y2006">
-        2006/2007
+        2006 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -304,7 +304,7 @@
         </dd>
     </dl>
     <h2 class="mt-5" id="y2005">
-        2005/2006
+        2005 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -344,7 +344,7 @@
         </dd>
     </dl>
     <h2 class="mt-5" id="y2004">
-        2004/2005
+        2004 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -385,7 +385,7 @@
         </dd>
     </dl>
     <h2 class="mt-5" id="y2003">
-        2003/2004
+        2003 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -424,7 +424,7 @@
         </dd>
     </dl>
     <h2 class="mt-5" id="y2002">
-        2002/2003
+        2002 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -463,7 +463,7 @@
         </dd>
     </dl>
     <h2 class="mt-5" id="y2001">
-        2001/2002
+        2001 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -502,7 +502,7 @@
         </dd>
     </dl>
     <h2 class="mt-5" id="y2000">
-        2000/2001
+        2000 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -541,7 +541,7 @@
         </dd>
     </dl>
     <h2 class="mt-5" id="y1999">
-        1999/2000
+        1999 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -580,7 +580,7 @@
         </dd>
     </dl>
     <h2 class="mt-5" id="y1998">
-        1998/1999
+        1998 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -620,7 +620,7 @@
         </dd>
     </dl>
     <h2 class="mt-5" id="y1997">
-        1997/1998
+        1997 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -659,7 +659,7 @@
         </dd>
     </dl>
     <h2 class="mt-5" id="y1996">
-        1996/1997
+        1996 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -700,7 +700,7 @@
         </dd>
     </dl>
     <h2 class="mt-5" id="y1995">
-        1995/1996
+        1995 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -739,7 +739,7 @@
         </dd>
     </dl>
     <h2 class="mt-5" id="y1994">
-        1994/1995
+        1994 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -771,7 +771,7 @@
         </dd>
     </dl>
     <h2 class="mt-5" id="y1993">
-        1993/1994
+        1993 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
@@ -802,7 +802,7 @@
         </dd>
     </dl>
     <h2 class="mt-5" id="y1992">
-        1992/1993
+        1992 NomCom
     </h2>
     <dl class="row">
         <dt class="col-sm-2">
diff --git a/ietf/templates/nomcom/index.html b/ietf/templates/nomcom/index.html
index 91f63f74e..e765dd7c2 100644
--- a/ietf/templates/nomcom/index.html
+++ b/ietf/templates/nomcom/index.html
@@ -12,7 +12,7 @@
     <table class="table table-sm table-striped tablesorter">
         <thead>
             <tr>
-                <th scope="col" data-sort="year">Year</th>
+                <th scope="col" data-sort="year">Year Convened</th>
                 <th scope="col" data-sort="chair">Chair</th>
                 <th scope="col"></th>
             </tr>