Skip to content
Snippets Groups Projects
Commit ccf5bc01 authored by Bodor Máté's avatar Bodor Máté Committed by Barnabás Czémán
Browse files

update models

parent 625a11ae
No related branches found
No related tags found
No related merge requests found
# 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 = [
]
......@@ -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)
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