From 15c9492ce59c4a6a1aa336fa028b7e516621f2c7 Mon Sep 17 00:00:00 2001
From: "J.-S. Caux" <J.S.Caux@uva.nl>
Date: Tue, 12 Sep 2017 21:28:39 +0200
Subject: [PATCH] Add published to stats
---
stats/templates/stats/statistics.html | 4 ++--
submissions/managers.py | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/stats/templates/stats/statistics.html b/stats/templates/stats/statistics.html
index 71f94769a..52d44d1dc 100644
--- a/stats/templates/stats/statistics.html
+++ b/stats/templates/stats/statistics.html
@@ -49,7 +49,7 @@
<th>Nr submissions<br/>(distinct)</th>
<th>Nr submissions<br/>(including resubmissions)</th>
<th>Nr assignment failed</th>
- <th>Nr accepted</th>
+ <th>Nr accepted/<br/>published</th>
<th>Nr rejected</th>
<th>Nr withdrawn</th>
{% else %}
@@ -73,7 +73,7 @@
<td>{{ submissions|submissions_count_distinct }}</td>
<td>{{ submissions|length }}</td>
<td>{{ submissions.assignment_failed.count }}</td>
- <td>{{ submissions.accepted.count }}</td>
+ <td>{{ submissions.accepted.count|add:submissions.published.count }}</td>
<td>{{ submissions.rejected.count }}</td>
<td>{{ submissions.withdrawn.count }}</td>
{% else %}
diff --git a/submissions/managers.py b/submissions/managers.py
index 6a883e95f..c3ba890ef 100644
--- a/submissions/managers.py
+++ b/submissions/managers.py
@@ -114,6 +114,10 @@ class SubmissionQuerySet(models.QuerySet):
return self.filter(status=STATUS_ACCEPTED)
+ def published(self):
+ return self.filter(status=STATUS_PUBLISHED)
+
+
def assignment_failed(self):
return self.filter(status=STATUS_ASSIGNMENT_FAILED)
--
GitLab