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

Fixing the failing CI job, view is no longer a package but a file again.

- ran isort to properly sort imports
- reformatter some classes
parent 9ca68496
No related branches found
No related tags found
1 merge request!15Refactor
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 permissions
from core.custom_annotations import in_groups
from core.models import Student, Submission, Feedback
from core.custom_annotations import in_groups
from core.models import Feedback, Student, Submission
class StudentRequestOwnData(permissions.BasePermission):
......
from django.contrib.auth.models import User
from rest_framework import serializers
from core.models import Student, Submission, Feedback
from core.models import Feedback, Student, Submission
class FeedbackSerializer(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.urlpatterns import format_suffix_patterns
from core import views
urlpatterns = [
url(r'^api/student/$', views.StudentApiView.as_view()),
url(r'^api/submission/$', views.SubmissionApiView.as_view()),
......
from core.models import Student, Submission, Feedback
from core.serializers import SubmissionSerializer, StudentSerializer, FeedbackSerializer
from rest_framework.generics import RetrieveAPIView
from core.models import Feedback, Student, Submission
from core.serializers import (FeedbackSerializer, StudentSerializer,
SubmissionSerializer)
class StudentApiView(RetrieveAPIView):
def get_object(self):
......@@ -24,5 +26,3 @@ class FeedbackApiView(RetrieveAPIView):
class StudentPageView(RetrieveAPIView):
queryset = Student.objects.all()
......@@ -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
......
  • Henrik Brosenne @hbrosen

    mentioned in issue #46 (closed)

    By Jan Maximilian Michal on 2017-11-09T22:40:42 (imported from GitLab)

    ·

    mentioned in issue #46 (closed)

    By Jan Maximilian Michal on 2017-11-09T22:40:42 (imported from GitLab)

    Toggle commit list
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment