Download as
Browse Code »

Commit 378a94b16b147b2c58cd89e0a547965e2fa45add

Authored by Felipe Henrique de Almeida Bormann
1 parent d5aec98f
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

rebuilding heroku database

Showing 19 changed files with 130 additions and 350 deletions   Show diff stats
amadeus/settings.py
  Diff comments   View file @378a94b
@@ -58,6 +58,7 @@ INSTALLED_APPS = [ @@ -58,6 +58,7 @@ INSTALLED_APPS = [
58 'forum', 58 'forum',
59 'exam', 59 'exam',
60 'poll', 60 'poll',
  61 + 'exam',
61 'links', 62 'links',
62 'files', 63 'files',
63 64
app/migrations/0001_initial.py
View file @d5aec98
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-11-24 15:17  
3 -from __future__ import unicode_literals  
4 -  
5 -from django.db import migrations, models  
6 -  
7 -  
8 -class Migration(migrations.Migration):  
9 -  
10 - initial = True  
11 -  
12 - dependencies = [  
13 - ]  
14 -  
15 - operations = [  
16 - migrations.CreateModel(  
17 - name='EmailBackend',  
18 - fields=[  
19 - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),  
20 - ('description', models.CharField(max_length=100, verbose_name='Description')),  
21 - ('host', models.URLField(verbose_name='E-mail Host')),  
22 - ('port', models.CharField(blank=True, max_length=4, verbose_name='Email Port')),  
23 - ('username', models.CharField(max_length=30, verbose_name='Email host username')),  
24 - ('password', models.CharField(blank=True, max_length=30, verbose_name='Email host password')),  
25 - ('safe_conection', models.IntegerField(choices=[(0, 'No'), (1, 'TLS, if available'), (2, 'TLS'), (3, 'SSL')], default=0, verbose_name='Use safe conection')),  
26 - ('default_from_email', models.EmailField(max_length=254, verbose_name='Default from email')),  
27 - ],  
28 - options={  
29 - 'verbose_name': 'Amadeus SMTP setting',  
30 - 'verbose_name_plural': 'Amadeus SMTP settings',  
31 - },  
32 - ),  
33 - ]  
app/migrations/__init__.py
View file @d5aec98
core/migrations/0001_initial.py
  Diff comments   View file @378a94b
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-11-24 15:17 2 +# Generated by Django 1.10 on 2016-12-13 03:54
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
5 import autoslug.fields 5 import autoslug.fields
  6 +from django.conf import settings
6 import django.contrib.postgres.fields.jsonb 7 import django.contrib.postgres.fields.jsonb
7 from django.db import migrations, models 8 from django.db import migrations, models
8 import django.db.models.deletion 9 import django.db.models.deletion
@@ -13,6 +14,7 @@ class Migration(migrations.Migration): @@ -13,6 +14,7 @@ class Migration(migrations.Migration):
13 initial = True 14 initial = True
14 15
15 dependencies = [ 16 dependencies = [
  17 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
16 ] 18 ]
17 19
18 operations = [ 20 operations = [
@@ -33,6 +35,7 @@ class Migration(migrations.Migration): @@ -33,6 +35,7 @@ class Migration(migrations.Migration):
33 name='Action_Resource', 35 name='Action_Resource',
34 fields=[ 36 fields=[
35 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), 37 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
  38 + ('action', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied')),
36 ], 39 ],
37 options={ 40 options={
38 'verbose_name': 'Action_Resource', 41 'verbose_name': 'Action_Resource',
@@ -46,6 +49,8 @@ class Migration(migrations.Migration): @@ -46,6 +49,8 @@ class Migration(migrations.Migration):
46 ('component', models.TextField(verbose_name='Component (Module / App)')), 49 ('component', models.TextField(verbose_name='Component (Module / App)')),
47 ('context', django.contrib.postgres.fields.jsonb.JSONField(blank=True, verbose_name='Context')), 50 ('context', django.contrib.postgres.fields.jsonb.JSONField(blank=True, verbose_name='Context')),
48 ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')), 51 ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')),
  52 + ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')),
  53 + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor')),
49 ], 54 ],
50 options={ 55 options={
51 'verbose_name': 'Log', 56 'verbose_name': 'Log',
@@ -57,7 +62,7 @@ class Migration(migrations.Migration): @@ -57,7 +62,7 @@ class Migration(migrations.Migration):
57 fields=[ 62 fields=[
58 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), 63 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
59 ('typ', models.CharField(max_length=100, unique=True, verbose_name='Type')), 64 ('typ', models.CharField(max_length=100, unique=True, verbose_name='Type')),
60 - ('icon', models.CharField(max_length=50, unique=True, verbose_name='Icon')), 65 + ('icon', models.CharField(max_length=50, verbose_name='Icon')),
61 ], 66 ],
62 options={ 67 options={
63 'verbose_name': 'Amadeus Mime Type', 68 'verbose_name': 'Amadeus Mime Type',
@@ -72,6 +77,8 @@ class Migration(migrations.Migration): @@ -72,6 +77,8 @@ class Migration(migrations.Migration):
72 ('read', models.BooleanField(default=False, verbose_name='Read')), 77 ('read', models.BooleanField(default=False, verbose_name='Read')),
73 ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')), 78 ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')),
74 ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')), 79 ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')),
  80 + ('actor', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Performer')),
  81 + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User')),
75 ], 82 ],
76 options={ 83 options={
77 'verbose_name': 'Notification', 84 'verbose_name': 'Notification',
@@ -92,4 +99,9 @@ class Migration(migrations.Migration): @@ -92,4 +99,9 @@ class Migration(migrations.Migration):
92 'verbose_name_plural': 'Resources', 99 'verbose_name_plural': 'Resources',
93 }, 100 },
94 ), 101 ),
  102 + migrations.AddField(
  103 + model_name='action_resource',
  104 + name='resource',
  105 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'),
  106 + ),
95 ] 107 ]
core/migrations/0002_auto_20161124_1217.py
View file @d5aec98
@@ -1,50 +0,0 @@ @@ -1,50 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-11-24 15:17  
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 - initial = True  
13 -  
14 - dependencies = [  
15 - ('core', '0001_initial'),  
16 - migrations.swappable_dependency(settings.AUTH_USER_MODEL),  
17 - ]  
18 -  
19 - operations = [  
20 - migrations.AddField(  
21 - model_name='notification',  
22 - name='actor',  
23 - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Performer'),  
24 - ),  
25 - migrations.AddField(  
26 - model_name='notification',  
27 - name='user',  
28 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User'),  
29 - ),  
30 - migrations.AddField(  
31 - model_name='log',  
32 - name='action_resource',  
33 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource'),  
34 - ),  
35 - migrations.AddField(  
36 - model_name='log',  
37 - name='user',  
38 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor'),  
39 - ),  
40 - migrations.AddField(  
41 - model_name='action_resource',  
42 - name='action',  
43 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied'),  
44 - ),  
45 - migrations.AddField(  
46 - model_name='action_resource',  
47 - name='resource',  
48 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'),  
49 - ),  
50 - ]  
core/migrations/0003_auto_20161210_1541.py
View file @d5aec98
@@ -1,20 +0,0 @@ @@ -1,20 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-12-10 18:41  
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', '0002_auto_20161124_1217'),  
12 - ]  
13 -  
14 - operations = [  
15 - migrations.AlterField(  
16 - model_name='mimetype',  
17 - name='icon',  
18 - field=models.CharField(max_length=50, verbose_name='Icon'),  
19 - ),  
20 - ]  
courses/migrations/0001_initial.py
  Diff comments   View file @378a94b
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-11-24 15:17 2 +# Generated by Django 1.10 on 2016-12-13 03:54
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
5 import autoslug.fields 5 import autoslug.fields
  6 +from django.conf import settings
6 from django.db import migrations, models 7 from django.db import migrations, models
7 import django.db.models.deletion 8 import django.db.models.deletion
8 import s3direct.fields 9 import s3direct.fields
@@ -13,6 +14,7 @@ class Migration(migrations.Migration): @@ -13,6 +14,7 @@ class Migration(migrations.Migration):
13 initial = True 14 initial = True
14 15
15 dependencies = [ 16 dependencies = [
  17 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
16 ('core', '0001_initial'), 18 ('core', '0001_initial'),
17 ] 19 ]
18 20
@@ -23,6 +25,7 @@ class Migration(migrations.Migration): @@ -23,6 +25,7 @@ class Migration(migrations.Migration):
23 ('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')),
24 ('limit_date', models.DateField(verbose_name='Deliver Date')), 26 ('limit_date', models.DateField(verbose_name='Deliver Date')),
25 ('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')),
26 ], 29 ],
27 bases=('core.resource',), 30 bases=('core.resource',),
28 ), 31 ),
@@ -32,6 +35,7 @@ class Migration(migrations.Migration): @@ -32,6 +35,7 @@ class Migration(migrations.Migration):
32 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), 35 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
33 ('pdf', s3direct.fields.S3DirectField()), 36 ('pdf', s3direct.fields.S3DirectField()),
34 ('name', models.CharField(max_length=100)), 37 ('name', models.CharField(max_length=100)),
  38 + ('diet', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity')),
35 ], 39 ],
36 options={ 40 options={
37 'verbose_name': 'Activity File', 41 'verbose_name': 'Activity File',
@@ -61,8 +65,8 @@ class Migration(migrations.Migration): @@ -61,8 +65,8 @@ class Migration(migrations.Migration):
61 ('public', models.BooleanField(default=False, verbose_name='Public')), 65 ('public', models.BooleanField(default=False, verbose_name='Public')),
62 ], 66 ],
63 options={ 67 options={
64 - 'verbose_name': 'Course',  
65 'verbose_name_plural': 'Courses', 68 'verbose_name_plural': 'Courses',
  69 + 'verbose_name': 'Course',
66 'ordering': ('create_date', 'name'), 70 'ordering': ('create_date', 'name'),
67 }, 71 },
68 ), 72 ),
@@ -101,6 +105,7 @@ class Migration(migrations.Migration): @@ -101,6 +105,7 @@ class Migration(migrations.Migration):
101 fields=[ 105 fields=[
102 ('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')), 106 ('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')),
103 ('all_students', models.BooleanField(default=False, verbose_name='All Students')), 107 ('all_students', models.BooleanField(default=False, verbose_name='All Students')),
  108 + ('students', models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students')),
104 ], 109 ],
105 bases=('core.resource',), 110 bases=('core.resource',),
106 ), 111 ),
@@ -118,10 +123,12 @@ class Migration(migrations.Migration): @@ -118,10 +123,12 @@ class Migration(migrations.Migration):
118 ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')), 123 ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')),
119 ('category', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='subject_category', to='courses.CategorySubject', verbose_name='Category')), 124 ('category', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='subject_category', to='courses.CategorySubject', verbose_name='Category')),
120 ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')), 125 ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')),
  126 + ('professors', models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors')),
  127 + ('students', models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students')),
121 ], 128 ],
122 options={ 129 options={
123 - 'verbose_name': 'Subject',  
124 'verbose_name_plural': 'Subjects', 130 'verbose_name_plural': 'Subjects',
  131 + 'verbose_name': 'Subject',
125 'ordering': ('create_date', 'name'), 132 'ordering': ('create_date', 'name'),
126 }, 133 },
127 ), 134 ),
@@ -152,9 +159,49 @@ class Migration(migrations.Migration): @@ -152,9 +159,49 @@ class Migration(migrations.Migration):
152 ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject')), 159 ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject')),
153 ], 160 ],
154 options={ 161 options={
155 - 'verbose_name': 'Topic',  
156 'verbose_name_plural': 'Topics', 162 'verbose_name_plural': 'Topics',
  163 + 'verbose_name': 'Topic',
157 'ordering': ('create_date', 'name'), 164 'ordering': ('create_date', 'name'),
158 }, 165 },
159 ), 166 ),
  167 + migrations.AddField(
  168 + model_name='material',
  169 + name='topic',
  170 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'),
  171 + ),
  172 + migrations.AddField(
  173 + model_name='linkmaterial',
  174 + name='material',
  175 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'),
  176 + ),
  177 + migrations.AddField(
  178 + model_name='filematerial',
  179 + name='material',
  180 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'),
  181 + ),
  182 + migrations.AddField(
  183 + model_name='course',
  184 + name='category',
  185 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'),
  186 + ),
  187 + migrations.AddField(
  188 + model_name='course',
  189 + name='coordenator',
  190 + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='course_coordenator', to=settings.AUTH_USER_MODEL, verbose_name='Coordenator'),
  191 + ),
  192 + migrations.AddField(
  193 + model_name='course',
  194 + name='professors',
  195 + field=models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
  196 + ),
  197 + migrations.AddField(
  198 + model_name='course',
  199 + name='students',
  200 + field=models.ManyToManyField(blank=True, related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
  201 + ),
  202 + migrations.AddField(
  203 + model_name='activity',
  204 + name='topic',
  205 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'),
  206 + ),
160 ] 207 ]
courses/migrations/0002_auto_20161124_1217.py
View file @d5aec98
@@ -1,85 +0,0 @@ @@ -1,85 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-11-24 15:17  
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 - initial = True  
13 -  
14 - dependencies = [  
15 - migrations.swappable_dependency(settings.AUTH_USER_MODEL),  
16 - ('courses', '0001_initial'),  
17 - ]  
18 -  
19 - operations = [  
20 - migrations.AddField(  
21 - model_name='subject',  
22 - name='professors',  
23 - field=models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),  
24 - ),  
25 - migrations.AddField(  
26 - model_name='subject',  
27 - name='students',  
28 - field=models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),  
29 - ),  
30 - migrations.AddField(  
31 - model_name='material',  
32 - name='students',  
33 - field=models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students'),  
34 - ),  
35 - migrations.AddField(  
36 - model_name='material',  
37 - name='topic',  
38 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'),  
39 - ),  
40 - migrations.AddField(  
41 - model_name='linkmaterial',  
42 - name='material',  
43 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'),  
44 - ),  
45 - migrations.AddField(  
46 - model_name='filematerial',  
47 - name='material',  
48 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'),  
49 - ),  
50 - migrations.AddField(  
51 - model_name='course',  
52 - name='category',  
53 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'),  
54 - ),  
55 - migrations.AddField(  
56 - model_name='course',  
57 - name='coordenator',  
58 - field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='course_coordenator', to=settings.AUTH_USER_MODEL, verbose_name='Coordenator'),  
59 - ),  
60 - migrations.AddField(  
61 - model_name='course',  
62 - name='professors',  
63 - field=models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),  
64 - ),  
65 - migrations.AddField(  
66 - model_name='course',  
67 - name='students',  
68 - field=models.ManyToManyField(blank=True, related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),  
69 - ),  
70 - migrations.AddField(  
71 - model_name='activityfile',  
72 - name='diet',  
73 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity'),  
74 - ),  
75 - migrations.AddField(  
76 - model_name='activity',  
77 - name='students',  
78 - field=models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students'),  
79 - ),  
80 - migrations.AddField(  
81 - model_name='activity',  
82 - name='topic',  
83 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'),  
84 - ),  
85 - ]  
exam/migrations/0001_initial.py
  Diff comments   View file @378a94b
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-11-24 15:17 2 +# Generated by Django 1.10 on 2016-12-13 03:55
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,10 +13,19 @@ class Migration(migrations.Migration): @@ -12,10 +13,19 @@ 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 = [
18 migrations.CreateModel( 20 migrations.CreateModel(
  21 + name='Alternative',
  22 + fields=[
  23 + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
  24 + ('statement', models.TextField(verbose_name='Statement')),
  25 + ('answer', models.BooleanField(default=False, verbose_name='answer')),
  26 + ],
  27 + ),
  28 + migrations.CreateModel(
19 name='Answer', 29 name='Answer',
20 fields=[ 30 fields=[
21 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), 31 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
@@ -24,8 +34,8 @@ class Migration(migrations.Migration): @@ -24,8 +34,8 @@ class Migration(migrations.Migration):
24 ], 34 ],
25 options={ 35 options={
26 'verbose_name': 'Answer', 36 'verbose_name': 'Answer',
27 - 'verbose_name_plural': 'Answers',  
28 'ordering': ('order',), 37 'ordering': ('order',),
  38 + 'verbose_name_plural': 'Answers',
29 }, 39 },
30 ), 40 ),
31 migrations.CreateModel( 41 migrations.CreateModel(
@@ -46,6 +56,8 @@ class Migration(migrations.Migration): @@ -46,6 +56,8 @@ class Migration(migrations.Migration):
46 fields=[ 56 fields=[
47 ('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')), 57 ('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')),
48 ('begin_date', models.DateField(blank=True, verbose_name='Begin of Course Date')), 58 ('begin_date', models.DateField(blank=True, verbose_name='Begin of Course Date')),
  59 + ('begin_exam', models.DateField(blank=True, verbose_name='Begin of Exam')),
  60 + ('end_exam', models.DateField(blank=True, verbose_name='End of Exam')),
49 ('exibe', models.BooleanField(default=False, verbose_name='Exibe?')), 61 ('exibe', models.BooleanField(default=False, verbose_name='Exibe?')),
50 ], 62 ],
51 options={ 63 options={
@@ -54,9 +66,32 @@ class Migration(migrations.Migration): @@ -54,9 +66,32 @@ class Migration(migrations.Migration):
54 }, 66 },
55 bases=('courses.activity',), 67 bases=('courses.activity',),
56 ), 68 ),
  69 + migrations.CreateModel(
  70 + name='Question',
  71 + fields=[
  72 + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
  73 + ('statement', models.TextField(verbose_name='Statement')),
  74 + ('exam', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='question_exam', to='exam.Exam', verbose_name='Exam')),
  75 + ],
  76 + ),
57 migrations.AddField( 77 migrations.AddField(
58 model_name='answersstudent', 78 model_name='answersstudent',
59 name='exam', 79 name='exam',
60 field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student_exam', to='exam.Exam', verbose_name='Exam'), 80 field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student_exam', to='exam.Exam', verbose_name='Exam'),
61 ), 81 ),
  82 + migrations.AddField(
  83 + model_name='answersstudent',
  84 + name='student',
  85 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student', to=settings.AUTH_USER_MODEL, verbose_name='Student'),
  86 + ),
  87 + migrations.AddField(
  88 + model_name='answer',
  89 + name='exam',
  90 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='exam.Exam', verbose_name='Answers'),
  91 + ),
  92 + migrations.AddField(
  93 + model_name='alternative',
  94 + name='question',
  95 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='alternative_question', to='exam.Question', verbose_name='Question'),
  96 + ),
62 ] 97 ]
exam/migrations/0002_auto_20161124_1217.py
View file @d5aec98
@@ -1,30 +0,0 @@ @@ -1,30 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-11-24 15:17  
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 - initial = True  
13 -  
14 - dependencies = [  
15 - migrations.swappable_dependency(settings.AUTH_USER_MODEL),  
16 - ('exam', '0001_initial'),  
17 - ]  
18 -  
19 - operations = [  
20 - migrations.AddField(  
21 - model_name='answersstudent',  
22 - name='student',  
23 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student', to=settings.AUTH_USER_MODEL, verbose_name='Student'),  
24 - ),  
25 - migrations.AddField(  
26 - model_name='answer',  
27 - name='exam',  
28 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='exam.Exam', verbose_name='Answers'),  
29 - ),  
30 - ]  
exam/migrations/0003_auto_20161125_0808.py
View file @d5aec98
@@ -1,28 +0,0 @@ @@ -1,28 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-11-25 11:08  
3 -from __future__ import unicode_literals  
4 -  
5 -from django.db import migrations, models  
6 -import django.utils.timezone  
7 -  
8 -  
9 -class Migration(migrations.Migration):  
10 -  
11 - dependencies = [  
12 - ('exam', '0002_auto_20161124_1217'),  
13 - ]  
14 -  
15 - operations = [  
16 - migrations.AddField(  
17 - model_name='exam',  
18 - name='begin_exam',  
19 - field=models.DateField(blank=True, default=django.utils.timezone.now, verbose_name='Begin of Exam'),  
20 - preserve_default=False,  
21 - ),  
22 - migrations.AddField(  
23 - model_name='exam',  
24 - name='end_exam',  
25 - field=models.DateField(blank=True, default=django.utils.timezone.now, verbose_name='End of Exam'),  
26 - preserve_default=False,  
27 - ),  
28 - ]  
files/migrations/0001_initial.py
  Diff comments   View file @378a94b
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-11-24 15:17 2 +# Generated by Django 1.10 on 2016-12-13 03:59
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 import files.models 8 import files.models
@@ -12,8 +13,9 @@ class Migration(migrations.Migration): @@ -12,8 +13,9 @@ class Migration(migrations.Migration):
12 initial = True 13 initial = True
13 14
14 dependencies = [ 15 dependencies = [
15 - ('core', '0001_initial'),  
16 ('courses', '0001_initial'), 16 ('courses', '0001_initial'),
  17 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  18 + ('core', '0001_initial'),
17 ] 19 ]
18 20
19 operations = [ 21 operations = [
@@ -24,6 +26,7 @@ class Migration(migrations.Migration): @@ -24,6 +26,7 @@ class Migration(migrations.Migration):
24 ('description', models.TextField(blank=True, verbose_name='Description')), 26 ('description', models.TextField(blank=True, verbose_name='Description')),
25 ('file_url', models.FileField(upload_to=files.models.file_path, verbose_name='File')), 27 ('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.MimeType', verbose_name='Type file')), 28 ('file_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='topic_files', to='core.MimeType', verbose_name='Type file')),
  29 + ('professor', models.ManyToManyField(related_name='file_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors')),
27 ], 30 ],
28 options={ 31 options={
29 'verbose_name': 'File', 32 'verbose_name': 'File',
files/migrations/0002_topicfile_professor.py
View file @d5aec98
@@ -1,24 +0,0 @@ @@ -1,24 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-11-24 15:17  
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 - initial = True  
12 -  
13 - dependencies = [  
14 - migrations.swappable_dependency(settings.AUTH_USER_MODEL),  
15 - ('files', '0001_initial'),  
16 - ]  
17 -  
18 - operations = [  
19 - migrations.AddField(  
20 - model_name='topicfile',  
21 - name='professor',  
22 - field=models.ManyToManyField(related_name='file_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),  
23 - ),  
24 - ]  
forum/migrations/0001_initial.py
  Diff comments   View file @378a94b
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-11-24 15:17 2 +# Generated by Django 1.10 on 2016-12-13 04:00
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
@@ -11,6 +12,7 @@ class Migration(migrations.Migration): @@ -11,6 +12,7 @@ class Migration(migrations.Migration):
11 initial = True 12 initial = True
12 13
13 dependencies = [ 14 dependencies = [
  15 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
14 ('courses', '0001_initial'), 16 ('courses', '0001_initial'),
15 ] 17 ]
16 18
@@ -36,6 +38,8 @@ class Migration(migrations.Migration): @@ -36,6 +38,8 @@ class Migration(migrations.Migration):
36 ('message', models.TextField(verbose_name='Post message')), 38 ('message', models.TextField(verbose_name='Post message')),
37 ('modification_date', models.DateTimeField(auto_now=True, verbose_name='Modification Date')), 39 ('modification_date', models.DateTimeField(auto_now=True, verbose_name='Modification Date')),
38 ('post_date', models.DateTimeField(auto_now_add=True, verbose_name='Post Date')), 40 ('post_date', models.DateTimeField(auto_now_add=True, verbose_name='Post Date')),
  41 + ('forum', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Forum', verbose_name='Forum')),
  42 + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor')),
39 ], 43 ],
40 options={ 44 options={
41 'verbose_name': 'Post', 45 'verbose_name': 'Post',
@@ -50,6 +54,7 @@ class Migration(migrations.Migration): @@ -50,6 +54,7 @@ class Migration(migrations.Migration):
50 ('modification_date', models.DateTimeField(auto_now=True, verbose_name='Modification Date')), 54 ('modification_date', models.DateTimeField(auto_now=True, verbose_name='Modification Date')),
51 ('answer_date', models.DateTimeField(auto_now_add=True, verbose_name='Answer Date')), 55 ('answer_date', models.DateTimeField(auto_now_add=True, verbose_name='Answer Date')),
52 ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Post', verbose_name='Post')), 56 ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Post', verbose_name='Post')),
  57 + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor')),
53 ], 58 ],
54 options={ 59 options={
55 'verbose_name': 'Post Answer', 60 'verbose_name': 'Post Answer',
forum/migrations/0002_auto_20161124_1217.py
View file @d5aec98
@@ -1,35 +0,0 @@ @@ -1,35 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-11-24 15:17  
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 - initial = True  
13 -  
14 - dependencies = [  
15 - migrations.swappable_dependency(settings.AUTH_USER_MODEL),  
16 - ('forum', '0001_initial'),  
17 - ]  
18 -  
19 - operations = [  
20 - migrations.AddField(  
21 - model_name='postanswer',  
22 - name='user',  
23 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'),  
24 - ),  
25 - migrations.AddField(  
26 - model_name='post',  
27 - name='forum',  
28 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Forum', verbose_name='Forum'),  
29 - ),  
30 - migrations.AddField(  
31 - model_name='post',  
32 - name='user',  
33 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'),  
34 - ),  
35 - ]  
links/migrations/0001_initial.py
  Diff comments   View file @378a94b
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-11-24 15:17 2 +# Generated by Django 1.10 on 2016-12-13 04:00
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
poll/migrations/0001_initial.py
  Diff comments   View file @378a94b
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-11-24 15:17 2 +# Generated by Django 1.10 on 2016-12-13 04:00
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 = [
@@ -24,8 +26,8 @@ class Migration(migrations.Migration): @@ -24,8 +26,8 @@ class Migration(migrations.Migration):
24 ], 26 ],
25 options={ 27 options={
26 'verbose_name': 'Answer', 28 'verbose_name': 'Answer',
27 - 'verbose_name_plural': 'Answers',  
28 'ordering': ('order',), 29 'ordering': ('order',),
  30 + 'verbose_name_plural': 'Answers',
29 }, 31 },
30 ), 32 ),
31 migrations.CreateModel( 33 migrations.CreateModel(
@@ -57,4 +59,14 @@ class Migration(migrations.Migration): @@ -57,4 +59,14 @@ class Migration(migrations.Migration):
57 name='poll', 59 name='poll',
58 field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundet', to='poll.Poll', verbose_name='Poll'), 60 field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundet', to='poll.Poll', verbose_name='Poll'),
59 ), 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(
  68 + model_name='answer',
  69 + name='poll',
  70 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='poll.Poll', verbose_name='Answers'),
  71 + ),
60 ] 72 ]
poll/migrations/0002_auto_20161124_1217.py
View file @d5aec98
@@ -1,30 +0,0 @@ @@ -1,30 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-11-24 15:17  
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 - initial = True  
13 -  
14 - dependencies = [  
15 - migrations.swappable_dependency(settings.AUTH_USER_MODEL),  
16 - ('poll', '0001_initial'),  
17 - ]  
18 -  
19 - operations = [  
20 - migrations.AddField(  
21 - model_name='answersstudent',  
22 - name='student',  
23 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundent', to=settings.AUTH_USER_MODEL, verbose_name='Student'),  
24 - ),  
25 - migrations.AddField(  
26 - model_name='answer',  
27 - name='poll',  
28 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='poll.Poll', verbose_name='Answers'),  
29 - ),  
30 - ]  
users/migrations/0001_initial.py
  Diff comments   View file @378a94b
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-11-24 15:17 2 +# Generated by Django 1.10 on 2016-12-13 03:54
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
5 import django.contrib.auth.models 5 import django.contrib.auth.models