Download as
Browse Code »

Commit ca9cd1f3f38cc16e83bbaac64f8da078211d334a

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

Migrations

Showing 44 changed files with 313 additions and 845 deletions   Show diff stats
app/migrations/0001_initial.py
  Diff comments   View file @ca9cd1f
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-11-17 05:17 2 +# Generated by Django 1.10 on 2016-11-24 15:17
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
@@ -26,8 +26,8 @@ class Migration(migrations.Migration): @@ -26,8 +26,8 @@ class Migration(migrations.Migration):
26 ('default_from_email', models.EmailField(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_plural': 'Amadeus SMTP settings',  
30 'verbose_name': 'Amadeus SMTP setting', 29 'verbose_name': 'Amadeus SMTP setting',
  30 + 'verbose_name_plural': 'Amadeus SMTP settings',
31 }, 31 },
32 ), 32 ),
33 ] 33 ]
core/migrations/0001_initial.py
  Diff comments   View file @ca9cd1f
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-11-17 05:17 2 +# Generated by Django 1.10 on 2016-11-24 15:17
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_plural': 'Actions',  
29 'verbose_name': 'Action', 28 'verbose_name': 'Action',
  29 + 'verbose_name_plural': 'Actions',
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_plural': 'Action_Resources',  
39 'verbose_name': 'Action_Resource', 38 'verbose_name': 'Action_Resource',
  39 + 'verbose_name_plural': 'Action_Resources',
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_plural': 'Logs',  
52 'verbose_name': 'Log', 51 'verbose_name': 'Log',
  52 + 'verbose_name_plural': 'Logs',
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_plural': 'Amadeus Mime Types',  
64 'verbose_name': 'Amadeus Mime Type', 63 'verbose_name': 'Amadeus Mime Type',
  64 + 'verbose_name_plural': 'Amadeus Mime Types',
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_plural': 'Notifications',  
78 'verbose_name': 'Notification', 77 'verbose_name': 'Notification',
  78 + 'verbose_name_plural': 'Notifications',
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_plural': 'Resources',  
92 'verbose_name': 'Resource', 91 'verbose_name': 'Resource',
  92 + 'verbose_name_plural': 'Resources',
93 }, 93 },
94 ), 94 ),
95 ] 95 ]
core/migrations/0002_auto_20161117_0217.py
View file @1033157
@@ -1,50 +0,0 @@ @@ -1,50 +0,0 @@
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/0002_auto_20161124_1217.py 0 → 100644
  Diff comments   View file @ca9cd1f
@@ -0,0 +1,50 @@ @@ -0,0 +1,50 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-24 15:17
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.conf import settings
  6 +from django.db import migrations, models
  7 +import django.db.models.deletion
  8 +
  9 +
  10 +class Migration(migrations.Migration):
  11 +
  12 + initial = True
  13 +
  14 + dependencies = [
  15 + ('core', '0001_initial'),
  16 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  17 + ]
  18 +
  19 + operations = [
  20 + migrations.AddField(
  21 + model_name='notification',
  22 + name='actor',
  23 + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Performer'),
  24 + ),
  25 + migrations.AddField(
  26 + model_name='notification',
  27 + name='user',
  28 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User'),
  29 + ),
  30 + migrations.AddField(
  31 + model_name='log',
  32 + name='action_resource',
  33 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource'),
  34 + ),
  35 + migrations.AddField(
  36 + model_name='log',
  37 + name='user',
  38 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor'),
  39 + ),
  40 + migrations.AddField(
  41 + model_name='action_resource',
  42 + name='action',
  43 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied'),
  44 + ),
  45 + migrations.AddField(
  46 + model_name='action_resource',
  47 + name='resource',
  48 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'),
  49 + ),
  50 + ]
courses/migrations/0001_initial.py
  Diff comments   View file @ca9cd1f
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-11-17 05:17 2 +# Generated by Django 1.10 on 2016-11-24 15:17
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_plural': 'Activitys Files',  
38 'verbose_name': 'Activity File', 37 'verbose_name': 'Activity File',
  38 + 'verbose_name_plural': 'Activitys Files',
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_plural': 'Categories',  
51 'verbose_name': 'Category', 50 'verbose_name': 'Category',
  51 + 'verbose_name_plural': 'Categories',
52 }, 52 },
53 ), 53 ),
54 migrations.CreateModel( 54 migrations.CreateModel(
@@ -61,9 +61,9 @@ class Migration(migrations.Migration): @@ -61,9 +61,9 @@ class Migration(migrations.Migration):
61 ('public', models.BooleanField(default=False, verbose_name='Public')), 61 ('public', models.BooleanField(default=False, verbose_name='Public')),
62 ], 62 ],
63 options={ 63 options={
64 - 'verbose_name_plural': 'Courses',  
65 'verbose_name': 'Course', 64 'verbose_name': 'Course',
66 - 'ordering': ('create_date', 'name'), 65 + 'verbose_name_plural': 'Courses',
  66 + 'ordering': ('create_date', 'name'),
67 }, 67 },
68 ), 68 ),
69 migrations.CreateModel( 69 migrations.CreateModel(
@@ -75,8 +75,8 @@ class Migration(migrations.Migration): @@ -75,8 +75,8 @@ class Migration(migrations.Migration):
75 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), 75 ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')),
76 ], 76 ],
77 options={ 77 options={
78 - 'verbose_name_plural': 'Categories',  
79 'verbose_name': 'Category', 78 'verbose_name': 'Category',
  79 + 'verbose_name_plural': 'Categories',
80 }, 80 },
81 ), 81 ),
82 migrations.CreateModel( 82 migrations.CreateModel(
@@ -120,8 +120,8 @@ class Migration(migrations.Migration): @@ -120,8 +120,8 @@ class Migration(migrations.Migration):
120 ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')), 120 ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')),
121 ], 121 ],
122 options={ 122 options={
123 - 'verbose_name_plural': 'Subjects',  
124 'verbose_name': 'Subject', 123 'verbose_name': 'Subject',
  124 + 'verbose_name_plural': 'Subjects',
125 'ordering': ('create_date', 'name'), 125 'ordering': ('create_date', 'name'),
126 }, 126 },
127 ), 127 ),
@@ -135,8 +135,8 @@ class Migration(migrations.Migration): @@ -135,8 +135,8 @@ class Migration(migrations.Migration):
135 ('subjects', models.ManyToManyField(to='courses.Subject')), 135 ('subjects', models.ManyToManyField(to='courses.Subject')),
136 ], 136 ],
137 options={ 137 options={
138 - 'verbose_name_plural': 'subject categories',  
139 'verbose_name': 'subject category', 138 'verbose_name': 'subject category',
  139 + 'verbose_name_plural': 'subject categories',
140 }, 140 },
141 ), 141 ),
142 migrations.CreateModel( 142 migrations.CreateModel(
@@ -152,8 +152,8 @@ class Migration(migrations.Migration): @@ -152,8 +152,8 @@ class Migration(migrations.Migration):
152 ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject')), 152 ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject')),
153 ], 153 ],
154 options={ 154 options={
155 - 'verbose_name_plural': 'Topics',  
156 'verbose_name': 'Topic', 155 'verbose_name': 'Topic',
  156 + 'verbose_name_plural': 'Topics',
157 'ordering': ('create_date', 'name'), 157 'ordering': ('create_date', 'name'),
158 }, 158 },
159 ), 159 ),
courses/migrations/0002_auto_20161117_0217.py
View file @1033157
@@ -1,85 +0,0 @@ @@ -1,85 +0,0 @@
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/0002_auto_20161124_1217.py 0 → 100644
  Diff comments   View file @ca9cd1f
@@ -0,0 +1,85 @@ @@ -0,0 +1,85 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-24 15:17
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.conf import settings
  6 +from django.db import migrations, models
  7 +import django.db.models.deletion
  8 +
  9 +
  10 +class Migration(migrations.Migration):
  11 +
  12 + initial = True
  13 +
  14 + dependencies = [
  15 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  16 + ('courses', '0001_initial'),
  17 + ]
  18 +
  19 + operations = [
  20 + migrations.AddField(
  21 + model_name='subject',
  22 + name='professors',
  23 + field=models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
  24 + ),
  25 + migrations.AddField(
  26 + model_name='subject',
  27 + name='students',
  28 + field=models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
  29 + ),
  30 + migrations.AddField(
  31 + model_name='material',
  32 + name='students',
  33 + field=models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
  34 + ),
  35 + migrations.AddField(
  36 + model_name='material',
  37 + name='topic',
  38 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'),
  39 + ),
  40 + migrations.AddField(
  41 + model_name='linkmaterial',
  42 + name='material',
  43 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'),
  44 + ),
  45 + migrations.AddField(
  46 + model_name='filematerial',
  47 + name='material',
  48 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'),
  49 + ),
  50 + migrations.AddField(
  51 + model_name='course',
  52 + name='category',
  53 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'),
  54 + ),
  55 + migrations.AddField(
  56 + model_name='course',
  57 + name='coordenator',
  58 + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='course_coordenator', to=settings.AUTH_USER_MODEL, verbose_name='Coordenator'),
  59 + ),
  60 + migrations.AddField(
  61 + model_name='course',
  62 + name='professors',
  63 + field=models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'),
  64 + ),
  65 + migrations.AddField(
  66 + model_name='course',
  67 + name='students',
  68 + field=models.ManyToManyField(blank=True, related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
  69 + ),
  70 + migrations.AddField(
  71 + model_name='activityfile',
  72 + name='diet',
  73 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity'),
  74 + ),
  75 + migrations.AddField(
  76 + model_name='activity',
  77 + name='students',
  78 + field=models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students'),
  79 + ),
  80 + migrations.AddField(
  81 + model_name='activity',
  82 + name='topic',
  83 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'),
  84 + ),
  85 + ]
exam/migrations/0001_initial.py
  Diff comments   View file @ca9cd1f
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-11-17 05:17 2 +# Generated by Django 1.10 on 2016-11-24 15:17
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,8 +23,8 @@ class Migration(migrations.Migration): @@ -23,8 +23,8 @@ 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_plural': 'Answers',  
27 'verbose_name': 'Answer', 26 'verbose_name': 'Answer',
  27 + 'verbose_name_plural': 'Answers',
28 'ordering': ('order',), 28 'ordering': ('order',),
29 }, 29 },
30 ), 30 ),
@@ -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_plural': 'Answers Student',  
41 'verbose_name': 'Answer Stundent', 40 'verbose_name': 'Answer Stundent',
  41 + 'verbose_name_plural': 'Answers Student',
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_plural': 'Exams',  
53 'verbose_name': 'Exam', 52 'verbose_name': 'Exam',
  53 + 'verbose_name_plural': 'Exams',
54 }, 54 },
55 bases=('courses.activity',), 55 bases=('courses.activity',),
56 ), 56 ),
exam/migrations/0002_auto_20161117_0217.py
View file @1033157
@@ -1,30 +0,0 @@ @@ -1,30 +0,0 @@
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/0002_auto_20161124_1217.py 0 → 100644
  Diff comments   View file @ca9cd1f
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-24 15:17
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.conf import settings
  6 +from django.db import migrations, models
  7 +import django.db.models.deletion
  8 +
  9 +
  10 +class Migration(migrations.Migration):
  11 +
  12 + initial = True
  13 +
  14 + dependencies = [
  15 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  16 + ('exam', '0001_initial'),
  17 + ]
  18 +
  19 + operations = [
  20 + migrations.AddField(
  21 + model_name='answersstudent',
  22 + name='student',
  23 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student', to=settings.AUTH_USER_MODEL, verbose_name='Student'),
  24 + ),
  25 + migrations.AddField(
  26 + model_name='answer',
  27 + name='exam',
  28 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='exam.Exam', verbose_name='Answers'),
  29 + ),
  30 + ]
exam/templates/exam/create.html.py
View file @1033157
@@ -1,109 +0,0 @@ @@ -1,109 +0,0 @@
1 -BBBBBBB BBBBBBBBBBB  
2 -  
3 -BBBB BBBB  
4 -  
5 -BBBBB BBBBBBB  
6 -XXXX XXXXXXXXXXXX XXXXXXXXXXXX  
7 - XXXX XXXXXXXXXXXXXXXXXXXXXX  
8 - BBBBB BBBBBBBBBB  
9 - XXX XXXXXXXXXXXXXXXXXXXX gettext(u'New Exam') XXXXX  
10 - BBBBBBBB BBBBBBBBBB  
11 - XXXXXX  
12 - XXXX XXXXXXXXXXXXXXXXXXX  
13 - XXXX XXXXXXXXXX XXXXXXXXXXXX  
14 - XXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u'Exam Name') XXXXXXXX  
15 - XXXX XXXXXXXXXXXXXXXXXX  
16 - XXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXX gettext(u'Exam Name') XX  
17 - XXXXXX  
18 - XXXXXX  
19 - XXXX XXXXXXXXXX XXXXXXXXXXXX  
20 - XXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u"Exam's begin date") XXXXXXXX  
21 - XXXX XXXXXXXXXXXXXXXXXX  
22 - XXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXX gettext(u'Begin Date') XX  
23 - XXXXXX  
24 - XXXXXX  
25 - XXXX XXXXXXXXXX XXXXXXXXXXXX  
26 - XXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u"Exam's end date") XXXXXXXX  
27 - XXXX XXXXXXXXXXXXXXXXXX  
28 - XXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX gettext(u'End Date') XX  
29 - XXXXXX  
30 - XXXXXX  
31 - XXXX XXXXXXXXXX XXXXXXXXXXXX  
32 - XXXX XXXXXXXXXXXXXXXXXX  
33 - XXXX XXXXXXXXXXXXXXXXX  
34 - XXXXXXX  
35 - XXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX gettext(u'Allow submissions after deadline?')  
36 - XXXXXXXX  
37 - XXXXXX  
38 - XXXXXX  
39 - XXXXXX  
40 - XXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXX  
41 -  
42 - XXXXXX  
43 - XXXX XXXXXXXXXX XXXXXXXXXXXX  
44 - XXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u'Question Type') XXXXXXXX  
45 - XXXX XXXXXXXXXXXXXXXXXX  
46 - XXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXX  
47 - XXXXXXX XXXXXXXX XXXXXXXXX gettext(u'Question Type') XXXXXXXXX  
48 - XXXXXXX XXXXXXXXXX gettext(u'Multiple Choice') XXXXXXXXX  
49 - XXXXXXX XXXXXXXXXX gettext(u'True or False') XXXXXXXXX  
50 - XXXXXXX XXXXXXXXXX gettext(u'Gap Filling') XXXXXXXXX  
51 - XXXXXXX XXXXXXXXXX gettext(u'Discursive Question') XXXXXXXXX  
52 - XXXXXXXXX  
53 - XXXXXX  
54 - XXXXXX  
55 - XXXX XXXXXXXXXXXX  
56 - XXXX XXXXXXXXXXXXXXXXXX  
57 - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXX gettext(u'add question') XXXXXXXXX  
58 - XXXXXX  
59 - XXXXXX  
60 - XXXXXX  
61 - XXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXX  
62 - XXXXXXX XXXXXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXX gettext(u'Create') XXXXXXXXX  
63 - XXXXXX  
64 -XXXXXX  
65 -XXXXXXXX  
66 -XXX XX X XX  
67 -XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
68 - XXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXX XXXXXXXXXXXXXXX  
69 - XX XXX XXXXX X XXXXXXXXXXXXX  
70 - XX XXXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX  
71 - XX XXXXXXXXXXXXX  
72 - XXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
73 - XX XXXXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX X XXXX  
74 - XXXXXXXXXXXXXXXXXXXXXXXXX X XXXXXX  
75 - XXX  
76 -XXX  
77 -XXX XXXXXXXXXXXXXXXX X XX  
78 -XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XX X  
79 - XXX XXXXXXX X XXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXX X  
80 - XXXXXXXXX X  
81 - XXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXX X XXXXXXXXX XXXXXXXXXXXXXXXXX X XXXX X  
82 - XXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXX XXXX XXXXXXXXXXXXXXXXXXXXXXXXX X  
83 - XXXXXXXXXX X  
84 - XXXXXXXXX  
85 - XXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
86 - XXXXXXXXXXXXXXXXXXX  
87 -XXX  
88 -XXX XXXXXXXXXXXXXXXXXX X XX  
89 -XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX XX X  
90 - XXX XXXXXXX X XXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXX X  
91 - XXXXXXXXX X  
92 - XXXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXX XXXX XXXXXXXXXXXXXXXXXXXXXXXXX X  
93 - XXXXXXXXXX X  
94 - XXXXXXXXX X  
95 - XXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXX X XXXXXXXXXXXXXXXXXX XXX XXXXXXXXXXX X  
96 - XXXXXXXXXX X  
97 - XXXXXXXXX X  
98 - XXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXX X  
99 - XXXXXXXXXX X  
100 - XXXXXXXXX  
101 - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
102 - XXXXXXXXXXXXXXXXXXXXX  
103 -XXX  
104 -XXXXXXXXXXXX X  
105 - XX XXXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX  
106 -XXX  
107 -XXXXXXXXX  
108 -  
109 -BBBBBBBB BBBBBBB  
exam/templates/exam/questions/discursive_question.html.py
View file @1033157
@@ -1,6 +0,0 @@ @@ -1,6 +0,0 @@
1 -XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXX  
2 - XXXXXX XXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u'Question') XXXXXXXX  
3 - XXXX XXXXXXXXXXXXXXXXXX  
4 - XXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXX XXXXXXXXXXXXX gettext(u'Question') XXXXXXXXXXXXX  
5 - XXXXXX  
6 -XXXXXX  
exam/templates/exam/questions/gap_filling_answer.html.py
View file @1033157
exam/templates/exam/questions/gap_filling_question.html.py
View file @1033157
@@ -1,3 +0,0 @@ @@ -1,3 +0,0 @@
1 -XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXX  
2 - XXX gettext(u'Gap Filling Question') XXXX  
3 -XXXXXX  
exam/templates/exam/questions/multiple_choice_answer.html.py
View file @1033157
exam/templates/exam/questions/multiple_choice_question.html.py
View file @1033157
@@ -1,42 +0,0 @@ @@ -1,42 +0,0 @@
1 -BBBB BBBB  
2 -  
3 -XXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXX  
4 -  
5 - XXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u'Question') XXXXXXXX  
6 -  
7 -  
8 - XXXX XXXXXXXXXXXXXXXXXX  
9 - XXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
10 - XXXXXX  
11 -  
12 -  
13 -XXXXXX  
14 -XXXX XXXXXXXXXXXXXXXXXXX  
15 - XXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXX gettext(u'Alternatives') XXXXXXXX  
16 - XXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXX  
17 - XXXX XXXXXXXXXXXX XXXXXXXXXXXXXXX  
18 - XXXXXXX  
19 - XXXXXX XXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXX  
20 - XXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXX XXXX XXXXXXXXXXXXXXXXXXXXXXXX  
21 - XXXXXXXX  
22 - XXXXXX  
23 - XXXX XXXXXXXXXXXX XXXXXXXXXXXXXXX  
24 - XXXXXXX  
25 - XXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXX  
26 - XXXXXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXX XXXXXXXXXXXXXXXXXX XXXX XXXXXXXXXXXXXXXXXXXXXXXX  
27 - XXXXXXXX  
28 - XXXXXX  
29 - XXXXXX  
30 -XXXXXX  
31 -XXXX XXX XXXXXXXXXXX XXXXXX XXX  
32 -XXXX XXXXXXXXXXXXXXXXXXX  
33 - XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX  
34 - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX XXXXX XXXX XXXXXXXXXXXX XXXXXXXXXXX  
35 - XXXXXX  
36 -XXXXXX  
37 -XXXX XXXXXXXXXXXXXXXXXXX  
38 - XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX  
39 - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXX  
40 - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXX  
41 - XXXXXX  
42 -XXXXXX  
exam/templates/exam/questions/true_or_false_answer.html.py
View file @1033157
@@ -1,15 +0,0 @@ @@ -1,15 +0,0 @@
1 -BBBB BBBB  
2 -  
3 -XXXX XXXXXXXXXX XXXXXXXXXXX X  
4 - XXXX XXXXXXXXXXXXXXXXX  
5 - XXXXX  
6 - XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
7 - XXXXXX  
8 - XXXX XXXXXXXXXXXXXXXXXX  
9 - XXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXX gettext(u'Write your alternative') XXXXXXXXXX  
10 - XXXXXX  
11 - XXXX XXXXXXXXXXXXXXXXX  
12 - XXXXX  
13 - XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
14 - XXXXXX  
15 -XXXXXX  
exam/templates/exam/questions/true_or_false_question.html.py
View file @1033157
@@ -1,67 +0,0 @@ @@ -1,67 +0,0 @@
1 -  
2 -  
3 -BBBB BBBB  
4 -  
5 -XXXXXXX  
6 - XXXXXXXXXXXXXXXXXXXXXXX X  
7 - XXXXXXX XXXXXXXX  
8 - X  
9 - XXXXXXXXXXXXXXXXXXXXX X  
10 - XXXXXXX XXXXX  
11 - X  
12 -XXXXXXXX  
13 -XXXX XXXXXXXX XXXXXXX  
14 - XXXX XXXXXXXXXX XXXXXXXXXXXX  
15 - XXXX XXXXXXXXXXXXXXXXX  
16 - XXXXX  
17 - XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
18 - XXXXXX  
19 - XXXX XXXXXXXXXXXXXXXXX  
20 - XXXXXX XXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXX gettext(u'Question') XXXXXXXX  
21 - XXXXXX  
22 - XXXX XXXXXXXXXXXXXXXXX  
23 - XXXX XXXXXXXXXXXX  
24 - XXXX XXXXXXXXXXXXXXXXXX  
25 - XXXXXX XXXXXXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX XXXXXXXXXXXXX gettext(u'Question') XXXXXXXXXX  
26 - XXXXXX  
27 - XXXX XXXXXXXXXXXXXXXXX  
28 - XXXXX  
29 - XXXXXXXXXXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
30 - XXXXXX  
31 - XXXXXX  
32 - XXXXXX  
33 -  
34 - XXXXXX  
35 - XXXX XXXXXXXXXXXX  
36 - XXXX XXXXXXXXXXXXXXXXXXXXXX XXXXXXXXXX  
37 - XXXXXX XXXXXXXXXXXXXXXXXXXXXX gettext(u'Alternatives: T/F') XXXXXXXX  
38 - XXXXXX  
39 - XXXX XXXXXXXXXXXXXXXX XXXXXXXXXXXXXX  
40 - BBBBBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB  
41 - XXXXXX  
42 - XXXXXX  
43 - XXXX XXXXXXXXXXXXXXXXXXX  
44 - XXXX XXXXXXXXXXXXXXX XXXXXXXXXXXXXXXXX  
45 - XXXXXXX XXXXXXXXXXXXX XXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXX XXXXXXXXXXXXXXXXXXXXX gettext(u'New Alternative') XXXXXXXXX  
46 - XXXXXX  
47 - XXXXXX  
48 -XXXXXX  
49 -XXXXXXX XXXXXXXXXXXXXXXXXXXXXXX  
50 - XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX  
51 - XXXXXXXBBB BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBXX XXXXXXXXXXXXXXX  
52 - XXXXXXXXXXXXXXXXXXXXXXXXXXXX  
53 - XXX  
54 - XXX  
55 - XXXXXX XXX XXXXXXXXX XXXXXX XXXXXX XX XXXX  
56 - XX XXXXXXXXXXX XXXXXXXXXXXX XX XXXXXXXXX XXXX XXXXX X XXXXXXXXXXXXXX XXX XXXXXXXXX  
57 - XXXXXX XXXX  
58 - XXXXXXXXX XX  
59 - XXXXXXX XXXXXXXXX XXXXXX XX X X  
60 - XXX XXXX X XX  
61 - XXXXXXXXXXXX XXX XXX XXXXXXXXXXXXXXXXXXXXXXXX  
62 - XXXXXXXXXXXXXXXXXXXXXXXXXXXX  
63 - XXX  
64 - XX  
65 - XXX  
66 -XXXXXXXXX  
67 -  
exam/templates/exam/remove.html.py
View file @1033157
exam/templates/exam/update.html.py
View file @1033157
exam/templates/exam/view.html.py
View file @1033157
exercise/migrations/0001_initial.py
  Diff comments   View file @ca9cd1f
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-11-17 08:09 2 +# Generated by Django 1.10 on 2016-11-24 15:17
3 from __future__ import unicode_literals 3 from __future__ import unicode_literals
4 4
5 from decimal import Decimal 5 from decimal import Decimal
6 -from django.conf import settings  
7 from django.db import migrations, models 6 from django.db import migrations, models
8 import django.db.models.deletion 7 import django.db.models.deletion
9 -import exercise.models  
10 8
11 9
12 class Migration(migrations.Migration): 10 class Migration(migrations.Migration):
@@ -14,9 +12,7 @@ class Migration(migrations.Migration): @@ -14,9 +12,7 @@ class Migration(migrations.Migration):
14 initial = True 12 initial = True
15 13
16 dependencies = [ 14 dependencies = [
17 - ('courses', '0002_auto_20161117_0217'),  
18 - migrations.swappable_dependency(settings.AUTH_USER_MODEL),  
19 - ('core', '0002_auto_20161117_0217'), 15 + ('core', '0001_initial'),
20 ] 16 ]
21 17
22 operations = [ 18 operations = [
@@ -24,16 +20,13 @@ class Migration(migrations.Migration): @@ -24,16 +20,13 @@ class Migration(migrations.Migration):
24 name='Exercise', 20 name='Exercise',
25 fields=[ 21 fields=[
26 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), 22 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
27 - ('name_exercise', models.CharField(max_length=100, verbose_name='Exercise Name')), 23 + ('name_exercise', models.CharField(max_length=100, verbose_name='Name')),
28 ('description', models.TextField(blank=True, verbose_name='Description')), 24 ('description', models.TextField(blank=True, verbose_name='Description')),
29 - ('init_date', models.DateField(verbose_name='Begin of Subject Date')),  
30 - ('end_date', models.DateField(verbose_name='End of Subject Date')), 25 + ('end_date', models.DateField(verbose_name='Delivery Date')),
31 ('grade', models.DecimalField(decimal_places=2, default=Decimal('0.00'), max_digits=20, null=True)), 26 ('grade', models.DecimalField(decimal_places=2, default=Decimal('0.00'), max_digits=20, null=True)),
32 - ('file', models.FileField(upload_to=exercise.models.file_path)),  
33 - ('file_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='exercise_type', to='core.MimeType', verbose_name='Type file')),  
34 - ('professors', models.ManyToManyField(blank=True, related_name='professors_exercise', to=settings.AUTH_USER_MODEL, verbose_name='Professors')),  
35 - ('students', models.ManyToManyField(blank=True, related_name='subject_exercise', to=settings.AUTH_USER_MODEL, verbose_name='Students')),  
36 - ('topic', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='exercises', to='courses.Topic', verbose_name='Topic')), 27 + ('file', models.FileField(upload_to='uploads/%Y/%m/%d')),
  28 + ('allowed', models.BooleanField(default=False, verbose_name='Allowed delivery after end date?')),
  29 + ('file_type', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='exercise_type', to='core.MimeType', verbose_name='Type file')),
37 ], 30 ],
38 ), 31 ),
39 ] 32 ]
exercise/migrations/0002_auto_20161117_0555.py
View file @1033157
@@ -1,31 +0,0 @@ @@ -1,31 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-11-17 08:55  
3 -from __future__ import unicode_literals  
4 -  
5 -from django.db import migrations, models  
6 -import django.db.models.deletion  
7 -  
8 -  
9 -class Migration(migrations.Migration):  
10 -  
11 - dependencies = [  
12 - ('exercise', '0001_initial'),  
13 - ]  
14 -  
15 - operations = [  
16 - migrations.AlterField(  
17 - model_name='exercise',  
18 - name='file',  
19 - field=models.FileField(upload_to='uploads/%Y/%m/%d'),  
20 - ),  
21 - migrations.AlterField(  
22 - model_name='exercise',  
23 - name='name_exercise',  
24 - field=models.CharField(max_length=100, verbose_name='Name'),  
25 - ),  
26 - migrations.AlterField(  
27 - model_name='exercise',  
28 - name='topic',  
29 - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='exercise_topic', to='courses.Topic', verbose_name='Topic'),  
30 - ),  
31 - ]  
exercise/migrations/0002_auto_20161124_1217.py 0 → 100644
  Diff comments   View file @ca9cd1f
@@ -0,0 +1,36 @@ @@ -0,0 +1,36 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-24 15:17
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.conf import settings
  6 +from django.db import migrations, models
  7 +import django.db.models.deletion
  8 +
  9 +
  10 +class Migration(migrations.Migration):
  11 +
  12 + initial = True
  13 +
  14 + dependencies = [
  15 + ('exercise', '0001_initial'),
  16 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  17 + ('courses', '0002_auto_20161124_1217'),
  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='exercise_topic', to='courses.Topic', verbose_name='Topic'),
  35 + ),
  36 + ]
exercise/migrations/0003_auto_20161118_2242.py
View file @1033157
@@ -1,21 +0,0 @@ @@ -1,21 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-11-19 01:42  
3 -from __future__ import unicode_literals  
4 -  
5 -from django.db import migrations, models  
6 -import django.db.models.deletion  
7 -  
8 -  
9 -class Migration(migrations.Migration):  
10 -  
11 - dependencies = [  
12 - ('exercise', '0002_auto_20161117_0555'),  
13 - ]  
14 -  
15 - operations = [  
16 - migrations.AlterField(  
17 - model_name='exercise',  
18 - name='file_type',  
19 - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='exercise_type', to='core.MimeType', verbose_name='Type file'),  
20 - ),  
21 - ]  
exercise/migrations/0004_auto_20161121_0922.py
View file @1033157
@@ -1,24 +0,0 @@ @@ -1,24 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-11-21 12:22  
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', '0003_auto_20161118_2242'),  
12 - ]  
13 -  
14 - operations = [  
15 - migrations.RemoveField(  
16 - model_name='exercise',  
17 - name='init_date',  
18 - ),  
19 - migrations.AlterField(  
20 - model_name='exercise',  
21 - name='end_date',  
22 - field=models.DateField(verbose_name='Delivery Date'),  
23 - ),  
24 - ]  
exercise/migrations/0005_exercise_allowed.py
View file @1033157
@@ -1,20 +0,0 @@ @@ -1,20 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-11-21 12:50  
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', '0004_auto_20161121_0922'),  
12 - ]  
13 -  
14 - operations = [  
15 - migrations.AddField(  
16 - model_name='exercise',  
17 - name='allowed',  
18 - field=models.BooleanField(default=False, verbose_name='Allowed delivery after end date?'),  
19 - ),  
20 - ]  
exercise/migrations/0006_auto_20161121_1008.py
View file @1033157
@@ -1,21 +0,0 @@ @@ -1,21 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-11-21 13:08  
3 -from __future__ import unicode_literals  
4 -  
5 -from django.db import migrations, models  
6 -import exercise.models  
7 -  
8 -  
9 -class Migration(migrations.Migration):  
10 -  
11 - dependencies = [  
12 - ('exercise', '0005_exercise_allowed'),  
13 - ]  
14 -  
15 - operations = [  
16 - migrations.AlterField(  
17 - model_name='exercise',  
18 - name='file',  
19 - field=models.FileField(upload_to=exercise.models.file_path, verbose_name='File'),  
20 - ),  
21 - ]  
exercise/migrations/0007_auto_20161121_1019.py
View file @1033157
@@ -1,20 +0,0 @@ @@ -1,20 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-11-21 13:19  
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', '0006_auto_20161121_1008'),  
12 - ]  
13 -  
14 - operations = [  
15 - migrations.AlterField(  
16 - model_name='exercise',  
17 - name='file',  
18 - field=models.FileField(upload_to='uploads/%Y/%m/%d'),  
19 - ),  
20 - ]  
exercise/templates/exercise/create_exercise.html.py
View file @1033157
@@ -1,83 +0,0 @@ @@ -1,83 +0,0 @@
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
View file @1033157
@@ -1,66 +0,0 @@ @@ -1,66 +0,0 @@
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
View file @1033157
@@ -1,7 +0,0 @@ @@ -1,7 +0,0 @@
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
View file @1033157
@@ -1,6 +0,0 @@ @@ -1,6 +0,0 @@
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 @ca9cd1f
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-11-17 05:17 2 +# Generated by Django 1.10 on 2016-11-24 15:17
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,8 +26,8 @@ class Migration(migrations.Migration): @@ -26,8 +26,8 @@ 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_plural': 'Files',  
30 'verbose_name': 'File', 29 'verbose_name': 'File',
  30 + 'verbose_name_plural': 'Files',
31 'ordering': ('-id',), 31 'ordering': ('-id',),
32 }, 32 },
33 bases=('courses.material',), 33 bases=('courses.material',),
files/migrations/0002_topicfile_professor.py
  Diff comments   View file @ca9cd1f
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-11-17 05:17 2 +# Generated by Django 1.10 on 2016-11-24 15:17
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 - ('files', '0001_initial'),  
15 migrations.swappable_dependency(settings.AUTH_USER_MODEL), 14 migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  15 + ('files', '0001_initial'),
16 ] 16 ]
17 17
18 operations = [ 18 operations = [
forum/migrations/0001_initial.py
  Diff comments   View file @ca9cd1f
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-11-17 05:17 2 +# Generated by Django 1.10 on 2016-11-24 15:17
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_plural': 'Foruns',  
28 'verbose_name': 'Forum', 27 'verbose_name': 'Forum',
  28 + 'verbose_name_plural': 'Foruns',
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_plural': 'Posts',  
42 'verbose_name': 'Post', 41 'verbose_name': 'Post',
  42 + 'verbose_name_plural': 'Posts',
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_plural': 'Post Answers',  
56 'verbose_name': 'Post Answer', 55 'verbose_name': 'Post Answer',
  56 + 'verbose_name_plural': 'Post Answers',
57 }, 57 },
58 ), 58 ),
59 ] 59 ]
forum/migrations/0002_auto_20161117_0217.py
View file @1033157
@@ -1,35 +0,0 @@ @@ -1,35 +0,0 @@
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/0002_auto_20161124_1217.py 0 → 100644
  Diff comments   View file @ca9cd1f
@@ -0,0 +1,35 @@ @@ -0,0 +1,35 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-24 15:17
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.conf import settings
  6 +from django.db import migrations, models
  7 +import django.db.models.deletion
  8 +
  9 +
  10 +class Migration(migrations.Migration):
  11 +
  12 + initial = True
  13 +
  14 + dependencies = [
  15 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  16 + ('forum', '0001_initial'),
  17 + ]
  18 +
  19 + operations = [
  20 + migrations.AddField(
  21 + model_name='postanswer',
  22 + name='user',
  23 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'),
  24 + ),
  25 + migrations.AddField(
  26 + model_name='post',
  27 + name='forum',
  28 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='forum.Forum', verbose_name='Forum'),
  29 + ),
  30 + migrations.AddField(
  31 + model_name='post',
  32 + name='user',
  33 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Autor'),
  34 + ),
  35 + ]
links/migrations/0001_initial.py
  Diff comments   View file @ca9cd1f
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-11-17 05:17 2 +# Generated by Django 1.10 on 2016-11-24 15:17
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_plural': 'Links',  
28 'verbose_name': 'Link', 27 'verbose_name': 'Link',
  28 + 'verbose_name_plural': 'Links',
29 }, 29 },
30 bases=('courses.material',), 30 bases=('courses.material',),
31 ), 31 ),
poll/migrations/0001_initial.py
  Diff comments   View file @ca9cd1f
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-11-17 05:17 2 +# Generated by Django 1.10 on 2016-11-24 15:17
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,8 +23,8 @@ class Migration(migrations.Migration): @@ -23,8 +23,8 @@ 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_plural': 'Answers',  
27 'verbose_name': 'Answer', 26 'verbose_name': 'Answer',
  27 + 'verbose_name_plural': 'Answers',
28 'ordering': ('order',), 28 'ordering': ('order',),
29 }, 29 },
30 ), 30 ),
@@ -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_plural': 'Answers Student',  
41 'verbose_name': 'Answer Stundent', 40 'verbose_name': 'Answer Stundent',
  41 + 'verbose_name_plural': 'Answers Student',
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_plural': 'Polls',  
51 'verbose_name': 'Poll', 50 'verbose_name': 'Poll',
  51 + 'verbose_name_plural': 'Polls',
52 }, 52 },
53 bases=('courses.activity',), 53 bases=('courses.activity',),
54 ), 54 ),
poll/migrations/0002_auto_20161117_0217.py
View file @1033157
@@ -1,30 +0,0 @@ @@ -1,30 +0,0 @@
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/0002_auto_20161124_1217.py 0 → 100644
  Diff comments   View file @ca9cd1f
@@ -0,0 +1,30 @@ @@ -0,0 +1,30 @@
  1 +# -*- coding: utf-8 -*-
  2 +# Generated by Django 1.10 on 2016-11-24 15:17
  3 +from __future__ import unicode_literals
  4 +
  5 +from django.conf import settings
  6 +from django.db import migrations, models
  7 +import django.db.models.deletion
  8 +
  9 +
  10 +class Migration(migrations.Migration):
  11 +
  12 + initial = True
  13 +
  14 + dependencies = [
  15 + migrations.swappable_dependency(settings.AUTH_USER_MODEL),
  16 + ('poll', '0001_initial'),
  17 + ]
  18 +
  19 + operations = [
  20 + migrations.AddField(
  21 + model_name='answersstudent',
  22 + name='student',
  23 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers_stundent', to=settings.AUTH_USER_MODEL, verbose_name='Student'),
  24 + ),
  25 + migrations.AddField(
  26 + model_name='answer',
  27 + name='poll',
  28 + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='poll.Poll', verbose_name='Answers'),
  29 + ),
  30 + ]
users/migrations/0001_initial.py
  Diff comments   View file @ca9cd1f
1 # -*- coding: utf-8 -*- 1 # -*- coding: utf-8 -*-
2 -# Generated by Django 1.10 on 2016-11-17 05:17 2 +# Generated by Django 1.10 on 2016-11-24 15:17
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
@@ -40,14 +40,14 @@ class Migration(migrations.Migration): @@ -40,14 +40,14 @@ class Migration(migrations.Migration):
40 ('institution', models.CharField(blank=True, max_length=50, null=True, verbose_name='Institution')), 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='Administrator')),
44 ('is_active', models.BooleanField(default=True, verbose_name='Active')), 44 ('is_active', models.BooleanField(default=True, verbose_name='Active')),
45 ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), 45 ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')),
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_plural': 'Users',  
50 'verbose_name': 'User', 49 'verbose_name': 'User',
  50 + 'verbose_name_plural': 'Users',
51 }, 51 },
52 managers=[ 52 managers=[
53 ('objects', django.contrib.auth.models.UserManager()), 53 ('objects', django.contrib.auth.models.UserManager()),
users/migrations/0002_auto_20161121_0922.py
View file @1033157
@@ -1,20 +0,0 @@ @@ -1,20 +0,0 @@
1 -# -*- coding: utf-8 -*-  
2 -# Generated by Django 1.10 on 2016-11-21 12:22  
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='is_staff',  
18 - field=models.BooleanField(default=False, verbose_name='Administrator'),  
19 - ),  
20 - ]