Download as
Browse Code »

Commit cae4d31d7cc561affea7da06719d1de8b846793a

Authored by Matheus Lins
1 parent 51d3f448
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

modal create exercise #95

Showing 46 changed files with 388 additions and 684 deletions   Show diff stats
app/migrations/0001_initial.py
  Diff comments   View file @cae4d31
1 1 # -*- coding: utf-8 -*-
2   -
3   -# Generated by Django 1.10 on 2016-11-15 22:36
  2 +# Generated by Django 1.10 on 2016-11-17 05:17
4 3 from __future__ import unicode_literals
5 4  
6 5 from django.db import migrations, models
... ... @@ -24,11 +23,11 @@ class Migration(migrations.Migration):
24 23 ('username', models.CharField(max_length=30, verbose_name='Email host username')),
25 24 ('password', models.CharField(blank=True, max_length=30, verbose_name='Email host password')),
26 25 ('safe_conection', models.IntegerField(choices=[(0, 'No'), (1, 'TLS, if available'), (2, 'TLS'), (3, 'SSL')], default=0, verbose_name='Use safe conection')),
27   - ('default_from_email', models.EmailField(blank=True, max_length=254, verbose_name='Default from email')),
  26 + ('default_from_email', models.EmailField(max_length=254, verbose_name='Default from email')),
28 27 ],
29 28 options={
30   - 'verbose_name': 'Amadeus SMTP setting',
31 29 'verbose_name_plural': 'Amadeus SMTP settings',
  30 + 'verbose_name': 'Amadeus SMTP setting',
32 31 },
33 32 ),
34 33 ]
... ...
app/migrations/0002_auto_20161115_2054.py
View file @51d3f44
... ... @@ -1,20 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-11-15 23:54
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   - ('app', '0001_initial'),
12   - ]
13   -
14   - operations = [
15   - migrations.AlterField(
16   - model_name='emailbackend',
17   - name='default_from_email',
18   - field=models.EmailField(max_length=254, verbose_name='Default from email'),
19   - ),
20   - ]
core/migrations/0001_initial.py
  Diff comments   View file @cae4d31
1 1 # -*- coding: utf-8 -*-
2   -
3   -# Generated by Django 1.10 on 2016-11-15 22:36
  2 +# Generated by Django 1.10 on 2016-11-17 05:17
4 3 from __future__ import unicode_literals
5 4  
6 5 import autoslug.fields
... ... @@ -26,8 +25,8 @@ class Migration(migrations.Migration):
26 25 ('created_date', models.DateTimeField(auto_now_add=True, verbose_name='Created Date')),
27 26 ],
28 27 options={
29   - 'verbose_name': 'Action',
30 28 'verbose_name_plural': 'Actions',
  29 + 'verbose_name': 'Action',
31 30 },
32 31 ),
33 32 migrations.CreateModel(
... ... @@ -36,8 +35,8 @@ class Migration(migrations.Migration):
36 35 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
37 36 ],
38 37 options={
39   - 'verbose_name': 'Action_Resource',
40 38 'verbose_name_plural': 'Action_Resources',
  39 + 'verbose_name': 'Action_Resource',
41 40 },
42 41 ),
43 42 migrations.CreateModel(
... ... @@ -49,8 +48,8 @@ class Migration(migrations.Migration):
49 48 ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')),
50 49 ],
51 50 options={
52   - 'verbose_name': 'Log',
53 51 'verbose_name_plural': 'Logs',
  52 + 'verbose_name': 'Log',
54 53 },
55 54 ),
56 55 migrations.CreateModel(
... ... @@ -61,8 +60,8 @@ class Migration(migrations.Migration):
61 60 ('icon', models.CharField(max_length=50, unique=True, verbose_name='Icon')),
62 61 ],
63 62 options={
64   - 'verbose_name': 'Amadeus Mime Type',
65 63 'verbose_name_plural': 'Amadeus Mime Types',
  64 + 'verbose_name': 'Amadeus Mime Type',
66 65 },
67 66 ),
68 67 migrations.CreateModel(
... ... @@ -75,8 +74,8 @@ class Migration(migrations.Migration):
75 74 ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')),
76 75 ],
77 76 options={
78   - 'verbose_name': 'Notification',
79 77 'verbose_name_plural': 'Notifications',
  78 + 'verbose_name': 'Notification',
80 79 },
81 80 ),
82 81 migrations.CreateModel(
... ... @@ -89,8 +88,8 @@ class Migration(migrations.Migration):
89 88 ('url', models.CharField(default='', max_length=100, verbose_name='URL')),
90 89 ],
91 90 options={
92   - 'verbose_name': 'Resource',
93 91 'verbose_name_plural': 'Resources',
  92 + 'verbose_name': 'Resource',
94 93 },
95 94 ),
96 95 ]
... ...
core/migrations/0002_auto_20161115_1936.py
View file @51d3f44
... ... @@ -1,50 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-11-15 22:36
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   - ('core', '0001_initial'),
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/0002_auto_20161117_0009.py
View file @51d3f44
... ... @@ -1,50 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-11-17 03:09
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   - ('core', '0001_initial'),
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/0002_auto_20161117_0217.py 0 → 100644
  Diff comments   View file @cae4d31
... ... @@ -0,0 +1,50 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-17 05: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 + ('core', '0001_initial'),
  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_merge_20161117_0157.py
View file @51d3f44
... ... @@ -1,16 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-11-17 04:57
3   -from __future__ import unicode_literals
4   -
5   -from django.db import migrations
6   -
7   -
8   -class Migration(migrations.Migration):
9   -
10   - dependencies = [
11   - ('core', '0002_auto_20161115_1936'),
12   - ('core', '0002_auto_20161117_0009'),
13   - ]
14   -
15   - operations = [
16   - ]
courses/migrations/0001_initial.py
  Diff comments   View file @cae4d31
1 1 # -*- coding: utf-8 -*-
2   -
3   -# Generated by Django 1.10 on 2016-11-15 22:36
  2 +# Generated by Django 1.10 on 2016-11-17 05:17
4 3 from __future__ import unicode_literals
5 4  
6 5 import autoslug.fields
... ... @@ -35,8 +34,8 @@ class Migration(migrations.Migration):
35 34 ('name', models.CharField(max_length=100)),
36 35 ],
37 36 options={
38   - 'verbose_name': 'Activity File',
39 37 'verbose_name_plural': 'Activitys Files',
  38 + 'verbose_name': 'Activity File',
40 39 },
41 40 ),
42 41 migrations.CreateModel(
... ... @@ -48,8 +47,8 @@ class Migration(migrations.Migration):
48 47 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
49 48 ],
50 49 options={
51   - 'verbose_name': 'Category',
52 50 'verbose_name_plural': 'Categories',
  51 + 'verbose_name': 'Category',
53 52 },
54 53 ),
55 54 migrations.CreateModel(
... ... @@ -69,8 +68,8 @@ class Migration(migrations.Migration):
69 68 ('public', models.BooleanField(default=False, verbose_name='Public')),
70 69 ],
71 70 options={
72   - 'verbose_name': 'Course',
73 71 'verbose_name_plural': 'Courses',
  72 + 'verbose_name': 'Course',
74 73 'ordering': ('create_date', 'name'),
75 74 },
76 75 ),
... ... @@ -83,8 +82,8 @@ class Migration(migrations.Migration):
83 82 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
84 83 ],
85 84 options={
86   - 'verbose_name': 'Category',
87 85 'verbose_name_plural': 'Categories',
  86 + 'verbose_name': 'Category',
88 87 },
89 88 ),
90 89 migrations.CreateModel(
... ... @@ -128,8 +127,8 @@ class Migration(migrations.Migration):
128 127 ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')),
129 128 ],
130 129 options={
131   - 'verbose_name': 'Subject',
132 130 'verbose_name_plural': 'Subjects',
  131 + 'verbose_name': 'Subject',
133 132 'ordering': ('create_date', 'name'),
134 133 },
135 134 ),
... ... @@ -143,8 +142,8 @@ class Migration(migrations.Migration):
143 142 ('subjects', models.ManyToManyField(to='courses.Subject')),
144 143 ],
145 144 options={
146   - 'verbose_name': 'subject category',
147 145 'verbose_name_plural': 'subject categories',
  146 + 'verbose_name': 'subject category',
148 147 },
149 148 ),
150 149 migrations.CreateModel(
... ... @@ -160,8 +159,8 @@ class Migration(migrations.Migration):
160 159 ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject')),
161 160 ],
162 161 options={
163   - 'verbose_name': 'Topic',
164 162 'verbose_name_plural': 'Topics',
  163 + 'verbose_name': 'Topic',
165 164 'ordering': ('create_date', 'name'),
166 165 },
167 166 ),
... ...
courses/migrations/0002_auto_20161115_1936.py
View file @51d3f44
... ... @@ -1,85 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-11-15 22:36
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   - ('courses', '0001_initial'),
16   - migrations.swappable_dependency(settings.AUTH_USER_MODEL),
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(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   - ]
courses/migrations/0002_auto_20161117_0009.py
View file @51d3f44
... ... @@ -1,75 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-11-17 03:09
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(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='activityfile',
62   - name='diet',
63   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity'),
64   - ),
65   - migrations.AddField(
66   - model_name='activity',
67   - name='students',
68   - field=models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
69   - ),
70   - migrations.AddField(
71   - model_name='activity',
72   - name='topic',
73   - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'),
74   - ),
75   - ]
courses/migrations/0002_auto_20161117_0217.py 0 → 100644
  Diff comments   View file @cae4d31
... ... @@ -0,0 +1,85 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-17 05: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(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 + ]
... ...
courses/migrations/0003_merge_20161117_0157.py
View file @51d3f44
... ... @@ -1,16 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-11-17 04:57
3   -from __future__ import unicode_literals
4   -
5   -from django.db import migrations
6   -
7   -
8   -class Migration(migrations.Migration):
9   -
10   - dependencies = [
11   - ('courses', '0002_auto_20161115_1936'),
12   - ('courses', '0002_auto_20161117_0009'),
13   - ]
14   -
15   - operations = [
16   - ]
courses/templates/subject/form_view_teacher.html
  Diff comments   View file @cae4d31
... ... @@ -135,7 +135,6 @@
135 135 </ul>
136 136 </div>
137 137 </div>
138   - {% include "exercise/create_exercise.html" %}
139 138 </div>
140 139  
141 140 {# opções de cancelar e editar no modo de edição #}
... ...
exam/migrations/0001_initial.py
  Diff comments   View file @cae4d31
1 1 # -*- coding: utf-8 -*-
2   -
3   -# Generated by Django 1.10 on 2016-11-15 22:36
  2 +# Generated by Django 1.10 on 2016-11-17 05:17
4 3 from __future__ import unicode_literals
5 4  
6 5 from django.db import migrations, models
... ... @@ -24,9 +23,8 @@ class Migration(migrations.Migration):
24 23 ('order', models.PositiveSmallIntegerField(verbose_name='Order')),
25 24 ],
26 25 options={
27   - 'verbose_name': 'Answer',
28   - 'ordering': ('order',),
29 26 'verbose_name_plural': 'Answers',
  27 + 'verbose_name': 'Answer',
30 28 'ordering': ('order',),
31 29 },
32 30 ),
... ... @@ -39,8 +37,8 @@ class Migration(migrations.Migration):
39 37 ('answer', models.ManyToManyField(related_name='student_answer', to='exam.Answer', verbose_name='Answers Students')),
40 38 ],
41 39 options={
42   - 'verbose_name': 'Answer Stundent',
43 40 'verbose_name_plural': 'Answers Student',
  41 + 'verbose_name': 'Answer Stundent',
44 42 },
45 43 ),
46 44 migrations.CreateModel(
... ... @@ -51,8 +49,8 @@ class Migration(migrations.Migration):
51 49 ('exibe', models.BooleanField(default=False, verbose_name='Exibe?')),
52 50 ],
53 51 options={
54   - 'verbose_name': 'Exam',
55 52 'verbose_name_plural': 'Exams',
  53 + 'verbose_name': 'Exam',
56 54 },
57 55 bases=('courses.activity',),
58 56 ),
... ...
exam/migrations/0002_auto_20161115_1936.py
View file @51d3f44
... ... @@ -1,30 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-11-15 22:36
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/0002_auto_20161117_0009.py
View file @51d3f44
... ... @@ -1,30 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-11-17 03:09
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/0002_auto_20161117_0217.py 0 → 100644
  Diff comments   View file @cae4d31
... ... @@ -0,0 +1,30 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-17 05: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 + ('exam', '0001_initial'),
  16 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  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_merge_20161117_0157.py
View file @51d3f44
... ... @@ -1,16 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-11-17 04:57
3   -from __future__ import unicode_literals
4   -
5   -from django.db import migrations
6   -
7   -
8   -class Migration(migrations.Migration):
9   -
10   - dependencies = [
11   - ('exam', '0002_auto_20161115_1936'),
12   - ('exam', '0002_auto_20161117_0009'),
13   - ]
14   -
15   - operations = [
16   - ]
exercise/admin.py
  Diff comments   View file @cae4d31
... ... @@ -2,12 +2,12 @@ from django.contrib import admin
2 2 from .models import Exercise, File
3 3  
4 4 class ExerciseAdmin(admin.ModelAdmin):
5   - list_display = ['name']
6   - search_fields = ['name']
  5 + list_display = ['name_exercise']
  6 + search_fields = ['name_exercise']
7 7  
8 8 class FileAdmin(admin.ModelAdmin):
9   - list_display = ['name']
10   - search_fields = ['name']
  9 + list_display = ['name_file']
  10 + search_fields = ['name_file']
11 11  
12 12 admin.site.register(Exercise, ExerciseAdmin)
13   -admin.site.register(File, ExerciseAdmin)
  13 +admin.site.register(File, FileAdmin)
... ...
exercise/forms.py
  Diff comments   View file @cae4d31
... ... @@ -9,11 +9,13 @@ class ExerciseForm(forms.ModelForm):
9 9  
10 10 class Meta:
11 11 model = Exercise
12   - fields = ['name']
  12 + fields = ['name_exercise', 'description', 'init_date',
  13 + 'end_date', 'name_exercise']
13 14  
14 15  
15 16 class UpdateExerciseForm(forms.ModelForm):
16 17  
17 18 class Meta:
18 19 model = Exercise
19   - fields = ['name']
  20 + fields = ['name_exercise', 'description', 'init_date',
  21 + 'end_date', 'grade', 'name_exercise']
... ...
exercise/migrations/0001_initial.py
  Diff comments   View file @cae4d31
1 1 # -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-17 05:17
2 3 from __future__ import unicode_literals
3 4  
4 5 from decimal import Decimal
5   -from django.conf import settings
6 6 from django.db import migrations, models
7 7 import django.db.models.deletion
8 8  
... ... @@ -12,9 +12,7 @@ class Migration(migrations.Migration):
12 12 initial = True
13 13  
14 14 dependencies = [
15   - migrations.swappable_dependency(settings.AUTH_USER_MODEL),
16   - ('courses', '0002_auto_20161117_0009'),
17   - ('core', '0002_auto_20161117_0009'),
  15 + ('core', '0001_initial'),
18 16 ]
19 17  
20 18 operations = [
... ... @@ -27,9 +25,6 @@ class Migration(migrations.Migration):
27 25 ('end_date', models.DateField(verbose_name='End of Subject Date')),
28 26 ('grade', models.DecimalField(decimal_places=2, default=Decimal('0.00'), max_digits=20, null=True)),
29 27 ('name', models.CharField(max_length=100)),
30   - ('professors', models.ManyToManyField(blank=True, related_name='professors_exercise', to=settings.AUTH_USER_MODEL, verbose_name='Professors')),
31   - ('students', models.ManyToManyField(blank=True, related_name='subject_exercise', to=settings.AUTH_USER_MODEL, verbose_name='Students')),
32   - ('topic', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='exercises', to='courses.Topic', verbose_name='Topic')),
33 28 ],
34 29 ),
35 30 migrations.CreateModel(
... ...
exercise/migrations/0002_auto_20161117_0217.py 0 → 100644
  Diff comments   View file @cae4d31
... ... @@ -0,0 +1,36 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-17 05: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 + ('courses', '0002_auto_20161117_0217'),
  16 + ('exercise', '0001_initial'),
  17 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  18 + ]
  19 +
  20 + operations = [
  21 + migrations.AddField(
  22 + model_name='exercise',
  23 + name='professors',
  24 + field=models.ManyToManyField(blank=True, related_name='professors_exercise', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
  25 + ),
  26 + migrations.AddField(
  27 + model_name='exercise',
  28 + name='students',
  29 + field=models.ManyToManyField(blank=True, related_name='subject_exercise', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
  30 + ),
  31 + migrations.AddField(
  32 + model_name='exercise',
  33 + name='topic',
  34 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='exercises', to='courses.Topic', verbose_name='Topic'),
  35 + ),
  36 + ]
... ...
exercise/migrations/0003_auto_20161117_0351.py 0 → 100644
  Diff comments   View file @cae4d31
... ... @@ -0,0 +1,20 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-17 06:51
  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 + ('exercise', '0002_auto_20161117_0217'),
  12 + ]
  13 +
  14 + operations = [
  15 + migrations.AlterField(
  16 + model_name='file',
  17 + name='name',
  18 + field=models.CharField(blank=True, max_length=100, null=True, verbose_name='Nome do arquivo'),
  19 + ),
  20 + ]
... ...
exercise/migrations/0004_auto_20161117_0357.py 0 → 100644
  Diff comments   View file @cae4d31
... ... @@ -0,0 +1,32 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-17 06:57
  3 +from __future__ import unicode_literals
  4 +
  5 +import datetime
  6 +from django.db import migrations, models
  7 +from django.utils.timezone import utc
  8 +
  9 +
  10 +class Migration(migrations.Migration):
  11 +
  12 + dependencies = [
  13 + ('exercise', '0003_auto_20161117_0351'),
  14 + ]
  15 +
  16 + operations = [
  17 + migrations.RenameField(
  18 + model_name='file',
  19 + old_name='name',
  20 + new_name='name_file',
  21 + ),
  22 + migrations.RemoveField(
  23 + model_name='exercise',
  24 + name='name',
  25 + ),
  26 + migrations.AddField(
  27 + model_name='exercise',
  28 + name='name_exercise',
  29 + field=models.CharField(default=datetime.datetime(2016, 11, 17, 6, 57, 41, 28915, tzinfo=utc), max_length=100, verbose_name='Nome do Exercício'),
  30 + preserve_default=False,
  31 + ),
  32 + ]
... ...
exercise/models.py
  Diff comments   View file @cae4d31
... ... @@ -18,6 +18,7 @@ def file_path(instance, filename):
18 18 It represents the Exercises inside topic.
19 19 """
20 20  
  21 +
21 22 class Exercise(models.Model):
22 23 topic = models.ForeignKey(Topic, verbose_name=_('Topic'), related_name='exercises')
23 24 professors = models.ManyToManyField(User, verbose_name=_('Professors'), related_name='professors_exercise', blank=True)
... ... @@ -26,17 +27,17 @@ class Exercise(models.Model):
26 27 init_date = models.DateField(_('Begin of Subject Date'))
27 28 end_date = models.DateField(_('End of Subject Date'))
28 29 grade = models.DecimalField(max_digits=20, decimal_places=2, default=Decimal('0.00'), null=True)
29   - name = models.CharField(max_length=100)
  30 + name_exercise = models.CharField(_('Nome do Exercício'), max_length=100)
30 31  
31 32 def __str__(self):
32   - return self.name
  33 + return self.name_exercise
33 34  
34 35  
35 36 class File(models.Model):
36   - name = models.CharField(max_length=100)
  37 + name_file = models.CharField(_('Nome do arquivo'), max_length=100, blank=True, null=True)
37 38 file = models.FileField(upload_to='uploads/%Y/%m/%d')
38   - exercise = models.ForeignKey(Exercise, related_name='file')
39   - file_type = models.ForeignKey(MimeType, verbose_name=_('Type file'), related_name='file_files')
  39 + exercise = models.ForeignKey(Exercise, related_name='file_exercise')
  40 + file_type = models.ForeignKey(MimeType, verbose_name=_('Type file'), related_name='exercise_type')
40 41  
41 42 def __str__(self):
42   - return self.name
43 43 \ No newline at end of file
  44 + return self.name_file
44 45 \ No newline at end of file
... ...
exercise/static/js/exercise.js
  Diff comments   View file @cae4d31
1   -function get_modal_link(url, id,div_content){
  1 +function get_modal_exercise(url, id,div_content){
2 2 $.get(url, function (data) {
3 3 $(div_content).detach();
4 4 $(div_content).append(data);
... ...
exercise/templates/exercise/card_list_user.html
  Diff comments   View file @cae4d31
... ... @@ -37,7 +37,7 @@
37 37 <h4>{% trans 'Delivery' %}</h4>
38 38 </div>
39 39 {% for file in files %}
40   - <li>{{file.exercise}}: <a href="{{file.file.url}}" target="_blank">{{file.name}}</a></li>
  40 + <li>{{file.exercise}}: <a href="{{file.file.url}}" target="_blank">{{file.name_file}}</a></li>
41 41 {% endfor %}
42 42  
43 43 </div>
... ...
exercise/templates/exercise/card_topic_exercises.html
  Diff comments   View file @cae4d31
... ... @@ -5,7 +5,7 @@
5 5 <div class="panel-body">
6 6 <form class="form-horizontal">
7 7 <fieldset>
8   - <center><legend>{{exercise.name}}</legend></center>
  8 + <center><legend>{{exercise.name_exercise}}</legend></center>
9 9 <div class="container-fluid">
10 10 <div class="form-group">
11 11 <label class="col-md-2 col-xs-2 col-sm-2 control-label">Describe: </label><br>
... ...
exercise/templates/exercise/create_exercise.html
  Diff comments   View file @cae4d31
... ... @@ -51,7 +51,6 @@
51 51 </div>
52 52 </div>
53 53 <!-- EndModal -->
54   -<script src="{% static 'js/exercises.js' %}"></script>
55 54 <script type="text/javascript">
56 55 $("#form-exercise").submit(function(event) {
57 56 $("#createExercisesModal").modal("hide");
... ... @@ -64,7 +63,7 @@
64 63 processData: false,
65 64 contentType: false,
66 65 success: function(data) {
67   - $('#requisicoes_ajax').empty();
  66 + $('#createExercisesModal').modal('hide');
68 67 $('#list-topic{{ topic.id }}-exercises').append(data);
69 68 $('#list-topic{{ topic.id }}-exercises-edit').append(data);
70 69 alertify.success('Exercise successfully created!')
... ...
exercise/views.py
  Diff comments   View file @cae4d31
... ... @@ -24,7 +24,7 @@ class CreateExercise(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationMix
24 24 log_action = 'create'
25 25 log_component = {}
26 26  
27   - allowed_roles = ['student', 'professor']
  27 + allowed_roles = ['professor', 'student']
28 28 login_url = reverse_lazy("core:home")
29 29 redirect_field_name = 'next'
30 30 model = Exercise
... ... @@ -36,7 +36,6 @@ class CreateExercise(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationMix
36 36 log_resource = "exercise"
37 37 log_action = "create"
38 38 log_context = {}
39   - context_object_name = 'form'
40 39  
41 40 def form_invalid(self, form, **kwargs):
42 41 context = super(CreateExercise, self).form_invalid(form)
... ... @@ -48,19 +47,20 @@ class CreateExercise(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationMix
48 47 self.object = form.save(commit = False)
49 48 topic = get_object_or_404(Topic, slug = self.kwargs.get('slug'))
50 49 self.object.topic = topic
51   -
52 50 self.object.name = str(self.object)
53   -
  51 + self.object.professors = topic.subject.professors
  52 + self.object.students = topic.subject.students
54 53  
55 54 # Set MimeType
56 55 exercise = self.request.FILES['exercise_url']
  56 + self.object.file_exercise.file = exercise
57 57 try:
58 58 if exercise:
59 59 exercise_type = exercise.content_type
60 60  
61 61 # Check if exist a mimetype in database
62 62 try:
63   - self.object.exercise_type = MimeType.objects.get(typ = exercise_type)
  63 + self.object.file_exercise.file_type = MimeType.objects.get(typ = exercise_type)
64 64 # Create if not
65 65 except:
66 66 mtype = MimeType.objects.create(
... ... @@ -68,7 +68,7 @@ class CreateExercise(LoginRequiredMixin, HasRoleMixin, LogMixin, NotificationMix
68 68 icon = mime_type_to_material_icons[exercise_type]
69 69 )
70 70 mtype.save()
71   - self.object.exercise_type = mtype
  71 + self.object.file_exercise.file_type = mtype
72 72 except:
73 73 print('Exercise not uploaded')
74 74  
... ...
files/migrations/0001_initial.py
  Diff comments   View file @cae4d31
1 1 # -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-11-15 22:36
  2 +# Generated by Django 1.10 on 2016-11-17 05:17
3 3 from __future__ import unicode_literals
4 4  
5 5 from django.db import migrations, models
... ... @@ -26,9 +26,8 @@ class Migration(migrations.Migration):
26 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 28 options={
29   - 'verbose_name': 'File',
30   -
31 29 'verbose_name_plural': 'Files',
  30 + 'verbose_name': 'File',
32 31 'ordering': ('-id',),
33 32 },
34 33 bases=('courses.material',),
... ...
files/migrations/0002_topicfile_professor.py
  Diff comments   View file @cae4d31
1 1 # -*- coding: utf-8 -*-
2   -
3   -# Generated by Django 1.10 on 2016-11-15 22:36
  2 +# Generated by Django 1.10 on 2016-11-17 05:17
4 3 from __future__ import unicode_literals
5 4  
6 5 from django.conf import settings
... ... @@ -12,8 +11,8 @@ class Migration(migrations.Migration):
12 11 initial = True
13 12  
14 13 dependencies = [
15   - migrations.swappable_dependency(settings.AUTH_USER_MODEL),
16 14 ('files', '0001_initial'),
  15 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
17 16 ]
18 17  
19 18 operations = [
... ...
forum/migrations/0001_initial.py
  Diff comments   View file @cae4d31
1 1 # -*- coding: utf-8 -*-
2   -
3   -# Generated by Django 1.10 on 2016-11-15 22:36
  2 +# Generated by Django 1.10 on 2016-11-17 05:17
4 3 from __future__ import unicode_literals
5 4  
6 5 from django.db import migrations, models
... ... @@ -25,8 +24,8 @@ class Migration(migrations.Migration):
25 24 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Create Date')),
26 25 ],
27 26 options={
28   - 'verbose_name': 'Forum',
29 27 'verbose_name_plural': 'Foruns',
  28 + 'verbose_name': 'Forum',
30 29 },
31 30 bases=('courses.activity',),
32 31 ),
... ... @@ -39,8 +38,8 @@ class Migration(migrations.Migration):
39 38 ('post_date', models.DateTimeField(auto_now_add=True, verbose_name='Post Date')),
40 39 ],
41 40 options={
42   - 'verbose_name': 'Post',
43 41 'verbose_name_plural': 'Posts',
  42 + 'verbose_name': 'Post',
44 43 },
45 44 ),
46 45 migrations.CreateModel(
... ... @@ -53,8 +52,8 @@ class Migration(migrations.Migration):
53 52 ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Post', verbose_name='Post')),
54 53 ],
55 54 options={
56   - 'verbose_name': 'Post Answer',
57 55 'verbose_name_plural': 'Post Answers',
  56 + 'verbose_name': 'Post Answer',
58 57 },
59 58 ),
60 59 ]
... ...
forum/migrations/0002_auto_20161115_1936.py
View file @51d3f44
... ... @@ -1,35 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-11-15 22:36
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   - ('forum', '0001_initial'),
16   - migrations.swappable_dependency(settings.AUTH_USER_MODEL),
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   - ]
forum/migrations/0002_auto_20161117_0009.py
View file @51d3f44
... ... @@ -1,35 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-11-17 03:09
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   - ]
forum/migrations/0002_auto_20161117_0217.py 0 → 100644
  Diff comments   View file @cae4d31
... ... @@ -0,0 +1,35 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-17 05: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 + ('forum', '0001_initial'),
  16 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  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 + ]
... ...
forum/migrations/0003_merge_20161117_0157.py
View file @51d3f44
... ... @@ -1,16 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-11-17 04:57
3   -from __future__ import unicode_literals
4   -
5   -from django.db import migrations
6   -
7   -
8   -class Migration(migrations.Migration):
9   -
10   - dependencies = [
11   - ('forum', '0002_auto_20161115_1936'),
12   - ('forum', '0002_auto_20161117_0009'),
13   - ]
14   -
15   - operations = [
16   - ]
links/migrations/0001_initial.py
  Diff comments   View file @cae4d31
1 1 # -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-11-15 22:36
  2 +# Generated by Django 1.10 on 2016-11-17 05:17
3 3 from __future__ import unicode_literals
4 4  
5 5 from django.db import migrations, models
... ... @@ -24,8 +24,8 @@ class Migration(migrations.Migration):
24 24 ('image', models.ImageField(blank=True, upload_to='links/')),
25 25 ],
26 26 options={
27   - 'verbose_name': 'Link',
28 27 'verbose_name_plural': 'Links',
  28 + 'verbose_name': 'Link',
29 29 },
30 30 bases=('courses.material',),
31 31 ),
... ...
poll/migrations/0001_initial.py
  Diff comments   View file @cae4d31
1 1 # -*- coding: utf-8 -*-
2   -
3   -# Generated by Django 1.10 on 2016-11-15 22:36
  2 +# Generated by Django 1.10 on 2016-11-17 05:17
4 3 from __future__ import unicode_literals
5 4  
6 5 from django.db import migrations, models
... ... @@ -24,9 +23,9 @@ class Migration(migrations.Migration):
24 23 ('order', models.PositiveSmallIntegerField(verbose_name='Order')),
25 24 ],
26 25 options={
  26 + 'verbose_name_plural': 'Answers',
27 27 'verbose_name': 'Answer',
28 28 'ordering': ('order',),
29   - 'verbose_name_plural': 'Answers',
30 29 },
31 30 ),
32 31 migrations.CreateModel(
... ... @@ -38,8 +37,8 @@ class Migration(migrations.Migration):
38 37 ('answer', models.ManyToManyField(related_name='answers_stundet', to='poll.Answer', verbose_name='Answers Students')),
39 38 ],
40 39 options={
41   - 'verbose_name': 'Answer Stundent',
42 40 'verbose_name_plural': 'Answers Student',
  41 + 'verbose_name': 'Answer Stundent',
43 42 },
44 43 ),
45 44 migrations.CreateModel(
... ... @@ -48,8 +47,8 @@ class Migration(migrations.Migration):
48 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')),
49 48 ],
50 49 options={
51   - 'verbose_name': 'Poll',
52 50 'verbose_name_plural': 'Polls',
  51 + 'verbose_name': 'Poll',
53 52 },
54 53 bases=('courses.activity',),
55 54 ),
... ...
poll/migrations/0002_auto_20161115_1936.py
View file @51d3f44
... ... @@ -1,30 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-11-15 22:36
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   - ]
poll/migrations/0002_auto_20161117_0009.py
View file @51d3f44
... ... @@ -1,30 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-11-17 03:09
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   - ]
poll/migrations/0002_auto_20161117_0217.py 0 → 100644
  Diff comments   View file @cae4d31
... ... @@ -0,0 +1,30 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-17 05: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 + ]
... ...
poll/migrations/0003_merge_20161117_0157.py
View file @51d3f44
... ... @@ -1,16 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-11-17 04:57
3   -from __future__ import unicode_literals
4   -
5   -from django.db import migrations
6   -
7   -
8   -class Migration(migrations.Migration):
9   -
10   - dependencies = [
11   - ('poll', '0002_auto_20161115_1936'),
12   - ('poll', '0002_auto_20161117_0009'),
13   - ]
14   -
15   - operations = [
16   - ]
users/migrations/0001_initial.py
  Diff comments   View file @cae4d31
1 1 # -*- coding: utf-8 -*-
2   -
3   -# Generated by Django 1.10 on 2016-11-15 22:36
  2 +# Generated by Django 1.10 on 2016-11-17 05:17
4 3 from __future__ import unicode_literals
5 4  
6 5 import django.contrib.auth.models
... ... @@ -31,14 +30,14 @@ class Migration(migrations.Migration):
31 30 ('city', models.CharField(blank=True, max_length=90, verbose_name='City')),
32 31 ('state', models.CharField(blank=True, max_length=30, verbose_name='State')),
33 32 ('gender', models.CharField(choices=[('M', 'Male'), ('F', 'Female')], max_length=1, verbose_name='Gender')),
34   - ('image', models.ImageField(blank=True, null=True, upload_to='users/', verbose_name='Image')),
35   - ('birth_date', models.DateField(verbose_name='Birth Date')),
  33 + ('image', models.ImageField(blank=True, null=True, upload_to='users/', verbose_name='Photo')),
  34 + ('birth_date', models.DateField(null=True, verbose_name='Birth Date')),
36 35 ('phone', models.CharField(blank=True, max_length=30, verbose_name='Phone')),
37   - ('cpf', models.CharField(max_length=15, verbose_name='Cpf')),
  36 + ('cpf', models.CharField(blank=True, max_length=15, null=True, verbose_name='CPF')),
38 37 ('type_profile', models.IntegerField(blank=True, choices=[(1, 'Professor'), (2, 'Student')], default=2, null=True, verbose_name='Type')),
39 38 ('titration', models.CharField(blank=True, max_length=50, null=True, verbose_name='Titration')),
40 39 ('year_titration', models.CharField(blank=True, max_length=4, null=True, verbose_name='Year of titration')),
41   - ('institution', models.CharField(blank=True, max_length=50, null=True, verbose_name='Institution where he had titration')),
  40 + ('institution', models.CharField(blank=True, max_length=50, null=True, verbose_name='Institution')),
42 41 ('curriculum', models.FileField(blank=True, null=True, upload_to='users/curriculum/', verbose_name='Curriculum')),
43 42 ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Create Date')),
44 43 ('is_staff', models.BooleanField(default=False, verbose_name='Administrador')),
... ... @@ -47,8 +46,8 @@ class Migration(migrations.Migration):
47 46 ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')),
48 47 ],
49 48 options={
50   - 'verbose_name': 'User',
51 49 'verbose_name_plural': 'Users',
  50 + 'verbose_name': 'User',
52 51 },
53 52 managers=[
54 53 ('objects', django.contrib.auth.models.UserManager()),
... ...
users/migrations/0002_auto_20161115_1941.py
View file @51d3f44
... ... @@ -1,20 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-11-15 22: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   - ('users', '0001_initial'),
12   - ]
13   -
14   - operations = [
15   - migrations.AlterField(
16   - model_name='user',
17   - name='birth_date',
18   - field=models.DateField(null=True, verbose_name='Birth Date'),
19   - ),
20   - ]
users/migrations/0003_auto_20161115_2054.py
View file @51d3f44
... ... @@ -1,30 +0,0 @@
1   -# -*- coding: utf-8 -*-
2   -# Generated by Django 1.10 on 2016-11-15 23:54
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   - ('users', '0002_auto_20161115_1941'),
12   - ]
13   -
14   - operations = [
15   - migrations.AlterField(
16   - model_name='user',
17   - name='cpf',
18   - field=models.CharField(blank=True, max_length=15, null=True, verbose_name='CPF'),
19   - ),
20   - migrations.AlterField(
21   - model_name='user',
22   - name='image',
23   - field=models.ImageField(blank=True, null=True, upload_to='users/', verbose_name='Photo'),
24   - ),
25   - migrations.AlterField(
26   - model_name='user',
27   - name='institution',
28   - field=models.CharField(blank=True, max_length=50, null=True, verbose_name='Institution'),
29   - ),
30   - ]