Skip to content
Snippets Groups Projects
Commit 9b6b1212 authored by Bodor Máté's avatar Bodor Máté
Browse files

Add note and corrected field to the Solution model

parent 1dbb64a3
No related branches found
No related tags found
No related merge requests found
# Generated by Django 2.0.1 on 2018-12-29 19:19
# Generated by Django 2.0.1 on 2019-01-04 19:59
import common.validators
import django.core.validators
from django.db import migrations, models
import django.db.models.deletion
......@@ -20,7 +22,7 @@ class Migration(migrations.Migration):
('uploaded_at', models.DateTimeField(auto_now_add=True)),
('name', models.CharField(max_length=150)),
('description', models.TextField()),
('file', models.FileField(upload_to='')),
('files', models.FileField(upload_to='', validators=[django.core.validators.FileExtensionValidator(['png', 'jpeg', 'jpg', 'zip']), common.validators.FileSizeValidator(size_limit=52428800)])),
('uploaded_by', models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, to='account.Profile')),
],
),
......
# Generated by Django 2.0.1 on 2018-12-24 16:02
# Generated by Django 2.0.1 on 2019-01-04 19:59
import common.validators
import django.core.validators
......@@ -21,7 +21,9 @@ class Migration(migrations.Migration):
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('created_at', models.DateTimeField(auto_now_add=True)),
('updated_at', models.DateTimeField(auto_now=True)),
('note', models.TextField()),
('accepted', models.BooleanField()),
('corrected', models.BooleanField()),
('files', models.FileField(upload_to='', validators=[django.core.validators.FileExtensionValidator(['png', 'jpeg', 'jpg', 'zip']), common.validators.FileSizeValidator(size_limit=52428800)])),
('created_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student_solution', to='account.Profile')),
],
......
......@@ -23,7 +23,9 @@ class Solution(models.Model):
created_by = models.ForeignKey(Profile, related_name='student_solution', on_delete=models.CASCADE)
created_at = models.DateTimeField(auto_now_add=True, editable=False)
updated_at = models.DateTimeField(auto_now=True, editable=False)
note = models.TextField()
accepted = models.BooleanField()
corrected = models.BooleanField()
files = models.FileField(
validators=[
validators.FileExtensionValidator([
......
......@@ -27,7 +27,16 @@ class SolutionSerializer(serializers.ModelSerializer):
class Meta:
model = models.Solution
read_only_fields = ('created_by', 'created_at', 'updated_at', 'ready')
fields = ('task', 'created_at', 'updated_at', 'accepted', 'files', 'created_by')
fields = (
'task',
'created_at',
'updated_at',
'accepted',
'files',
'created_by',
'corrected',
'note',
)
def validate(self, data):
if timezone.now() > data['task'].deadline:
......@@ -36,4 +45,6 @@ class SolutionSerializer(serializers.ModelSerializer):
def create(self, validated_data):
validated_data['accepted'] = False
validated_data['corrected'] = False
validated_data['note'] = ''
return self.Meta.model.objects.create(**validated_data)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment