diff --git a/stats/templates/stats/statistics.html b/stats/templates/stats/statistics.html index 71f94769a02aa8aaae8750a1be94bd3aca8b6f99..52d44d1dc553e142f4481dc6e87ff392d0d80166 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 6a883e95fa3ab22474ab75dcde1bb155cf4f7e97..c3ba890ef814a2dca7c939a61b6f72879e6569d9 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)