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

Reorderd imports in compliance with isort rules

parent a8e51d33
No related branches found
No related tags found
2 merge requests!15Refactor,!13Student page
Pipeline #
......@@ -2,10 +2,11 @@
# Generated by Django 1.11.7 on 2017-11-04 19:10
from __future__ import unicode_literals
import core.models
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import core.models
class Migration(migrations.Migration):
......
......@@ -10,8 +10,8 @@ from collections import OrderedDict
from random import randrange, sample
from string import ascii_lowercase
from django.contrib.auth.models import AbstractBaseUser, BaseUserManager
from django.contrib.auth import get_user_model
from django.contrib.auth.models import AbstractBaseUser, BaseUserManager
from django.db import models
from django.db.models import Value as V
from django.db.models import (BooleanField, Case, Count, F, IntegerField, Q,
......
from rest_framework import serializers
from core.models import Student, Submission, Feedback, ExamType
from core.models import ExamType, Feedback, Student, Submission
class ExamSerializer(serializers.ModelSerializer):
......
from django.test import TestCase
from core.models import Submission, SubmissionType, Feedback, Student, Tutor, Reviewer
from core.models import (Feedback, Reviewer, Student, Submission,
SubmissionType, Tutor)
from util.importer import GradyUserFactory
......
......@@ -4,8 +4,6 @@ from rest_framework_jwt.views import obtain_jwt_token
from core import views
urlpatterns = [
url(r'^$', views.IndexView.as_view(), name='index'),
url(r'^login/$', views.Login.as_view(), name='login'),
......
from core.serializers import SubmissionSerializer, StudentSerializer, FeedbackSerializer
from rest_framework.generics import RetrieveAPIView
from core.permissions import IsStudent
from core.serializers import (FeedbackSerializer, StudentSerializer,
SubmissionSerializer)
class StudentApiView(RetrieveAPIView):
......@@ -25,5 +27,3 @@ class FeedbackApiView(RetrieveAPIView):
def get_queryset(self):
return [submission.feedback for submission in self.request.user.submissions]
serializer_class = FeedbackSerializer
......@@ -10,8 +10,8 @@ For the full list of settings and their values, see
https://docs.djangoproject.com/en/1.10/ref/settings/
"""
import os
import datetime
import os
from django.contrib.messages import constants as messages
......@@ -159,4 +159,3 @@ REST_FRAMEWORK = {
JWT_AUTH = {
'JWT_EXPIRATION_DELTA': datetime.timedelta(seconds=600),
}
......@@ -8,8 +8,9 @@ from typing import Callable
import util.convert
import util.processing
from core.models import (ExamType, Feedback, Student, Tutor, Reviewer, Submission,
SubmissionType, Test, UserAccount as User)
from core.models import UserAccount as User
from core.models import (ExamType, Feedback, Reviewer, Student, Submission,
SubmissionType, Test, Tutor)
from util.messages import info, warn
from util.processing import EmptyTest
......
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