Download as
Browse Code »

Commit 707b27efc10e32a6a3826b22b850a0e05398bf7d

Authored by Gustavo Bernardo
1 parent 373a983b
Exists in master and in 5 other branches amadeus_univasf, dev, image-crop, pdf_file_html, refactoring

Migrations and Translations

Showing 40 changed files with 503 additions and 500 deletions   Show diff stats
amadeus/staticfiles/nothing.d41d8cd98f00.txt.py 0 → 100644
  Diff comments   View file @707b27e
amadeus/staticfiles/nothing.txt.py 0 → 100644
  Diff comments   View file @707b27e
amadeus/staticfiles/sample.c7b009bae842.txt.py 0 → 100644
  Diff comments   View file @707b27e
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +XXXX XXXX XXX XXXXXXX XX XXXX XXXXXXXX XX XXXXXXX
0 \ No newline at end of file 2 \ No newline at end of file
amadeus/staticfiles/sample.txt.py 0 → 100644
  Diff comments   View file @707b27e
@@ -0,0 +1 @@ @@ -0,0 +1 @@
  1 +XXXX XXXX XXX XXXXXXX XX XXXX XXXXXXXX XX XXXXXXX
0 \ No newline at end of file 2 \ No newline at end of file
app/migrations/0001_initial.py
  Diff comments   View file @707b27e
1 # -*- coding: utf-8 -*- 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-16 13:57
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
@@ -23,11 +23,11 @@ class Migration(migrations.Migration): @@ -23,11 +23,11 @@ class Migration(migrations.Migration):
23 ('username', models.CharField(max_length=30, verbose_name='Email host username')), 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')), 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')), 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(blank=True, max_length=254, verbose_name='Default from email')), 26 + ('default_from_email', models.EmailField(max_length=254, verbose_name='Default from email')),
27 ], 27 ],
28 options={ 28 options={
29 - 'verbose_name': 'Amadeus SMTP setting',  
30 'verbose_name_plural': 'Amadeus SMTP settings', 29 'verbose_name_plural': 'Amadeus SMTP settings',
  30 + 'verbose_name': 'Amadeus SMTP setting',
31 }, 31 },
32 ), 32 ),
33 ] 33 ]
app/migrations/0002_auto_20161115_2054.py
View file @373a983
@@ -1,20 +0,0 @@ @@ -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 @707b27e
1 # -*- coding: utf-8 -*- 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-16 13:57
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
5 import autoslug.fields 5 import autoslug.fields
@@ -25,8 +25,8 @@ class Migration(migrations.Migration): @@ -25,8 +25,8 @@ class Migration(migrations.Migration):
25 ('created_date', models.DateTimeField(auto_now_add=True, verbose_name='Created Date')), 25 ('created_date', models.DateTimeField(auto_now_add=True, verbose_name='Created Date')),
26 ], 26 ],
27 options={ 27 options={
28 - 'verbose_name': 'Action',  
29 'verbose_name_plural': 'Actions', 28 'verbose_name_plural': 'Actions',
  29 + 'verbose_name': 'Action',
30 }, 30 },
31 ), 31 ),
32 migrations.CreateModel( 32 migrations.CreateModel(
@@ -35,8 +35,8 @@ class Migration(migrations.Migration): @@ -35,8 +35,8 @@ class Migration(migrations.Migration):
35 ('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')),
36 ], 36 ],
37 options={ 37 options={
38 - 'verbose_name': 'Action_Resource',  
39 'verbose_name_plural': 'Action_Resources', 38 'verbose_name_plural': 'Action_Resources',
  39 + 'verbose_name': 'Action_Resource',
40 }, 40 },
41 ), 41 ),
42 migrations.CreateModel( 42 migrations.CreateModel(
@@ -48,8 +48,8 @@ class Migration(migrations.Migration): @@ -48,8 +48,8 @@ class Migration(migrations.Migration):
48 ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')), 48 ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')),
49 ], 49 ],
50 options={ 50 options={
51 - 'verbose_name': 'Log',  
52 'verbose_name_plural': 'Logs', 51 'verbose_name_plural': 'Logs',
  52 + 'verbose_name': 'Log',
53 }, 53 },
54 ), 54 ),
55 migrations.CreateModel( 55 migrations.CreateModel(
@@ -60,8 +60,8 @@ class Migration(migrations.Migration): @@ -60,8 +60,8 @@ class Migration(migrations.Migration):
60 ('icon', models.CharField(max_length=50, unique=True, verbose_name='Icon')), 60 ('icon', models.CharField(max_length=50, unique=True, verbose_name='Icon')),
61 ], 61 ],
62 options={ 62 options={
63 - 'verbose_name': 'Amadeus Mime Type',  
64 'verbose_name_plural': 'Amadeus Mime Types', 63 'verbose_name_plural': 'Amadeus Mime Types',
  64 + 'verbose_name': 'Amadeus Mime Type',
65 }, 65 },
66 ), 66 ),
67 migrations.CreateModel( 67 migrations.CreateModel(
@@ -74,8 +74,8 @@ class Migration(migrations.Migration): @@ -74,8 +74,8 @@ class Migration(migrations.Migration):
74 ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')), 74 ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')),
75 ], 75 ],
76 options={ 76 options={
77 - 'verbose_name': 'Notification',  
78 'verbose_name_plural': 'Notifications', 77 'verbose_name_plural': 'Notifications',
  78 + 'verbose_name': 'Notification',
79 }, 79 },
80 ), 80 ),
81 migrations.CreateModel( 81 migrations.CreateModel(
@@ -88,8 +88,8 @@ class Migration(migrations.Migration): @@ -88,8 +88,8 @@ class Migration(migrations.Migration):
88 ('url', models.CharField(default='', max_length=100, verbose_name='URL')), 88 ('url', models.CharField(default='', max_length=100, verbose_name='URL')),
89 ], 89 ],
90 options={ 90 options={
91 - 'verbose_name': 'Resource',  
92 'verbose_name_plural': 'Resources', 91 'verbose_name_plural': 'Resources',
  92 + 'verbose_name': 'Resource',
93 }, 93 },
94 ), 94 ),
95 ] 95 ]
core/migrations/0002_auto_20161115_1936.py
View file @373a983
@@ -1,50 +0,0 @@ @@ -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_20161116_1057.py 0 → 100644
  Diff comments   View file @707b27e
@@ -0,0 +1,50 @@ @@ -0,0 +1,50 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-16 13:57
  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 + ]
courses/migrations/0001_initial.py
  Diff comments   View file @707b27e
1 # -*- coding: utf-8 -*- 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-16 13:57
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
5 import autoslug.fields 5 import autoslug.fields
@@ -34,8 +34,8 @@ class Migration(migrations.Migration): @@ -34,8 +34,8 @@ class Migration(migrations.Migration):
34 ('name', models.CharField(max_length=100)), 34 ('name', models.CharField(max_length=100)),
35 ], 35 ],
36 options={ 36 options={
37 - 'verbose_name': 'Activity File',  
38 'verbose_name_plural': 'Activitys Files', 37 'verbose_name_plural': 'Activitys Files',
  38 + 'verbose_name': 'Activity File',
39 }, 39 },
40 ), 40 ),
41 migrations.CreateModel( 41 migrations.CreateModel(
@@ -47,8 +47,8 @@ class Migration(migrations.Migration): @@ -47,8 +47,8 @@ class Migration(migrations.Migration):
47 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), 47 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
48 ], 48 ],
49 options={ 49 options={
50 - 'verbose_name': 'Category',  
51 'verbose_name_plural': 'Categories', 50 'verbose_name_plural': 'Categories',
  51 + 'verbose_name': 'Category',
52 }, 52 },
53 ), 53 ),
54 migrations.CreateModel( 54 migrations.CreateModel(
@@ -68,9 +68,9 @@ class Migration(migrations.Migration): @@ -68,9 +68,9 @@ class Migration(migrations.Migration):
68 ('public', models.BooleanField(default=False, verbose_name='Public')), 68 ('public', models.BooleanField(default=False, verbose_name='Public')),
69 ], 69 ],
70 options={ 70 options={
71 - 'verbose_name': 'Course',  
72 'verbose_name_plural': 'Courses', 71 'verbose_name_plural': 'Courses',
73 'ordering': ('create_date', 'name'), 72 'ordering': ('create_date', 'name'),
  73 + 'verbose_name': 'Course',
74 }, 74 },
75 ), 75 ),
76 migrations.CreateModel( 76 migrations.CreateModel(
@@ -82,8 +82,8 @@ class Migration(migrations.Migration): @@ -82,8 +82,8 @@ class Migration(migrations.Migration):
82 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), 82 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
83 ], 83 ],
84 options={ 84 options={
85 - 'verbose_name': 'Category',  
86 'verbose_name_plural': 'Categories', 85 'verbose_name_plural': 'Categories',
  86 + 'verbose_name': 'Category',
87 }, 87 },
88 ), 88 ),
89 migrations.CreateModel( 89 migrations.CreateModel(
@@ -127,9 +127,9 @@ class Migration(migrations.Migration): @@ -127,9 +127,9 @@ class Migration(migrations.Migration):
127 ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')), 127 ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')),
128 ], 128 ],
129 options={ 129 options={
130 - 'verbose_name': 'Subject',  
131 'verbose_name_plural': 'Subjects', 130 'verbose_name_plural': 'Subjects',
132 'ordering': ('create_date', 'name'), 131 'ordering': ('create_date', 'name'),
  132 + 'verbose_name': 'Subject',
133 }, 133 },
134 ), 134 ),
135 migrations.CreateModel( 135 migrations.CreateModel(
@@ -142,8 +142,8 @@ class Migration(migrations.Migration): @@ -142,8 +142,8 @@ class Migration(migrations.Migration):
142 ('subjects', models.ManyToManyField(to='courses.Subject')), 142 ('subjects', models.ManyToManyField(to='courses.Subject')),
143 ], 143 ],
144 options={ 144 options={
145 - 'verbose_name': 'subject category',  
146 'verbose_name_plural': 'subject categories', 145 'verbose_name_plural': 'subject categories',
  146 + 'verbose_name': 'subject category',
147 }, 147 },
148 ), 148 ),
149 migrations.CreateModel( 149 migrations.CreateModel(
@@ -159,9 +159,9 @@ class Migration(migrations.Migration): @@ -159,9 +159,9 @@ class Migration(migrations.Migration):
159 ('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')),
160 ], 160 ],
161 options={ 161 options={
162 - 'verbose_name': 'Topic',  
163 'verbose_name_plural': 'Topics', 162 'verbose_name_plural': 'Topics',
164 'ordering': ('create_date', 'name'), 163 'ordering': ('create_date', 'name'),
  164 + 'verbose_name': 'Topic',
165 }, 165 },
166 ), 166 ),
167 ] 167 ]
courses/migrations/0002_auto_20161115_1936.py
View file @373a983
@@ -1,85 +0,0 @@ @@ -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_20161116_1057.py 0 → 100644
  Diff comments   View file @707b27e
@@ -0,0 +1,85 @@ @@ -0,0 +1,85 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-16 13:57
  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 + ]
exam/migrations/0001_initial.py
  Diff comments   View file @707b27e
1 # -*- coding: utf-8 -*- 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-16 13:57
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
@@ -23,9 +23,9 @@ class Migration(migrations.Migration): @@ -23,9 +23,9 @@ class Migration(migrations.Migration):
23 ('order', models.PositiveSmallIntegerField(verbose_name='Order')), 23 ('order', models.PositiveSmallIntegerField(verbose_name='Order')),
24 ], 24 ],
25 options={ 25 options={
26 - 'verbose_name': 'Answer',  
27 'verbose_name_plural': 'Answers', 26 'verbose_name_plural': 'Answers',
28 'ordering': ('order',), 27 'ordering': ('order',),
  28 + 'verbose_name': 'Answer',
29 }, 29 },
30 ), 30 ),
31 migrations.CreateModel( 31 migrations.CreateModel(
@@ -37,8 +37,8 @@ class Migration(migrations.Migration): @@ -37,8 +37,8 @@ class Migration(migrations.Migration):
37 ('answer', models.ManyToManyField(related_name='student_answer', to='exam.Answer', verbose_name='Answers Students')), 37 ('answer', models.ManyToManyField(related_name='student_answer', to='exam.Answer', verbose_name='Answers Students')),
38 ], 38 ],
39 options={ 39 options={
40 - 'verbose_name': 'Answer Stundent',  
41 'verbose_name_plural': 'Answers Student', 40 'verbose_name_plural': 'Answers Student',
  41 + 'verbose_name': 'Answer Stundent',
42 }, 42 },
43 ), 43 ),
44 migrations.CreateModel( 44 migrations.CreateModel(
@@ -49,8 +49,8 @@ class Migration(migrations.Migration): @@ -49,8 +49,8 @@ class Migration(migrations.Migration):
49 ('exibe', models.BooleanField(default=False, verbose_name='Exibe?')), 49 ('exibe', models.BooleanField(default=False, verbose_name='Exibe?')),
50 ], 50 ],
51 options={ 51 options={
52 - 'verbose_name': 'Exam',  
53 'verbose_name_plural': 'Exams', 52 'verbose_name_plural': 'Exams',
  53 + 'verbose_name': 'Exam',
54 }, 54 },
55 bases=('courses.activity',), 55 bases=('courses.activity',),
56 ), 56 ),
exam/migrations/0002_auto_20161115_1936.py
View file @373a983
@@ -1,30 +0,0 @@ @@ -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_20161116_1057.py 0 → 100644
  Diff comments   View file @707b27e
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-16 13:57
  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 + ]
exercise/migrations/0001_initial.py
  Diff comments   View file @707b27e
1 # -*- coding: utf-8 -*- 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-16 13:57
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
exercise/templates/exercise/create_exercise.html.py 0 → 100644
  Diff comments   View file @707b27e
@@ -0,0 +1,83 @@ @@ -0,0 +1,83 @@
  1 +BBBB BBBBBBBBBBBBB BBBB BBBBBB
  2 +XXXXXXXXX XXXXXX XXXXXXXXXXX
  3 +XXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  4 + XXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
  5 + XXXX XXXXXXXXXXXXXXXXXXXXXX
  6 + XXXX XXXXXXXXXXXXXXXXXXXXX
  7 + XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  8 + XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX gettext(u'Create a New Exercise') XXXXX
  9 + XXXXXX
  10 + XXXX XXXXXXXXXXXXXXXXXXX
  11 + XXXX XXXX XXX
  12 + XXXXX XXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  13 + BBBBBBBBBB
  14 + BB BBBBBBBB
  15 + BBB BBBBBBB BB BBBBBBBB
  16 + XXXX XXXXXXXXXXXX XXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX
  17 + XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX
  18 + XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  19 + XXXXXXXXX
  20 + XXXXXXX
  21 + XXXXXX
  22 + BBBBBB
  23 + BBBBB
  24 + BBB BBBBB BB BBBB
  25 + XXXX XXXXX XXXXXXXXXXXXXX
  26 + BB BBBBBBBBBBBBBBBBBBBB
  27 + XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  28 + BBBBB
  29 + BBBBBBBBBBBB BBBBB BBBBBBBBBBBBBBBBBBB BBBBBBBBB
  30 + BB BBBBBBBBBBBB
  31 + XXXX XXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXX
  32 + XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX
  33 + XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  34 + XXXXXXXXX
  35 + XXXX
  36 + BBB BBBBB BB BBBBBBBBBBBB
  37 + XXXXXXXXX
  38 + BBBBBB
  39 + XXXXX
  40 + XXXXXX
  41 + BBBBB
  42 + XXXXXX
  43 + BBBBBB
  44 + XXXX XXXXXXXXXXXXXXXXXXX
  45 + XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX X XXXXXXXXXXXXXXXXXXXXX gettext(u'Cancel') XXXXXXXXX
  46 + XXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXX gettext(u'Submit') XXXXXXXXX
  47 + XXXXXX
  48 + XXXX XXXX XXXX XXX
  49 + XXXXXX
  50 + XXXXXX
  51 + XXXXXX
  52 +XXXXXX
  53 +XXXX XXXXXXXX XXX
  54 +XXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBBXXXXXXXXXXX
  55 +XXXXXXX XXXXXXXXXXXXXXXXXXXXXXX
  56 + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X
  57 + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  58 + XXX XXXX X XXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  59 + XXXXXXXX
  60 + XXXX XBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBXX
  61 + XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  62 + XXXXX XXXXX
  63 + XXXXXX XXXXXX
  64 + XXXXXXXXXXXX XXXXXX
  65 + XXXXXXXXXXXX XXXXXX
  66 + XXXXXXXX XXXXXXXXXXXXXX X
  67 + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  68 + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  69 + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  70 + XXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXX
  71 + XX
  72 + XXXXXX XXXXXXXXXXXXXXX
  73 + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  74 + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  75 + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  76 + XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXX X XXXXX XXXXXXX
  77 + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  78 + XXXXXXXXXXXXXXXXXXX XX X XXXXXXXXXXXXXXXXXXX XX XXXXXX
  79 + X
  80 + XXX
  81 + XXXXXXXXXXXXXXXXXXXXXXX
  82 + XXX
  83 +XXXXXXXXX
exercise/templates/exercise/delete_exercise.html.py 0 → 100644
  Diff comments   View file @707b27e
@@ -0,0 +1,66 @@ @@ -0,0 +1,66 @@
  1 +BBBB BBBBBB BBBBBBBBBBBBB BBBB
  2 +
  3 +XXXX XXXXX XXXXXX XXXX XXX
  4 +XXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXBBBBBB BBBBBBBBBBBBBBBBBBXX
  5 +
  6 +XXXX XXXXXXXXXXXXXXXXXXXX
  7 + XXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXX
  8 + XXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX
  9 + XXXX XXXXXXXXXXXXXXXXXXXXXX
  10 + XXXX XXXXXXXXXXXXXXXXXXXXX
  11 + XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  12 + XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXX gettext(u'Delete Exercise') XXXXX
  13 + XXXXXX
  14 + XXXX XXXXXXXXXXXXXXXXXXX
  15 + XXXX XXXX XXX
  16 + XXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  17 + BBBBBBBBBB
  18 + XXXXXXXXXX
  19 + XXXX XXXXXXXXXXXXXXXXXX
  20 + gettext(u'Are you sure to delete the exercise ') XXXXXXXXXXXXXXXXXXX XXXX XX X
  21 + XXXXXX
  22 + XXXX XXXXXXXXXXXXXXXXXXX
  23 + XXXX XXXXXXXXXXXXXXXXXX
  24 + XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX gettext(u'Close') XXXXXXXXX
  25 + XXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXX gettext(u'Delete') XXXXXXXXX
  26 + XXXXXX
  27 + XXXXXX
  28 + XXXXXXXXXXX
  29 + XXXXXXX
  30 + XXXX XXXX XXXX XXX
  31 + XXXXXX
  32 + XXXXXX
  33 + XXXXXX
  34 + XXXXXX
  35 +XXXXXX
  36 + XXXXXXX XXXXXBBBBBB BBBBBBBBBBBBBBBBXXXXXXXXXXX
  37 + XXXXXXX XXXXXXXXXXXXXXXXXXXXXXX
  38 + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X
  39 + XXX XXXX X XXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  40 + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  41 + XXXXXXXX
  42 + XXXX XBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBBBBXX
  43 + XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  44 + XXXXX XXXXX
  45 + XXXXXX XXXXXX
  46 + XXXXXXXXXXXX XXXXXX
  47 + XXXXXXXXXXXX XXXXXX
  48 + XXXXXXXX XXXXXXXXXXXXXX X
  49 + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  50 + XXXXXXXXXXXXXXXXXXXXXXXXX
  51 + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  52 + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  53 + XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXX
  54 + XX
  55 + XXXXXX XXXXXXXXXXXXXXX
  56 + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  57 + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  58 + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  59 + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  60 + XXXXXXXXXXXXXXXXXXXXX XXXX XXXXXX XX XXXXXXXXXX
  61 + X
  62 + XXX
  63 + XXXXXXXXXXXXXXXXXXXXXXX
  64 + XXX
  65 + XXXXXXXXX
  66 +XXXX XXXXXXXX XXX
exercise/templates/exercise/exercise_edit.html.py 0 → 100644
  Diff comments   View file @707b27e
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
  1 +BBBB BBBBBB BBBB BBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBB
  2 +XXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  3 + BBB BBBBBBBB BB BBBBBBBBB
  4 + XXX XXXXXXXXXXXXXXXXXXXXXXXX XX X XXXXXXXXXXXXXXXXXXXXXX XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXXX XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXX XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXX XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  5 + XXX XX X XXXXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
  6 + BBBBBB
  7 +XXXXXX
exercise/templates/exercise/exercise_list.html.py 0 → 100644
  Diff comments   View file @707b27e
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
  1 +BBBB BBBBBB BBBB BBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBB
  2 +XXXX XXXXXXXXXXXXXXXXXXXXXXXXXX
  3 +BBB BBBBBBBB BB BBBBBBBBB
  4 + XXX XXXXXXXXXXXXXXXXX XXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XX XXXXXXXXXXXXXXXXX
  5 +BBBBBB
  6 +XXXXXX
files/migrations/0001_initial.py
  Diff comments   View file @707b27e
1 # -*- coding: utf-8 -*- 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-16 13:57
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
5 from django.db import migrations, models 5 from django.db import migrations, models
@@ -12,8 +12,8 @@ class Migration(migrations.Migration): @@ -12,8 +12,8 @@ class Migration(migrations.Migration):
12 initial = True 12 initial = True
13 13
14 dependencies = [ 14 dependencies = [
15 - ('courses', '0001_initial'),  
16 ('core', '0001_initial'), 15 ('core', '0001_initial'),
  16 + ('courses', '0001_initial'),
17 ] 17 ]
18 18
19 operations = [ 19 operations = [
@@ -26,9 +26,9 @@ class Migration(migrations.Migration): @@ -26,9 +26,9 @@ class Migration(migrations.Migration):
26 ('file_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='topic_files', to='core.MimeType', verbose_name='Type file')), 26 ('file_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='topic_files', to='core.MimeType', verbose_name='Type file')),
27 ], 27 ],
28 options={ 28 options={
29 - 'verbose_name': 'File',  
30 'verbose_name_plural': 'Files', 29 'verbose_name_plural': 'Files',
31 'ordering': ('-id',), 30 'ordering': ('-id',),
  31 + 'verbose_name': 'File',
32 }, 32 },
33 bases=('courses.material',), 33 bases=('courses.material',),
34 ), 34 ),
files/migrations/0002_topicfile_professor.py
  Diff comments   View file @707b27e
1 # -*- coding: utf-8 -*- 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-16 13:57
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
5 from django.conf import settings 5 from django.conf import settings
@@ -11,8 +11,8 @@ class Migration(migrations.Migration): @@ -11,8 +11,8 @@ class Migration(migrations.Migration):
11 initial = True 11 initial = True
12 12
13 dependencies = [ 13 dependencies = [
14 - migrations.swappable_dependency(settings.AUTH_USER_MODEL),  
15 ('files', '0001_initial'), 14 ('files', '0001_initial'),
  15 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
16 ] 16 ]
17 17
18 operations = [ 18 operations = [
forum/migrations/0001_initial.py
  Diff comments   View file @707b27e
1 # -*- coding: utf-8 -*- 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-16 13:57
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
@@ -24,8 +24,8 @@ class Migration(migrations.Migration): @@ -24,8 +24,8 @@ class Migration(migrations.Migration):
24 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Create Date')), 24 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Create Date')),
25 ], 25 ],
26 options={ 26 options={
27 - 'verbose_name': 'Forum',  
28 'verbose_name_plural': 'Foruns', 27 'verbose_name_plural': 'Foruns',
  28 + 'verbose_name': 'Forum',
29 }, 29 },
30 bases=('courses.activity',), 30 bases=('courses.activity',),
31 ), 31 ),
@@ -38,8 +38,8 @@ class Migration(migrations.Migration): @@ -38,8 +38,8 @@ class Migration(migrations.Migration):
38 ('post_date', models.DateTimeField(auto_now_add=True, verbose_name='Post Date')), 38 ('post_date', models.DateTimeField(auto_now_add=True, verbose_name='Post Date')),
39 ], 39 ],
40 options={ 40 options={
41 - 'verbose_name': 'Post',  
42 'verbose_name_plural': 'Posts', 41 'verbose_name_plural': 'Posts',
  42 + 'verbose_name': 'Post',
43 }, 43 },
44 ), 44 ),
45 migrations.CreateModel( 45 migrations.CreateModel(
@@ -52,8 +52,8 @@ class Migration(migrations.Migration): @@ -52,8 +52,8 @@ class Migration(migrations.Migration):
52 ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Post', verbose_name='Post')), 52 ('post', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Post', verbose_name='Post')),
53 ], 53 ],
54 options={ 54 options={
55 - 'verbose_name': 'Post Answer',  
56 'verbose_name_plural': 'Post Answers', 55 'verbose_name_plural': 'Post Answers',
  56 + 'verbose_name': 'Post Answer',
57 }, 57 },
58 ), 58 ),
59 ] 59 ]
forum/migrations/0002_auto_20161115_1936.py
View file @373a983
@@ -1,35 +0,0 @@ @@ -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_20161116_1057.py 0 → 100644
  Diff comments   View file @707b27e
@@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-16 13:57
  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 + ]
links/migrations/0001_initial.py
  Diff comments   View file @707b27e
1 # -*- coding: utf-8 -*- 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-16 13:57
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
@@ -24,8 +24,8 @@ class Migration(migrations.Migration): @@ -24,8 +24,8 @@ class Migration(migrations.Migration):
24 ('image', models.ImageField(blank=True, upload_to='links/')), 24 ('image', models.ImageField(blank=True, upload_to='links/')),
25 ], 25 ],
26 options={ 26 options={
27 - 'verbose_name': 'Link',  
28 'verbose_name_plural': 'Links', 27 'verbose_name_plural': 'Links',
  28 + 'verbose_name': 'Link',
29 }, 29 },
30 bases=('courses.material',), 30 bases=('courses.material',),
31 ), 31 ),
links/migrations/0002_auto_20161116_1338.py 0 → 100644
  Diff comments   View file @707b27e
@@ -0,0 +1,25 @@ @@ -0,0 +1,25 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-16 16:38
  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 + ('links', '0001_initial'),
  12 + ]
  13 +
  14 + operations = [
  15 + migrations.AlterField(
  16 + model_name='link',
  17 + name='link_description',
  18 + field=models.TextField(verbose_name='Description'),
  19 + ),
  20 + migrations.AlterField(
  21 + model_name='link',
  22 + name='link_url',
  23 + field=models.URLField(verbose_name='Link_URL'),
  24 + ),
  25 + ]
links/migrations/0003_auto_20161116_1340.py 0 → 100644
  Diff comments   View file @707b27e
@@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-16 16:40
  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 + ('links', '0002_auto_20161116_1338'),
  12 + ]
  13 +
  14 + operations = [
  15 + migrations.AlterField(
  16 + model_name='link',
  17 + name='link_description',
  18 + field=models.TextField(max_length=200, verbose_name='Description'),
  19 + ),
  20 + ]
links/migrations/0004_auto_20161116_1341.py 0 → 100644
  Diff comments   View file @707b27e
@@ -0,0 +1,20 @@ @@ -0,0 +1,20 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-16 16: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 + ('links', '0003_auto_20161116_1340'),
  12 + ]
  13 +
  14 + operations = [
  15 + migrations.AlterField(
  16 + model_name='link',
  17 + name='link_description',
  18 + field=models.CharField(max_length=200, verbose_name='Description'),
  19 + ),
  20 + ]
links/templates/links/create_link.html.py
View file @373a983
@@ -1,68 +0,0 @@ @@ -1,68 +0,0 @@
1 -BBBB BBBBBBBBBBBBB BBBB  
2 -  
3 -XXXXXXXXX XXXXXX XXXXXXX  
4 -XXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
5 - XXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX  
6 - XXXX XXXXXXXXXXXXXXXXXXXXXX  
7 - XXXX XXXXXXXXXXXXXXXXXXXXX  
8 - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
9 - XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX gettext(u'Create a New Link') XXXXX  
10 - XXXXXX  
11 - XXXX XXXXXXXXXXXXXXXXXXX  
12 - XXXX XXXX XXX  
13 - XXXXX XXXXXXXXXXXXX XXXXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
14 - BBBBBBBBBB  
15 - BB BBBBBBBB  
16 - BBB BBBBBBB BB BBBBBBBB  
17 - XXXX XXXXXXXXXXXX XXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX  
18 - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX  
19 - XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
20 - XXXXXXXXX  
21 - XXXXXXX  
22 - XXXXXX  
23 - BBBBBB  
24 - BBBBB  
25 - BBB BBBBB BB BBBB  
26 - BB BBBBBBBBBBBBBBBBBBBB  
27 - XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
28 - BBBB  
29 - XXXXXX XXXXXXXXXXXXXXX  
30 - BBBBB  
31 - BBBBBBBBBBBB BBBBB BBBBBBBBBBBBBBBBBBBB  
32 - BBBBBB  
33 - XXXX XXXXXXXXXXXXXXXXXXX  
34 - XX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX gettext(u'Cancel') XXXX  
35 - XXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXX XXXXXXXX XXXXXXXXXXX  
36 - XXXXXX  
37 - XXXX XXXX XXXX XXX  
38 - XXXXXX  
39 - XXXXXX  
40 - XXXXXX  
41 -XXXXXX  
42 -XXXX XXXXXXXX XXX  
43 -  
44 -  
45 -XXXXXXX XXXXXXXXXXXXXXXXXXXXXXX  
46 - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX X  
47 - XXX XXXX X XXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
48 - XXXXXXXX  
49 - XXXX XBBB BBBBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBBXX  
50 - XXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
51 - XXXXX XXXXX  
52 - XXXXXX XXXXXX  
53 - XXXXXXXXXXXX XXXXXX  
54 - XXXXXXXXXXXX XXXXXX  
55 - XXXXXXXX XXXXXXXXXXXXXX X  
56 - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
57 - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
58 - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
59 - XX  
60 - XXXXXX XXXXXXXXXXXXXXX  
61 - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
62 - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
63 - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
64 - X  
65 - XXX  
66 - XXXXXXXXXXXXXXXXXXXXXXX  
67 - XXX  
68 -XXXXXXXXX  
links/templates/links/delete_link.html.py
View file @373a983
@@ -1,22 +0,0 @@ @@ -1,22 +0,0 @@
1 -BBBB BBBBBBBBBBBBB BBBB  
2 -XXXX XXXXX XXXXXX XXXX XXX  
3 -XXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXX  
4 - XXXX XXXXXXXXXXXXXXXXXXXXX  
5 - XXXX XXXXXXXXXXXXXXXXXXXXXX  
6 - XXXX XXXXXXXXXXXXXXXXXXXXX  
7 - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
8 - XXX XXXXXXXXXXXXXXXXXXXXXXXXX  
9 - XXXXXX  
10 - XXXX XXXXXXXXXXXXXXXXXXX  
11 - XXX gettext(u'Do you really want to delete this link?') XXXX  
12 - XXXXXX  
13 - XXXX XXXXXXXXXXXXXXXXXXXXX  
14 - XXXX XXX  
15 - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX gettext(u'Cancel') XXXXXXXXX  
16 - XX XXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX gettext(u'Confirm') XXXXXXXXXXXXX  
17 -  
18 - XXXXXX  
19 - XXXXXX  
20 - XXXXXX  
21 -XXXXXX  
22 -XXXX XXX XXX  
links/templates/links/render_link.html.py
View file @373a983
@@ -1 +0,0 @@ @@ -1 +0,0 @@
1 -XXXXXX XXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXXXXXXX XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBB BBBBBBBBBXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
links/templates/links/update_link.html.py
View file @373a983
@@ -1,33 +0,0 @@ @@ -1,33 +0,0 @@
1 -BBBB BBBBBBBBBBBBB BBBB  
2 -XXXX XXXXX XXXX XXXXXXX  
3 -XXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
4 - XXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX  
5 - XXXX XXXXXXXXXXXXXXXXXXXXXX  
6 - XXXX XXXXXXXXXXXXXXXXXXXXX  
7 - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
8 - XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX gettext(u'Links') XXXXX  
9 - XXXXXX  
10 - XXXX XXXXXXXXXXXXXXXXXXX  
11 - XXXX XXXX XXX  
12 - XXXX XXXXXXXXXXXXXXXXXXX  
13 - XXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX gettext(u'Name') XXXXXXXX  
14 - XXXXXX XXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX  
15 - XXXXXX  
16 - XXXX XXXXXXXXXXXXXXXXXXX  
17 - XXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX gettext(u'URL') XXXXXXXX  
18 - XXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX  
19 - XXXXXX  
20 - XXXX XXXXXXXXXXXXXXXXX XXXXXXXXXX  
21 - XXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX gettext(u'Descrição') XXXXXXXX  
22 - XXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX  
23 - XXXXXX  
24 - XXXX XXXXXXXXXXXXXXXXXXX  
25 - XX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX gettext(u'Cancel') XXXX  
26 - XX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXX gettext(u'Submit') XXXX  
27 - XXXXXX  
28 - XXXX XXXX XXXX XXX  
29 - XXXXXX  
30 - XXXXXX  
31 - XXXXXX  
32 -XXXXXX  
33 -XXXX XXXXXXXX XXX  
links/templates/links/view_link.html.py
View file @373a983
@@ -1,32 +0,0 @@ @@ -1,32 +0,0 @@
1 -BBBB BBBBBB BBBB BBBBBBBBBBBBBBBBB BBBBBBBBBBBBBBB  
2 -XXXXXXXXX XXXX XXXXXXX  
3 -XXXX XXXXXXXXXXXX XXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
4 - XXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXX  
5 - XXXX XXXXXXXXXXXXXXXXXXXXXX  
6 - XXXX XXXXXXXXXXXXXXXXXXXXX  
7 - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
8 - XXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX gettext(u'Link') XXXXX  
9 - XXXXXX  
10 - XXXX XXXXXXXXXXXXXXXXXXX  
11 - XXXX XXXX XXX  
12 - XXXXXXXX XXXXXXXXXXX XXXXXXXX XXXXXXXXXXXX  
13 - XXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX  
14 - XXXX XXXXXXXXXXXXXXXXXXX  
15 - XX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
16 - XX XXXXXXXXXXXXXXXXXX XXXXXXXXXXX  
17 - XX XXXXXXX XXXXXXXXXX XXXXXXXXXXXXX gettext(u'Read more') XXXX  
18 - XXXXXX  
19 - XXXXXXXXXX  
20 - XXXX XXXX XXXX XXX  
21 - XXXXXX  
22 - XXXXXX  
23 - XXXXXX  
24 -XXXXXX  
25 -  
26 -XXXX XXXXX X XXXXX XX XXXXXXXXXXXXXXXX  
27 -  
28 -XXXXXX  
29 -XXXX XXXXXXXX XXX  
30 -XXXXXXX XXXXXXXXXXXXXXXXXXXXXXX  
31 -XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
32 -XXXXXXXXX  
poll/migrations/0001_initial.py
  Diff comments   View file @707b27e
1 # -*- coding: utf-8 -*- 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-16 13:57
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
@@ -23,9 +23,9 @@ class Migration(migrations.Migration): @@ -23,9 +23,9 @@ class Migration(migrations.Migration):
23 ('order', models.PositiveSmallIntegerField(verbose_name='Order')), 23 ('order', models.PositiveSmallIntegerField(verbose_name='Order')),
24 ], 24 ],
25 options={ 25 options={
26 - 'verbose_name': 'Answer',  
27 'verbose_name_plural': 'Answers', 26 'verbose_name_plural': 'Answers',
28 'ordering': ('order',), 27 'ordering': ('order',),
  28 + 'verbose_name': 'Answer',
29 }, 29 },
30 ), 30 ),
31 migrations.CreateModel( 31 migrations.CreateModel(
@@ -37,8 +37,8 @@ class Migration(migrations.Migration): @@ -37,8 +37,8 @@ class Migration(migrations.Migration):
37 ('answer', models.ManyToManyField(related_name='answers_stundet', to='poll.Answer', verbose_name='Answers Students')), 37 ('answer', models.ManyToManyField(related_name='answers_stundet', to='poll.Answer', verbose_name='Answers Students')),
38 ], 38 ],
39 options={ 39 options={
40 - 'verbose_name': 'Answer Stundent',  
41 'verbose_name_plural': 'Answers Student', 40 'verbose_name_plural': 'Answers Student',
  41 + 'verbose_name': 'Answer Stundent',
42 }, 42 },
43 ), 43 ),
44 migrations.CreateModel( 44 migrations.CreateModel(
@@ -47,8 +47,8 @@ class Migration(migrations.Migration): @@ -47,8 +47,8 @@ class Migration(migrations.Migration):
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')), 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')),
48 ], 48 ],
49 options={ 49 options={
50 - 'verbose_name': 'Poll',  
51 'verbose_name_plural': 'Polls', 50 'verbose_name_plural': 'Polls',
  51 + 'verbose_name': 'Poll',
52 }, 52 },
53 bases=('courses.activity',), 53 bases=('courses.activity',),
54 ), 54 ),
poll/migrations/0002_auto_20161115_1936.py
View file @373a983
@@ -1,30 +0,0 @@ @@ -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_20161116_1057.py 0 → 100644
  Diff comments   View file @707b27e
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-16 13:57
  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 + ('poll', '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='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 @707b27e
1 # -*- coding: utf-8 -*- 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-16 13:57
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
@@ -30,14 +30,14 @@ class Migration(migrations.Migration): @@ -30,14 +30,14 @@ class Migration(migrations.Migration):
30 ('city', models.CharField(blank=True, max_length=90, verbose_name='City')), 30 ('city', models.CharField(blank=True, max_length=90, verbose_name='City')),
31 ('state', models.CharField(blank=True, max_length=30, verbose_name='State')), 31 ('state', models.CharField(blank=True, max_length=30, verbose_name='State')),
32 ('gender', models.CharField(choices=[('M', 'Male'), ('F', 'Female')], max_length=1, verbose_name='Gender')), 32 ('gender', models.CharField(choices=[('M', 'Male'), ('F', 'Female')], max_length=1, verbose_name='Gender')),
33 - ('image', models.ImageField(blank=True, null=True, upload_to='users/', verbose_name='Image')),  
34 - ('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')),
35 ('phone', models.CharField(blank=True, max_length=30, verbose_name='Phone')), 35 ('phone', models.CharField(blank=True, max_length=30, verbose_name='Phone')),
36 - ('cpf', models.CharField(max_length=15, verbose_name='Cpf')), 36 + ('cpf', models.CharField(blank=True, max_length=15, null=True, verbose_name='CPF')),
37 ('type_profile', models.IntegerField(blank=True, choices=[(1, 'Professor'), (2, 'Student')], default=2, null=True, verbose_name='Type')), 37 ('type_profile', models.IntegerField(blank=True, choices=[(1, 'Professor'), (2, 'Student')], default=2, null=True, verbose_name='Type')),
38 ('titration', models.CharField(blank=True, max_length=50, null=True, verbose_name='Titration')), 38 ('titration', models.CharField(blank=True, max_length=50, null=True, verbose_name='Titration')),
39 ('year_titration', models.CharField(blank=True, max_length=4, null=True, verbose_name='Year of titration')), 39 ('year_titration', models.CharField(blank=True, max_length=4, null=True, verbose_name='Year of titration')),
40 - ('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')),
41 ('curriculum', models.FileField(blank=True, null=True, upload_to='users/curriculum/', verbose_name='Curriculum')), 41 ('curriculum', models.FileField(blank=True, null=True, upload_to='users/curriculum/', verbose_name='Curriculum')),
42 ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Create Date')), 42 ('date_created', models.DateTimeField(auto_now_add=True, verbose_name='Create Date')),
43 ('is_staff', models.BooleanField(default=False, verbose_name='Administrador')), 43 ('is_staff', models.BooleanField(default=False, verbose_name='Administrador')),
@@ -46,8 +46,8 @@ class Migration(migrations.Migration): @@ -46,8 +46,8 @@ class Migration(migrations.Migration):
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')), 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')),
47 ], 47 ],
48 options={ 48 options={
49 - 'verbose_name': 'User',  
50 'verbose_name_plural': 'Users', 49 'verbose_name_plural': 'Users',
  50 + 'verbose_name': 'User',
51 }, 51 },
52 managers=[ 52 managers=[
53 ('objects', django.contrib.auth.models.UserManager()), 53 ('objects', django.contrib.auth.models.UserManager()),
users/migrations/0002_auto_20161115_1941.py
View file @373a983
@@ -1,20 +0,0 @@ @@ -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 @373a983
@@ -1,30 +0,0 @@ @@ -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 - ]