Adding groups app

Zambom
1 parent e9573f81
Showing 20 changed files with 330 additions and 2 deletions Show diff stats
amadeus/settings.py
amadeus/urls.py
categories/migrations/0007_auto_20170118_1711.py
students_group/__init__.py
students_group/admin.py
students_group/apps.py
students_group/forms.py
students_group/migrations/0001_initial.py
students_group/migrations/__init__.py
students_group/models.py
students_group/templates/groups/create.html
students_group/templates/groups/index.html
students_group/tests.py
students_group/urls.py
students_group/views.py
subjects/templates/subjects/subject_card.html
subjects/templates/subjects/view.html
topics/migrations/0004_auto_20170118_1711.py
topics/templates/topics/create.html
topics/templates/topics/update.html
@@ -58,6 +58,7 @@ INSTALLED_APPS = [
     'log',
     'categories',
     'subjects',
+    'students_group',
     'topics',
     'mailsender',
     'security',
@@ -27,6 +27,7 @@ urlpatterns = [
     url(r'^$', index, name = 'home'),
     url(r'^categories/', include('categories.urls', namespace = 'categories')),
     url(r'^subjects/', include('subjects.urls', namespace = 'subjects')),
+    url(r'^groups/', include('students_group.urls', namespace = 'groups')),
     url(r'^topics/', include('topics.urls', namespace = 'topics')),
     url(r'^mailsender/', include('mailsender.urls', namespace = 'mailsender')),
     url(r'^security/', include('security.urls', namespace = 'security')),
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2017-01-18 20:11
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('categories', '0006_auto_20170102_1856'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='category',
+            name='coordinators',
+            field=models.ManyToManyField(blank=True, related_name='Coordenadores', to=settings.AUTH_USER_MODEL),
+        ),
+    ]
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class StudentsGroupConfig(AppConfig):
+    name = 'students_group'
@@ -0,0 +1,36 @@
+# coding=utf-8
+from django import forms
+from django.utils.translation import ugettext_lazy as _
+
+from .models import StudentsGroup
+
+class StudentsGroupForm(forms.ModelForm):
+	subject = None
+
+	def __init__(self, *args, **kwargs):
+		super(StudentsGroupForm, self).__init__(*args, **kwargs)
+
+		self.subject = kwargs['initial'].get('subject', None)
+
+	def clean_name(self):
+		name = self.cleaned_data.get('name', '')
+		
+		if self.instance.id:
+			same_name = self.subject.group_subject.filter(name__unaccent__iexact = name).exclude(id = self.instance.id).count()
+		else:
+			same_name = self.subject.group_subject.filter(name__unaccent__iexact = name).count()
+		
+		if same_name > 0:
+			self._errors['name'] = [_('This subject already has a group with this name')]
+
+			return ValueError
+
+		return name
+
+	class Meta:
+		model = StudentsGroup
+		fields = ['name', 'description', 'participants']
+		widgets = {
+			'description': forms.Textarea,
+			'participants': forms.SelectMultiple,
+		}
 \ No newline at end of file
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2017-01-18 20:11
+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),
+        ('subjects', '0012_auto_20170112_1408'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='StudentsGroup',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=200, verbose_name='Name')),
+                ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')),
+                ('description', models.TextField(blank=True, verbose_name='Description')),
+                ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Create Date')),
+                ('last_update', models.DateTimeField(auto_now=True, verbose_name='Last Update')),
+                ('participants', models.ManyToManyField(blank=True, related_name='group_participants', to=settings.AUTH_USER_MODEL, verbose_name='Participants')),
+                ('subject', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='group_subject', to='subjects.Subject', verbose_name='Subject')),
+            ],
+            options={
+                'verbose_name': 'Students Group',
+                'verbose_name_plural': 'Students Groups',
+            },
+        ),
+    ]
@@ -0,0 +1,22 @@
+from django.db import models
+from autoslug.fields import AutoSlugField
+from django.utils.translation import ugettext_lazy as _
+
+from subjects.models import Subject
+from users.models import User
+
+class StudentsGroup(models.Model):
+	name = models.CharField(_('Name'), max_length = 200)
+	slug = AutoSlugField(_("Slug"), populate_from = 'name', unique = True)
+	description = models.TextField(_('Description'), blank = True)
+	subject = models.ForeignKey(Subject, verbose_name = _('Subject'), related_name = 'group_subject', null = True)
+	participants = models.ManyToManyField(User, verbose_name = _('Participants'), related_name = 'group_participants', blank = True)
+	create_date = models.DateTimeField(_('Create Date'), auto_now_add = True)
+	last_update = models.DateTimeField(_('Last Update'), auto_now = True)
+
+	class Meta:
+		verbose_name = _('Students Group')
+		verbose_name_plural = _('Students Groups')
+
+	def __str__(self):
+		return self.name
 \ No newline at end of file
@@ -0,0 +1,21 @@
+{% extends 'groups/index.html' %}
+
+{% load i18n django_bootstrap_breadcrumbs %}
+
+{% block breadcrumbs %}
+  	{{ block.super }}
+  	
+  	{% trans 'Create Group' as bread %}
+    {% breadcrumb bread 'groups:create' subject.slug %}
+{% endblock %}
+
+{% block content %}
+	<div class="card">
+		<div class="card-content">
+			<div class="card-body">
+			</div>
+		</div>
+  	</div>
+  	<br clear="all" />
+    <br clear="all" />
+{% endblock %}
@@ -0,0 +1,44 @@
+{% extends 'subjects/view.html' %}
+
+{% load static i18n pagination %}
+{% load django_bootstrap_breadcrumbs %}
+
+{% block javascript%}
+    {{ block.super }}
+{% endblock%}
+
+{% block breadcrumbs %}
+    {{ block.super }}
+
+    {% trans 'Groups' as bread %}
+    {% breadcrumb bread 'groups:index' subject.slug %}
+{% endblock %}
+
+{% block content %}
+    {% if messages %}
+        {% for message in messages %}
+            <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
+                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+                <p>{{ message }}</p>
+            </div>
+        {% endfor %}
+    {% endif %}
+
+    <div class='row'>
+        <div class="col-md-offset-4 col-md-3">
+            <a href="{% url 'groups:create' subject.slug %}" class="btn btn-raised btn-success btn-block">{% trans "Create Group" %}</a>
+        </div>
+    </div>
+
+    <div class="col-md-12 cards-content">
+        <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
+            {% for group in groups  %}
+            {% endfor %}
+
+            {% pagination request paginator page_obj %}
+        </div>
+    </div>
+
+{% endblock %}
 \ No newline at end of file
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
@@ -0,0 +1,7 @@
+from django.conf.urls import url
+from . import views
+
+urlpatterns = [
+	url(r'^(?P<slug>[\w_-]+)/$', views.IndexView.as_view(), name='index'),
+	url(r'^create/(?P<slug>[\w_-]+)/$', views.CreateView.as_view(), name='create'),
+]
 \ No newline at end of file
@@ -0,0 +1,103 @@
+from django.shortcuts import get_object_or_404, redirect, render
+from django.views import generic
+from django.contrib import messages
+from django.http import JsonResponse
+from django.core.urlresolvers import reverse, reverse_lazy
+from django.utils.translation import ugettext_lazy as _
+from django.contrib.auth.mixins import LoginRequiredMixin
+
+from amadeus.permissions import has_subject_permissions
+
+from subjects.models import Subject
+
+from .models import StudentsGroup
+from .forms import StudentsGroupForm
+
+class IndexView(LoginRequiredMixin, generic.ListView):
+	login_url = reverse_lazy("users:login")
+	redirect_field_name = 'next'
+
+	model = StudentsGroup
+	context_object_name = 'groups'
+	template_name = 'groups/index.html'
+	paginate_by = 10
+
+	def dispatch(self, request, *args, **kwargs):
+		slug = self.kwargs.get('slug', '')
+		subject = get_object_or_404(Subject, slug = slug)
+
+		if not has_subject_permissions(request.user, subject):
+			return redirect(reverse_lazy('subjects:home'))
+
+		return super(IndexView, self).dispatch(request, *args, **kwargs)
+
+	def get_queryset(self):
+		slug = self.kwargs.get('slug', '')
+		subject = get_object_or_404(Subject, slug = slug)
+
+		return StudentsGroup.objects.filter(subject = subject)
+
+	def get_context_data(self, **kwargs):
+		context = super(IndexView, self).get_context_data(**kwargs)
+
+		slug = self.kwargs.get('slug', '')
+		subject = get_object_or_404(Subject, slug = slug)
+
+		context['title'] = _('Students Groups')
+		context['subject'] = subject
+
+		return context
+
+class CreateView(LoginRequiredMixin, generic.edit.CreateView):
+	login_url = reverse_lazy("users:login")
+	redirect_field_name = 'next'
+
+	template_name = 'groups/create.html'
+	form_class = StudentsGroupForm
+
+	def dispatch(self, request, *args, **kwargs):
+		slug = self.kwargs.get('slug', '')
+		subject = get_object_or_404(Subject, slug = slug)
+
+		if not has_subject_permissions(request.user, subject):
+			return redirect(reverse_lazy('subjects:home'))
+
+		return super(CreateView, self).dispatch(request, *args, **kwargs)
+
+	def get_initial(self):
+		initial = super(CreateView, self).get_initial()
+
+		slug = self.kwargs.get('slug', '')
+
+		initial['subject'] = get_object_or_404(Subject, slug = slug)
+		
+		return initial
+
+	def form_valid(self, form):
+		self.object = form.save(commit = False)
+
+		slug = self.kwargs.get('slug', '')
+		subject = get_object_or_404(Subject, slug = slug)
+
+		self.object.subject = subject
+
+		self.object.save()
+
+		return super(CreateView, self).form_valid(form)
+
+	def get_context_data(self, **kwargs):
+		context = super(CreateView, self).get_context_data(**kwargs)
+
+		context['title'] = _('Create Topic')
+
+		slug = self.kwargs.get('slug', '')
+		subject = get_object_or_404(Subject, slug = slug)
+
+		context['subject'] = subject
+
+		return context
+
+	def get_success_url(self):
+		messages.success(self.request, _('The group "%s" was created successfully!')%(self.object.name))
+
+		return reverse_lazy('groups:index', kwargs = {'slug': self.object.subject.slug})
 \ No newline at end of file
@@ -18,6 +18,7 @@
                             <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
                                 <li><a href="{% url 'subjects:replicate' subject.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
                                 <li><a href="{% url 'subjects:update' subject.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
+                                <li><a href="{% url 'groups:index' subject.slug %}"><i class="fa fa-group fa-fw" aria-hidden="true"></i>{% trans 'Groups' %}</a></li>
                                 <li><a href="javascript:delete_subject.get('{% url 'subjects:delete' subject.slug %}?view=index','#subject','#modal_subject')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
                             </ul>
                         {% endif %}
@@ -48,6 +48,7 @@
                             <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
                                 <li><a href="{% url 'subjects:replicate' subject.slug %}"><i class="fa fa-files-o fa-fw" aria-hidden="true"></i>{% trans 'Replicate' %}</a></li>
                                 <li><a href="{% url 'subjects:update' subject.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i>{% trans 'Edit' %}</a></li>
+                                <li><a href="{% url 'groups:index' subject.slug %}"><i class="fa fa-group fa-fw" aria-hidden="true"></i>{% trans 'Groups' %}</a></li>
                                 <li><a href="javascript:delete_subject.get('{% url 'subjects:delete' subject.slug %}?view=index','#subject','#modal_subject')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i>&nbsp;{% trans 'Remove' %}</a></li>
                             </ul>
                         {% endif %}
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2017-01-18 20:11
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('topics', '0003_auto_20170116_2101'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='topic',
+            options={'ordering': ['order'], 'verbose_name': 'Topic', 'verbose_name_plural': 'Topics'},
+        ),
+    ]
 {% extends 'subjects/view.html' %}
-{% load django_bootstrap_breadcrumbs %}
+{% load i18n django_bootstrap_breadcrumbs %}
 {% block breadcrumbs %}
   	{{ block.super }}
+  	
   	{% trans 'Create Topic' as bread %}
     {% breadcrumb bread 'topics:create' subject.slug %}
 {% endblock %}
 {% extends 'subjects/view.html' %}
-{% load django_bootstrap_breadcrumbs %}
+{% load i18n django_bootstrap_breadcrumbs %}
 {% block breadcrumbs %}
   	{{ block.super }}
+  	
   	{% trans 'Update Topic' as bread %}
     {% breadcrumb bread 'topics:update' subject.slug topic.slug %}
 {% endblock %}
@@ -0,0 +1,21 @@		@@ -0,0 +1,21 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2017-01-18 20:11
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.conf import settings
	6	+from django.db import migrations, models
	7	+
	8	+
	9	+class Migration(migrations.Migration):
	10	+
	11	+ dependencies = [
	12	+ ('categories', '0006_auto_20170102_1856'),
	13	+ ]
	14	+
	15	+ operations = [
	16	+ migrations.AlterField(
	17	+ model_name='category',
	18	+ name='coordinators',
	19	+ field=models.ManyToManyField(blank=True, related_name='Coordenadores', to=settings.AUTH_USER_MODEL),
	20	+ ),
	21	+ ]
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+from django.contrib import admin
	2	+
	3	+# Register your models here.
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+from django.apps import AppConfig
	2	+
	3	+
	4	+class StudentsGroupConfig(AppConfig):
	5	+ name = 'students_group'
	@@ -0,0 +1,36 @@		@@ -0,0 +1,36 @@
		1	+# coding=utf-8
		2	+from django import forms
		3	+from django.utils.translation import ugettext_lazy as _
		4	+
		5	+from .models import StudentsGroup
		6	+
		7	+class StudentsGroupForm(forms.ModelForm):
		8	+ subject = None
		9	+
		10	+ def __init__(self, args, *kwargs):
		11	+ super(StudentsGroupForm, self).__init__(args, *kwargs)
		12	+
		13	+ self.subject = kwargs['initial'].get('subject', None)
		14	+
		15	+ def clean_name(self):
		16	+ name = self.cleaned_data.get('name', '')
		17	+
		18	+ if self.instance.id:
		19	+ same_name = self.subject.group_subject.filter(name__unaccent__iexact = name).exclude(id = self.instance.id).count()
		20	+ else:
		21	+ same_name = self.subject.group_subject.filter(name__unaccent__iexact = name).count()
		22	+
		23	+ if same_name > 0:
		24	+ self._errors['name'] = [_('This subject already has a group with this name')]
		25	+
		26	+ return ValueError
		27	+
		28	+ return name
		29	+
		30	+ class Meta:
		31	+ model = StudentsGroup
		32	+ fields = ['name', 'description', 'participants']
		33	+ widgets = {
		34	+ 'description': forms.Textarea,
		35	+ 'participants': forms.SelectMultiple,
		36	+ }
0	\ No newline at end of file	37	\ No newline at end of file
@@ -0,0 +1,38 @@		@@ -0,0 +1,38 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2017-01-18 20:11
	3	+from __future__ import unicode_literals
	4	+
	5	+import autoslug.fields
	6	+from django.conf import settings
	7	+from django.db import migrations, models
	8	+import django.db.models.deletion
	9	+
	10	+
	11	+class Migration(migrations.Migration):
	12	+
	13	+ initial = True
	14	+
	15	+ dependencies = [
	16	+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
	17	+ ('subjects', '0012_auto_20170112_1408'),
	18	+ ]
	19	+
	20	+ operations = [
	21	+ migrations.CreateModel(
	22	+ name='StudentsGroup',
	23	+ fields=[
	24	+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
	25	+ ('name', models.CharField(max_length=200, verbose_name='Name')),
	26	+ ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='name', unique=True, verbose_name='Slug')),
	27	+ ('description', models.TextField(blank=True, verbose_name='Description')),
	28	+ ('create_date', models.DateTimeField(auto_now_add=True, verbose_name='Create Date')),
	29	+ ('last_update', models.DateTimeField(auto_now=True, verbose_name='Last Update')),
	30	+ ('participants', models.ManyToManyField(blank=True, related_name='group_participants', to=settings.AUTH_USER_MODEL, verbose_name='Participants')),
	31	+ ('subject', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='group_subject', to='subjects.Subject', verbose_name='Subject')),
	32	+ ],
	33	+ options={
	34	+ 'verbose_name': 'Students Group',
	35	+ 'verbose_name_plural': 'Students Groups',
	36	+ },
	37	+ ),
	38	+ ]
	@@ -0,0 +1,22 @@		@@ -0,0 +1,22 @@
		1	+from django.db import models
		2	+from autoslug.fields import AutoSlugField
		3	+from django.utils.translation import ugettext_lazy as _
		4	+
		5	+from subjects.models import Subject
		6	+from users.models import User
		7	+
		8	+class StudentsGroup(models.Model):
		9	+ name = models.CharField(_('Name'), max_length = 200)
		10	+ slug = AutoSlugField(_("Slug"), populate_from = 'name', unique = True)
		11	+ description = models.TextField(_('Description'), blank = True)
		12	+ subject = models.ForeignKey(Subject, verbose_name = _('Subject'), related_name = 'group_subject', null = True)
		13	+ participants = models.ManyToManyField(User, verbose_name = _('Participants'), related_name = 'group_participants', blank = True)
		14	+ create_date = models.DateTimeField(_('Create Date'), auto_now_add = True)
		15	+ last_update = models.DateTimeField(_('Last Update'), auto_now = True)
		16	+
		17	+ class Meta:
		18	+ verbose_name = _('Students Group')
		19	+ verbose_name_plural = _('Students Groups')
		20	+
		21	+ def __str__(self):
		22	+ return self.name
0	\ No newline at end of file	23	\ No newline at end of file
@@ -0,0 +1,21 @@		@@ -0,0 +1,21 @@
	1	+{% extends 'groups/index.html' %}
	2	+
	3	+{% load i18n django_bootstrap_breadcrumbs %}
	4	+
	5	+{% block breadcrumbs %}
	6	+ {{ block.super }}
	7	+
	8	+ {% trans 'Create Group' as bread %}
	9	+ {% breadcrumb bread 'groups:create' subject.slug %}
	10	+{% endblock %}
	11	+
	12	+{% block content %}
	13	+ <div class="card">
	14	+ <div class="card-content">
	15	+ <div class="card-body">
	16	+ </div>
	17	+ </div>
	18	+ </div>
	19	+ <br clear="all" />
	20	+ <br clear="all" />
	21	+{% endblock %}
	@@ -0,0 +1,44 @@		@@ -0,0 +1,44 @@
		1	+{% extends 'subjects/view.html' %}
		2	+
		3	+{% load static i18n pagination %}
		4	+{% load django_bootstrap_breadcrumbs %}
		5	+
		6	+{% block javascript%}
		7	+ {{ block.super }}
		8	+{% endblock%}
		9	+
		10	+{% block breadcrumbs %}
		11	+ {{ block.super }}
		12	+
		13	+ {% trans 'Groups' as bread %}
		14	+ {% breadcrumb bread 'groups:index' subject.slug %}
		15	+{% endblock %}
		16	+
		17	+{% block content %}
		18	+ {% if messages %}
		19	+ {% for message in messages %}
		20	+ <div class="alert alert-{{ message.tags }} alert-dismissible" role="alert">
		21	+ <button type="button" class="close" data-dismiss="alert" aria-label="Close">
		22	+ <span aria-hidden="true">×</span>
		23	+ </button>
		24	+ <p>{{ message }}</p>
		25	+ </div>
		26	+ {% endfor %}
		27	+ {% endif %}
		28	+
		29	+ <div class='row'>
		30	+ <div class="col-md-offset-4 col-md-3">
		31	+ <a href="{% url 'groups:create' subject.slug %}" class="btn btn-raised btn-success btn-block">{% trans "Create Group" %}</a>
		32	+ </div>
		33	+ </div>
		34	+
		35	+ <div class="col-md-12 cards-content">
		36	+ <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
		37	+ {% for group in groups %}
		38	+ {% endfor %}
		39	+
		40	+ {% pagination request paginator page_obj %}
		41	+ </div>
		42	+ </div>
		43	+
		44	+{% endblock %}
0	\ No newline at end of file	45	\ No newline at end of file
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+from django.test import TestCase
	2	+
	3	+# Create your tests here.
	@@ -0,0 +1,7 @@		@@ -0,0 +1,7 @@
		1	+from django.conf.urls import url
		2	+from . import views
		3	+
		4	+urlpatterns = [
		5	+ url(r'^(?P<slug>[\w_-]+)/$', views.IndexView.as_view(), name='index'),
		6	+ url(r'^create/(?P<slug>[\w_-]+)/$', views.CreateView.as_view(), name='create'),
		7	+]
0	\ No newline at end of file	8	\ No newline at end of file