From f100872178620564df2b52018b9a101cc1dff819 Mon Sep 17 00:00:00 2001 From: Zambom Date: Thu, 20 Oct 2016 18:12:33 -0300 Subject: [PATCH] Changing students field in (Course and Subject) to non-required [Issues: #192 and #195] --- courses/migrations/0004_auto_20161020_1808.py | 21 +++++++++++++++++++++ courses/models.py | 5 ++--- exam/migrations/0002_answersstudent.py | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 courses/migrations/0004_auto_20161020_1808.py create mode 100644 exam/migrations/0002_answersstudent.py diff --git a/courses/migrations/0004_auto_20161020_1808.py b/courses/migrations/0004_auto_20161020_1808.py new file mode 100644 index 0000000..47b9736 --- /dev/null +++ b/courses/migrations/0004_auto_20161020_1808.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-10-20 21:08 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('courses', '0003_course_public'), + ] + + operations = [ + migrations.AlterField( + model_name='course', + name='students', + field=models.ManyToManyField(blank=True, related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'), + ), + ] diff --git a/courses/models.py b/courses/models.py index 1ff9d6a..9db0eb0 100644 --- a/courses/models.py +++ b/courses/models.py @@ -45,7 +45,7 @@ class Course(models.Model): image = models.ImageField(verbose_name = _('Image'), blank = True, upload_to = 'courses/') category = models.ForeignKey(CourseCategory, verbose_name = _('Category'), related_name='course_category') professors = models.ManyToManyField(User,verbose_name=_('Professors'), related_name='courses_professors') - students = models.ManyToManyField(User,verbose_name=_('Students'), related_name='courses_student') + students = models.ManyToManyField(User,verbose_name=_('Students'), related_name='courses_student', blank = True) public = models.BooleanField(_('Public')) class Meta: @@ -69,8 +69,7 @@ class Subject(models.Model): course = models.ForeignKey(Course, verbose_name = _('Course'), related_name="subjects") category = models.ForeignKey(CategorySubject, verbose_name = _('Category'), related_name='subject_category',null=True) professors = models.ManyToManyField(User,verbose_name=_('Professors'), related_name='professors_subjects') - students = models.ManyToManyField(User,verbose_name=_('Students'), related_name='subject_student') - + students = models.ManyToManyField(User,verbose_name=_('Students'), related_name='subject_student', blank = True) class Meta: ordering = ('create_date','name') diff --git a/exam/migrations/0002_answersstudent.py b/exam/migrations/0002_answersstudent.py new file mode 100644 index 0000000..8de6364 --- /dev/null +++ b/exam/migrations/0002_answersstudent.py @@ -0,0 +1,33 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-10-20 21:08 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('exam', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='AnswersStudent', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('status', models.BooleanField(default=False, verbose_name='Answered')), + ('answered_in', models.DateTimeField(auto_now=True, verbose_name='Answered Date')), + ('answer', models.ManyToManyField(related_name='student_answer', to='exam.Answer', verbose_name='Answers Students')), + ('exam', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student_exam', to='exam.Exam', verbose_name='Exam')), + ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student', to=settings.AUTH_USER_MODEL, verbose_name='Student')), + ], + options={ + 'verbose_name': 'Answer Stundent', + 'verbose_name_plural': 'Answers Student', + }, + ), + ] -- libgit2 0.21.2