From cae4d31d7cc561affea7da06719d1de8b846793a Mon Sep 17 00:00:00 2001 From: Matheus Lins Date: Thu, 17 Nov 2016 04:53:14 -0300 Subject: [PATCH] modal create exercise #95 --- app/migrations/0001_initial.py | 7 +++---- app/migrations/0002_auto_20161115_2054.py | 20 -------------------- core/migrations/0001_initial.py | 15 +++++++-------- core/migrations/0002_auto_20161115_1936.py | 50 -------------------------------------------------- core/migrations/0002_auto_20161117_0009.py | 50 -------------------------------------------------- core/migrations/0002_auto_20161117_0217.py | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ core/migrations/0003_merge_20161117_0157.py | 16 ---------------- courses/migrations/0001_initial.py | 17 ++++++++--------- courses/migrations/0002_auto_20161115_1936.py | 85 ------------------------------------------------------------------------------------- courses/migrations/0002_auto_20161117_0009.py | 75 --------------------------------------------------------------------------- courses/migrations/0002_auto_20161117_0217.py | 85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ courses/migrations/0003_merge_20161117_0157.py | 16 ---------------- courses/templates/subject/form_view_teacher.html | 1 - exam/migrations/0001_initial.py | 10 ++++------ exam/migrations/0002_auto_20161115_1936.py | 30 ------------------------------ exam/migrations/0002_auto_20161117_0009.py | 30 ------------------------------ exam/migrations/0002_auto_20161117_0217.py | 30 ++++++++++++++++++++++++++++++ exam/migrations/0003_merge_20161117_0157.py | 16 ---------------- exercise/admin.py | 10 +++++----- exercise/forms.py | 6 ++++-- exercise/migrations/0001_initial.py | 9 ++------- exercise/migrations/0002_auto_20161117_0217.py | 36 ++++++++++++++++++++++++++++++++++++ exercise/migrations/0003_auto_20161117_0351.py | 20 ++++++++++++++++++++ exercise/migrations/0004_auto_20161117_0357.py | 32 ++++++++++++++++++++++++++++++++ exercise/models.py | 13 +++++++------ exercise/static/js/exercise.js | 2 +- exercise/templates/exercise/card_list_user.html | 2 +- exercise/templates/exercise/card_topic_exercises.html | 2 +- exercise/templates/exercise/create_exercise.html | 3 +-- exercise/views.py | 12 ++++++------ files/migrations/0001_initial.py | 5 ++--- files/migrations/0002_topicfile_professor.py | 5 ++--- forum/migrations/0001_initial.py | 9 ++++----- forum/migrations/0002_auto_20161115_1936.py | 35 ----------------------------------- forum/migrations/0002_auto_20161117_0009.py | 35 ----------------------------------- forum/migrations/0002_auto_20161117_0217.py | 35 +++++++++++++++++++++++++++++++++++ forum/migrations/0003_merge_20161117_0157.py | 16 ---------------- links/migrations/0001_initial.py | 4 ++-- poll/migrations/0001_initial.py | 9 ++++----- poll/migrations/0002_auto_20161115_1936.py | 30 ------------------------------ poll/migrations/0002_auto_20161117_0009.py | 30 ------------------------------ poll/migrations/0002_auto_20161117_0217.py | 30 ++++++++++++++++++++++++++++++ poll/migrations/0003_merge_20161117_0157.py | 16 ---------------- users/migrations/0001_initial.py | 13 ++++++------- users/migrations/0002_auto_20161115_1941.py | 20 -------------------- users/migrations/0003_auto_20161115_2054.py | 30 ------------------------------ 46 files changed, 388 insertions(+), 684 deletions(-) delete mode 100644 app/migrations/0002_auto_20161115_2054.py delete mode 100644 core/migrations/0002_auto_20161115_1936.py delete mode 100644 core/migrations/0002_auto_20161117_0009.py create mode 100644 core/migrations/0002_auto_20161117_0217.py delete mode 100644 core/migrations/0003_merge_20161117_0157.py delete mode 100644 courses/migrations/0002_auto_20161115_1936.py delete mode 100644 courses/migrations/0002_auto_20161117_0009.py create mode 100644 courses/migrations/0002_auto_20161117_0217.py delete mode 100644 courses/migrations/0003_merge_20161117_0157.py delete mode 100644 exam/migrations/0002_auto_20161115_1936.py delete mode 100644 exam/migrations/0002_auto_20161117_0009.py create mode 100644 exam/migrations/0002_auto_20161117_0217.py delete mode 100644 exam/migrations/0003_merge_20161117_0157.py create mode 100644 exercise/migrations/0002_auto_20161117_0217.py create mode 100644 exercise/migrations/0003_auto_20161117_0351.py create mode 100644 exercise/migrations/0004_auto_20161117_0357.py delete mode 100644 forum/migrations/0002_auto_20161115_1936.py delete mode 100644 forum/migrations/0002_auto_20161117_0009.py create mode 100644 forum/migrations/0002_auto_20161117_0217.py delete mode 100644 forum/migrations/0003_merge_20161117_0157.py delete mode 100644 poll/migrations/0002_auto_20161115_1936.py delete mode 100644 poll/migrations/0002_auto_20161117_0009.py create mode 100644 poll/migrations/0002_auto_20161117_0217.py delete mode 100644 poll/migrations/0003_merge_20161117_0157.py delete mode 100644 users/migrations/0002_auto_20161115_1941.py delete mode 100644 users/migrations/0003_auto_20161115_2054.py diff --git a/app/migrations/0001_initial.py b/app/migrations/0001_initial.py index e5dc19b..6ed99da 100644 --- a/app/migrations/0001_initial.py +++ b/app/migrations/0001_initial.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- - -# Generated by Django 1.10 on 2016-11-15 22:36 +# Generated by Django 1.10 on 2016-11-17 05:17 from __future__ import unicode_literals from django.db import migrations, models @@ -24,11 +23,11 @@ class Migration(migrations.Migration): ('username', models.CharField(max_length=30, verbose_name='Email host username')), ('password', models.CharField(blank=True, max_length=30, verbose_name='Email host password')), ('safe_conection', models.IntegerField(choices=[(0, 'No'), (1, 'TLS, if available'), (2, 'TLS'), (3, 'SSL')], default=0, verbose_name='Use safe conection')), - ('default_from_email', models.EmailField(blank=True, max_length=254, verbose_name='Default from email')), + ('default_from_email', models.EmailField(max_length=254, verbose_name='Default from email')), ], options={ - 'verbose_name': 'Amadeus SMTP setting', 'verbose_name_plural': 'Amadeus SMTP settings', + 'verbose_name': 'Amadeus SMTP setting', }, ), ] diff --git a/app/migrations/0002_auto_20161115_2054.py b/app/migrations/0002_auto_20161115_2054.py deleted file mode 100644 index 0a8a21f..0000000 --- a/app/migrations/0002_auto_20161115_2054.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-15 23:54 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('app', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='emailbackend', - name='default_from_email', - field=models.EmailField(max_length=254, verbose_name='Default from email'), - ), - ] diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py index e220921..e1267d2 100644 --- a/core/migrations/0001_initial.py +++ b/core/migrations/0001_initial.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- - -# Generated by Django 1.10 on 2016-11-15 22:36 +# Generated by Django 1.10 on 2016-11-17 05:17 from __future__ import unicode_literals import autoslug.fields @@ -26,8 +25,8 @@ class Migration(migrations.Migration): ('created_date', models.DateTimeField(auto_now_add=True, verbose_name='Created Date')), ], options={ - 'verbose_name': 'Action', 'verbose_name_plural': 'Actions', + 'verbose_name': 'Action', }, ), migrations.CreateModel( @@ -36,8 +35,8 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ], options={ - 'verbose_name': 'Action_Resource', 'verbose_name_plural': 'Action_Resources', + 'verbose_name': 'Action_Resource', }, ), migrations.CreateModel( @@ -49,8 +48,8 @@ class Migration(migrations.Migration): ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')), ], options={ - 'verbose_name': 'Log', 'verbose_name_plural': 'Logs', + 'verbose_name': 'Log', }, ), migrations.CreateModel( @@ -61,8 +60,8 @@ class Migration(migrations.Migration): ('icon', models.CharField(max_length=50, unique=True, verbose_name='Icon')), ], options={ - 'verbose_name': 'Amadeus Mime Type', 'verbose_name_plural': 'Amadeus Mime Types', + 'verbose_name': 'Amadeus Mime Type', }, ), migrations.CreateModel( @@ -75,8 +74,8 @@ class Migration(migrations.Migration): ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')), ], options={ - 'verbose_name': 'Notification', 'verbose_name_plural': 'Notifications', + 'verbose_name': 'Notification', }, ), migrations.CreateModel( @@ -89,8 +88,8 @@ class Migration(migrations.Migration): ('url', models.CharField(default='', max_length=100, verbose_name='URL')), ], options={ - 'verbose_name': 'Resource', 'verbose_name_plural': 'Resources', + 'verbose_name': 'Resource', }, ), ] diff --git a/core/migrations/0002_auto_20161115_1936.py b/core/migrations/0002_auto_20161115_1936.py deleted file mode 100644 index 084112a..0000000 --- a/core/migrations/0002_auto_20161115_1936.py +++ /dev/null @@ -1,50 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-15 22:36 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('core', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='notification', - name='actor', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Performer'), - ), - migrations.AddField( - model_name='notification', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User'), - ), - migrations.AddField( - model_name='log', - name='action_resource', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource'), - ), - migrations.AddField( - model_name='log', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor'), - ), - migrations.AddField( - model_name='action_resource', - name='action', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied'), - ), - migrations.AddField( - model_name='action_resource', - name='resource', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'), - ), - ] diff --git a/core/migrations/0002_auto_20161117_0009.py b/core/migrations/0002_auto_20161117_0009.py deleted file mode 100644 index 4b20bf8..0000000 --- a/core/migrations/0002_auto_20161117_0009.py +++ /dev/null @@ -1,50 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 03:09 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('core', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='notification', - name='actor', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Performer'), - ), - migrations.AddField( - model_name='notification', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User'), - ), - migrations.AddField( - model_name='log', - name='action_resource', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource'), - ), - migrations.AddField( - model_name='log', - name='user', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor'), - ), - migrations.AddField( - model_name='action_resource', - name='action', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied'), - ), - migrations.AddField( - model_name='action_resource', - name='resource', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'), - ), - ] diff --git a/core/migrations/0002_auto_20161117_0217.py b/core/migrations/0002_auto_20161117_0217.py new file mode 100644 index 0000000..418596b --- /dev/null +++ b/core/migrations/0002_auto_20161117_0217.py @@ -0,0 +1,50 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-11-17 05:17 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('core', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='notification', + name='actor', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Performer'), + ), + migrations.AddField( + model_name='notification', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User'), + ), + migrations.AddField( + model_name='log', + name='action_resource', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource'), + ), + migrations.AddField( + model_name='log', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor'), + ), + migrations.AddField( + model_name='action_resource', + name='action', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied'), + ), + migrations.AddField( + model_name='action_resource', + name='resource', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Resource', verbose_name='Resource'), + ), + ] diff --git a/core/migrations/0003_merge_20161117_0157.py b/core/migrations/0003_merge_20161117_0157.py deleted file mode 100644 index 5c26a4a..0000000 --- a/core/migrations/0003_merge_20161117_0157.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 04:57 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0002_auto_20161115_1936'), - ('core', '0002_auto_20161117_0009'), - ] - - operations = [ - ] diff --git a/courses/migrations/0001_initial.py b/courses/migrations/0001_initial.py index 95c4f06..31ac681 100644 --- a/courses/migrations/0001_initial.py +++ b/courses/migrations/0001_initial.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- - -# Generated by Django 1.10 on 2016-11-15 22:36 +# Generated by Django 1.10 on 2016-11-17 05:17 from __future__ import unicode_literals import autoslug.fields @@ -35,8 +34,8 @@ class Migration(migrations.Migration): ('name', models.CharField(max_length=100)), ], options={ - 'verbose_name': 'Activity File', 'verbose_name_plural': 'Activitys Files', + 'verbose_name': 'Activity File', }, ), migrations.CreateModel( @@ -48,8 +47,8 @@ class Migration(migrations.Migration): ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), ], options={ - 'verbose_name': 'Category', 'verbose_name_plural': 'Categories', + 'verbose_name': 'Category', }, ), migrations.CreateModel( @@ -69,8 +68,8 @@ class Migration(migrations.Migration): ('public', models.BooleanField(default=False, verbose_name='Public')), ], options={ - 'verbose_name': 'Course', 'verbose_name_plural': 'Courses', + 'verbose_name': 'Course', 'ordering': ('create_date', 'name'), }, ), @@ -83,8 +82,8 @@ class Migration(migrations.Migration): ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), ], options={ - 'verbose_name': 'Category', 'verbose_name_plural': 'Categories', + 'verbose_name': 'Category', }, ), migrations.CreateModel( @@ -128,8 +127,8 @@ class Migration(migrations.Migration): ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')), ], options={ - 'verbose_name': 'Subject', 'verbose_name_plural': 'Subjects', + 'verbose_name': 'Subject', 'ordering': ('create_date', 'name'), }, ), @@ -143,8 +142,8 @@ class Migration(migrations.Migration): ('subjects', models.ManyToManyField(to='courses.Subject')), ], options={ - 'verbose_name': 'subject category', 'verbose_name_plural': 'subject categories', + 'verbose_name': 'subject category', }, ), migrations.CreateModel( @@ -160,8 +159,8 @@ class Migration(migrations.Migration): ('subject', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject')), ], options={ - 'verbose_name': 'Topic', 'verbose_name_plural': 'Topics', + 'verbose_name': 'Topic', 'ordering': ('create_date', 'name'), }, ), diff --git a/courses/migrations/0002_auto_20161115_1936.py b/courses/migrations/0002_auto_20161115_1936.py deleted file mode 100644 index f3dfad1..0000000 --- a/courses/migrations/0002_auto_20161115_1936.py +++ /dev/null @@ -1,85 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-15 22:36 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('courses', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.AddField( - model_name='subject', - name='professors', - field=models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), - ), - migrations.AddField( - model_name='subject', - name='students', - field=models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'), - ), - migrations.AddField( - model_name='material', - name='students', - field=models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students'), - ), - migrations.AddField( - model_name='material', - name='topic', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'), - ), - migrations.AddField( - model_name='linkmaterial', - name='material', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'), - ), - migrations.AddField( - model_name='filematerial', - name='material', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'), - ), - migrations.AddField( - model_name='course', - name='category', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'), - ), - migrations.AddField( - model_name='course', - name='coordenator', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='course_coordenator', to=settings.AUTH_USER_MODEL, verbose_name='Coordenator'), - ), - migrations.AddField( - model_name='course', - name='professors', - field=models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), - ), - migrations.AddField( - model_name='course', - name='students', - field=models.ManyToManyField(blank=True, related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'), - ), - migrations.AddField( - model_name='activityfile', - name='diet', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity'), - ), - migrations.AddField( - model_name='activity', - name='students', - field=models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students'), - ), - migrations.AddField( - model_name='activity', - name='topic', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'), - ), - ] diff --git a/courses/migrations/0002_auto_20161117_0009.py b/courses/migrations/0002_auto_20161117_0009.py deleted file mode 100644 index e252e6b..0000000 --- a/courses/migrations/0002_auto_20161117_0009.py +++ /dev/null @@ -1,75 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 03:09 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('courses', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='subject', - name='professors', - field=models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), - ), - migrations.AddField( - model_name='subject', - name='students', - field=models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'), - ), - migrations.AddField( - model_name='material', - name='students', - field=models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students'), - ), - migrations.AddField( - model_name='material', - name='topic', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'), - ), - migrations.AddField( - model_name='linkmaterial', - name='material', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'), - ), - migrations.AddField( - model_name='filematerial', - name='material', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'), - ), - migrations.AddField( - model_name='course', - name='category', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'), - ), - migrations.AddField( - model_name='course', - name='coordenator', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='course_coordenator', to=settings.AUTH_USER_MODEL, verbose_name='Coordenator'), - ), - migrations.AddField( - model_name='activityfile', - name='diet', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity'), - ), - migrations.AddField( - model_name='activity', - name='students', - field=models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students'), - ), - migrations.AddField( - model_name='activity', - name='topic', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'), - ), - ] diff --git a/courses/migrations/0002_auto_20161117_0217.py b/courses/migrations/0002_auto_20161117_0217.py new file mode 100644 index 0000000..18900e6 --- /dev/null +++ b/courses/migrations/0002_auto_20161117_0217.py @@ -0,0 +1,85 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-11-17 05:17 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('courses', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='subject', + name='professors', + field=models.ManyToManyField(related_name='professors_subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), + ), + migrations.AddField( + model_name='subject', + name='students', + field=models.ManyToManyField(blank=True, related_name='subject_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'), + ), + migrations.AddField( + model_name='material', + name='students', + field=models.ManyToManyField(related_name='materials', to=settings.AUTH_USER_MODEL, verbose_name='Students'), + ), + migrations.AddField( + model_name='material', + name='topic', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='materials', to='courses.Topic', verbose_name='Topic'), + ), + migrations.AddField( + model_name='linkmaterial', + name='material', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_link', to='courses.Material', verbose_name='Material'), + ), + migrations.AddField( + model_name='filematerial', + name='material', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='material_file', to='courses.Material', verbose_name='Material'), + ), + migrations.AddField( + model_name='course', + name='category', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='course_category', to='courses.CourseCategory', verbose_name='Category'), + ), + migrations.AddField( + model_name='course', + name='coordenator', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='course_coordenator', to=settings.AUTH_USER_MODEL, verbose_name='Coordenator'), + ), + migrations.AddField( + model_name='course', + name='professors', + field=models.ManyToManyField(related_name='courses_professors', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), + ), + migrations.AddField( + model_name='course', + name='students', + field=models.ManyToManyField(blank=True, related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'), + ), + migrations.AddField( + model_name='activityfile', + name='diet', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='courses.Activity'), + ), + migrations.AddField( + model_name='activity', + name='students', + field=models.ManyToManyField(related_name='activities', to=settings.AUTH_USER_MODEL, verbose_name='Students'), + ), + migrations.AddField( + model_name='activity', + name='topic', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='activities', to='courses.Topic', verbose_name='Topic'), + ), + ] diff --git a/courses/migrations/0003_merge_20161117_0157.py b/courses/migrations/0003_merge_20161117_0157.py deleted file mode 100644 index 6bc869c..0000000 --- a/courses/migrations/0003_merge_20161117_0157.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 04:57 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('courses', '0002_auto_20161115_1936'), - ('courses', '0002_auto_20161117_0009'), - ] - - operations = [ - ] diff --git a/courses/templates/subject/form_view_teacher.html b/courses/templates/subject/form_view_teacher.html index 12e9fa7..edc6eeb 100644 --- a/courses/templates/subject/form_view_teacher.html +++ b/courses/templates/subject/form_view_teacher.html @@ -135,7 +135,6 @@ - {% include "exercise/create_exercise.html" %} {# opções de cancelar e editar no modo de edição #} diff --git a/exam/migrations/0001_initial.py b/exam/migrations/0001_initial.py index eb204dd..b25376c 100644 --- a/exam/migrations/0001_initial.py +++ b/exam/migrations/0001_initial.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- - -# Generated by Django 1.10 on 2016-11-15 22:36 +# Generated by Django 1.10 on 2016-11-17 05:17 from __future__ import unicode_literals from django.db import migrations, models @@ -24,9 +23,8 @@ class Migration(migrations.Migration): ('order', models.PositiveSmallIntegerField(verbose_name='Order')), ], options={ - 'verbose_name': 'Answer', - 'ordering': ('order',), 'verbose_name_plural': 'Answers', + 'verbose_name': 'Answer', 'ordering': ('order',), }, ), @@ -39,8 +37,8 @@ class Migration(migrations.Migration): ('answer', models.ManyToManyField(related_name='student_answer', to='exam.Answer', verbose_name='Answers Students')), ], options={ - 'verbose_name': 'Answer Stundent', 'verbose_name_plural': 'Answers Student', + 'verbose_name': 'Answer Stundent', }, ), migrations.CreateModel( @@ -51,8 +49,8 @@ class Migration(migrations.Migration): ('exibe', models.BooleanField(default=False, verbose_name='Exibe?')), ], options={ - 'verbose_name': 'Exam', 'verbose_name_plural': 'Exams', + 'verbose_name': 'Exam', }, bases=('courses.activity',), ), diff --git a/exam/migrations/0002_auto_20161115_1936.py b/exam/migrations/0002_auto_20161115_1936.py deleted file mode 100644 index 893c18b..0000000 --- a/exam/migrations/0002_auto_20161115_1936.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-15 22:36 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('exam', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='answersstudent', - name='student', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student', to=settings.AUTH_USER_MODEL, verbose_name='Student'), - ), - migrations.AddField( - model_name='answer', - name='exam', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='exam.Exam', verbose_name='Answers'), - ), - ] diff --git a/exam/migrations/0002_auto_20161117_0009.py b/exam/migrations/0002_auto_20161117_0009.py deleted file mode 100644 index 26bfebc..0000000 --- a/exam/migrations/0002_auto_20161117_0009.py +++ /dev/null @@ -1,30 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 03:09 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('exam', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='answersstudent', - name='student', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student', to=settings.AUTH_USER_MODEL, verbose_name='Student'), - ), - migrations.AddField( - model_name='answer', - name='exam', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='exam.Exam', verbose_name='Answers'), - ), - ] diff --git a/exam/migrations/0002_auto_20161117_0217.py b/exam/migrations/0002_auto_20161117_0217.py new file mode 100644 index 0000000..f21976c --- /dev/null +++ b/exam/migrations/0002_auto_20161117_0217.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-11-17 05:17 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('exam', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.AddField( + model_name='answersstudent', + name='student', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student', to=settings.AUTH_USER_MODEL, verbose_name='Student'), + ), + migrations.AddField( + model_name='answer', + name='exam', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='answers', to='exam.Exam', verbose_name='Answers'), + ), + ] diff --git a/exam/migrations/0003_merge_20161117_0157.py b/exam/migrations/0003_merge_20161117_0157.py deleted file mode 100644 index 2a388ca..0000000 --- a/exam/migrations/0003_merge_20161117_0157.py +++ /dev/null @@ -1,16 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-11-17 04:57 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('exam', '0002_auto_20161115_1936'), - ('exam', '0002_auto_20161117_0009'), - ] - - operations = [ - ] diff --git a/exercise/admin.py b/exercise/admin.py index 92c98dc..5148c5e 100644 --- a/exercise/admin.py +++ b/exercise/admin.py @@ -2,12 +2,12 @@ from django.contrib import admin from .models import Exercise, File class ExerciseAdmin(admin.ModelAdmin): - list_display = ['name'] - search_fields = ['name'] + list_display = ['name_exercise'] + search_fields = ['name_exercise'] class FileAdmin(admin.ModelAdmin): - list_display = ['name'] - search_fields = ['name'] + list_display = ['name_file'] + search_fields = ['name_file'] admin.site.register(Exercise, ExerciseAdmin) -admin.site.register(File, ExerciseAdmin) +admin.site.register(File, FileAdmin) diff --git a/exercise/forms.py b/exercise/forms.py index 8b48f80..b73c74c 100644 --- a/exercise/forms.py +++ b/exercise/forms.py @@ -9,11 +9,13 @@ class ExerciseForm(forms.ModelForm): class Meta: model = Exercise - fields = ['name'] + fields = ['name_exercise', 'description', 'init_date', + 'end_date', 'name_exercise'] class UpdateExerciseForm(forms.ModelForm): class Meta: model = Exercise - fields = ['name'] + fields = ['name_exercise', 'description', 'init_date', + 'end_date', 'grade', 'name_exercise'] diff --git a/exercise/migrations/0001_initial.py b/exercise/migrations/0001_initial.py index 0cbf8dd..fe48abc 100644 --- a/exercise/migrations/0001_initial.py +++ b/exercise/migrations/0001_initial.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-11-17 05:17 from __future__ import unicode_literals from decimal import Decimal -from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -12,9 +12,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('courses', '0002_auto_20161117_0009'), - ('core', '0002_auto_20161117_0009'), + ('core', '0001_initial'), ] operations = [ @@ -27,9 +25,6 @@ class Migration(migrations.Migration): ('end_date', models.DateField(verbose_name='End of Subject Date')), ('grade', models.DecimalField(decimal_places=2, default=Decimal('0.00'), max_digits=20, null=True)), ('name', models.CharField(max_length=100)), - ('professors', models.ManyToManyField(blank=True, related_name='professors_exercise', to=settings.AUTH_USER_MODEL, verbose_name='Professors')), - ('students', models.ManyToManyField(blank=True, related_name='subject_exercise', to=settings.AUTH_USER_MODEL, verbose_name='Students')), - ('topic', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='exercises', to='courses.Topic', verbose_name='Topic')), ], ), migrations.CreateModel( diff --git a/exercise/migrations/0002_auto_20161117_0217.py b/exercise/migrations/0002_auto_20161117_0217.py new file mode 100644 index 0000000..1a5b96c --- /dev/null +++ b/exercise/migrations/0002_auto_20161117_0217.py @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-11-17 05:17 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('courses', '0002_auto_20161117_0217'), + ('exercise', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.AddField( + model_name='exercise', + name='professors', + field=models.ManyToManyField(blank=True, related_name='professors_exercise', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), + ), + migrations.AddField( + model_name='exercise', + name='students', + field=models.ManyToManyField(blank=True, related_name='subject_exercise', to=settings.AUTH_USER_MODEL, verbose_name='Students'), + ), + migrations.AddField( + model_name='exercise', + name='topic', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='exercises', to='courses.Topic', verbose_name='Topic'), + ), + ] diff --git a/exercise/migrations/0003_auto_20161117_0351.py b/exercise/migrations/0003_auto_20161117_0351.py new file mode 100644 index 0000000..f30dc21 --- /dev/null +++ b/exercise/migrations/0003_auto_20161117_0351.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-11-17 06:51 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('exercise', '0002_auto_20161117_0217'), + ] + + operations = [ + migrations.AlterField( + model_name='file', + name='name', + field=models.CharField(blank=True, max_length=100, null=True, verbose_name='Nome do arquivo'), + ), + ] diff --git a/exercise/migrations/0004_auto_20161117_0357.py b/exercise/migrations/0004_auto_20161117_0357.py new file mode 100644 index 0000000..6e8e6c1 --- /dev/null +++ b/exercise/migrations/0004_auto_20161117_0357.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-11-17 06:57 +from __future__ import unicode_literals + +import datetime +from django.db import migrations, models +from django.utils.timezone import utc + + +class Migration(migrations.Migration): + + dependencies = [ + ('exercise', '0003_auto_20161117_0351'), + ] + + operations = [ + migrations.RenameField( + model_name='file', + old_name='name', + new_name='name_file', + ), + migrations.RemoveField( + model_name='exercise', + name='name', + ), + migrations.AddField( + model_name='exercise', + name='name_exercise', + field=models.CharField(default=datetime.datetime(2016, 11, 17, 6, 57, 41, 28915, tzinfo=utc), max_length=100, verbose_name='Nome do Exercício'), + preserve_default=False, + ), + ] diff --git a/exercise/models.py b/exercise/models.py index e01f620..e4a26a3 100644 --- a/exercise/models.py +++ b/exercise/models.py @@ -18,6 +18,7 @@ def file_path(instance, filename): It represents the Exercises inside topic. """ + class Exercise(models.Model): topic = models.ForeignKey(Topic, verbose_name=_('Topic'), related_name='exercises') professors = models.ManyToManyField(User, verbose_name=_('Professors'), related_name='professors_exercise', blank=True) @@ -26,17 +27,17 @@ class Exercise(models.Model): init_date = models.DateField(_('Begin of Subject Date')) end_date = models.DateField(_('End of Subject Date')) grade = models.DecimalField(max_digits=20, decimal_places=2, default=Decimal('0.00'), null=True) - name = models.CharField(max_length=100) + name_exercise = models.CharField(_('Nome do Exercício'), max_length=100) def __str__(self): - return self.name + return self.name_exercise class File(models.Model): - name = models.CharField(max_length=100) + name_file = models.CharField(_('Nome do arquivo'), max_length=100, blank=True, null=True) file = models.FileField(upload_to='uploads/%Y/%m/%d') - exercise = models.ForeignKey(Exercise, related_name='file') - file_type = models.ForeignKey(MimeType, verbose_name=_('Type file'), related_name='file_files') + exercise = models.ForeignKey(Exercise, related_name='file_exercise') + file_type = models.ForeignKey(MimeType, verbose_name=_('Type file'), related_name='exercise_type') def __str__(self): - return self.name \ No newline at end of file + return self.name_file \ No newline at end of file diff --git a/exercise/static/js/exercise.js b/exercise/static/js/exercise.js index a071569..15559aa 100644 --- a/exercise/static/js/exercise.js +++ b/exercise/static/js/exercise.js @@ -1,4 +1,4 @@ -function get_modal_link(url, id,div_content){ +function get_modal_exercise(url, id,div_content){ $.get(url, function (data) { $(div_content).detach(); $(div_content).append(data); diff --git a/exercise/templates/exercise/card_list_user.html b/exercise/templates/exercise/card_list_user.html index c927e63..995b5c1 100644 --- a/exercise/templates/exercise/card_list_user.html +++ b/exercise/templates/exercise/card_list_user.html @@ -37,7 +37,7 @@

{% trans 'Delivery' %}

{% for file in files %} -
  • {{file.exercise}}: {{file.name}}
    • +
  • {{file.exercise}}: {{file.name_file}}
    • {% endfor %} diff --git a/exercise/templates/exercise/card_topic_exercises.html b/exercise/templates/exercise/card_topic_exercises.html index d49523d..f5e06af 100644 --- a/exercise/templates/exercise/card_topic_exercises.html +++ b/exercise/templates/exercise/card_topic_exercises.html @@ -5,7 +5,7 @@
    -
    {{exercise.name}}
    +
    {{exercise.name_exercise}}

    diff --git a/exercise/templates/exercise/create_exercise.html b/exercise/templates/exercise/create_exercise.html index 733181d..4a376f7 100644 --- a/exercise/templates/exercise/create_exercise.html +++ b/exercise/templates/exercise/create_exercise.html @@ -51,7 +51,6 @@
    -