diff --git a/backend/core/admin.py b/backend/core/admin.py index d423e1baf95f49fc46b51dd4b0097be43348df09..a2e9f295ca1e3cb3e5c3afd5fef9ec0cc66a6443 100644 --- a/backend/core/admin.py +++ b/backend/core/admin.py @@ -1,9 +1,7 @@ -from django import forms from django.contrib import admin -from django.contrib.auth.admin import UserAdmin as BaseUserAdmin -from django.contrib.auth.forms import ReadOnlyPasswordHashField +from django.contrib.auth.models import Group -from core.models import (Feedback, Reviewer, Student, Submission, +from core.models import (ExamType, Feedback, Reviewer, Student, Submission, SubmissionType, Test, Tutor, UserAccount) # Stuff we needwant diff --git a/backend/core/migrations/0002_auto_20171110_1612.py b/backend/core/migrations/0002_auto_20171110_1612.py index 51ea77b9d911e7133d6fd9f8f4d1c6d52d9b90d5..d7eba8e70eb18ecc8e279c2dac007def36d06a48 100644 --- a/backend/core/migrations/0002_auto_20171110_1612.py +++ b/backend/core/migrations/0002_auto_20171110_1612.py @@ -4,8 +4,8 @@ from __future__ import unicode_literals import django.contrib.auth.models import django.contrib.auth.validators -from django.db import migrations, models import django.utils.timezone +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/backend/core/serializers.py b/backend/core/serializers.py index a5d7967f6d46e68132d215b3f577abec331c15ab..8178ecfae6f841340d82c7e9afada2bee9dd3c52 100644 --- a/backend/core/serializers.py +++ b/backend/core/serializers.py @@ -2,6 +2,7 @@ from rest_framework import serializers from core.models import ExamType, Feedback, Student, Submission + class ExamSerializer(serializers.ModelSerializer): class Meta: diff --git a/backend/core/views.py b/backend/core/views.py index 17ee5bce75d826109458c491f45cf9c3dd16dd41..20f185b4f5ba84513c37fdf1d9fc0e91d6cdd66e 100644 --- a/backend/core/views.py +++ b/backend/core/views.py @@ -32,5 +32,3 @@ class FeedbackApiView(RetrieveAPIView): def get_queryset(self): return [submission.feedback for submission in self.request.user.submissions] serializer_class = FeedbackSerializer - - diff --git a/backend/delbert.py b/backend/delbert.py index d97add4cdc76dd8c8a857ba4c502994d2a1c4d3d..0a478a2d796276259fcc2fc6b0ebba6f688a4c42 100644 --- a/backend/delbert.py +++ b/backend/delbert.py @@ -1,18 +1,21 @@ import argparse import csv +import json import os -os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'grady.settings') import secrets import sys -import json import django -django.setup() - from django.contrib.auth.models import User -from core.models import Student, Submission import util.importer +from core.models import Student, Submission + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'grady.settings') + +django.setup() + + def parseme(): parser = argparse.ArgumentParser()