feat: Reclassify nomcom feedback (ietf-tools#4669)

- There's a new `Chair/Advisor Tasks` menu item `Reclassify feedback`. - I overloaded `view_feedback*` URLs with a `?reclassify` parameter. - This adds a checkbox to each feedback message, and a `Reclassify` button at the bottom of each feedback page. - "Reclassifying" basically de-classifies the feedback, and punts it back to the "Pending emails" view for reclassification. - If a feedback has been applied to multiple nominees, declassifying it from one nominee removes it from all.
pselkirk · Jul 21, 2023 · 3a6d70c · 3a6d70c
1 parent 2ede70e
commit 3a6d70c
Show file tree

Hide file tree

Showing 6 changed files with 141 additions and 18 deletions.
diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py
@@ -1,4 +1,4 @@
-# Copyright The IETF Trust 2012-2020, All Rights Reserved
+# Copyright The IETF Trust 2012-2023, All Rights Reserved
 # -*- coding: utf-8 -*-
 
 
@@ -828,6 +828,8 @@ def nominee_staterank(nominee):
             topic_feedback.append( (ft.name,count,newflag) )
         topics_feedback.append ( {'topic':topic, 'feedback':topic_feedback} )
 
+    reclassify = request.GET.get('reclassify') is not None
+
     return render(request, 'nomcom/view_feedback.html',
                               {'year': year,
                                'selected': 'view_feedback',
@@ -838,7 +840,9 @@ def nominee_staterank(nominee):
                                'topics_feedback': topics_feedback,
                                'independent_feedback': independent_feedback,
                                'nominees_feedback': nominees_feedback,
-                               'nomcom': nomcom})
+                               'nomcom': nomcom,
+                               'reclassify': reclassify,
+                               })
 
 
 @role_required("Nomcom Chair", "Nomcom Advisor")
@@ -956,15 +960,31 @@ def view_feedback_unrelated(request, year):
         feedback_types.append({'ft': ft,
                                'feedback': ft.feedback_set.get_by_nomcom(nomcom)})
 
+    reclassify = request.GET.get('reclassify') is not None
+    is_chair = nomcom.group.has_role(request.user, "chair")
+    if reclassify and is_chair and request.method == 'POST':
+        action = request.POST.get('action')
+        feedback_to_modify = request.POST.getlist('selected')
+        if feedback_to_modify:
+            for ft in feedback_types:
+                feedback = ft['feedback'].filter(id__in=feedback_to_modify)
+                feedback.update(type=None)
+            messages.success(request, 'The selected feedback has been de-classified. Please reclassify it in the Pending emails tab.')
+        else:
+            messages.warning(request, "Please select some feedback to work with")
+
     return render(request, 'nomcom/view_feedback_unrelated.html',
                               {'year': year,
                                'selected': 'view_feedback',
                                'feedback_types': feedback_types,
-                               'nomcom': nomcom})
+                               'nomcom': nomcom,
+                               'is_chair': is_chair,
+                               'reclassify': reclassify,
+                               })
 
 @role_required("Nomcom")
 @nomcom_private_key_required
-def view_feedback_topic(request, year, topic_id):
+def view_feedback_topic(request, year, topic_id, reflassify=False):
     nomcom = get_nomcom_by_year(year)
     topic = get_object_or_404(Topic, id=topic_id)
     feedback_types = FeedbackTypeName.objects.filter(slug__in=['comment',])
@@ -976,13 +996,28 @@ def view_feedback_topic(request, year, topic_id):
     else:
         TopicFeedbackLastSeen.objects.create(reviewer=request.user.person,topic=topic)
 
+    reclassify = request.GET.get('reclassify') is not None
+    is_chair = nomcom.group.has_role(request.user, "chair")
+    if reclassify and is_chair and request.method == 'POST':
+        action = request.POST.get('action')
+        feedback_to_modify = request.POST.getlist('selected')
+        if feedback_to_modify:
+            feedback = topic.feedback_set.filter(id__in=feedback_to_modify)
+            feedback.update(type=None)
+            messages.success(request, 'The selected feedback has been de-classified. Please reclassify it in the Pending emails tab.')
+        else:
+            messages.warning(request, "Please select some feedback to work with")
+
     return render(request, 'nomcom/view_feedback_topic.html',
                               {'year': year,
                                'selected': 'view_feedback',
                                'topic': topic,
                                'feedback_types': feedback_types,
                                'last_seen_time' : last_seen_time,
-                               'nomcom': nomcom})
+                               'nomcom': nomcom,
+                               'is_chair': is_chair,
+                               'reclassify': reclassify,
+                               })
 
 @role_required("Nomcom")
 @nomcom_private_key_required
@@ -998,13 +1033,30 @@ def view_feedback_nominee(request, year, nominee_id):
     else:
         FeedbackLastSeen.objects.create(reviewer=request.user.person,nominee=nominee)
 
+    reclassify = request.GET.get('reclassify') is not None
+    is_chair = nomcom.group.has_role(request.user, "chair")
+    if reclassify and is_chair and request.method == 'POST':
+        action = request.POST.get('action')
+        feedback_to_modify = request.POST.getlist('selected')
+        if feedback_to_modify:
+            feedback = nominee.feedback_set.filter(id__in=feedback_to_modify)
+            feedback.update(type=None)
+            for fb in feedback:
+                fb.nominees.clear()
+            messages.success(request, 'The selected feedback has been de-classified. Please reclassify it in the Pending emails tab.')
+        else:
+            messages.warning(request, "Please select some feedback to work with")
+
     return render(request, 'nomcom/view_feedback_nominee.html',
                               {'year': year,
                                'selected': 'view_feedback',
                                'nominee': nominee,
                                'feedback_types': feedback_types,
                                'last_seen_time' : last_seen_time,
-                               'nomcom': nomcom})
+                               'nomcom': nomcom,
+                               'is_chair': is_chair,
+                               'reclassify': reclassify,
+                               })
 
 
 @role_required("Nomcom Chair", "Nomcom Advisor")

diff --git a/ietf/templates/nomcom/nomcom_private_base.html b/ietf/templates/nomcom/nomcom_private_base.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2023, All Rights Reserved #}
 {% load origin %}
 {% load nomcom_tags %}
 {% load ietf_filters %}
@@ -84,6 +84,9 @@ <h1>
                         <li class="dropdown-item">
                             <a href="{% url "ietf.nomcom.views.private_merge_nominee" year %}">Merge nominee records</a>
                         </li>
+                        <li class="dropdown-item">
+                            <a href="{% url "ietf.nomcom.views.view_feedback" year %}?reclassify">Reclassify feedback</a>
+                        </li>
                     {% endif %}
                     <li role="presentation" class="dropdown-header">NomCom configuration</li>
                     <li class="dropdown-item">

diff --git a/ietf/templates/nomcom/view_feedback.html b/ietf/templates/nomcom/view_feedback.html
@@ -31,17 +31,17 @@ <h3 class="mt-5" id="declined">Declined each nominated position</h3>
                 {% for fb_dict in staterank.list %}
                     <tr>
                         <td>
-                            <a href="{% url 'ietf.nomcom.views.view_feedback_nominee' year=year nominee_id=fb_dict.nominee.id %}">
+                            <a href="{% url 'ietf.nomcom.views.view_feedback_nominee' year=year nominee_id=fb_dict.nominee.id %}{% if reclassify %}?reclassify{% endif %}">
                                 {{ fb_dict.nominee.person.first_name }}
                             </a>
                         </td>
                         <td>
-                            <a href="{% url 'ietf.nomcom.views.view_feedback_nominee' year=year nominee_id=fb_dict.nominee.id %}">
+                            <a href="{% url 'ietf.nomcom.views.view_feedback_nominee' year=year nominee_id=fb_dict.nominee.id %}{% if reclassify %}?reclassify{% endif %}">
                                 {{ fb_dict.nominee.person.last_name }}
                             </a>
                         </td>
                         <td>
-                            <a href="{% url 'ietf.nomcom.views.view_feedback_nominee' year=year nominee_id=fb_dict.nominee.id %}">
+                            <a href="{% url 'ietf.nomcom.views.view_feedback_nominee' year=year nominee_id=fb_dict.nominee.id %}{% if reclassify %}?reclassify{% endif %}">
                                 {{ fb_dict.nominee.email.address }}
                             </a>
                         </td>
@@ -80,7 +80,7 @@ <h2 class="mt-5" id="topics">Feedback related to topics</h2>
             {% for fb_dict in topics_feedback %}
                 <tr>
                     <td>
-                        <a href="{% url 'ietf.nomcom.views.view_feedback_topic' year=year topic_id=fb_dict.topic.id %}">
+                        <a href="{% url 'ietf.nomcom.views.view_feedback_topic' year=year topic_id=fb_dict.topic.id %}{% if reclassify %}?reclassify{% endif %}">
                             {{ fb_dict.topic.subject }}
                         </a>
                     </td>
@@ -106,7 +106,7 @@ <h2 class="mt-5" id="misc">Feedback not related to Nominees</h2>
             <tbody>
                 <tr>
                     <td>
-                        <a href="{% url 'ietf.nomcom.views.view_feedback_unrelated' year %}">View feedback not related to nominees</a>
+                        <a href="{% url 'ietf.nomcom.views.view_feedback_unrelated' year %}{% if reclassify %}?reclassify{% endif %}">View feedback not related to nominees</a>
                     </td>
                     {% for count in independent_feedback %}<td>{{ count }}</td>{% endfor %}
                 </tr>

diff --git a/ietf/templates/nomcom/view_feedback_nominee.html b/ietf/templates/nomcom/view_feedback_nominee.html
@@ -1,5 +1,5 @@
 {% extends "nomcom/nomcom_private_base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2023, All Rights Reserved #}
 {% load origin %}
 {% load nomcom_tags textfilters %}
 {% block subtitle %}- View feedback about {{ nominee.email.person.name }}{% endblock %}
@@ -22,9 +22,24 @@ <h2>Feedback about {{ nominee }}</h2>
         {% for ft in feedback_types %}
             <div role="tabpanel" class="tab-pane {% if forloop.first %} active{% endif %}"
                  id="{{ ft.slug }}">
+                {% if is_chair and nomcom.group.state_id == 'active' and reclassify %}
+                    <form class="form-inline" id="batch-action-form" method="post">
+                    {% csrf_token %}
+                {% endif %}
                 {% for feedback in nominee.feedback_set.all %}
                     {% if feedback.type.slug == ft.slug %}
                         <dl class="row">
+                            {% if is_chair and nomcom.group.state_id == 'active' and reclassify %}
+                            <dt class="col-sm-2">
+                                <input class="batch-select form-check-input"
+                                       type="checkbox"
+                                       value="{{ feedback.id }}"
+                                       id="id-{{ feedback.id }}"
+                                       aria-label="feedback.id"
+                                       name="selected">
+                            </dt>
+                            <dd/>
+                            {% endif %}
                             <dt class="col-sm-2">
                                 {% if feedback.time > last_seen_time %}<span class="badge rounded-pill bg-success">New</span>{% endif %}
                                 From
@@ -85,11 +100,16 @@ <h2>Feedback about {{ nominee }}</h2>
                         {% if not forloop.last %}<hr>{% endif %}
                     {% endif %}
                 {% endfor %}
+                {% if is_chair and nomcom.group.state_id == 'active' and reclassify and nominee.feedback_set.all|length > 0 %}
+                    <p><button class="btn btn-warning"  type="submit" title="Run action">
+                        Reclassify
+                    </button></p>
+                {% endif %}
             </div>
         {% endfor %}
     </div>
     <a class="btn btn-secondary"
-       href="{% url 'ietf.nomcom.views.view_feedback' year %}">Back</a>
+       href="{% url 'ietf.nomcom.views.view_feedback' year %}{% if reclassify %}?reclassify{% endif %}">Back</a>
 {% endblock %}
 {% block js %}
     <script>

diff --git a/ietf/templates/nomcom/view_feedback_topic.html b/ietf/templates/nomcom/view_feedback_topic.html
@@ -1,5 +1,5 @@
 {% extends "nomcom/nomcom_private_base.html" %}
-{# Copyright The IETF Trust 2017, All Rights Reserved #}
+{# Copyright The IETF Trust 2017-2023, All Rights Reserved #}
 {% load origin %}
 {% load nomcom_tags textfilters %}
 {% block subtitle %}- View feedback about {{ topic.subject }}{% endblock %}
@@ -22,9 +22,24 @@ <h2>Feedback about {{ topic.subject }}</h2>
         {% for ft in feedback_types %}
             <div role="tabpanel" class="tab-pane {% if forloop.first %} active{% endif %}"
                  id="{{ ft.slug }}">
+                {% if is_chair and nomcom.group.state_id == 'active' and reclassify %}
+                    <form class="form-inline" id="batch-action-form" method="post">
+                    {% csrf_token %}
+                {% endif %}
                 {% for feedback in topic.feedback_set.all %}
                     {% if feedback.type.slug == ft.slug %}
                         <dl class="row">
+                            {% if is_chair and nomcom.group.state_id == 'active' and reclassify %}
+                            <dt class="col-sm-2">
+                                <input class="batch-select form-check-input"
+                                       type="checkbox"
+                                       value="{{ feedback.id }}"
+                                       id="id-{{ feedback.id }}"
+                                       aria-label="feedback.id"
+                                       name="selected">
+                            </dt>
+                            <dd/>
+                            {% endif %}
                             <dt class="col-sm-2">
                                 {% if feedback.time > last_seen_time %}<span class="badge rounded-pill bg-success">New</span>{% endif %}
                                 From
@@ -48,11 +63,16 @@ <h2>Feedback about {{ topic.subject }}</h2>
                         {% if not forloop.last %}<hr>{% endif %}
                     {% endif %}
                 {% endfor %}
+                {% if is_chair and nomcom.group.state_id == 'active' and reclassify and topic.feedback_set.all|length > 0 %}
+                    <p><button class="btn btn-warning"  type="submit" title="Run action">
+                        Reclassify
+                    </button></p>
+                {% endif %}
             </div>
         {% endfor %}
     </div>
     <a class="btn btn-secondary"
-       href="{% url 'ietf.nomcom.views.view_feedback' year %}">Back</a>
+       href="{% url 'ietf.nomcom.views.view_feedback' year %}{% if reclassify %}?reclassify{% endif %}">Back</a>
 {% endblock %}
 {% block js %}
     <script>

diff --git a/ietf/templates/nomcom/view_feedback_unrelated.html b/ietf/templates/nomcom/view_feedback_unrelated.html
@@ -1,5 +1,5 @@
 {% extends "nomcom/nomcom_private_base.html" %}
-{# Copyright The IETF Trust 2015, All Rights Reserved #}
+{# Copyright The IETF Trust 2015-2023, All Rights Reserved #}
 {% load origin %}
 {% load nomcom_tags textfilters %}
 {% block subtitle %}- View unrelated feedback{% endblock %}
@@ -22,11 +22,26 @@ <h2>Feedback not related to nominees</h2>
         {% for ft in feedback_types %}
             <div role="tabpanel" class="tab-pane {% if forloop.first %} active{% endif %}"
                  id="{{ ft.ft.slug }}">
+                {% if is_chair and nomcom.group.state_id == 'active' and reclassify %}
+                    <form class="form-inline" id="batch-action-form" method="post">
+                    {% csrf_token %}
+                {% endif %}
                 {% for feedback in ft.feedback %}
                     {% if not forloop.first %}
                         <hr>
                     {% endif %}
                     <dl class="row">
+                        {% if is_chair and nomcom.group.state_id == 'active' and reclassify %}
+                        <dt class="col-sm-2">
+                            <input class="batch-select form-check-input"
+                                   type="checkbox"
+                                   value="{{ feedback.id }}"
+                                   id="id-{{ feedback.id }}"
+                                   aria-label="feedback.id"
+                                   name="selected">
+                        </dt>
+                        <dd/>
+                        {% endif %}
                         <dt class="col-sm-2">
                             From
                         </dt>
@@ -39,6 +54,14 @@ <h2>Feedback not related to nominees</h2>
                         <dd class="col-sm-10">
                             {{ feedback.time|date:"Y-m-d" }}
                         </dd>
+                        {% if feedback.subject %}
+                            <dt class="col-sm-2">
+                                Subject
+                            </dt>
+                            <dd class="col-sm-10">
+                                {{ feedback.subject }}
+                            </dd>
+                        {% endif %}
                         <dt class="col-sm-2">
                             Feedback
                         </dt>
@@ -47,12 +70,17 @@ <h2>Feedback not related to nominees</h2>
                         </dd>
                     </dl>
                 {% endfor %}
+                {% if is_chair and nomcom.group.state_id == 'active' and reclassify and ft.feedback|length > 0 %}
+                    <p><button class="btn btn-warning"  type="submit" title="Run action">
+                        Reclassify
+                    </button></p>
+                {% endif %}
             </div>
         {% endfor %}
     </div>
     <p>
         <a class="btn btn-secondary"
-           href="{% url 'ietf.nomcom.views.view_feedback' year %}">Back</a>
+           href="{% url 'ietf.nomcom.views.view_feedback' year %}{% if reclassify %}?reclassify{% endif %}">Back</a>
     </p>
 {% endblock %}
 {% block js %}