From 7238d48c4962b1749a4510f53dbb9c05a9208797 Mon Sep 17 00:00:00 2001
From: Bodor Mate <bmate711@gmail.com>
Date: Wed, 11 Apr 2018 01:03:50 +0200
Subject: [PATCH] little changes
---
src/homework/__init__.py | 0
src/homework/admin.py | 0
src/homework/apps.py | 0
src/homework/migrations/0001_initial.py | 0
.../migrations/0002_auto_20180411_0047.py | 22 +++++++++++++++++++
src/homework/migrations/__init__.py | 0
src/homework/models.py | 4 ++--
src/homework/serializers.py | 6 +++++
src/homework/tests.py | 0
src/homework/urls.py | 0
src/homework/views.py | 2 ++
11 files changed, 32 insertions(+), 2 deletions(-)
mode change 100644 => 100755 src/homework/__init__.py
mode change 100644 => 100755 src/homework/admin.py
mode change 100644 => 100755 src/homework/apps.py
mode change 100644 => 100755 src/homework/migrations/0001_initial.py
create mode 100644 src/homework/migrations/0002_auto_20180411_0047.py
mode change 100644 => 100755 src/homework/migrations/__init__.py
mode change 100644 => 100755 src/homework/models.py
mode change 100644 => 100755 src/homework/serializers.py
mode change 100644 => 100755 src/homework/tests.py
mode change 100644 => 100755 src/homework/urls.py
mode change 100644 => 100755 src/homework/views.py
diff --git a/src/homework/__init__.py b/src/homework/__init__.py
old mode 100644
new mode 100755
diff --git a/src/homework/admin.py b/src/homework/admin.py
old mode 100644
new mode 100755
diff --git a/src/homework/apps.py b/src/homework/apps.py
old mode 100644
new mode 100755
diff --git a/src/homework/migrations/0001_initial.py b/src/homework/migrations/0001_initial.py
old mode 100644
new mode 100755
diff --git a/src/homework/migrations/0002_auto_20180411_0047.py b/src/homework/migrations/0002_auto_20180411_0047.py
new file mode 100644
index 0000000..cafe25c
--- /dev/null
+++ b/src/homework/migrations/0002_auto_20180411_0047.py
@@ -0,0 +1,22 @@
+# 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(),
+ ),
+ ]
diff --git a/src/homework/migrations/__init__.py b/src/homework/migrations/__init__.py
old mode 100644
new mode 100755
diff --git a/src/homework/models.py b/src/homework/models.py
old mode 100644
new mode 100755
index 973fb45..a62333d
--- a/src/homework/models.py
+++ b/src/homework/models.py
@@ -12,6 +12,7 @@ class Task(models.Model):
title = models.CharField(max_length=150)
text = models.TextField()
deadline = models.DateTimeField()
+ # dokumentum kezeles
def __str__(self):
return self.title
@@ -22,8 +23,7 @@ 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)
- ready = models.BooleanField(default=False)
- accepted = models.BooleanField(default=False)
+ accepted = models.BooleanField()
files = models.FileField(
validators=[
validators.FileExtensionValidator([
diff --git a/src/homework/serializers.py b/src/homework/serializers.py
old mode 100644
new mode 100755
index afc29b4..15fb166
--- a/src/homework/serializers.py
+++ b/src/homework/serializers.py
@@ -13,6 +13,11 @@ class TaskSerializer(serializers.ModelSerializer):
read_only_fields = ('created_by', 'created_at', 'updated_at')
fields = '__all__'
+ def validate(self, data):
+ if timezone.now() >= data['deadline']:
+ raise serializers.ValidationError('Please, enter appropriate deadline.')
+ return data
+
class SolutionSerializer(serializers.ModelSerializer):
created_at = serializers.DateTimeField(read_only=True)
@@ -27,4 +32,5 @@ class SolutionSerializer(serializers.ModelSerializer):
def validate(self, data):
if timezone.now() > data['task'].deadline:
raise serializers.ValidationError('You late.')
+ data['accepted'] = False
return data
diff --git a/src/homework/tests.py b/src/homework/tests.py
old mode 100644
new mode 100755
diff --git a/src/homework/urls.py b/src/homework/urls.py
old mode 100644
new mode 100755
diff --git a/src/homework/views.py b/src/homework/views.py
old mode 100644
new mode 100755
index 82b20b4..253bb39
--- a/src/homework/views.py
+++ b/src/homework/views.py
@@ -15,3 +15,5 @@ class SolutionsViewSet(viewsets.ModelViewSet):
serializer_class = serializers.SolutionSerializer
queryset = models.Solution.objects.all()
permission_classes = (permissions.IsStaffOrReadOnlyForAuthenticated, )
+
+ # view
--
GitLab