From 735ee8bdc9dd257bdf2aacc4e9e2413a29ccd54d Mon Sep 17 00:00:00 2001 From: Zambom Date: Wed, 21 Sep 2016 20:59:31 -0300 Subject: [PATCH] Minor fixes --- amadeus/settings.py | 4 ++-- app/views.py | 2 +- core/migrations/0001_initial.py | 14 +------------- core/migrations/0002_auto_20160920_1815.py | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ courses/migrations/0001_initial.py | 31 +++++-------------------------- courses/migrations/0002_auto_20160920_1815.py | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ courses/templates/subject/form_view_student.html | 26 ++++++++++++-------------- courses/templates/subject/index.html | 52 +++++++++++++++++++++++++++------------------------- 8 files changed, 173 insertions(+), 81 deletions(-) create mode 100644 core/migrations/0002_auto_20160920_1815.py create mode 100644 courses/migrations/0002_auto_20160920_1815.py diff --git a/amadeus/settings.py b/amadeus/settings.py index 6f023ed..f169c68 100644 --- a/amadeus/settings.py +++ b/amadeus/settings.py @@ -78,8 +78,8 @@ TEMPLATES = [ 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', - # 'core.context_processors.notifications', - # 'courses.context_processors.courses', + 'core.context_processors.notifications', + 'courses.context_processors.courses', ], }, }, diff --git a/app/views.py b/app/views.py index 90ce690..e60b23f 100644 --- a/app/views.py +++ b/app/views.py @@ -42,7 +42,7 @@ class AppIndex(LoginRequiredMixin, LogMixin, ListView, NotificationMixin): else: self.template_name = "home_teacher_student_content.html" - #super(AppIndex, self).createNotification("testando notificacao de login", resource_name="home", resource_link="/") + super(AppIndex, self).createNotification("testando notificacao de login", resource_name="home", resource_link="/") return self.response_class(request = self.request, template = self.template_name, context = context, using = self.template_engine, **response_kwargs) diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py index 70c28e4..1ecd03a 100644 --- a/core/migrations/0001_initial.py +++ b/core/migrations/0001_initial.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-20 13:57 +# Generated by Django 1.10 on 2016-09-20 21:15 from __future__ import unicode_literals import autoslug.fields -from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -13,7 +12,6 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -33,7 +31,6 @@ class Migration(migrations.Migration): name='Action_Resource', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('action', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action', verbose_name='Action_Applied')), ], options={ 'verbose_name_plural': 'Action_Resources', @@ -45,8 +42,6 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')), - ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Actor')), ], options={ 'verbose_name_plural': 'Logs', @@ -61,8 +56,6 @@ class Migration(migrations.Migration): ('read', models.BooleanField(default=False, verbose_name='Read')), ('datetime', models.DateTimeField(auto_now_add=True, verbose_name='Date and Time of action')), ('action_resource', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.Action_Resource', verbose_name='Action_Resource')), - ('actor', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='notification_Performer', to=settings.AUTH_USER_MODEL, verbose_name='Perfomer')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notification_Actor', to=settings.AUTH_USER_MODEL, verbose_name='User')), ], options={ 'verbose_name_plural': 'Notifications', @@ -83,9 +76,4 @@ class Migration(migrations.Migration): 'verbose_name': 'Resource', }, ), - 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_20160920_1815.py b/core/migrations/0002_auto_20160920_1815.py new file mode 100644 index 0000000..745f782 --- /dev/null +++ b/core/migrations/0002_auto_20160920_1815.py @@ -0,0 +1,50 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-09-20 21:15 +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 = [ + ('core', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + 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='Perfomer'), + ), + 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/courses/migrations/0001_initial.py b/courses/migrations/0001_initial.py index 7641011..500c3be 100644 --- a/courses/migrations/0001_initial.py +++ b/courses/migrations/0001_initial.py @@ -1,9 +1,8 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.10 on 2016-09-20 13:57 +# Generated by Django 1.10 on 2016-09-20 21:15 from __future__ import unicode_literals import autoslug.fields -from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -14,7 +13,6 @@ class Migration(migrations.Migration): dependencies = [ ('core', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ @@ -24,7 +22,6 @@ class Migration(migrations.Migration): ('resource_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.Resource')), ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), ('limit_date', models.DateTimeField(verbose_name='Deliver Date')), - ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='student')), ], bases=('core.resource',), ), @@ -37,8 +34,8 @@ class Migration(migrations.Migration): ('create_date', models.DateField(auto_now_add=True, verbose_name='Creation Date')), ], options={ - 'verbose_name': 'Category', 'verbose_name_plural': 'Categories', + 'verbose_name': 'Category', }, ), migrations.CreateModel( @@ -56,13 +53,10 @@ class Migration(migrations.Migration): ('init_date', models.DateField(verbose_name='Begin of Course Date')), ('end_date', models.DateField(verbose_name='End of Course Date')), ('image', models.ImageField(blank=True, upload_to='courses/', verbose_name='Image')), - ('category', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Category', verbose_name='Category')), - ('professors', models.ManyToManyField(related_name='courses', to=settings.AUTH_USER_MODEL, verbose_name='Professors')), - ('students', models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students')), ], options={ - 'verbose_name': 'Course', 'verbose_name_plural': 'Courses', + 'verbose_name': 'Course', 'ordering': ('create_date', 'name'), }, ), @@ -71,7 +65,6 @@ class Migration(migrations.Migration): fields=[ ('resource_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='core.Resource')), ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), - ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='student')), ], bases=('core.resource',), ), @@ -87,12 +80,10 @@ class Migration(migrations.Migration): ('end_date', models.DateField(verbose_name='End of Subject Date')), ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')), - ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course')), - ('professors', models.ManyToManyField(related_name='subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors')), ], options={ - 'verbose_name': 'Subject', 'verbose_name_plural': 'Subjects', + 'verbose_name': 'Subject', 'ordering': ('create_date', 'name'), }, ), @@ -106,23 +97,11 @@ class Migration(migrations.Migration): ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), ('update_date', models.DateTimeField(auto_now=True, verbose_name='Date of last update')), ('visible', models.BooleanField(default=False, verbose_name='Visible')), - ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner')), - ('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'), }, ), - migrations.AddField( - model_name='material', - name='topic', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Topic', verbose_name='Topic'), - ), - migrations.AddField( - model_name='activity', - name='topic', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Topic', verbose_name='Topic'), - ), ] diff --git a/courses/migrations/0002_auto_20160920_1815.py b/courses/migrations/0002_auto_20160920_1815.py new file mode 100644 index 0000000..1ede817 --- /dev/null +++ b/courses/migrations/0002_auto_20160920_1815.py @@ -0,0 +1,75 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-09-20 21:15 +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='topic', + name='owner', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Owner'), + ), + migrations.AddField( + model_name='topic', + name='subject', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Subject', verbose_name='Subject'), + ), + migrations.AddField( + model_name='subject', + name='course', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='subjects', to='courses.Course', verbose_name='Course'), + ), + migrations.AddField( + model_name='subject', + name='professors', + field=models.ManyToManyField(related_name='subjects', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), + ), + migrations.AddField( + model_name='material', + name='student', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='student'), + ), + migrations.AddField( + model_name='material', + name='topic', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Topic', verbose_name='Topic'), + ), + migrations.AddField( + model_name='course', + name='category', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Category', verbose_name='Category'), + ), + migrations.AddField( + model_name='course', + name='professors', + field=models.ManyToManyField(related_name='courses', to=settings.AUTH_USER_MODEL, verbose_name='Professors'), + ), + migrations.AddField( + model_name='course', + name='students', + field=models.ManyToManyField(related_name='courses_student', to=settings.AUTH_USER_MODEL, verbose_name='Students'), + ), + migrations.AddField( + model_name='activity', + name='student', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='student'), + ), + migrations.AddField( + model_name='activity', + name='topic', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Topic', verbose_name='Topic'), + ), + ] diff --git a/courses/templates/subject/form_view_student.html b/courses/templates/subject/form_view_student.html index c21da8d..3de7294 100644 --- a/courses/templates/subject/form_view_student.html +++ b/courses/templates/subject/form_view_student.html @@ -1,18 +1,16 @@ {% load i18n %}
- -
-
-
-

{{topic}}

-
-
-
- -
- -
-

{{topic.description|linebreaks}}

-
+ +
+
+
+

{{topic}}

+
+
+
+ +
+

{{topic.description|linebreaks}}

+
\ No newline at end of file diff --git a/courses/templates/subject/index.html b/courses/templates/subject/index.html index c794f4d..068c112 100644 --- a/courses/templates/subject/index.html +++ b/courses/templates/subject/index.html @@ -41,37 +41,39 @@ {% endblock %} {% block content %} -
-
+
+
-
-

{{subject}}

-
-
+
+

{{subject}}

+
+
{% if user|has_role:'system_admin' or user in subject.professors %} - {% trans "edit" %} + {% trans "edit" %} {% endif %} -
+
{% if user|has_role:'system_admin' or user in subject.professors %} - {% trans "delete" %} + {% trans "delete" %} {% endif %} -
-
-
-
-

- {{subject.description|linebreaks}} -

-
-
-{% for topic in topics %} - {% if user|has_role:'system_admin' or topic.owner == user%} - {% include "subject/form_view_teacher.html" %} - {% else %} - {% include "subject/form_view_student.html" %} - {% endif %} -{% endfor %} +
+
+ +
+

+ {{subject.description|linebreaks}} +

+
+ + + {% for topic in topics %} + {% if user|has_role:'system_admin' or topic.owner == user%} + {% include "subject/form_view_teacher.html" %} + {% else %} + {% include "subject/form_view_student.html" %} + {% endif %} + {% endfor %} + {% if user|has_role:'system_admin' or topic.owner == user%} {% trans "Create Topic" %} {% endif %} -- libgit2 0.21.2