From 3fbfad6d08f7da0be48133fccd034c27b8283696 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bodor=20M=C3=A1t=C3=A9?= <bmate711@gmail.com>
Date: Sun, 11 Feb 2018 11:58:21 +0100
Subject: [PATCH] update models
---
.../migrations/0007_merge_20180209_1734.py | 14 ++++++++++++++
src/homework/models.py | 8 ++++----
2 files changed, 18 insertions(+), 4 deletions(-)
create mode 100644 src/homework/migrations/0007_merge_20180209_1734.py
diff --git a/src/homework/migrations/0007_merge_20180209_1734.py b/src/homework/migrations/0007_merge_20180209_1734.py
new file mode 100644
index 0000000..c23d34a
--- /dev/null
+++ b/src/homework/migrations/0007_merge_20180209_1734.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.0.1 on 2018-02-09 16:34
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('homework', '0006_auto_20180204_1601'),
+ ('homework', '0005_auto_20180126_0135'),
+ ]
+
+ operations = [
+ ]
diff --git a/src/homework/models.py b/src/homework/models.py
index 681953d..212748e 100644
--- a/src/homework/models.py
+++ b/src/homework/models.py
@@ -4,6 +4,7 @@ from django.core.exceptions import ValidationError
from django.utils.translation import ugettext_lazy as _
from django.utils import timezone
from django.core import validators
+#from account.models import Profile
# from . import myfields
@@ -21,7 +22,7 @@ class Task(models.Model):
date = models.DateTimeField(auto_now_add=True, editable=False)
deadline = models.DateTimeField(validators=[validate_deadline])
text = models.TextField()
- created_by = models.ForeignKey(User, on_delete=models.DO_NOTHING)
+ created_by = models.ForeignKey(User, on_delete=models.DO_NOTHING) #Profile
files = models.FileField(
validators=[validators.FileExtensionValidator(
'image/png',
@@ -37,9 +38,9 @@ class Task(models.Model):
class Solution(models.Model):
task = models.ForeignKey(Task, related_name='task_solution', on_delete=models.CASCADE)
- # student = models.ForeignKey(account.models.Profile, related_name='student_solution', on_delete=models.CASCADE)
+ created_by = models.ForeignKey(User, related_name='student_solution', on_delete=models.CASCADE) # Profile
date = models.DateTimeField(auto_now_add=True, editable=False)
- ready = models.BooleanField(default=False) # if(Soulution.date <= Task.deadline)
+ ready = models.BooleanField(default=False)
accepted = models.BooleanField(default=False)
files = models.FileField(
validators=[validators.FileExtensionValidator(
@@ -49,4 +50,3 @@ class Solution(models.Model):
)],
blank=True,
)
- created_by = models.ForeignKey(User, on_delete=models.CASCADE)
--
GitLab