Skip to content
Snippets Groups Projects
Commit 7238d48c authored by Bodor Mate's avatar Bodor Mate
Browse files

little changes

parent d6fdc0e7
No related branches found
No related tags found
No related merge requests found
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
# Generated by Django 2.0.1 on 2018-04-10 22:47
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('homework', '0001_initial'),
]
operations = [
migrations.RemoveField(
model_name='solution',
name='ready',
),
migrations.AlterField(
model_name='solution',
name='accepted',
field=models.BooleanField(),
),
]
File mode changed from 100644 to 100755
...@@ -12,6 +12,7 @@ class Task(models.Model): ...@@ -12,6 +12,7 @@ class Task(models.Model):
title = models.CharField(max_length=150) title = models.CharField(max_length=150)
text = models.TextField() text = models.TextField()
deadline = models.DateTimeField() deadline = models.DateTimeField()
# dokumentum kezeles
def __str__(self): def __str__(self):
return self.title return self.title
...@@ -22,8 +23,7 @@ class Solution(models.Model): ...@@ -22,8 +23,7 @@ class Solution(models.Model):
created_by = models.ForeignKey(Profile, related_name='student_solution', on_delete=models.CASCADE) created_by = models.ForeignKey(Profile, related_name='student_solution', on_delete=models.CASCADE)
created_at = models.DateTimeField(auto_now_add=True, editable=False) created_at = models.DateTimeField(auto_now_add=True, editable=False)
updated_at = models.DateTimeField(auto_now=True, editable=False) updated_at = models.DateTimeField(auto_now=True, editable=False)
ready = models.BooleanField(default=False) accepted = models.BooleanField()
accepted = models.BooleanField(default=False)
files = models.FileField( files = models.FileField(
validators=[ validators=[
validators.FileExtensionValidator([ validators.FileExtensionValidator([
......
...@@ -13,6 +13,11 @@ class TaskSerializer(serializers.ModelSerializer): ...@@ -13,6 +13,11 @@ class TaskSerializer(serializers.ModelSerializer):
read_only_fields = ('created_by', 'created_at', 'updated_at') read_only_fields = ('created_by', 'created_at', 'updated_at')
fields = '__all__' fields = '__all__'
def validate(self, data):
if timezone.now() >= data['deadline']:
raise serializers.ValidationError('Please, enter appropriate deadline.')
return data
class SolutionSerializer(serializers.ModelSerializer): class SolutionSerializer(serializers.ModelSerializer):
created_at = serializers.DateTimeField(read_only=True) created_at = serializers.DateTimeField(read_only=True)
...@@ -27,4 +32,5 @@ class SolutionSerializer(serializers.ModelSerializer): ...@@ -27,4 +32,5 @@ class SolutionSerializer(serializers.ModelSerializer):
def validate(self, data): def validate(self, data):
if timezone.now() > data['task'].deadline: if timezone.now() > data['task'].deadline:
raise serializers.ValidationError('You late.') raise serializers.ValidationError('You late.')
data['accepted'] = False
return data return data
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
...@@ -15,3 +15,5 @@ class SolutionsViewSet(viewsets.ModelViewSet): ...@@ -15,3 +15,5 @@ class SolutionsViewSet(viewsets.ModelViewSet):
serializer_class = serializers.SolutionSerializer serializer_class = serializers.SolutionSerializer
queryset = models.Solution.objects.all() queryset = models.Solution.objects.all()
permission_classes = (permissions.IsStaffOrReadOnlyForAuthenticated, ) permission_classes = (permissions.IsStaffOrReadOnlyForAuthenticated, )
# view
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