From 752e2ee0dc3563288a41e112fd492e90c6bc50ea Mon Sep 17 00:00:00 2001
From: janmax <mail-github@jmx.io>
Date: Fri, 5 May 2017 11:47:32 +0200
Subject: [PATCH] minor fixes and only accepted feedback is counted
---
core/templates/core/reviewer_startpage.html | 1 +
core/templates/core/tutor_startpage.html | 1 +
core/views/user_startpages.py | 17 ++++++++++++-----
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/core/templates/core/reviewer_startpage.html b/core/templates/core/reviewer_startpage.html
index efcbaa9e..c6dd512d 100644
--- a/core/templates/core/reviewer_startpage.html
+++ b/core/templates/core/reviewer_startpage.html
@@ -111,6 +111,7 @@
"paging": false,
"info": false,
"searching": false,
+ "stateSave": true,
"order": [[ 0, 'desc' ], [ 2, 'desc' ]],
"columnDefs": [
{ "orderable": false, "targets": -1 },
diff --git a/core/templates/core/tutor_startpage.html b/core/templates/core/tutor_startpage.html
index a2723f46..0347a727 100644
--- a/core/templates/core/tutor_startpage.html
+++ b/core/templates/core/tutor_startpage.html
@@ -109,6 +109,7 @@
"paging": false,
"info": false,
"searching": false,
+ "stateSave": true,
"order": [[ 0, 'desc' ], [ 3, 'desc' ]],
"columnDefs": [
{ "orderable": false, "targets": -1 },
diff --git a/core/views/user_startpages.py b/core/views/user_startpages.py
index ab958d34..51506a37 100644
--- a/core/views/user_startpages.py
+++ b/core/views/user_startpages.py
@@ -1,6 +1,6 @@
from django.contrib.auth.decorators import login_required
from django.contrib.auth.models import User
-from django.db.models import Count, Q
+from django.db.models import Count, Q, Case, When, IntegerField, Value
from django.http import HttpResponseRedirect
from django.shortcuts import render
from django.urls import reverse
@@ -36,10 +36,17 @@ def get_annotated_feedback_count():
Returns:
annotated queryset
"""
- return SubmissionType.objects.annotate( # to display only manual
- feedback_count=Count('submissions__feedback')).annotate(
- submission_count=Count('submissions')
- ).all().order_by('name')
+ return SubmissionType.objects\
+ .annotate( # to display only manual
+ feedback_count=Count(
+ Case(
+ When(Q(submissions__feedback__isnull=False) & Q(submissions__feedback__status=Feedback.ACCEPTED),
+ then=Value(1)), output_field=IntegerField(),
+ )
+ )
+ ).annotate(
+ submission_count=Count('submissions')
+ ).all().order_by('name')
@group_required('Tutors')
def tutor_view(request):
--
GitLab