Skip to content
Snippets Groups Projects
Commit e07e9e13 authored by Jan Maximilian Michal's avatar Jan Maximilian Michal
Browse files

does not display auto generated feedback

parent 8b1745ea
No related branches found
No related tags found
No related merge requests found
...@@ -26,7 +26,7 @@ pre { ...@@ -26,7 +26,7 @@ pre {
} }
.editor-pre { .editor-pre {
height: 200px; height: 250px;
} }
.nopadding-right { .nopadding-right {
......
...@@ -20,14 +20,25 @@ def user_home(request): ...@@ -20,14 +20,25 @@ def user_home(request):
else: else:
return HttpResponseRedirect(reverse('index')) 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') @group_required('Tutors')
def tutor_view(request): def tutor_view(request):
context = { context = {
'submission_type_list': SubmissionType.objects.annotate( 'submission_type_list': get_annotated_feedback_count(),
Count('submissions__feedback_list')).annotate(
Count('submissions')
).all(),
'feedback_list': Feedback.objects.filter(of_tutor=request.user), 'feedback_list': Feedback.objects.filter(of_tutor=request.user),
} }
return render(request, 'core/tutor_startpage.html', context) return render(request, 'core/tutor_startpage.html', context)
...@@ -45,12 +56,9 @@ def student_view(request): ...@@ -45,12 +56,9 @@ def student_view(request):
@group_required('Reviewers') @group_required('Reviewers')
def reviewer_view(request): def reviewer_view(request):
context = { context = {
'submission_type_list': SubmissionType.objects.annotate( 'submission_type_list': get_annotated_feedback_count(),
Count('submissions__feedback_list')).annotate(
Count('submissions')
).all(),
'tutor_list': User.objects.annotate(Count('corrected_submissions')).filter(groups__name='Tutors'), 'tutor_list': User.objects.annotate(Count('corrected_submissions')).filter(groups__name='Tutors'),
'submission_list': Submission.objects.all(), '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) return render(request, 'core/reviewer_startpage.html', context)
...@@ -40,7 +40,7 @@ def add_submission(type, text, student, pre="Vorgabe"): ...@@ -40,7 +40,7 @@ def add_submission(type, text, student, pre="Vorgabe"):
input=text, input=text,
encoding='latin-1', encoding='latin-1',
) )
return command.stderr return command.stderr # and returncode
sub = Submission() sub = Submission()
sub.type = type sub.type = type
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment