diff --git a/amadeus/settings.py b/amadeus/settings.py index fba516c..3fc7683 100644 --- a/amadeus/settings.py +++ b/amadeus/settings.py @@ -45,7 +45,6 @@ INSTALLED_APPS = [ 'core', 'app', 'courses', - 'subscriptions', 'users', ] @@ -74,8 +73,6 @@ TEMPLATES = [ 'django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', - - 'subscriptions.context_processors.subscribed_courses', ], }, }, diff --git a/app/templates/app/index.html b/app/templates/app/index.html index 03f5ada..55f614d 100644 --- a/app/templates/app/index.html +++ b/app/templates/app/index.html @@ -43,18 +43,7 @@ {% if user|has_role:'student' %}

{% trans 'Your course(s):' %}

- {% if subscribed_courses|length > 0 %} -
- {% for subscribed in subscribed_courses %} - - {{ subscribed.course }} - - {% endfor %} -
- {% trans 'See all' %} - {% else %} -

{% trans 'No courses subscribed yet' %}

- {% endif %} +

{% trans 'No courses subscribed yet' %}

{% endif %} {% endblock %} diff --git a/app/urls.py b/app/urls.py index d08b8d4..0096d36 100644 --- a/app/urls.py +++ b/app/urls.py @@ -4,7 +4,6 @@ from . import views urlpatterns = [ url(r'^$', views.index, name='index'), - url(r'^', include('subscriptions.urls', namespace = 'subscription')), url(r'^', include('courses.urls', namespace = 'course')), url(r'^cursos/participantes/$', views.participantes_curso, name='participantes_curso'), url(r'^cursos/avaliacoes/$', views.avaliacao_curso, name='avaliacao_curso'), diff --git a/subscriptions/__init__.py b/subscriptions/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/subscriptions/__init__.py +++ /dev/null diff --git a/subscriptions/admin.py b/subscriptions/admin.py deleted file mode 100644 index eb65288..0000000 --- a/subscriptions/admin.py +++ /dev/null @@ -1,9 +0,0 @@ -from django.contrib import admin - -from .models import Subscribe - -class SubscribeAdmin(admin.ModelAdmin): - list_display = ['user', 'course'] - search_fields = ['user', 'course'] - -admin.site.register(Subscribe, SubscribeAdmin) \ No newline at end of file diff --git a/subscriptions/apps.py b/subscriptions/apps.py deleted file mode 100644 index bb0a84c..0000000 --- a/subscriptions/apps.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.apps import AppConfig - - -class SubscriptionsConfig(AppConfig): - name = 'subscriptions' diff --git a/subscriptions/context_processors.py b/subscriptions/context_processors.py deleted file mode 100644 index 2caeebd..0000000 --- a/subscriptions/context_processors.py +++ /dev/null @@ -1,12 +0,0 @@ -from django.contrib.auth.decorators import login_required -from .models import Subscribe - -def subscribed_courses(request): - context = {} - - if request.user.is_anonymous: - context['subscribed_courses'] = None - else: - context['subscribed_courses'] = Subscribe.objects.filter(user = request.user)[:3] or None - - return context \ No newline at end of file diff --git a/subscriptions/forms.py b/subscriptions/forms.py deleted file mode 100644 index d93821a..0000000 --- a/subscriptions/forms.py +++ /dev/null @@ -1,8 +0,0 @@ -from django import forms -from django.utils.translation import ugettext_lazy as _ -from .models import Subscribe - -class SubscribeForm(forms.ModelForm): - class Meta: - model = Subscribe - fields = ['user', 'course'] \ No newline at end of file diff --git a/subscriptions/migrations/0001_initial.py b/subscriptions/migrations/0001_initial.py deleted file mode 100644 index 8da9f27..0000000 --- a/subscriptions/migrations/0001_initial.py +++ /dev/null @@ -1,34 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-08-15 19:31 -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', '0005_auto_20160815_0922'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='Subscribe', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('subs_date', models.DateField(auto_now_add=True, verbose_name='Subscription Date')), - ('create_date', models.DateField(auto_now_add=True, verbose_name='Creation Date')), - ('course', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='courses.Course', verbose_name='Course')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='User')), - ], - options={ - 'verbose_name_plural': 'Subscriptions', - 'verbose_name': 'Subscription', - }, - ), - ] diff --git a/subscriptions/migrations/__init__.py b/subscriptions/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/subscriptions/migrations/__init__.py +++ /dev/null diff --git a/subscriptions/models.py b/subscriptions/models.py deleted file mode 100644 index 32f7609..0000000 --- a/subscriptions/models.py +++ /dev/null @@ -1,14 +0,0 @@ -from django.db import models -from django.utils.translation import ugettext_lazy as _ -from courses.models import Course -from users.models import User - -class Subscribe(models.Model): - user = models.ForeignKey(User, verbose_name = _('User')) - course = models.ForeignKey(Course, verbose_name = _('Course')) - subs_date = models.DateField(_('Subscription Date'), auto_now_add = True) - create_date = models.DateField(_('Creation Date'), auto_now_add = True) - - class Meta: - verbose_name = _('Subscription') - verbose_name_plural = _('Subscriptions') diff --git a/subscriptions/templates/subscribed/index.html b/subscriptions/templates/subscribed/index.html deleted file mode 100644 index 613223d..0000000 --- a/subscriptions/templates/subscribed/index.html +++ /dev/null @@ -1,69 +0,0 @@ -{% extends 'app/base.html' %} - -{% load static i18n %} - -{% block breadcrumbs %} -
    -
  1. {% trans 'Home' %}
    2. -
  2. {% trans 'Subscribed Courses' %}
    3. -
-{% endblock %} - -{% block sidebar %} -
- - {% trans 'All Courses' %} - -
- -
-{% endblock %} - -{% block content %} - {% if subscriptions|length > 0 %} - {% for courses in subscriptions %} -
-
- -
-
-
-
-
- - - -
-

- - {{ courses.course }} - -

- {{ courses.course.category }} - {{ courses.course.max_students }} {% trans 'students maximum' %} - - {{ courses.course.objectivies|linebreaks }} - -
-
- {% trans 'Subscribe Period:' %} de {{ courses.course.init_register_date }} até {{ courses.course.end_register_date }} -
- {% trans 'Period:' %} de {{ courses.course.init_date }} até {{ courses.course.end_date }} -
-
-
-
- {% endfor %} - - {% else %} - {% trans 'No courses subscribed yet' %} - {% endif %} -{% endblock %} \ No newline at end of file diff --git a/subscriptions/templates/subscribed/participants.html b/subscriptions/templates/subscribed/participants.html deleted file mode 100644 index 6c9d270..0000000 --- a/subscriptions/templates/subscribed/participants.html +++ /dev/null @@ -1,99 +0,0 @@ -{% extends 'app/base.html' %} - -{% load static i18n permission_tags %} - -{% block breadcrumbs %} -
    -
  1. {% trans 'Home' %}
    2. -
  2. {{ subscribers.0.course }}
    3. -
  3. {% trans 'Participants' %}
    4. -
-{% endblock %} - -{% block sidebar %} -
- - {% trans 'Courses' %} - - - {% trans 'Course Info' %} - - - {% trans 'Manage Modules' %} - - - {% trans 'Create Course' %} - - - {% trans 'Edit Course' %} - - - {% trans 'Participants' %} - - - {% trans 'Course avaliations' %} - - - {% trans 'Duplicate Course' %} - - - {% trans 'Delete Course' %} - -
-{% endblock %} - -{% block content %} - {% if messages %} - {% for message in messages %} - - {% endfor %} - {% endif %} - - -{% endblock %} \ No newline at end of file diff --git a/subscriptions/tests.py b/subscriptions/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/subscriptions/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/subscriptions/urls.py b/subscriptions/urls.py deleted file mode 100644 index 1cd9a1b..0000000 --- a/subscriptions/urls.py +++ /dev/null @@ -1,9 +0,0 @@ -from django.conf.urls import url - -from . import views - -urlpatterns = [ - url(r'^subscribe/$', views.subscribe, name='subscribe'), - url(r'^cursos/subscribed/$', views.Index.as_view(), name='subscribed'), - url(r'^cursos/(?P[\w_-]+)/participants/$', views.Participants.as_view(), name='participants'), -] \ No newline at end of file diff --git a/subscriptions/views.py b/subscriptions/views.py deleted file mode 100644 index 0a584cb..0000000 --- a/subscriptions/views.py +++ /dev/null @@ -1,51 +0,0 @@ -from django.shortcuts import render, get_object_or_404, redirect -from django.views import generic -from django.contrib import messages -from django.core.paginator import Paginator, EmptyPage -from django.contrib.auth.decorators import login_required -from django.contrib.auth.mixins import LoginRequiredMixin -from django.utils.translation import ugettext_lazy as _ -from rolepermissions.mixins import HasRoleMixin -from .forms import SubscribeForm -from .models import Subscribe -from courses.models import Course - -@login_required -def subscribe(request): - if request.method == 'POST': - print(request.POST) - form = SubscribeForm(request.POST) - - print(form) - - if form.is_valid(): - form.save() - - messages.success(request, _('Course subscribed successfully!')) - - return redirect('app:course:manage') - -class Index(HasRoleMixin, LoginRequiredMixin, generic.ListView): - - allowed_roles = ['student'] - login_url = '/' - redirect_field_name = 'next' - template_name = 'subscribed/index.html' - context_object_name = 'subscriptions' - paginate_by = 10 - - def get_queryset(self): - return Subscribe.objects.filter(user = self.request.user) - -class Participants(HasRoleMixin, LoginRequiredMixin, generic.ListView): - - allowed_roles = ['professor', 'system_admin'] - login_url = '/' - redirect_field_name = 'next' - template_name = 'subscribed/participants.html' - context_object_name = 'subscribers' - paginate_by = 10 - - def get_queryset(self): - course = get_object_or_404(Course, slug = self.kwargs.get('slug')) - return Subscribe.objects.filter(course = course) \ No newline at end of file -- libgit2 0.21.2