diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py index 4a98a5b..17b5352 100644 --- a/core/migrations/0001_initial.py +++ b/core/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-05 13:37 +# Generated by Django 1.10 on 2016-10-17 12:25 from __future__ import unicode_literals import autoslug.fields @@ -25,8 +25,8 @@ class Migration(migrations.Migration): ('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( @@ -36,8 +36,8 @@ class Migration(migrations.Migration): ('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( @@ -49,8 +49,20 @@ class Migration(migrations.Migration): ('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( + name='MimeType', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('typ', models.CharField(max_length=100, unique=True, verbose_name='Type')), + ('icon', models.CharField(max_length=50, unique=True, verbose_name='Icon')), + ], + options={ + 'verbose_name_plural': 'Amadeus Mime Types', + 'verbose_name': 'Amadeus Mime Type', }, ), migrations.CreateModel( @@ -65,8 +77,8 @@ class Migration(migrations.Migration): ('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( @@ -79,8 +91,8 @@ 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( diff --git a/core/migrations/0002_mymetype.py b/core/migrations/0002_mymetype.py deleted file mode 100644 index a813883..0000000 --- a/core/migrations/0002_mymetype.py +++ /dev/null @@ -1,27 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-12 17:29 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='MymeType', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('typ', models.CharField(max_length=100, unique=True, verbose_name='Type')), - ('icon', models.CharField(max_length=50, unique=True, verbose_name='Icon')), - ], - options={ - 'verbose_name_plural': 'Amadeus Myme Types', - 'verbose_name': 'Amadeus Myme Type', - }, - ), - ] diff --git a/courses/migrations/0001_initial.py b/courses/migrations/0001_initial.py index ed91baf..86a6674 100644 --- a/courses/migrations/0001_initial.py +++ b/courses/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-05 13:37 +# Generated by Django 1.10 on 2016-10-17 12:25 from __future__ import unicode_literals import autoslug.fields @@ -14,8 +14,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('core', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -23,7 +23,7 @@ class Migration(migrations.Migration): name='Activity', 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')), - ('limit_date', models.DateTimeField(verbose_name='Deliver Date')), + ('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')), ], @@ -43,19 +43,6 @@ class Migration(migrations.Migration): }, ), migrations.CreateModel( - name='Category', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100, unique=True, verbose_name='Name')), - ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')), - ('create_date', models.DateField(auto_now_add=True, verbose_name='Creation Date')), - ], - options={ - 'verbose_name': 'Category', - 'verbose_name_plural': 'Categories', - }, - ), - migrations.CreateModel( name='Course', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), @@ -70,9 +57,6 @@ 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')), - ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Category', verbose_name='Category')), - ('professors', models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors')), - ('students', models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students')), ], options={ 'verbose_name': 'Course', @@ -81,6 +65,19 @@ class Migration(migrations.Migration): }, ), migrations.CreateModel( + name='CourseCategory', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=100, unique=True, verbose_name='Name')), + ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')), + ('create_date', models.DateField(auto_now_add=True, verbose_name='Creation Date')), + ], + options={ + 'verbose_name': 'Category', + 'verbose_name_plural': 'Categories', + }, + ), + migrations.CreateModel( name='Material', 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')), @@ -102,7 +99,8 @@ 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')), ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')), - ('professors', models.ManyToManyField(related_name='subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors')), + ('professors', models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors')), + ('students', models.ManyToManyField(related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students')), ], options={ 'verbose_name': 'Subject', @@ -149,6 +147,21 @@ class Migration(migrations.Migration): field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'), ), 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='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_subject_students.py b/courses/migrations/0002_subject_students.py deleted file mode 100644 index cc00c9d..0000000 --- a/courses/migrations/0002_subject_students.py +++ /dev/null @@ -1,22 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-05 21:02 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('courses', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='subject', - name='students', - field=models.ManyToManyField(related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'), - ), - ] diff --git a/courses/migrations/0003_auto_20161007_1612.py b/courses/migrations/0003_auto_20161007_1612.py deleted file mode 100644 index 6ec5dd6..0000000 --- a/courses/migrations/0003_auto_20161007_1612.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-07 19:12 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('courses', '0002_subject_students'), - ] - - operations = [ - migrations.RenameModel( - old_name='Category', - new_name='CourseCategory', - ), - migrations.AlterField( - model_name='activity', - name='limit_date', - field=models.DateField(verbose_name='Deliver Date'), - ), - migrations.AlterField( - model_name='subject', - name='professors', - field=models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), - ), - ] diff --git a/courses/migrations/0004_auto_20161011_1951.py b/courses/migrations/0004_auto_20161011_1951.py deleted file mode 100644 index 567bfa3..0000000 --- a/courses/migrations/0004_auto_20161011_1951.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-11 22:51 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('courses', '0003_auto_20161007_1612'), - ] - - operations = [ - migrations.AlterField( - 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'), - ), - ] diff --git a/courses/migrations/0005_file.py b/courses/migrations/0005_file.py deleted file mode 100644 index bd45634..0000000 --- a/courses/migrations/0005_file.py +++ /dev/null @@ -1,31 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-13 17:29 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0002_mymetype'), - ('courses', '0004_auto_20161011_1951'), - ] - - operations = [ - migrations.CreateModel( - name='File', - fields=[ - ('material_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='courses.Material')), - ('description', models.TextField(blank=True, verbose_name='Description')), - ('content', models.FileField(upload_to='uploads/courses/subject/topic/%Y/%m/%d/')), - ('typ', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='file', to='core.MymeType', verbose_name='Type')), - ], - options={ - 'verbose_name': 'Topic file', - 'verbose_name_plural': 'Topic files', - }, - bases=('courses.material',), - ), - ] diff --git a/exam/migrations/0001_initial.py b/exam/migrations/0001_initial.py index 7ebe2b0..f62ab25 100644 --- a/exam/migrations/0001_initial.py +++ b/exam/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-06 19:57 +# Generated by Django 1.10 on 2016-10-17 12:31 from __future__ import unicode_literals from django.db import migrations, models @@ -11,6 +11,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ + ('courses', '0001_initial'), ] operations = [ @@ -18,27 +19,26 @@ class Migration(migrations.Migration): name='Answer', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('answer', models.CharField(max_length=200, verbose_name='Answer')), + ('answer', models.CharField(max_length=300, verbose_name='Answer')), ('order', models.PositiveSmallIntegerField(verbose_name='Order')), ], options={ - 'verbose_name_plural': 'Answers', - 'ordering': ('order',), 'verbose_name': 'Answer', + 'ordering': ('order',), + 'verbose_name_plural': 'Answers', }, ), migrations.CreateModel( name='Exam', fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100, verbose_name='Name')), - ('beginDate', models.DateTimeField(auto_now_add=True, verbose_name='Start Date')), - ('endDate', models.DateTimeField(auto_now=True, verbose_name='Date of last update')), + ('activity_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='courses.Activity')), + ('begin_date', models.DateField(blank=True, verbose_name='Begin of Course Date')), ], options={ 'verbose_name_plural': 'Exams', 'verbose_name': 'Exam', }, + bases=('courses.activity',), ), migrations.AddField( model_name='answer', diff --git a/files/migrations/0001_initial.py b/files/migrations/0001_initial.py index d0ae546..567d62e 100644 --- a/files/migrations/0001_initial.py +++ b/files/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-13 16:12 +# Generated by Django 1.10 on 2016-10-17 12:25 from __future__ import unicode_literals from django.db import migrations, models @@ -12,8 +12,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('core', '0002_mymetype'), - ('courses', '0004_auto_20161011_1951'), + ('core', '0001_initial'), + ('courses', '0001_initial'), ] operations = [ @@ -23,11 +23,12 @@ class Migration(migrations.Migration): ('material_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='courses.Material')), ('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.MymeType', verbose_name='Type file')), + ('file_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='topic_files', to='core.MimeType', verbose_name='Type file')), ], options={ 'verbose_name': 'File', 'verbose_name_plural': 'Files', + 'ordering': ('-id',), }, bases=('courses.material',), ), diff --git a/forum/migrations/0001_initial.py b/forum/migrations/0001_initial.py index c8ce381..3b274f4 100644 --- a/forum/migrations/0001_initial.py +++ b/forum/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-05 13:38 +# Generated by Django 1.10 on 2016-10-17 12:25 from __future__ import unicode_literals from django.conf import settings @@ -12,8 +12,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('courses', '0001_initial'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('courses', '0001_initial'), ] operations = [ diff --git a/links/migrations/0001_initial.py b/links/migrations/0001_initial.py index 9c60280..fc5e074 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-06 17:57 +# Generated by Django 1.10 on 2016-10-17 12:25 from __future__ import unicode_literals from django.db import migrations, models @@ -22,8 +22,8 @@ class Migration(migrations.Migration): ('description', models.CharField(max_length=200)), ], options={ - 'verbose_name_plural': 'Links', 'verbose_name': 'Link', + 'verbose_name_plural': 'Links', }, ), ] diff --git a/poll/migrations/0001_initial.py b/poll/migrations/0001_initial.py index 413f0de..27b5cbe 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-05 13:38 +# Generated by Django 1.10 on 2016-10-17 12:25 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 = [ @@ -23,9 +25,22 @@ class Migration(migrations.Migration): ('order', models.PositiveSmallIntegerField(verbose_name='Order')), ], options={ - 'verbose_name': 'Answer', - 'verbose_name_plural': 'Answers', 'ordering': ('order',), + 'verbose_name_plural': 'Answers', + 'verbose_name': 'Answer', + }, + ), + 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='answers_stundet', to='poll.Answer', verbose_name='Answers Students')), + ], + options={ + 'verbose_name_plural': 'Answers Student', + 'verbose_name': 'Answer Stundent', }, ), migrations.CreateModel( @@ -40,6 +55,16 @@ class Migration(migrations.Migration): bases=('courses.activity',), ), migrations.AddField( + model_name='answersstudent', + 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_answersstudent.py b/poll/migrations/0002_answersstudent.py deleted file mode 100644 index 031dd05..0000000 --- a/poll/migrations/0002_answersstudent.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-12 18:26 -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), - ('poll', '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='answers_stundet', to='poll.Answer', verbose_name='Answers Students')), - ('poll', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundet', to='poll.Poll', verbose_name='Answers')), - ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundent', to=settings.AUTH_USER_MODEL, verbose_name='Student')), - ], - options={ - 'verbose_name': 'Answer Stundent', - 'verbose_name_plural': 'Answers Student', - }, - ), - ] diff --git a/poll/migrations/0003_auto_20161012_1638.py b/poll/migrations/0003_auto_20161012_1638.py deleted file mode 100644 index 03d191d..0000000 --- a/poll/migrations/0003_auto_20161012_1638.py +++ /dev/null @@ -1,21 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-10-12 19:38 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('poll', '0002_answersstudent'), - ] - - operations = [ - migrations.AlterField( - model_name='answersstudent', - name='poll', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundet', to='poll.Poll', verbose_name='Poll'), - ), - ] -- libgit2 0.21.2