fixup! views: add series-list view

Author: victor-accarini

patchwork/models.py

@@ -14,6 +14,7 @@
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
 from django.core.validators import validate_unicode_slug
+from django.db.models import Count
 from django.db import models
 from django.urls import reverse
 from django.utils.functional import cached_property
@@ -880,6 +881,32 @@ def received_total(self):
     def received_all(self):
         return self.total <= self.received_total
 
+    @property
+    def interest_count(self):
+        count = self.patches.aggregate(
+            Count('planning_to_review', distinct=True)
+        )
+        return count['planning_to_review__count']
+
+    @property
+    def check_count(self):
+        """Generate a list of unique checks for all patchs in the series.
+
+        Compile a list of checks associated with this series patches for each
+        type of check. Only "unique" checks are considered, identified by their
+        'context' field. This means, given n checks with the same 'context', the
+        newest check is the only one counted regardless of its value. The end
+        result will be a association of types to number of unique checks for
+        said type.
+        """
+        counts = {key: 0 for key, _ in Check.STATE_CHOICES}
+
+        for p in self.patches.all():
+            for check in p.checks:
+                counts[check.state] += 1
+
+        return counts
+
     def add_cover_letter(self, cover):
         """Add a cover letter to the series.
 

patchwork/templates/patchwork/series-list.html

@@ -11,6 +11,7 @@
 {% load person %}
 {% load listurl %}
 {% load patch %}
+{% load series %}
 {% load project %}
 {% load static %}
 
@@ -37,7 +38,15 @@
       </th>
 
       <th>
-        <span class="series-list-header">Cover Letter</span>
+        {% project_tags %}
+      </th>
+
+      <th>
+        <span class="series-list-header" title="Success / Warning / Fail">S/W/F</span>
+      </th>
+
+      <th>
+        <span class="series-list-header" title="Declared review interest">Review Interest</span>
       </th>
 
       <th>
@@ -83,13 +92,9 @@
         {{ series.version|default:"-"}}
       </td>
 
-      <td>
-        {% if series.cover_letter.content %}
-          <b>&check;</b>
-        {% else %}
-          -
-        {% endif %}
-      </td>
+      <td id="series-tags:{{series.id}}" class="text-nowrap">{{ series|series_tags }}</td>
+      <td id="series-checks:{{series.id}}" class="text-nowrap">{{ series|series_checks }}</td>
+      <td id="series-interest:{{series.id}}" class="text-nowrap">{{ series|series_interest }}</td>
       <td>{{ series.received_total}}</td>
       <td class="text-nowrap">{{ series.date|date:"Y-m-d" }}</td>
       <td>{{ series.submitter|personify:project }}</td>

patchwork/templatetags/series.py

@@ -0,0 +1,76 @@
+# Patchwork - automated patch tracking system
+# Copyright (C) 2008 Jeremy Kerr <[email protected]>
+# Copyright (C) 2015 Intel Corporation
+#
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+from django import template
+from django.utils.safestring import mark_safe
+
+from patchwork.models import Check
+
+
+register = template.Library()
+
+
+@register.filter(name='series_tags')
+def series_tags(series):
+    counts = []
+    titles = []
+
+    for tag in [t for t in series.project.tags if t.show_column]:
+        count = 0
+        for patch in series.patches.with_tag_counts(series.project).all():
+            count += getattr(patch, tag.attr_name)
+
+        titles.append('%d %s' % (count, tag.name))
+        if count == 0:
+            counts.append('-')
+        else:
+            counts.append(str(count))
+
+    return mark_safe(
+        '<span title="%s">%s</span>' % (' / '.join(titles), ' '.join(counts))
+    )
+
+
+@register.filter(name='series_checks')
+def series_checks(series):
+    required = [Check.STATE_SUCCESS, Check.STATE_WARNING, Check.STATE_FAIL]
+    titles = ['Success', 'Warning', 'Fail']
+    counts = series.check_count
+
+    check_elements = []
+    for state in required[::-1]:
+        if counts[state]:
+            color = dict(Check.STATE_CHOICES).get(state)
+            count = str(counts[state])
+        else:
+            color = ''
+            count = '-'
+
+        check_elements.append(
+            f'<span class="patchlistchecks {color}">{count}</span>'
+        )
+
+    check_elements.reverse()
+
+    return mark_safe(
+        '<span title="%s">%s</span>'
+        % (' / '.join(titles), ''.join(check_elements))
+    )
+
+
+@register.filter(name='series_interest')
+def series_interest(series):
+    reviews = series.interest_count
+    review_title = (
+        f'has {reviews} interested reviewers'
+        if reviews > 0
+        else 'no interested reviewers'
+    )
+    review_class = 'exists' if reviews > 0 else ''
+    return mark_safe(
+        '<span class="patchinterest %s" title="%s">%s</span>'
+        % (review_class, review_title, reviews if reviews > 0 else '-')
+    )