diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py index 29ed87e..a32a95d 100644 --- a/core/migrations/0001_initial.py +++ b/core/migrations/0001_initial.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-18 21:42 +# Generated by Django 1.10 on 2016-10-22 04:31 from __future__ import unicode_literals import autoslug.fields +from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -12,6 +13,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -20,21 +22,23 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('name', models.CharField(max_length=100, verbose_name='Name')), + ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from=('name',), unique=True, verbose_name='Slug')), ('created_date', models.DateField(auto_now_add=True, verbose_name='Created Date')), ], options={ - 'verbose_name': 'Action', 'verbose_name_plural': 'Actions', + 'verbose_name': 'Action', }, ), migrations.CreateModel( name='Action_Resource', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('action', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied')), ], options={ - 'verbose_name': 'Action_Resource', 'verbose_name_plural': 'Action_Resources', + 'verbose_name': 'Action_Resource', }, ), migrations.CreateModel( @@ -42,10 +46,12 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')), + ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor')), ], options={ - 'verbose_name': 'Log', 'verbose_name_plural': 'Logs', + 'verbose_name': 'Log', }, ), migrations.CreateModel( @@ -56,8 +62,8 @@ class Migration(migrations.Migration): ('icon', models.CharField(max_length=50, unique=True, verbose_name='Icon')), ], options={ - 'verbose_name': 'Amadeus Mime Type', 'verbose_name_plural': 'Amadeus Mime Types', + 'verbose_name': 'Amadeus Mime Type', }, ), migrations.CreateModel( @@ -68,10 +74,12 @@ class Migration(migrations.Migration): ('read', models.BooleanField(default=False, verbose_name='Read')), ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')), ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')), + ('actor', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Perfomer')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User')), ], options={ - 'verbose_name': 'Notification', 'verbose_name_plural': 'Notifications', + 'verbose_name': 'Notification', }, ), migrations.CreateModel( @@ -84,8 +92,13 @@ class Migration(migrations.Migration): ('url', models.CharField(default='', max_length=100, verbose_name='URL')), ], options={ - 'verbose_name': 'Resource', 'verbose_name_plural': 'Resources', + 'verbose_name': 'Resource', }, ), + migrations.AddField( + model_name='action_resource', + name='resource', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'), + ), ] diff --git a/core/migrations/0002_auto_20161018_1842.py b/core/migrations/0002_auto_20161018_1842.py deleted file mode 100644 index 5c2dabc..0000000 --- a/core/migrations/0002_auto_20161018_1842.py +++ /dev/null @@ -1,50 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-18 21:42 -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): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('core', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='notification', - name='actor', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Perfomer'), - ), - migrations.AddField( - model_name='notification', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User'), - ), - migrations.AddField( - model_name='log', - name='action_resource', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource'), - ), - migrations.AddField( - model_name='log', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor'), - ), - migrations.AddField( - model_name='action_resource', - name='action', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied'), - ), - migrations.AddField( - model_name='action_resource', - name='resource', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'), - ), - ] diff --git a/courses/migrations/0001_initial.py b/courses/migrations/0001_initial.py index a7f5709..e54da60 100644 --- a/courses/migrations/0001_initial.py +++ b/courses/migrations/0001_initial.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-18 21:42 +# Generated by Django 1.10 on 2016-10-22 04:32 from __future__ import unicode_literals import autoslug.fields +from django.conf import settings from django.db import migrations, models import django.db.models.deletion import s3direct.fields @@ -14,6 +15,7 @@ class Migration(migrations.Migration): dependencies = [ ('core', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -23,6 +25,7 @@ class Migration(migrations.Migration): ('resource_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.Resource')), ('limit_date', models.DateField(verbose_name='Deliver Date')), ('all_students', models.BooleanField(default=False, verbose_name='All Students')), + ('students', models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students')), ], bases=('core.resource',), ), @@ -32,10 +35,11 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('pdf', s3direct.fields.S3DirectField()), ('name', models.CharField(max_length=100)), + ('diet', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity')), ], options={ - 'verbose_name': 'Activity File', 'verbose_name_plural': 'Activitys Files', + 'verbose_name': 'Activity File', }, ), migrations.CreateModel( @@ -47,8 +51,8 @@ class Migration(migrations.Migration): ('create_date', models.DateField(auto_now_add=True, verbose_name='Creation Date')), ], options={ - 'verbose_name': 'Category', 'verbose_name_plural': 'Categories', + 'verbose_name': 'Category', }, ), migrations.CreateModel( @@ -66,11 +70,12 @@ class Migration(migrations.Migration): ('init_date', models.DateField(verbose_name='Begin of Course Date')), ('end_date', models.DateField(verbose_name='End of Course Date')), ('image', models.ImageField(blank=True, upload_to='courses/', verbose_name='Image')), + ('public', models.BooleanField(verbose_name='Public')), ], options={ - 'ordering': ('create_date', 'name'), - 'verbose_name': 'Course', 'verbose_name_plural': 'Courses', + 'verbose_name': 'Course', + 'ordering': ('create_date', 'name'), }, ), migrations.CreateModel( @@ -82,8 +87,8 @@ class Migration(migrations.Migration): ('create_date', models.DateField(auto_now_add=True, verbose_name='Creation Date')), ], options={ - 'verbose_name': 'Category', 'verbose_name_plural': 'Categories', + 'verbose_name': 'Category', }, ), migrations.CreateModel( @@ -108,6 +113,7 @@ class Migration(migrations.Migration): fields=[ ('resource_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.Resource')), ('all_students', models.BooleanField(default=False, verbose_name='All Students')), + ('students', models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students')), ], bases=('core.resource',), ), @@ -123,11 +129,15 @@ class Migration(migrations.Migration): ('end_date', models.DateField(verbose_name='End of Subject Date')), ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')), + ('category', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='subject_category', to='courses.CategorySubject', verbose_name='Category')), + ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')), + ('professors', models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors')), + ('students', models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students')), ], options={ - 'ordering': ('create_date', 'name'), - 'verbose_name': 'Subject', 'verbose_name_plural': 'Subjects', + 'verbose_name': 'Subject', + 'ordering': ('create_date', 'name'), }, ), migrations.CreateModel( @@ -137,10 +147,11 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=100, verbose_name='Name')), ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')), ('description', models.TextField(blank=True, verbose_name='Description')), + ('subjects', models.ManyToManyField(to='courses.Subject')), ], options={ - 'verbose_name': 'subject category', 'verbose_name_plural': 'subject categories', + 'verbose_name': 'subject category', }, ), migrations.CreateModel( @@ -153,11 +164,48 @@ class Migration(migrations.Migration): ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')), ('visible', models.BooleanField(default=False, verbose_name='Visible')), + ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner')), + ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject')), ], options={ - 'ordering': ('create_date', 'name'), - 'verbose_name': 'Topic', 'verbose_name_plural': 'Topics', + 'verbose_name': 'Topic', + 'ordering': ('create_date', 'name'), }, ), + migrations.AddField( + model_name='material', + name='topic', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'), + ), + migrations.AddField( + model_name='linkmaterial', + name='material', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'), + ), + migrations.AddField( + model_name='filematerial', + name='material', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'), + ), + migrations.AddField( + model_name='course', + name='category', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'), + ), + migrations.AddField( + model_name='course', + name='professors', + field=models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), + ), + migrations.AddField( + model_name='course', + name='students', + field=models.ManyToManyField(blank=True, related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'), + ), + migrations.AddField( + model_name='activity', + name='topic', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'), + ), ] diff --git a/courses/migrations/0002_auto_20161018_1842.py b/courses/migrations/0002_auto_20161018_1842.py deleted file mode 100644 index 150171c..0000000 --- a/courses/migrations/0002_auto_20161018_1842.py +++ /dev/null @@ -1,105 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-18 21:42 -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): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('courses', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='topic', - name='owner', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner'), - ), - migrations.AddField( - model_name='topic', - name='subject', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject'), - ), - migrations.AddField( - model_name='subjectcategory', - name='subjects', - field=models.ManyToManyField(to='courses.Subject'), - ), - migrations.AddField( - model_name='subject', - name='category', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='subject_category', to='courses.CategorySubject', verbose_name='Category'), - ), - migrations.AddField( - model_name='subject', - name='course', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course'), - ), - migrations.AddField( - model_name='subject', - name='professors', - field=models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), - ), - migrations.AddField( - model_name='subject', - name='students', - field=models.ManyToManyField(related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'), - ), - migrations.AddField( - model_name='material', - name='students', - field=models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students'), - ), - migrations.AddField( - model_name='material', - name='topic', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'), - ), - migrations.AddField( - model_name='linkmaterial', - name='material', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'), - ), - migrations.AddField( - model_name='filematerial', - name='material', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'), - ), - migrations.AddField( - model_name='course', - name='category', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'), - ), - migrations.AddField( - model_name='course', - name='professors', - field=models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), - ), - migrations.AddField( - model_name='course', - name='students', - field=models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'), - ), - migrations.AddField( - model_name='activityfile', - name='diet', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity'), - ), - migrations.AddField( - model_name='activity', - name='students', - field=models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students'), - ), - migrations.AddField( - model_name='activity', - name='topic', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'), - ), - ] diff --git a/courses/migrations/0003_course_public.py b/courses/migrations/0003_course_public.py deleted file mode 100644 index c1d9dbe..0000000 --- a/courses/migrations/0003_course_public.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-19 13:19 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('courses', '0002_auto_20161018_1842'), - ] - - operations = [ - migrations.AddField( - model_name='course', - name='public', - field=models.BooleanField(default=False, verbose_name='Public'), - preserve_default=False, - ), - ] diff --git a/courses/migrations/0004_auto_20161020_1808.py b/courses/migrations/0004_auto_20161020_1808.py deleted file mode 100644 index 47b9736..0000000 --- a/courses/migrations/0004_auto_20161020_1808.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- 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/migrations/0005_auto_20161021_1749.py b/courses/migrations/0005_auto_20161021_1749.py deleted file mode 100644 index afed17c..0000000 --- a/courses/migrations/0005_auto_20161021_1749.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-21 20:49 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('courses', '0004_auto_20161020_1808'), - ] - - operations = [ - migrations.AlterField( - model_name='subject', - name='students', - field=models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'), - ), - ] diff --git a/exam/migrations/0001_initial.py b/exam/migrations/0001_initial.py index 8b83b78..d04d23c 100644 --- a/exam/migrations/0001_initial.py +++ b/exam/migrations/0001_initial.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-18 21:42 +# Generated by Django 1.10 on 2016-10-22 04:32 from __future__ import unicode_literals +from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -11,6 +12,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('courses', '0001_initial'), ] @@ -23,9 +25,22 @@ class Migration(migrations.Migration): ('order', models.PositiveSmallIntegerField(verbose_name='Order')), ], options={ - 'ordering': ('order',), - 'verbose_name': 'Answer', 'verbose_name_plural': 'Answers', + 'verbose_name': 'Answer', + 'ordering': ('order',), + }, + ), + 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')), + ], + options={ + 'verbose_name_plural': 'Answers Student', + 'verbose_name': 'Answer Stundent', }, ), migrations.CreateModel( @@ -35,12 +50,22 @@ class Migration(migrations.Migration): ('begin_date', models.DateField(blank=True, verbose_name='Begin of Course Date')), ], options={ - 'verbose_name': 'Exam', 'verbose_name_plural': 'Exams', + 'verbose_name': 'Exam', }, bases=('courses.activity',), ), migrations.AddField( + model_name='answersstudent', + name='exam', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student_exam', to='exam.Exam', verbose_name='Exam'), + ), + migrations.AddField( + model_name='answersstudent', + name='student', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student', to=settings.AUTH_USER_MODEL, verbose_name='Student'), + ), + migrations.AddField( model_name='answer', name='exam', field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='exam.Exam', verbose_name='Answers'), diff --git a/exam/migrations/0002_answersstudent.py b/exam/migrations/0002_answersstudent.py deleted file mode 100644 index 8de6364..0000000 --- a/exam/migrations/0002_answersstudent.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- 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', - }, - ), - ] diff --git a/files/migrations/0001_initial.py b/files/migrations/0001_initial.py index 3aeb647..4c06945 100644 --- a/files/migrations/0001_initial.py +++ b/files/migrations/0001_initial.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-18 21:42 +# Generated by Django 1.10 on 2016-10-22 04:32 from __future__ import unicode_literals +from django.conf import settings from django.db import migrations, models import django.db.models.deletion import files.models @@ -14,6 +15,7 @@ class Migration(migrations.Migration): dependencies = [ ('courses', '0001_initial'), ('core', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -24,10 +26,11 @@ class Migration(migrations.Migration): ('description', models.TextField(blank=True, verbose_name='Description')), ('file_url', models.FileField(upload_to=files.models.file_path, verbose_name='File')), ('file_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='topic_files', to='core.MimeType', verbose_name='Type file')), + ('professor', models.ManyToManyField(related_name='file_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors')), ], options={ - 'ordering': ('-id',), 'verbose_name': 'File', + 'ordering': ('-id',), 'verbose_name_plural': 'Files', }, bases=('courses.material',), diff --git a/files/migrations/0002_topicfile_professor.py b/files/migrations/0002_topicfile_professor.py deleted file mode 100644 index d97d62d..0000000 --- a/files/migrations/0002_topicfile_professor.py +++ /dev/null @@ -1,24 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-18 21:42 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('files', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='topicfile', - name='professor', - field=models.ManyToManyField(related_name='file_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), - ), - ] diff --git a/forum/migrations/0001_initial.py b/forum/migrations/0001_initial.py index c656a8a..0df0e50 100644 --- a/forum/migrations/0001_initial.py +++ b/forum/migrations/0001_initial.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-18 21:42 +# Generated by Django 1.10 on 2016-10-22 04:32 from __future__ import unicode_literals +from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -12,6 +13,7 @@ class Migration(migrations.Migration): dependencies = [ ('courses', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -24,8 +26,8 @@ class Migration(migrations.Migration): ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Create Date')), ], options={ - 'verbose_name': 'Forum', 'verbose_name_plural': 'Foruns', + 'verbose_name': 'Forum', }, bases=('courses.activity',), ), @@ -36,10 +38,12 @@ class Migration(migrations.Migration): ('message', models.TextField(verbose_name='Post message')), ('modification_date', models.DateTimeField(auto_now=True, verbose_name='Modification Date')), ('post_date', models.DateTimeField(auto_now_add=True, verbose_name='Post Date')), + ('forum', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Forum', verbose_name='Forum')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor')), ], options={ - 'verbose_name': 'Post', 'verbose_name_plural': 'Posts', + 'verbose_name': 'Post', }, ), migrations.CreateModel( @@ -50,10 +54,11 @@ class Migration(migrations.Migration): ('modification_date', models.DateTimeField(auto_now=True, verbose_name='Modification Date')), ('answer_date', models.DateTimeField(auto_now_add=True, verbose_name='Answer Date')), ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Post', verbose_name='Post')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor')), ], options={ - 'verbose_name': 'Post Answer', 'verbose_name_plural': 'Post Answers', + 'verbose_name': 'Post Answer', }, ), ] diff --git a/forum/migrations/0002_auto_20161018_1842.py b/forum/migrations/0002_auto_20161018_1842.py deleted file mode 100644 index 943c07e..0000000 --- a/forum/migrations/0002_auto_20161018_1842.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-18 21:42 -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): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('forum', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='postanswer', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'), - ), - migrations.AddField( - model_name='post', - name='forum', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Forum', verbose_name='Forum'), - ), - migrations.AddField( - model_name='post', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'), - ), - ] diff --git a/links/migrations/0001_initial.py b/links/migrations/0001_initial.py index d464dfe..7997c6d 100644 --- a/links/migrations/0001_initial.py +++ b/links/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-18 21:42 +# Generated by Django 1.10 on 2016-10-22 04:32 from __future__ import unicode_literals from django.db import migrations, models @@ -23,8 +23,8 @@ class Migration(migrations.Migration): ('link_description', models.CharField(max_length=200)), ], options={ - 'verbose_name': 'Link', 'verbose_name_plural': 'Links', + 'verbose_name': 'Link', }, bases=('courses.material',), ), diff --git a/poll/migrations/0001_initial.py b/poll/migrations/0001_initial.py index 892b93f..06f658d 100644 --- a/poll/migrations/0001_initial.py +++ b/poll/migrations/0001_initial.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-18 21:42 +# Generated by Django 1.10 on 2016-10-22 04:32 from __future__ import unicode_literals +from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -12,6 +13,7 @@ class Migration(migrations.Migration): dependencies = [ ('courses', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -57,4 +59,14 @@ class Migration(migrations.Migration): name='poll', field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundet', to='poll.Poll', verbose_name='Poll'), ), + migrations.AddField( + model_name='answersstudent', + name='student', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundent', to=settings.AUTH_USER_MODEL, verbose_name='Student'), + ), + migrations.AddField( + model_name='answer', + name='poll', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='poll.Poll', verbose_name='Answers'), + ), ] diff --git a/poll/migrations/0002_auto_20161018_1842.py b/poll/migrations/0002_auto_20161018_1842.py deleted file mode 100644 index a1959cf..0000000 --- a/poll/migrations/0002_auto_20161018_1842.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-18 21:42 -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): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('poll', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='answersstudent', - name='student', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundent', to=settings.AUTH_USER_MODEL, verbose_name='Student'), - ), - migrations.AddField( - model_name='answer', - name='poll', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='poll.Poll', verbose_name='Answers'), - ), - ] -- libgit2 0.21.2