Download as
Browse Code »

Commit 5edbdc91f24358f32d4fcca2eafef554a563e073

Authored by ailsoncgt
1 parent c31e36bd
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Update migrations

Showing 14 changed files with 96 additions and 230 deletions   Show diff stats
core/migrations/0001_initial.py
  Diff comments   View file @5edbdc9
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-10-05 13:37 2 +# Generated by Django 1.10 on 2016-10-17 12:25
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
5 import autoslug.fields 5 import autoslug.fields
@@ -25,8 +25,8 @@ class Migration(migrations.Migration): @@ -25,8 +25,8 @@ class Migration(migrations.Migration):
25 ('created_date', models.DateField(auto_now_add=True, verbose_name='Created Date')), 25 ('created_date', models.DateField(auto_now_add=True, verbose_name='Created Date')),
26 ], 26 ],
27 options={ 27 options={
28 - 'verbose_name': 'Action',  
29 'verbose_name_plural': 'Actions', 28 'verbose_name_plural': 'Actions',
  29 + 'verbose_name': 'Action',
30 }, 30 },
31 ), 31 ),
32 migrations.CreateModel( 32 migrations.CreateModel(
@@ -36,8 +36,8 @@ class Migration(migrations.Migration): @@ -36,8 +36,8 @@ class Migration(migrations.Migration):
36 ('action', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied')), 36 ('action', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied')),
37 ], 37 ],
38 options={ 38 options={
39 - 'verbose_name': 'Action_Resource',  
40 'verbose_name_plural': 'Action_Resources', 39 'verbose_name_plural': 'Action_Resources',
  40 + 'verbose_name': 'Action_Resource',
41 }, 41 },
42 ), 42 ),
43 migrations.CreateModel( 43 migrations.CreateModel(
@@ -49,8 +49,20 @@ class Migration(migrations.Migration): @@ -49,8 +49,20 @@ class Migration(migrations.Migration):
49 ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor')), 49 ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor')),
50 ], 50 ],
51 options={ 51 options={
52 - 'verbose_name': 'Log',  
53 'verbose_name_plural': 'Logs', 52 'verbose_name_plural': 'Logs',
  53 + 'verbose_name': 'Log',
  54 + },
  55 + ),
  56 + migrations.CreateModel(
  57 + name='MimeType',
  58 + fields=[
  59 + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
  60 + ('typ', models.CharField(max_length=100, unique=True, verbose_name='Type')),
  61 + ('icon', models.CharField(max_length=50, unique=True, verbose_name='Icon')),
  62 + ],
  63 + options={
  64 + 'verbose_name_plural': 'Amadeus Mime Types',
  65 + 'verbose_name': 'Amadeus Mime Type',
54 }, 66 },
55 ), 67 ),
56 migrations.CreateModel( 68 migrations.CreateModel(
@@ -65,8 +77,8 @@ class Migration(migrations.Migration): @@ -65,8 +77,8 @@ class Migration(migrations.Migration):
65 ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User')), 77 ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User')),
66 ], 78 ],
67 options={ 79 options={
68 - 'verbose_name': 'Notification',  
69 'verbose_name_plural': 'Notifications', 80 'verbose_name_plural': 'Notifications',
  81 + 'verbose_name': 'Notification',
70 }, 82 },
71 ), 83 ),
72 migrations.CreateModel( 84 migrations.CreateModel(
@@ -79,8 +91,8 @@ class Migration(migrations.Migration): @@ -79,8 +91,8 @@ class Migration(migrations.Migration):
79 ('url', models.CharField(default='', max_length=100, verbose_name='URL')), 91 ('url', models.CharField(default='', max_length=100, verbose_name='URL')),
80 ], 92 ],
81 options={ 93 options={
82 - 'verbose_name': 'Resource',  
83 'verbose_name_plural': 'Resources', 94 'verbose_name_plural': 'Resources',
  95 + 'verbose_name': 'Resource',
84 }, 96 },
85 ), 97 ),
86 migrations.AddField( 98 migrations.AddField(
core/migrations/0002_mymetype.py
View file @c31e36b
@@ -1,27 +0,0 @@ @@ -1,27 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-10-12 17:29  
3 -from __future__ import unicode_literals  
4 -  
5 -from django.db import migrations, models  
6 -  
7 -  
8 -class Migration(migrations.Migration):  
9 -  
10 - dependencies = [  
11 - ('core', '0001_initial'),  
12 - ]  
13 -  
14 - operations = [  
15 - migrations.CreateModel(  
16 - name='MymeType',  
17 - fields=[  
18 - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),  
19 - ('typ', models.CharField(max_length=100, unique=True, verbose_name='Type')),  
20 - ('icon', models.CharField(max_length=50, unique=True, verbose_name='Icon')),  
21 - ],  
22 - options={  
23 - 'verbose_name_plural': 'Amadeus Myme Types',  
24 - 'verbose_name': 'Amadeus Myme Type',  
25 - },  
26 - ),  
27 - ]  
courses/migrations/0001_initial.py
  Diff comments   View file @5edbdc9
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-10-05 13:37 2 +# Generated by Django 1.10 on 2016-10-17 12:25
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
5 import autoslug.fields 5 import autoslug.fields
@@ -14,8 +14,8 @@ class Migration(migrations.Migration): @@ -14,8 +14,8 @@ class Migration(migrations.Migration):
14 initial = True 14 initial = True
15 15
16 dependencies = [ 16 dependencies = [
17 - migrations.swappable_dependency(settings.AUTH_USER_MODEL),  
18 ('core', '0001_initial'), 17 ('core', '0001_initial'),
  18 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
19 ] 19 ]
20 20
21 operations = [ 21 operations = [
@@ -23,7 +23,7 @@ class Migration(migrations.Migration): @@ -23,7 +23,7 @@ class Migration(migrations.Migration):
23 name='Activity', 23 name='Activity',
24 fields=[ 24 fields=[
25 ('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')), 25 ('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')),
26 - ('limit_date', models.DateTimeField(verbose_name='Deliver Date')), 26 + ('limit_date', models.DateField(verbose_name='Deliver Date')),
27 ('all_students', models.BooleanField(default=False, verbose_name='All Students')), 27 ('all_students', models.BooleanField(default=False, verbose_name='All Students')),
28 ('students', models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students')), 28 ('students', models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students')),
29 ], 29 ],
@@ -43,19 +43,6 @@ class Migration(migrations.Migration): @@ -43,19 +43,6 @@ class Migration(migrations.Migration):
43 }, 43 },
44 ), 44 ),
45 migrations.CreateModel( 45 migrations.CreateModel(
46 - name='Category',  
47 - fields=[  
48 - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),  
49 - ('name', models.CharField(max_length=100, unique=True, verbose_name='Name')),  
50 - ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')),  
51 - ('create_date', models.DateField(auto_now_add=True, verbose_name='Creation Date')),  
52 - ],  
53 - options={  
54 - 'verbose_name': 'Category',  
55 - 'verbose_name_plural': 'Categories',  
56 - },  
57 - ),  
58 - migrations.CreateModel(  
59 name='Course', 46 name='Course',
60 fields=[ 47 fields=[
61 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), 48 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
@@ -70,9 +57,6 @@ class Migration(migrations.Migration): @@ -70,9 +57,6 @@ class Migration(migrations.Migration):
70 ('init_date', models.DateField(verbose_name='Begin of Course Date')), 57 ('init_date', models.DateField(verbose_name='Begin of Course Date')),
71 ('end_date', models.DateField(verbose_name='End of Course Date')), 58 ('end_date', models.DateField(verbose_name='End of Course Date')),
72 ('image', models.ImageField(blank=True, upload_to='courses/', verbose_name='Image')), 59 ('image', models.ImageField(blank=True, upload_to='courses/', verbose_name='Image')),
73 - ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Category', verbose_name='Category')),  
74 - ('professors', models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors')),  
75 - ('students', models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students')),  
76 ], 60 ],
77 options={ 61 options={
78 'verbose_name': 'Course', 62 'verbose_name': 'Course',
@@ -81,6 +65,19 @@ class Migration(migrations.Migration): @@ -81,6 +65,19 @@ class Migration(migrations.Migration):
81 }, 65 },
82 ), 66 ),
83 migrations.CreateModel( 67 migrations.CreateModel(
  68 + name='CourseCategory',
  69 + fields=[
  70 + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
  71 + ('name', models.CharField(max_length=100, unique=True, verbose_name='Name')),
  72 + ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')),
  73 + ('create_date', models.DateField(auto_now_add=True, verbose_name='Creation Date')),
  74 + ],
  75 + options={
  76 + 'verbose_name': 'Category',
  77 + 'verbose_name_plural': 'Categories',
  78 + },
  79 + ),
  80 + migrations.CreateModel(
84 name='Material', 81 name='Material',
85 fields=[ 82 fields=[
86 ('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')), 83 ('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): @@ -102,7 +99,8 @@ class Migration(migrations.Migration):
102 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), 99 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
103 ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')), 100 ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')),
104 ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')), 101 ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')),
105 - ('professors', models.ManyToManyField(related_name='subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors')), 102 + ('professors', models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors')),
  103 + ('students', models.ManyToManyField(related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students')),
106 ], 104 ],
107 options={ 105 options={
108 'verbose_name': 'Subject', 106 'verbose_name': 'Subject',
@@ -149,6 +147,21 @@ class Migration(migrations.Migration): @@ -149,6 +147,21 @@ class Migration(migrations.Migration):
149 field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'), 147 field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'),
150 ), 148 ),
151 migrations.AddField( 149 migrations.AddField(
  150 + model_name='course',
  151 + name='category',
  152 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'),
  153 + ),
  154 + migrations.AddField(
  155 + model_name='course',
  156 + name='professors',
  157 + field=models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
  158 + ),
  159 + migrations.AddField(
  160 + model_name='course',
  161 + name='students',
  162 + field=models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
  163 + ),
  164 + migrations.AddField(
152 model_name='activity', 165 model_name='activity',
153 name='topic', 166 name='topic',
154 field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'), 167 field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'),
courses/migrations/0002_subject_students.py
View file @c31e36b
@@ -1,22 +0,0 @@ @@ -1,22 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-10-05 21:02  
3 -from __future__ import unicode_literals  
4 -  
5 -from django.conf import settings  
6 -from django.db import migrations, models  
7 -  
8 -  
9 -class Migration(migrations.Migration):  
10 -  
11 - dependencies = [  
12 - migrations.swappable_dependency(settings.AUTH_USER_MODEL),  
13 - ('courses', '0001_initial'),  
14 - ]  
15 -  
16 - operations = [  
17 - migrations.AddField(  
18 - model_name='subject',  
19 - name='students',  
20 - field=models.ManyToManyField(related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),  
21 - ),  
22 - ]  
courses/migrations/0003_auto_20161007_1612.py
View file @c31e36b
@@ -1,30 +0,0 @@ @@ -1,30 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-10-07 19:12  
3 -from __future__ import unicode_literals  
4 -  
5 -from django.conf import settings  
6 -from django.db import migrations, models  
7 -  
8 -  
9 -class Migration(migrations.Migration):  
10 -  
11 - dependencies = [  
12 - ('courses', '0002_subject_students'),  
13 - ]  
14 -  
15 - operations = [  
16 - migrations.RenameModel(  
17 - old_name='Category',  
18 - new_name='CourseCategory',  
19 - ),  
20 - migrations.AlterField(  
21 - model_name='activity',  
22 - name='limit_date',  
23 - field=models.DateField(verbose_name='Deliver Date'),  
24 - ),  
25 - migrations.AlterField(  
26 - model_name='subject',  
27 - name='professors',  
28 - field=models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),  
29 - ),  
30 - ]  
courses/migrations/0004_auto_20161011_1951.py
View file @c31e36b
@@ -1,21 +0,0 @@ @@ -1,21 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-10-11 22:51  
3 -from __future__ import unicode_literals  
4 -  
5 -from django.db import migrations, models  
6 -import django.db.models.deletion  
7 -  
8 -  
9 -class Migration(migrations.Migration):  
10 -  
11 - dependencies = [  
12 - ('courses', '0003_auto_20161007_1612'),  
13 - ]  
14 -  
15 - operations = [  
16 - migrations.AlterField(  
17 - model_name='course',  
18 - name='category',  
19 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'),  
20 - ),  
21 - ]  
courses/migrations/0005_file.py
View file @c31e36b
@@ -1,31 +0,0 @@ @@ -1,31 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-10-13 17:29  
3 -from __future__ import unicode_literals  
4 -  
5 -from django.db import migrations, models  
6 -import django.db.models.deletion  
7 -  
8 -  
9 -class Migration(migrations.Migration):  
10 -  
11 - dependencies = [  
12 - ('core', '0002_mymetype'),  
13 - ('courses', '0004_auto_20161011_1951'),  
14 - ]  
15 -  
16 - operations = [  
17 - migrations.CreateModel(  
18 - name='File',  
19 - fields=[  
20 - ('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')),  
21 - ('description', models.TextField(blank=True, verbose_name='Description')),  
22 - ('content', models.FileField(upload_to='uploads/courses/subject/topic/%Y/%m/%d/')),  
23 - ('typ', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='file', to='core.MymeType', verbose_name='Type')),  
24 - ],  
25 - options={  
26 - 'verbose_name': 'Topic file',  
27 - 'verbose_name_plural': 'Topic files',  
28 - },  
29 - bases=('courses.material',),  
30 - ),  
31 - ]  
exam/migrations/0001_initial.py
  Diff comments   View file @5edbdc9
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-10-06 19:57 2 +# Generated by Django 1.10 on 2016-10-17 12:31
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
5 from django.db import migrations, models 5 from django.db import migrations, models
@@ -11,6 +11,7 @@ class Migration(migrations.Migration): @@ -11,6 +11,7 @@ class Migration(migrations.Migration):
11 initial = True 11 initial = True
12 12
13 dependencies = [ 13 dependencies = [
  14 + ('courses', '0001_initial'),
14 ] 15 ]
15 16
16 operations = [ 17 operations = [
@@ -18,27 +19,26 @@ class Migration(migrations.Migration): @@ -18,27 +19,26 @@ class Migration(migrations.Migration):
18 name='Answer', 19 name='Answer',
19 fields=[ 20 fields=[
20 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), 21 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
21 - ('answer', models.CharField(max_length=200, verbose_name='Answer')), 22 + ('answer', models.CharField(max_length=300, verbose_name='Answer')),
22 ('order', models.PositiveSmallIntegerField(verbose_name='Order')), 23 ('order', models.PositiveSmallIntegerField(verbose_name='Order')),
23 ], 24 ],
24 options={ 25 options={
25 - 'verbose_name_plural': 'Answers',  
26 - 'ordering': ('order',),  
27 'verbose_name': 'Answer', 26 'verbose_name': 'Answer',
  27 + 'ordering': ('order',),
  28 + 'verbose_name_plural': 'Answers',
28 }, 29 },
29 ), 30 ),
30 migrations.CreateModel( 31 migrations.CreateModel(
31 name='Exam', 32 name='Exam',
32 fields=[ 33 fields=[
33 - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),  
34 - ('name', models.CharField(max_length=100, verbose_name='Name')),  
35 - ('beginDate', models.DateTimeField(auto_now_add=True, verbose_name='Start Date')),  
36 - ('endDate', models.DateTimeField(auto_now=True, verbose_name='Date of last update')), 34 + ('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')),
  35 + ('begin_date', models.DateField(blank=True, verbose_name='Begin of Course Date')),
37 ], 36 ],
38 options={ 37 options={
39 'verbose_name_plural': 'Exams', 38 'verbose_name_plural': 'Exams',
40 'verbose_name': 'Exam', 39 'verbose_name': 'Exam',
41 }, 40 },
  41 + bases=('courses.activity',),
42 ), 42 ),
43 migrations.AddField( 43 migrations.AddField(
44 model_name='answer', 44 model_name='answer',
files/migrations/0001_initial.py
  Diff comments   View file @5edbdc9
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-10-13 16:12 2 +# Generated by Django 1.10 on 2016-10-17 12:25
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
5 from django.db import migrations, models 5 from django.db import migrations, models
@@ -12,8 +12,8 @@ class Migration(migrations.Migration): @@ -12,8 +12,8 @@ class Migration(migrations.Migration):
12 initial = True 12 initial = True
13 13
14 dependencies = [ 14 dependencies = [
15 - ('core', '0002_mymetype'),  
16 - ('courses', '0004_auto_20161011_1951'), 15 + ('core', '0001_initial'),
  16 + ('courses', '0001_initial'),
17 ] 17 ]
18 18
19 operations = [ 19 operations = [
@@ -23,11 +23,12 @@ class Migration(migrations.Migration): @@ -23,11 +23,12 @@ class Migration(migrations.Migration):
23 ('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')), 23 ('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')),
24 ('description', models.TextField(blank=True, verbose_name='Description')), 24 ('description', models.TextField(blank=True, verbose_name='Description')),
25 ('file_url', models.FileField(upload_to=files.models.file_path, verbose_name='File')), 25 ('file_url', models.FileField(upload_to=files.models.file_path, verbose_name='File')),
26 - ('file_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='topic_files', to='core.MymeType', verbose_name='Type file')), 26 + ('file_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='topic_files', to='core.MimeType', verbose_name='Type file')),
27 ], 27 ],
28 options={ 28 options={
29 'verbose_name': 'File', 29 'verbose_name': 'File',
30 'verbose_name_plural': 'Files', 30 'verbose_name_plural': 'Files',
  31 + 'ordering': ('-id',),
31 }, 32 },
32 bases=('courses.material',), 33 bases=('courses.material',),
33 ), 34 ),
forum/migrations/0001_initial.py
  Diff comments   View file @5edbdc9
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-10-05 13:38 2 +# Generated by Django 1.10 on 2016-10-17 12:25
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
5 from django.conf import settings 5 from django.conf import settings
@@ -12,8 +12,8 @@ class Migration(migrations.Migration): @@ -12,8 +12,8 @@ class Migration(migrations.Migration):
12 initial = True 12 initial = True
13 13
14 dependencies = [ 14 dependencies = [
15 - ('courses', '0001_initial'),  
16 migrations.swappable_dependency(settings.AUTH_USER_MODEL), 15 migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  16 + ('courses', '0001_initial'),
17 ] 17 ]
18 18
19 operations = [ 19 operations = [
links/migrations/0001_initial.py
  Diff comments   View file @5edbdc9
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-10-06 17:57 2 +# Generated by Django 1.10 on 2016-10-17 12:25
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
5 from django.db import migrations, models 5 from django.db import migrations, models
@@ -22,8 +22,8 @@ class Migration(migrations.Migration): @@ -22,8 +22,8 @@ class Migration(migrations.Migration):
22 ('description', models.CharField(max_length=200)), 22 ('description', models.CharField(max_length=200)),
23 ], 23 ],
24 options={ 24 options={
25 - 'verbose_name_plural': 'Links',  
26 'verbose_name': 'Link', 25 'verbose_name': 'Link',
  26 + 'verbose_name_plural': 'Links',
27 }, 27 },
28 ), 28 ),
29 ] 29 ]
poll/migrations/0001_initial.py
  Diff comments   View file @5edbdc9
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-10-05 13:38 2 +# Generated by Django 1.10 on 2016-10-17 12:25
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
  5 +from django.conf import settings
5 from django.db import migrations, models 6 from django.db import migrations, models
6 import django.db.models.deletion 7 import django.db.models.deletion
7 8
@@ -12,6 +13,7 @@ class Migration(migrations.Migration): @@ -12,6 +13,7 @@ class Migration(migrations.Migration):
12 13
13 dependencies = [ 14 dependencies = [
14 ('courses', '0001_initial'), 15 ('courses', '0001_initial'),
  16 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
15 ] 17 ]
16 18
17 operations = [ 19 operations = [
@@ -23,9 +25,22 @@ class Migration(migrations.Migration): @@ -23,9 +25,22 @@ class Migration(migrations.Migration):
23 ('order', models.PositiveSmallIntegerField(verbose_name='Order')), 25 ('order', models.PositiveSmallIntegerField(verbose_name='Order')),
24 ], 26 ],
25 options={ 27 options={
26 - 'verbose_name': 'Answer',  
27 - 'verbose_name_plural': 'Answers',  
28 'ordering': ('order',), 28 'ordering': ('order',),
  29 + 'verbose_name_plural': 'Answers',
  30 + 'verbose_name': 'Answer',
  31 + },
  32 + ),
  33 + migrations.CreateModel(
  34 + name='AnswersStudent',
  35 + fields=[
  36 + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
  37 + ('status', models.BooleanField(default=False, verbose_name='Answered')),
  38 + ('answered_in', models.DateTimeField(auto_now=True, verbose_name='Answered Date')),
  39 + ('answer', models.ManyToManyField(related_name='answers_stundet', to='poll.Answer', verbose_name='Answers Students')),
  40 + ],
  41 + options={
  42 + 'verbose_name_plural': 'Answers Student',
  43 + 'verbose_name': 'Answer Stundent',
29 }, 44 },
30 ), 45 ),
31 migrations.CreateModel( 46 migrations.CreateModel(
@@ -40,6 +55,16 @@ class Migration(migrations.Migration): @@ -40,6 +55,16 @@ class Migration(migrations.Migration):
40 bases=('courses.activity',), 55 bases=('courses.activity',),
41 ), 56 ),
42 migrations.AddField( 57 migrations.AddField(
  58 + model_name='answersstudent',
  59 + name='poll',
  60 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundet', to='poll.Poll', verbose_name='Poll'),
  61 + ),
  62 + migrations.AddField(
  63 + model_name='answersstudent',
  64 + name='student',
  65 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundent', to=settings.AUTH_USER_MODEL, verbose_name='Student'),
  66 + ),
  67 + migrations.AddField(
43 model_name='answer', 68 model_name='answer',
44 name='poll', 69 name='poll',
45 field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='poll.Poll', verbose_name='Answers'), 70 field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='poll.Poll', verbose_name='Answers'),
poll/migrations/0002_answersstudent.py
View file @c31e36b
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-10-12 18:26  
3 -from __future__ import unicode_literals  
4 -  
5 -from django.conf import settings  
6 -from django.db import migrations, models  
7 -import django.db.models.deletion  
8 -  
9 -  
10 -class Migration(migrations.Migration):  
11 -  
12 - dependencies = [  
13 - migrations.swappable_dependency(settings.AUTH_USER_MODEL),  
14 - ('poll', '0001_initial'),  
15 - ]  
16 -  
17 - operations = [  
18 - migrations.CreateModel(  
19 - name='AnswersStudent',  
20 - fields=[  
21 - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),  
22 - ('status', models.BooleanField(default=False, verbose_name='Answered')),  
23 - ('answered_in', models.DateTimeField(auto_now=True, verbose_name='Answered Date')),  
24 - ('answer', models.ManyToManyField(related_name='answers_stundet', to='poll.Answer', verbose_name='Answers Students')),  
25 - ('poll', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundet', to='poll.Poll', verbose_name='Answers')),  
26 - ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundent', to=settings.AUTH_USER_MODEL, verbose_name='Student')),  
27 - ],  
28 - options={  
29 - 'verbose_name': 'Answer Stundent',  
30 - 'verbose_name_plural': 'Answers Student',  
31 - },  
32 - ),  
33 - ]  
poll/migrations/0003_auto_20161012_1638.py
View file @c31e36b
@@ -1,21 +0,0 @@ @@ -1,21 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-10-12 19:38  
3 -from __future__ import unicode_literals  
4 -  
5 -from django.db import migrations, models  
6 -import django.db.models.deletion  
7 -  
8 -  
9 -class Migration(migrations.Migration):  
10 -  
11 - dependencies = [  
12 - ('poll', '0002_answersstudent'),  
13 - ]  
14 -  
15 - operations = [  
16 - migrations.AlterField(  
17 - model_name='answersstudent',  
18 - name='poll',  
19 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundet', to='poll.Poll', verbose_name='Poll'),  
20 - ),  
21 - ]