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

minor tweak in ordering of feedback for reviewer

parent d7bb1ab0
No related branches found
No related tags found
No related merge requests found
# -*- coding: utf-8 -*-
# Generated by Django 1.10.7 on 2017-04-12 14:47
from __future__ import unicode_literals
from django.db import migrations, models
import django.utils.timezone
class Migration(migrations.Migration):
dependencies = [
('core', '0001_initial'),
]
operations = [
migrations.AddField(
model_name='feedback',
name='created',
field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
preserve_default=False,
),
migrations.AddField(
model_name='feedback',
name='modified',
field=models.DateTimeField(auto_now=True),
),
]
# -*- coding: utf-8 -*-
# Generated by Django 1.10.7 on 2017-04-12 15:07
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('core', '0002_auto_20170412_1447'),
]
operations = [
migrations.AlterField(
model_name='feedback',
name='origin',
field=models.IntegerField(choices=[(0, 'was empty'), (1, 'passed unittests'), (2, 'did not compile'), (3, 'could not link'), (4, 'created by a human. yak!')], default=4),
),
migrations.AlterField(
model_name='feedback',
name='status',
field=models.IntegerField(choices=[(0, 'editable'), (1, 'accepted'), (2, 'request review'), (3, 'request reassignment')], default=0),
),
]
...@@ -66,7 +66,7 @@ def reviewer_view(request): ...@@ -66,7 +66,7 @@ def reviewer_view(request):
'submission_type_list': get_annotated_feedback_count(), 'submission_type_list': get_annotated_feedback_count(),
'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_manual': Feedback.objects.filter(origin=Feedback.MANUAL).order_by('status', '-modified'), 'feedback_list_manual': Feedback.objects.filter(origin=Feedback.MANUAL).order_by('-status', '-modified'),
'feedback_list_empty': Feedback.objects.filter(origin=Feedback.WAS_EMPTY), 'feedback_list_empty': Feedback.objects.filter(origin=Feedback.WAS_EMPTY),
'feedback_list_did_not_compile': Feedback.objects.filter(origin=Feedback.DID_NOT_COMPILE), 'feedback_list_did_not_compile': Feedback.objects.filter(origin=Feedback.DID_NOT_COMPILE),
'feedback_list_could_not_link': Feedback.objects.filter(origin=Feedback.COULD_NOT_LINK), 'feedback_list_could_not_link': Feedback.objects.filter(origin=Feedback.COULD_NOT_LINK),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment