Signoffs changes and improvements

* Better signoff report with more detail
* Show signoff specification in signoffs view
* Honor disabled/bad flags and display in approval column
* Various other small bugfixes and tweaks

Signed-off-by: Dan McGee <dan@archlinux.org>

3 files changed, 32 insertions, 2 deletions

diff --git a/templates/packages/signoff_cell.html b/templates/packages/signoff_cell.html
index 0a63011..6c705b4 100644
--- a/templates/packages/signoff_cell.html
+++ b/templates/packages/signoff_cell.html
@@ -11,10 +11,12 @@
     <a class="signoff-link" href="{{ group.package.get_absolute_url }}signoff/revoke/"
         title="Revoke signoff {{ group.pkgbase }} for {{ group.arch }}">Revoke Signoff</a></div>
 {% else %}
+{% if not group.specification.known_bad and group.specification.enabled %}
 <div>
     <a class="signoff-link" href="{{ group.package.get_absolute_url }}signoff/"
         title="Signoff {{ group.pkgbase }} for {{ group.arch }}">Signoff</a></div>
 {% endif %}
+{% endif %}
 {% if group.packager == user %}
 <div>
     <a class="signoff-options" href="{{ group.package.get_absolute_url }}signoff/options/">Packager Options</a>
diff --git a/templates/packages/signoff_report.txt b/templates/packages/signoff_report.txt
index 84e3fc6..81020c8 100644
--- a/templates/packages/signoff_report.txt
+++ b/templates/packages/signoff_report.txt
@@ -1,6 +1,19 @@
 === {% autoescape off %}Signoff report for [{{ repo|lower }}] ===
 {{ signoffs_url }}
 
+There are currently:
+* {{ new|length }} new package{{ new|length|pluralize }} in last {{ new_hours }} hours
+* {{ bad|length }} known bad package{{ bad|length|pluralize }}
+* {{ disabled|length }} package{{ disabled|length|pluralize }} not accepting signoffs
+* {{ complete|length }} fully signed off package{{ complete|length|pluralize }}
+* {{ incomplete|length }} package{{ incomplete|length|pluralize }} missing signoffs
+* {{ old|length }} package{{ old|length|pluralize }} older than {{ old_days }} days
+
+(Note: the word 'package' as used here refers to packages as grouped by
+pkgbase, architecture, and repository; e.g., one PKGBUILD produces one
+package per architecture, even if it is a split package.)
+
+
 == New packages in [{{ repo|lower}}] in last {{ new_hours }} hours ({{ new|length }} total) ==
 {% for group in new %}
 * {{ group.pkgbase }}-{{ group.version }} ({{ group.arch }}){% endfor %}
diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index 9bc7fd7..d517e5e 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -39,6 +39,7 @@
                 <th>Last Updated</th>
                 <th>Approved</th>
                 <th>Signoffs</th>
+                <th>Notes</th>
             </tr>
         </thead>
         <tbody id="tbody_signoffs">
@@ -50,8 +51,22 @@
                 <td>{{ group.packager|default:"Unknown" }}</td>
                 <td>{{ group.packages|length }}</td>
                 <td>{{ group.last_update|date }}</td>
-                <td class="signoff-{{ group.approved|yesno }}">{{ group.approved|yesno|capfirst }}</td>
+                {% if group.specification.known_bad %}
+                <td class="approval signoff-bad">Bad</td>
+                {% else %}
+                {% if not group.specification.enabled %}
+                <td class="approval signoff-disabled">Disabled</td>
+                {% else %}
+                <td class="approval signoff-{{ group.approved|yesno }}">{{ group.approved|yesno|capfirst }}</td>
+                {% endif %}
+                {% endif %}
                 <td>{% include "packages/signoff_cell.html" %}</td>
+                <td class="wrap">{% if not group.default_spec %}{% with group.specification as spec %}
+                    {% if spec.required != 2 %}Required signoffs: {{ spec.required }}<br/>{% endif %}
+                    {% if not spec.enabled %}Signoffs are not currently enabled<br/>{% endif %}
+                    {% if spec.known_bad %}Package is known to be bad<br/>{% endif %}
+                    {{ spec.comments|default:""|linebreaks }}
+                {% endwith %}{% endif %}</td>
             </tr>
             {% endfor %}
         </tbody>
@@ -64,7 +79,7 @@
 $(document).ready(function() {
     $('a.signoff-link').click(signoff_package);
     $(".results").tablesorter({widgets: ['zebra'], sortList: [[0,0]],
-        headers: { 7: { sorter: false } } });
+        headers: { 7: { sorter: false }, 8: {sorter: false } } });
     $('#signoffs_filter input').change(filter_signoffs);
     $('#criteria_reset').click(filter_signoffs_reset);
     // fire function on page load to ensure the current form selections take effect