Merge branch 'refactoring' of https://github.com/amadeusproject/amadeuslms into refactoring

Felipe Henrique de Almeida Bormann
2 parents dc825f9a 4536c27f
Showing 33 changed files with 739 additions and 12 deletions Show diff stats
amadeus/settings.py
amadeus/static/css/base/amadeus.css
amadeus/static/css/themes/green.css
amadeus/static/js/course.js
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/0002_auto_20170118_1800.py
students_group/migrations/__init__.py
students_group/models.py
students_group/templates/groups/_form.html
students_group/templates/groups/create.html
students_group/templates/groups/delete.html
students_group/templates/groups/index.html
students_group/templates/groups/update.html
students_group/tests.py
@@ -58,6 +58,7 @@ INSTALLED_APPS = [
     'log',
     'categories',
     'subjects',
+    'students_group',
     'topics',
     'mailsender',
     'security',
@@ -73,7 +73,7 @@ a:focus {
 /* side bar menu ends*/
 /* category app starts */
-.category-panel > .panel-heading, .subject-panel > .panel-heading, .special-panel > .panel-heading, .topic-panel > .panel-heading {
+.category-panel > .panel-heading, .subject-panel > .panel-heading, .special-panel > .panel-heading, .topic-panel > .panel-heading, .group-panel > .panel-heading {
     padding: 2px 0px;
 }
@@ -59,6 +59,19 @@ a, a:focus, a:hover {
     background-color: #039BE5 !important;
 }
+.group-panel > .panel-heading {
+    background-color: #FFFFFF !important;
+}
+
+.group-panel .panel-title, .group-panel .category-header i, .group-panel .category-course-link {
+    color: #000000 !important;
+}
+
+.group-panel-body {
+    background: #FFFFFF !important;
+    border-top: 1px solid #CCCCCC;
+}
+
 .topic-panel > .panel-heading {
     background-color: #7BA5B9 !important;
 }
@@ -193,4 +193,14 @@ $(&#39;.collapse&#39;).on(&#39;hide.bs.collapse&#39;, function (e) {
             });
         }
     }
-});
 \ No newline at end of file
+});
+
+function delete_group(url) {
+    $('.modal').remove();
+
+    $.get(url, function (modal) {
+        $("#group-accordion").after(modal);
+
+        $('.modal').modal('show');
+    });
+}
 \ No newline at end of file
@@ -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,43 @@
+# coding=utf-8
+from django import forms
+from django.utils.translation import ugettext_lazy as _
+
+from subjects.models import Subject
+
+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)
+		
+		if self.instance.id:
+			self.subject = self.instance.subject
+
+		self.fields['participants'].queryset = self.subject.students.all()
+
+	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,17 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10 on 2017-01-18 21:00
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+from django.contrib.postgres.operations import UnaccentExtension
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('students_group', '0001_initial'),
+    ]
+
+    operations = [
+    	UnaccentExtension()
+    ]
@@ -0,0 +1,23 @@
+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')
+		ordering = ['name']
+
+	def __str__(self):
+		return self.name
 \ No newline at end of file
@@ -0,0 +1,113 @@
+{% load widget_tweaks static i18n %}
+
+<form method="post" action="" enctype="multipart/form-data">
+	{% csrf_token %}
+	{% for field in form %}
+		{% if field.auto_id == 'id_participants' %}
+			<div class="panel-group" id="professors_accordion" role="tablist" aria-multiselectable="true">
+				<div class="panel panel-info">
+        			<div class="panel-heading">
+            			<div class="row">
+                			<div class="col-md-12">
+                    			<a data-parent="#professors_accordion" data-toggle="collapse" href="#participants">
+                    				<h4 class="panel-title">
+                            			<button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button><label for="{{ field.auto_id }}">{{ field.label }}</label>
+                    				</h4>
+                    			</a>
+                    		</div>
+                    	</div>
+                    </div>
+                    <div id="participants" class="panel-collapse collapse">
+                    	<p><em>{% trans 'Attribute students to group' %}:</em></p>
+                    	{% render_field field class='form-control' %}
+                    </div>
+                </div>
+			</div>
+		{% else %}
+			<div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
+				<label for="{{ field.auto_id }}" class="control-label">{{ field.label }}</label>
+				
+				{% if field.auto_id == 'id_description' %}
+					{% render_field field class='form-control text_wysiwyg' %}
+				{% else %}
+					{% render_field field class='form-control' %}
+				{% endif %}
+			</div>
+		{% endif %}
+		
+		<span class="help-block">{{ field.help_text }}</span>
+		
+		{% if field.errors %}
+			<div class="row">
+				</br>
+				<div class="alert alert-danger alert-dismissible" role="alert">
+  					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+  						<span aria-hidden="true">&times;</span>
+					</button>
+					<ul>
+						{% for error in field.errors %}
+							<li>{{ error }}</li>
+						{% endfor %}
+					</ul>
+				</div>
+			</div>
+		{% endif %}
+	{% endfor %}
+	<div class="row text-center">
+		<input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised" />
+	</div>
+</form>
+
+<script type="text/javascript">
+	$('#id_participants').multiSelect({
+	  selectableHeader: "<input type='text' class='search-input category-search-users' autocomplete='off' placeholder=' '>",
+	  selectionHeader: "<input type='text' class='search-input category-search-users' autocomplete='off' placeholder=''>",
+	  afterInit: function(ms){
+	    var that = this,
+	        $selectableSearch = that.$selectableUl.prev(),
+	        $selectionSearch = that.$selectionUl.prev(),
+	        selectableSearchString = '#'+that.$container.attr('id')+' .ms-elem-selectable:not(.ms-selected)',
+	        selectionSearchString = '#'+that.$container.attr('id')+' .ms-elem-selection.ms-selected';
+
+	    that.qs1 = $selectableSearch.quicksearch(selectableSearchString)
+	    .on('keydown', function(e){
+	      if (e.which === 40){
+	        that.$selectableUl.focus();
+	        return false;
+	      }
+	    });
+
+	    that.qs2 = $selectionSearch.quicksearch(selectionSearchString)
+	    .on('keydown', function(e){
+	      if (e.which == 40){
+	        that.$selectionUl.focus();
+	        return false;
+	      }
+	    });
+	  },
+	  afterSelect: function(){
+	    this.qs1.cache();
+	    this.qs2.cache();
+	  },
+	  afterDeselect: function(){
+	    this.qs1.cache();
+	    this.qs2.cache();
+	  }
+	});// Used to create multi-select css style
+
+	$('.collapse').on('show.bs.collapse', function (e) {
+	if($(this).is(e.target)){
+    	var btn = $(this).parent().find('.fa-angle-right');
+
+    	btn.switchClass("fa-angle-right", "fa-angle-down", 250, "easeInOutQuad");
+    }
+    });
+
+    $('.collapse').on('hide.bs.collapse', function (e) {
+    	if($(this).is(e.target)){
+        	var btn = $(this).parent().find('.fa-angle-down');
+
+        	btn.switchClass("fa-angle-down", "fa-angle-right", 250, "easeInOutQuad");
+        }
+    });
+</script>
 \ No newline at end of file
@@ -0,0 +1,30 @@
+{% extends 'groups/index.html' %}
+
+{% load i18n django_bootstrap_breadcrumbs %}
+
+{% block breadcrumbs %}
+  	{{ block.super }}
+
+  	{% if group %}
+  		{% trans 'Replicate: ' as bread %}
+
+  		{% with bread|add:group.name as bread_slug %}
+	    	{% breadcrumb bread_slug 'groups:replicate' subject.slug group.slug %}
+	    {% endwith %}
+  	{% else %}
+	  	{% trans 'Create Group' as bread %}
+	    {% breadcrumb bread 'groups:create' subject.slug %}
+	{% endif %}
+{% endblock %}
+
+{% block content %}
+	<div class="card">
+		<div class="card-content">
+			<div class="card-body">
+				{% include 'groups/_form.html' %}
+			</div>
+		</div>
+  	</div>
+  	<br clear="all" />
+    <br clear="all" />
+{% endblock %}
@@ -0,0 +1,23 @@
+{% load i18n %}
+
+<div class="modal fade" id="topic" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-body">
+                <form id="delete_form" action="{% url 'groups:delete' group.slug %}" method="post">
+                    {% csrf_token %}
+                    <h3>{% trans 'Are you sure you want delete the group' %}: {{ group }}?</h3>
+                    <p>{% trans 'With this action the group will no longer exist but your participants will still be attached to the subject.' %}</p>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <div class="pull-right">
+                    <button type="button" class="btn btn-default btn-raised" data-dismiss="modal">{% trans "Close" %}</button>
+                </div>
+                <div class="pull-left">
+                    <button type="submit" form="delete_form" class="btn btn-success btn-raised">{% trans "Delete" %}</button>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
 \ No newline at end of file
@@ -0,0 +1,89 @@
+{% 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-12 text-center">
+            <a href="{% url 'groups:create' subject.slug %}" class="btn btn-raised btn-success">{% trans "Create Group" %}</a>
+        </div>
+    </div>
+
+    <div class="col-md-12 cards-content">
+        <div class="panel-group" id="group-accordion" role="tablist" aria-multiselectable="true">
+            {% for group in groups  %}
+            	<div class="panel panel-info group-panel">
+                    <div class="panel-heading">
+                        <div class="row">
+                            <div class="col-md-12 category-header">
+                                <h4 class="panel-title">
+                                    <a class="category-course-link pull-left" data-parent="#group-accordion" data-toggle="collapse" href="#{{group.slug}}">
+                                        <button class="btn btn-default btn-xs text-center cat-selector"><i class="fa fa-angle-right fa-2x" aria-hidden="true"></i></button> {{ group }} ({{ group.participants.count }})
+                                    </a>
+                                </h4>
+
+                                <div class="col-md-5 pull-right category-card-items">
+                                    <a href="" id="moreActions" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> 
+                                        <i class="fa fa-ellipsis-v" aria-hidden="true"></i>
+                                    </a>
+                                    <ul class="dropdown-menu pull-right" aria-labelledby="moreActions">
+                                        <li>
+                                            <a href="{% url 'groups:replicate' subject.slug group.slug %}">
+                                                <i class="fa fa-files-o" aria-hidden="true"></i> {% trans 'Replicate' %}
+                                            </a>
+                                        </li>
+                                        <li><a href="{% url 'groups:update' subject.slug group.slug %}"><i class="fa fa-pencil fa-fw" aria-hidden="true"></i> {% trans 'Edit' %}</a></li>
+                                        <li><a href="javascript:delete_group('{% url 'groups:delete' group.slug %}')"><i class="fa fa-trash fa-fw" aria-hidden="true"></i> {% trans 'Remove' %}</a></li>
+                                    </ul>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div id="{{ group.slug }}" class="panel-collapse panel-body collapse category-panel-content group-panel-body">
+                        {% autoescape off %}
+                            {{ group.description }}
+                        {% endautoescape %}
+
+                        <h3>{% trans 'Participant(s)' %}: </h3>
+                        
+                        <ul class="list-inline">
+                            {% for user in group.participants.all %}
+                                <li class="list-inline-item text-center col-lg-2 col-md-2 col-sm-2 col-xs-3">
+                                    <img src="{{ user.image_url }}" class="img-responsive" />
+                                    <p><small>{{ user }}</small></p>
+                                </li>
+                            {% endfor %}
+                        </ul>
+                    </div>
+                </div>
+            {% endfor %}
+
+            {% pagination request paginator page_obj %}
+        </div>
+    </div>
+
+    <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
+{% endblock %}
 \ No newline at end of file
@@ -0,0 +1,25 @@
+{% extends 'groups/index.html' %}
+
+{% load i18n django_bootstrap_breadcrumbs %}
+
+{% block breadcrumbs %}
+    {{ block.super }}
+    
+    {% trans 'Update: ' as bread %}
+    
+    {% with bread|add:group.name as bread_slug %}
+        {% breadcrumb bread_slug 'groups:update' subject.slug group.slug %}
+    {% endwith %}
+{% endblock %}
+
+{% block content %}
+    <div class="card">
+        <div class="card-content">
+            <div class="card-body">
+                {% include 'groups/_form.html' %}
+            </div>
+        </div>
+    </div>
+    <br clear="all" />
+    <br clear="all" />
+{% endblock %}
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
@@ -0,0 +1,10 @@
+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'),
+	url(r'^update/(?P<sub_slug>[\w_-]+)/(?P<slug>[\w_-]+)/$', views.UpdateView.as_view(), name='update'),
+	url(r'^replicate/(?P<slug>[\w_-]+)/(?P<group_slug>[\w_-]+)/$', views.CreateView.as_view(), name='replicate'),
+	url(r'^delete/(?P<slug>[\w_-]+)/$', views.DeleteView.as_view(), name = 'delete'),
+]
 \ No newline at end of file
@@ -0,0 +1,174 @@
+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)
+
+		if self.kwargs.get('group_slug'):
+			group = get_object_or_404(StudentsGroup, slug = self.kwargs['group_slug'])
+			initial = initial.copy()
+			initial['description'] = group.description
+			initial['name'] = group.name
+			initial['participants'] = group.participants.all()
+		
+		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
+
+		if self.kwargs.get('group_slug'):
+			group = get_object_or_404(StudentsGroup, slug = self.kwargs['group_slug'])
+
+			context['title'] = _('Replicate Group')
+
+			context['group'] = group
+
+		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})
+
+class UpdateView(LoginRequiredMixin, generic.UpdateView):
+	login_url = reverse_lazy("users:login")
+	redirect_field_name = 'next'
+
+	template_name = 'groups/update.html'
+	model = StudentsGroup
+	form_class = StudentsGroupForm
+	context_object_name = 'group'
+
+	def dispatch(self, request, *args, **kwargs):
+		slug = self.kwargs.get('sub_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(UpdateView, self).dispatch(request, *args, **kwargs)
+
+	def get_context_data(self, **kwargs):
+		context = super(UpdateView, self).get_context_data(**kwargs)
+
+		context['title'] = _('Update Group')
+
+		slug = self.kwargs.get('sub_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 updated successfully!')%(self.object.name))
+
+		return reverse_lazy('groups:index', kwargs = {'slug': self.object.subject.slug})
+
+class DeleteView(LoginRequiredMixin, generic.DeleteView):
+	login_url = reverse_lazy("users:login")
+	redirect_field_name = 'next'
+
+	template_name = 'groups/delete.html'
+	model = StudentsGroup
+	context_object_name = 'group'
+
+	def dispatch(self, request, *args, **kwargs):
+		slug = self.kwargs.get('slug', '')
+		group = get_object_or_404(StudentsGroup, slug = slug)
+
+		if not has_subject_permissions(request.user, group.subject):
+			return redirect(reverse_lazy('subjects:home'))
+
+		return super(DeleteView, self).dispatch(request, *args, **kwargs)
+
+	def get_success_url(self):
+		messages.success(self.request, _('The group "%s" was removed successfully!')%(self.object.name))
+
+		return reverse_lazy('groups:index', kwargs = {'slug': self.object.subject.slug})
 \ No newline at end of file
@@ -90,6 +90,7 @@
                             <div id="{{category.slug}}" class="panel-collapse panel-body collapse category-panel-content">
                                 <input type="hidden" class="log_url" value="{% url 'categories:view_log' category.id %}" />
                                 <input type="hidden" class="log_id" value="" />
+                                
                                 {% if category.coordinators.all|length > 0  %}
                                     <h4><b>{% trans "Coordinator(s) " %}: </b>
                                         {{ category.coordinators.all|join:', ' }}
@@ -193,4 +194,17 @@
     <div id="modal_subject"></div>
     <script type="text/javascript" src="{% static 'js/course.js' %}"></script>
+    <script type="text/javascript">
+        $(function (){
+            var cat_slug = "{{ cat_slug }}"
+
+            if (cat_slug != "") {
+                $("#" + cat_slug).collapse('show');
+
+                $('html, body').animate({
+                    scrollTop: $("#" + cat_slug).parent().offset().top
+                }, 2000);
+            }
+        });
+    </script>
 {% endblock %}
@@ -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 %}
@@ -9,7 +9,7 @@
 {% block breadcrumbs %}
     {{ block.super }}
-    {% breadcrumb subject.category 'subjects:index' %}
+    {% breadcrumb subject.category 'subjects:cat_view' subject.category.slug %}
     {% breadcrumb subject 'subjects:view' subject.slug %}
 {% endblock %}
@@ -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 %}
@@ -4,6 +4,7 @@ from . import views
 urlpatterns = [
 	url(r'^home/$', views.HomeView.as_view(), name='home'),
 	url(r'^$', views.IndexView.as_view(), name='index'),
+	url(r'^category/(?P<slug>[\w_-]+)/$', views.IndexView.as_view(), name='cat_view'),
 	url(r'^(?P<option>[\w_-]+)/$', views.IndexView.as_view(), name='index'),
 	url(r'^create/(?P<slug>[\w_-]+)/$', views.SubjectCreateView.as_view(), name='create'),
 	url(r'^replicate/(?P<subject_slug>[\w_-]+)/$', views.SubjectCreateView.as_view(), name='replicate'),
@@ -18,6 +18,17 @@ def has_professor_profile(user, category):
 	return False
+def get_category_page(categories, slug, per_page):
+	total = 1
+
+	for category in categories:
+		if category.slug == slug:
+			return total / per_page + 1
+
+		total += 1
+
+	return 1
+
 def count_subjects( user, all_subs = True):
 	total = 0
 	pk = user.pk
@@ -26,7 +26,7 @@ import time
 import datetime
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from .forms import CreateSubjectForm
-from .utils import has_student_profile, has_professor_profile, count_subjects
+from .utils import has_student_profile, has_professor_profile, count_subjects, get_category_page
 from users.models import User
@@ -55,6 +55,7 @@ class HomeView(LoginRequiredMixin, ListView):
         #bringing users
         tags = Tag.objects.all()
         context['tags'] = tags
+
         return context
@@ -67,8 +68,7 @@ class IndexView(LoginRequiredMixin, ListView):
     context_object_name = 'categories'
     paginate_by = 10
-    def get_queryset(self):
-        
+    def get_queryset(self):        
         if self.request.user.is_staff:
             categories = Category.objects.all().order_by('name')
         else:
@@ -94,6 +94,39 @@ class IndexView(LoginRequiredMixin, ListView):
         return categories
+    def paginate_queryset(self, queryset, page_size): 
+        paginator = self.get_paginator(
+            queryset, page_size, orphans=self.get_paginate_orphans(),
+            allow_empty_first_page=self.get_allow_empty())
+        
+        page_kwarg = self.page_kwarg
+        
+        page = self.kwargs.get(page_kwarg) or self.request.GET.get(page_kwarg) or 1
+        
+        if self.kwargs.get('slug'):
+            categories = queryset
+
+            paginator = Paginator(categories, self.paginate_by)
+
+            page = get_category_page(categories, self.kwargs.get('slug'), self.paginate_by)
+        
+        try:
+            page_number = int(page)
+        except ValueError:
+            if page == 'last':
+                page_number = paginator.num_pages
+            else:
+                raise Http404(_("Page is not 'last', nor can it be converted to an int."))
+        
+        try:
+            page = paginator.page(page_number)
+            return (paginator, page, page.object_list, page.has_other_pages())
+        except InvalidPage as e:
+            raise Http404(_('Invalid page (%(page_number)s): %(message)s') % {
+                'page_number': page_number,
+                'message': str(e)
+            })
+
     def render_to_response(self, context, **response_kwargs):
         if self.request.user.is_staff:
             context['page_template'] = "categories/home_admin_content.html"
@@ -116,11 +149,14 @@ class IndexView(LoginRequiredMixin, ListView):
         context['show_buttons'] = True #So it shows subscribe and access buttons
         context['totals'] = self.totals
-            
+        
         if self.kwargs.get('option'):
             context['all'] = True
             context['title'] = _('All Subjects')
+        if self.kwargs.get('slug'):
+            context['cat_slug'] = self.kwargs.get('slug')
+
         context['subjects_menu_active'] = 'subjects_menu_active'
         return context
@@ -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 %}
@@ -29,7 +29,7 @@
             </form>
         </div>
         <div class="col-md-3">
-            <a href="{% url 'users:create' %}" class="pull-right btn btn-primary btn-raised btn-md"><i class="fa fa-plus"></i> {% trans 'Create User' %}</a>
+            <a href="{% url 'users:create' %}" class="pull-right btn btn-success btn-raised btn-md"><i class="fa fa-plus"></i> {% trans 'Create User' %}</a>
         </div>
     </div>
@@ -53,7 +53,7 @@
                     </div>
                     <div class="col-md-3">
                         <div align="right">
-                            <a href="{% url 'users:update' acc.email %}" class="btn btn-primary btn-raised btn-sm"><i class="fa fa-edit"></i> {% trans 'Edit' %}</a>
+                            <a href="{% url 'users:update' acc.email %}" class="btn btn-success btn-raised btn-sm"><i class="fa fa-edit"></i> {% trans 'Edit' %}</a>
                             <a href="{% url 'users:delete' acc.email %}" class="btn btn-default btn-raised btn-sm"><i class="fa fa-trash"></i> {% trans 'Delete' %}</a>
                         </div>
                     </div>
@@ -72,7 +72,7 @@ class SearchView(braces_mixins.LoginRequiredMixin, braces_mixins.StaffuserRequir
 	def get_queryset(self):
 		search = self.request.GET.get('search', '')
-		users = User.objects.filter(Q(username__icontains = search) | Q(last_name__icontains = search) | Q(social_name__icontains = search) | Q(email__icontains = search)).order_by('social_name','username').exclude(email = self.request.user.email)
+		users = User.objects.filter(Q(username__icontains = search) | Q(last_name__icontains = search) | Q(social_name__icontains = search) | Q(email__icontains = search)).distinct().order_by('social_name','username').exclude(email = self.request.user.email)
 		return users
	@@ -73,7 +73,7 @@ a:focus {		@@ -73,7 +73,7 @@ a:focus {
73	/* side bar menu ends*/	73	/* side bar menu ends*/
74		74
75	/* category app starts */	75	/* category app starts */
76	-.category-panel > .panel-heading, .subject-panel > .panel-heading, .special-panel > .panel-heading, .topic-panel > .panel-heading {	76	+.category-panel > .panel-heading, .subject-panel > .panel-heading, .special-panel > .panel-heading, .topic-panel > .panel-heading, .group-panel > .panel-heading {
77	padding: 2px 0px;	77	padding: 2px 0px;
78	}	78	}
79		79
	@@ -59,6 +59,19 @@ a, a:focus, a:hover {		@@ -59,6 +59,19 @@ a, a:focus, a:hover {
59	background-color: #039BE5 !important;	59	background-color: #039BE5 !important;
60	}	60	}
61		61
		62	+.group-panel > .panel-heading {
		63	+ background-color: #FFFFFF !important;
		64	+}
		65	+
		66	+.group-panel .panel-title, .group-panel .category-header i, .group-panel .category-course-link {
		67	+ color: #000000 !important;
		68	+}
		69	+
		70	+.group-panel-body {
		71	+ background: #FFFFFF !important;
		72	+ border-top: 1px solid #CCCCCC;
		73	+}
		74	+
62	.topic-panel > .panel-heading {	75	.topic-panel > .panel-heading {
63	background-color: #7BA5B9 !important;	76	background-color: #7BA5B9 !important;
64	}	77	}
	@@ -193,4 +193,14 @@ $('.collapse').on('hide.bs.collapse', function (e) {		@@ -193,4 +193,14 @@ $('.collapse').on('hide.bs.collapse', function (e) {
193	});	193	});
194	}	194	}
195	}	195	}
196	-});
197	\ No newline at end of file	196	\ No newline at end of file
		197	+});
		198	+
		199	+function delete_group(url) {
		200	+ $('.modal').remove();
		201	+
		202	+ $.get(url, function (modal) {
		203	+ $("#group-accordion").after(modal);
		204	+
		205	+ $('.modal').modal('show');
		206	+ });
		207	+}
198	\ No newline at end of file	208	\ No newline at end of file
@@ -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,43 @@		@@ -0,0 +1,43 @@
		1	+# coding=utf-8
		2	+from django import forms
		3	+from django.utils.translation import ugettext_lazy as _
		4	+
		5	+from subjects.models import Subject
		6	+
		7	+from .models import StudentsGroup
		8	+
		9	+class StudentsGroupForm(forms.ModelForm):
		10	+ subject = None
		11	+
		12	+ def __init__(self, args, *kwargs):
		13	+ super(StudentsGroupForm, self).__init__(args, *kwargs)
		14	+
		15	+ self.subject = kwargs['initial'].get('subject', None)
		16	+
		17	+ if self.instance.id:
		18	+ self.subject = self.instance.subject
		19	+
		20	+ self.fields['participants'].queryset = self.subject.students.all()
		21	+
		22	+ def clean_name(self):
		23	+ name = self.cleaned_data.get('name', '')
		24	+
		25	+ if self.instance.id:
		26	+ same_name = self.subject.group_subject.filter(name__unaccent__iexact = name).exclude(id = self.instance.id).count()
		27	+ else:
		28	+ same_name = self.subject.group_subject.filter(name__unaccent__iexact = name).count()
		29	+
		30	+ if same_name > 0:
		31	+ self._errors['name'] = [_('This subject already has a group with this name')]
		32	+
		33	+ return ValueError
		34	+
		35	+ return name
		36	+
		37	+ class Meta:
		38	+ model = StudentsGroup
		39	+ fields = ['name', 'description', 'participants']
		40	+ widgets = {
		41	+ 'description': forms.Textarea,
		42	+ 'participants': forms.SelectMultiple,
		43	+ }
0	\ No newline at end of file	44	\ 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,17 @@		@@ -0,0 +1,17 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10 on 2017-01-18 21:00
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.db import migrations
	6	+
	7	+from django.contrib.postgres.operations import UnaccentExtension
	8	+
	9	+class Migration(migrations.Migration):
	10	+
	11	+ dependencies = [
	12	+ ('students_group', '0001_initial'),
	13	+ ]
	14	+
	15	+ operations = [
	16	+ UnaccentExtension()
	17	+ ]
	@@ -0,0 +1,23 @@		@@ -0,0 +1,23 @@
		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	+ ordering = ['name']
		21	+
		22	+ def __str__(self):
		23	+ return self.name
0	\ No newline at end of file	24	\ No newline at end of file