From 4e087247935b7fbb7a1aae7d4ef784740c26ce80 Mon Sep 17 00:00:00 2001 From: Felipe Henrique de Almeida Bormann Date: Wed, 21 Dec 2016 02:28:56 -0300 Subject: [PATCH] index url for courses was created, category model added and views are ready --- amadeus/settings.py | 2 +- amadeus/templates/base.html | 10 +++++----- amadeus/urls.py | 1 + courses/__init__.py | 0 courses/admin.py | 3 +++ courses/apps.py | 5 +++++ courses/migrations/0001_initial.py | 38 ++++++++++++++++++++++++++++++++++++++ courses/migrations/__init__.py | 0 courses/models.py | 23 +++++++++++++++++++++++ courses/templates/courses/home.html | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ courses/templates/courses/home_admin_content.html | 8 ++++++++ courses/templates/courses/home_teacher_student_content.html | 20 ++++++++++++++++++++ courses/templates/courses/list.html | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ courses/tests.py | 3 +++ courses/urls.py | 7 +++++++ courses/views.py | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ users/views.py | 2 +- 17 files changed, 327 insertions(+), 7 deletions(-) create mode 100644 courses/__init__.py create mode 100644 courses/admin.py create mode 100644 courses/apps.py create mode 100644 courses/migrations/0001_initial.py create mode 100644 courses/migrations/__init__.py create mode 100644 courses/models.py create mode 100755 courses/templates/courses/home.html create mode 100755 courses/templates/courses/home_admin_content.html create mode 100755 courses/templates/courses/home_teacher_student_content.html create mode 100755 courses/templates/courses/list.html create mode 100644 courses/tests.py create mode 100644 courses/urls.py create mode 100644 courses/views.py diff --git a/amadeus/settings.py b/amadeus/settings.py index 5c4d481..df078e5 100644 --- a/amadeus/settings.py +++ b/amadeus/settings.py @@ -55,7 +55,7 @@ INSTALLED_APPS = [ 'users', 'notifications', 'log', - + 'courses' ] MIDDLEWARE_CLASSES = [ diff --git a/amadeus/templates/base.html b/amadeus/templates/base.html index e842f42..f088b90 100644 --- a/amadeus/templates/base.html +++ b/amadeus/templates/base.html @@ -73,7 +73,7 @@
-
+
@@ -107,10 +107,10 @@
  • {{ user }}
    • diff --git a/amadeus/urls.py b/amadeus/urls.py index ab7a734..065d47c 100644 --- a/amadeus/urls.py +++ b/amadeus/urls.py @@ -25,6 +25,7 @@ urlpatterns = [ url(r'^users/', include('users.urls', namespace = 'users')), url(r'^admin/', admin.site.urls), url(r'^$', index), + url(r'^courses/', include('courses.urls', namespace = 'courses')), #API url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')), #S3Direct diff --git a/courses/__init__.py b/courses/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/courses/__init__.py diff --git a/courses/admin.py b/courses/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/courses/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/courses/apps.py b/courses/apps.py new file mode 100644 index 0000000..f41d025 --- /dev/null +++ b/courses/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class CourseConfig(AppConfig): + name = 'courses' diff --git a/courses/migrations/0001_initial.py b/courses/migrations/0001_initial.py new file mode 100644 index 0000000..62b0ce7 --- /dev/null +++ b/courses/migrations/0001_initial.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10 on 2016-12-21 03:51 +from __future__ import unicode_literals + +import autoslug.fields +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), + ] + + operations = [ + migrations.CreateModel( + name='Category', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=100, verbose_name='Name')), + ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')), + ('description', models.CharField(max_length=300, verbose_name='description')), + ('visible', models.BooleanField(verbose_name='visible')), + ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Creation Date')), + ('modified_date', models.DateTimeField(auto_now_add=True, verbose_name='Modified Date')), + ('category_father', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='category_parent', to='courses.Category')), + ('coordinators', models.ManyToManyField(related_name='coordinators', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'verbose_name_plural': 'Categories', + 'verbose_name': 'Category', + }, + ), + ] diff --git a/courses/migrations/__init__.py b/courses/migrations/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/courses/migrations/__init__.py diff --git a/courses/models.py b/courses/models.py new file mode 100644 index 0000000..18d9d7c --- /dev/null +++ b/courses/models.py @@ -0,0 +1,23 @@ +from django.db import models +from autoslug.fields import AutoSlugField +from django.utils.translation import ugettext_lazy as _ +from users.models import User + +class Category(models.Model): + """Represents a Course """ + + category_father = models.ForeignKey('Category', related_name =_("category_parent"), on_delete = models.CASCADE) + name = models.CharField(_("Name"), max_length = 100) + slug = AutoSlugField(_("Slug"),populate_from='name',unique=True) + description = models.CharField(_("description"), max_length = 300) + visible = models.BooleanField(_("visible")) + coordinators = models.ManyToManyField(User, related_name = _("coordinators")) + create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True) + modified_date = models.DateTimeField(_('Modified Date'), auto_now_add = True) + + class Meta: + verbose_name = _('Category') + verbose_name_plural = _('Categories') + + def __str__(self): + return self.name \ No newline at end of file diff --git a/courses/templates/courses/home.html b/courses/templates/courses/home.html new file mode 100755 index 0000000..f0842d6 --- /dev/null +++ b/courses/templates/courses/home.html @@ -0,0 +1,86 @@ +{% extends 'base.html' %} + +{% load static i18n django_bootstrap_breadcrumbs permission_tags %} + + + +{% block breadcrumbs %} + {% clear_breadcrumbs %} + {% breadcrumb 'Home' 'app:index' %} +{% endblock %} + + +{% block render_breadcrumbs %} + {% render_breadcrumbs %} +{% endblock %} + +{% block sidebar %} +
    +
    +

    {% trans 'Menu' %}

    +
    +
    + +
    +
    +{% endblock %} + +{% block content %} + {% if user|has_role:'system_admin' %} +

    {% trans 'Courses' %}

    +
    + {% include page_template %} +
    + {% else %} +
    + {% include page_template %} +
    + {% endif %} + +{% endblock %} diff --git a/courses/templates/courses/home_admin_content.html b/courses/templates/courses/home_admin_content.html new file mode 100755 index 0000000..8db61f1 --- /dev/null +++ b/courses/templates/courses/home_admin_content.html @@ -0,0 +1,8 @@ +{% load i18n %} + +{% for course in objects %} +
    +

    {{ course }}

    + {% trans 'Edit' %} +
    +{% endfor %} diff --git a/courses/templates/courses/home_teacher_student_content.html b/courses/templates/courses/home_teacher_student_content.html new file mode 100755 index 0000000..c98ccb3 --- /dev/null +++ b/courses/templates/courses/home_teacher_student_content.html @@ -0,0 +1,20 @@ +{% load static i18n %} + +{% for notification in objects %} + + +
    + +
    +
    + +
    +
    +

    {{ notification.actor.username }}

    +

    {{notification.message}} {% trans 'at' %} : {{ notification.action_resource.resource.name }}

    +

    {{ notification.datetime|timesince }} {% trans "ago" %}

    +
    +
    +
    +{% endfor %} + diff --git a/courses/templates/courses/list.html b/courses/templates/courses/list.html new file mode 100755 index 0000000..e225fb9 --- /dev/null +++ b/courses/templates/courses/list.html @@ -0,0 +1,66 @@ +{% extends 'home.html' %} + +{% load static i18n permission_tags %} +{% load django_bootstrap_breadcrumbs %} + +{% block javascript%} + {{ block.super }} +{% endblock%} + +{% block breadcrumbs %} + +{{ block.super }} +{% breadcrumb 'Courses' 'course:manage' %} + +{% endblock %} + +{% block content %} +{% if messages %} +{% for message in messages %} + +{% endfor %} +{% endif %} + +
    + +
    +
    + +
    + + + +
    + +
    +
    + {% for category in categorys_courses %} +
    +
    +
    +
    +
    +

    + {{category.name}} +

    +
    +
    +
    +
    + {% for course in category.course_category %} + {% include "course/course_card.html" %} + {% endfor %} +
    +
    +
    + {% endfor %} +
    + + +{% endblock %} diff --git a/courses/tests.py b/courses/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/courses/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/courses/urls.py b/courses/urls.py new file mode 100644 index 0000000..c416d2f --- /dev/null +++ b/courses/urls.py @@ -0,0 +1,7 @@ +from django.conf.urls import url +from . import views + +urlpatterns = [ + url(r'^$', views.IndexView.as_view(), name='index'), + +] \ No newline at end of file diff --git a/courses/views.py b/courses/views.py new file mode 100644 index 0000000..8cdf51d --- /dev/null +++ b/courses/views.py @@ -0,0 +1,60 @@ +from django.shortcuts import render +from django.views.generic import ListView +from .models import Category +from django.core.urlresolvers import reverse_lazy +from rolepermissions.verifications import has_role + +from django.utils.translation import ugettext_lazy as _ + +from django.contrib.auth.mixins import LoginRequiredMixin + +class IndexView(LoginRequiredMixin, ListView): + + login_url = reverse_lazy("users:login") + redirect_field_name = 'next' + queryset = Category.objects.all() + template_name = 'courses/home.html' + context_object_name = 'categories' + + + def get_queryset(self): + result = super(IndexView, self).get_queryset() + + + return result + + def render_to_response(self, context, **response_kwargs): + if self.request.user.is_staff: + context['page_template'] = "courses/home_admin_content.html" + else: + context['page_template'] = "courses/home_teacher_student_content.html" + + context['title'] = _('Home') + + if self.request.is_ajax(): + if self.request.user.is_staff: + self.template_name = "home_admin_content.html" + else: + self.template_name = "home_teacher_student_content.html" + + return self.response_class(request = self.request, template = self.template_name, context = context, using = self.template_engine, **response_kwargs) + + def get_context_data(self, **kwargs): + context = super(IndexView, self).get_context_data(**kwargs) + list_courses = None + if has_role(self.request.user,'system_admin'): + list_courses = self.get_queryset().order_by('name') + # categorys_courses = CourseCategory.objects.all() + elif has_role(self.request.user,'professor'): + pass + #list_courses = self.get_queryset().filter(professors__in = [self.request.user]).order_by('name') + # categorys_courses = CourseCategory.objects.filter(course_category__professors__name = self.request.user.name).distinct() + elif has_role(self.request.user, 'student'): + pass + #list_courses = self.get_queryset().filter(students__in = [self.request.user]).order_by('name') + + + context['title'] = _('Categories') + + return context + diff --git a/users/views.py b/users/views.py index c77d399..6d7f92a 100644 --- a/users/views.py +++ b/users/views.py @@ -258,7 +258,7 @@ def login(request): messages.add_message(request, messages.ERROR, _('E-mail or password are incorrect.')) context["username"] = username elif request.user.is_authenticated: - raise Http404('

    Page not found

    ') + return redirect('courses:index') return render(request,"users/login.html",context) -- libgit2 0.21.2