From e07e9e1316e2818885f2cfb29f9c0bf9b620225e Mon Sep 17 00:00:00 2001
From: janmax <mail-github@jmx.io>
Date: Thu, 30 Mar 2017 19:46:47 +0200
Subject: [PATCH] does not display auto generated feedback
---
core/static/lib/css/custom.css | 2 +-
core/views/user_startpages.py | 26 +++++++++++++++++---------
populatedb.py | 2 +-
3 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/core/static/lib/css/custom.css b/core/static/lib/css/custom.css
index 76c2162c..1196bf85 100644
--- a/core/static/lib/css/custom.css
+++ b/core/static/lib/css/custom.css
@@ -26,7 +26,7 @@ pre {
}
.editor-pre {
- height: 200px;
+ height: 250px;
}
.nopadding-right {
diff --git a/core/views/user_startpages.py b/core/views/user_startpages.py
index 611c31c6..1201b87b 100644
--- a/core/views/user_startpages.py
+++ b/core/views/user_startpages.py
@@ -20,14 +20,25 @@ def user_home(request):
else:
return HttpResponseRedirect(reverse('index'))
+def get_annotated_feedback_count():
+ """ Annotates submission lists with counts
+
+ count both
+ * number of submission per submission type
+ * count of received feedback per submission type
+
+ Returns:
+ annotated queryset
+ """
+ return SubmissionType.objects.annotate( # to display only manual
+ Count('submissions__feedback_list')).annotate(
+ Count('submissions')
+ ).all()
@group_required('Tutors')
def tutor_view(request):
context = {
- 'submission_type_list': SubmissionType.objects.annotate(
- Count('submissions__feedback_list')).annotate(
- Count('submissions')
- ).all(),
+ 'submission_type_list': get_annotated_feedback_count(),
'feedback_list': Feedback.objects.filter(of_tutor=request.user),
}
return render(request, 'core/tutor_startpage.html', context)
@@ -45,12 +56,9 @@ def student_view(request):
@group_required('Reviewers')
def reviewer_view(request):
context = {
- 'submission_type_list': SubmissionType.objects.annotate(
- Count('submissions__feedback_list')).annotate(
- Count('submissions')
- ).all(),
+ 'submission_type_list': get_annotated_feedback_count(),
'tutor_list': User.objects.annotate(Count('corrected_submissions')).filter(groups__name='Tutors'),
'submission_list': Submission.objects.all(),
- 'feedback_list': Feedback.objects.all(),
+ 'feedback_list': Feedback.objects.filter(origin=Feedback.MANUAL),
}
return render(request, 'core/reviewer_startpage.html', context)
diff --git a/populatedb.py b/populatedb.py
index 6faf2e6a..e93b0ed3 100644
--- a/populatedb.py
+++ b/populatedb.py
@@ -40,7 +40,7 @@ def add_submission(type, text, student, pre="Vorgabe"):
input=text,
encoding='latin-1',
)
- return command.stderr
+ return command.stderr # and returncode
sub = Submission()
sub.type = type
--
GitLab