Adding category pendencies page

Zambom
1 parent b737ff62
Showing 5 changed files with 50 additions and 5 deletions Show diff stats
amadeus/permissions.py
notifications/templates/notifications/index.html
notifications/urls.py
notifications/views.py
subjects/templates/subjects/list.html
 # File used to store functions to handle permissions
+from subjects.models import Subject
 from topics.models import Resource
 """
@@ -20,6 +21,10 @@ def has_subject_permissions(user, subject):
 	return False
+"""
+	Function to know if user has permission to:
+		- See subject
+"""
 def has_subject_view_permissions(user, subject):
 	if has_subject_permissions(user, subject):
 		return True
@@ -30,6 +35,14 @@ def has_subject_view_permissions(user, subject):
 	return False
 """
+	Function to know if user is student of some subject in category
+"""
+def has_category_permission(user, cat_slug):
+	exist = Subject.objects.filter(students__id = user.id, category__slug = cat_slug).exists()
+
+	return exist
+
+"""
 	Function to know if user has permission to:
 		- Access Resource
 """
@@ -6,13 +6,18 @@
 {% block breadcrumbs %}
     {{ block.super }}
+    {% if category %}
+    	{% breadcrumb category 'subjects:cat_view' category.slug %}
+    {% endif %}
+
     {% breadcrumb 'Pendencies' 'notifications:manage' %}
+
 {% endblock %}
 {% block content %}
 	<input type="hidden" id="pend_url" value="{% url 'notifications:manage' %}" />
-
 	{% if notifications.count > 0 %}
+		<p>{% trans 'You got pendencies in the following subjects' %}: </p>
 		<div class="panel-group" id="subject-accordion" role="tablist" aria-multiselectable="true">
 			{% for notification in notifications %}
 				<div class="panel panel-info subject-panel">
@@ -3,6 +3,7 @@ from . import views
 urlpatterns = [
 	url(r'^$', views.IndexView.as_view(), name='manage'),
+	url(r'^category/(?P<slug>[\w_-]+)/$', views.IndexView.as_view(), name='manage_cat'),
 	url(r'^set_goal/$', views.set_goal, name='set_goal'),
 	url(r'^ajax/(?P<id>[\w_-]+)/$', views.AjaxNotifications.as_view(), name='ajax_view'),
 	url(r'^ajax_history/(?P<id>[\w_-]+)/$', views.AjaxHistory.as_view(), name='ajax_history'),
@@ -12,9 +12,10 @@ from dateutil import parser
 from datetime import datetime
 from django.utils import formats, timezone
-from amadeus.permissions import has_subject_view_permissions
+from amadeus.permissions import has_subject_view_permissions, has_category_permission
 from subjects.models import Subject
+from categories.models import Category
 from .models import Notification
 from .utils import get_order_by, is_date
@@ -43,6 +44,8 @@ class SubjectNotifications(LoginRequiredMixin, generic.ListView):
         notifications = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject, creation_date = datetime.now()).order_by("task__limit_date", "task__end_date")
+        notifications.update(viewed = True)
+
         self.total = notifications.count()
         return notifications
@@ -134,8 +137,22 @@ class IndexView(LoginRequiredMixin, generic.ListView):
     template_name = 'notifications/index.html'
     paginate_by = 10
+    def dispatch(self, request, *args, **kwargs):
+        cat = self.kwargs.get('slug', None)
+
+        if cat:
+            if not has_category_permission(request.user, cat):
+                return redirect(reverse_lazy('subjects:home'))
+
+        return super(IndexView, self).dispatch(request, *args, **kwargs)
+
     def get_queryset(self):
-        notifications = Notification.objects.filter(user = self.request.user, viewed = False, creation_date = datetime.now()).values('task__resource__topic__subject', 'task__resource__topic__subject__name').annotate(total = Count('task__resource__topic__subject'))
+        cat = self.kwargs.get('slug', None)
+
+        if cat:
+            notifications = Notification.objects.filter(user = self.request.user, creation_date = datetime.now(), task__resource__topic__subject__category__slug = cat).values('task__resource__topic__subject', 'task__resource__topic__subject__name').annotate(total = Count('task__resource__topic__subject'))
+        else:
+            notifications = Notification.objects.filter(user = self.request.user, creation_date = datetime.now()).values('task__resource__topic__subject', 'task__resource__topic__subject__name').annotate(total = Count('task__resource__topic__subject'))
         return notifications
@@ -143,7 +160,14 @@ class IndexView(LoginRequiredMixin, generic.ListView):
         context = super(IndexView, self).get_context_data(**kwargs)
         context['title'] = _('Pendencies')
-        context['pendencies_menu_active'] = "subjects_menu_active"
+
+        cat = self.kwargs.get('slug', None)
+
+        if cat:
+            context['category'] = get_object_or_404(Category, slug = cat)
+        else:
+            context['pendencies_menu_active'] = "subjects_menu_active"
+
         return context
@@ -159,6 +183,8 @@ class AjaxNotifications(LoginRequiredMixin, generic.ListView):
         notifications = Notification.objects.filter(user = self.request.user, task__resource__topic__subject__id = subject_id, creation_date = datetime.now()).order_by("task__limit_date", "task__end_date")
+        notifications.update(viewed = True)
+
         return notifications
 class AjaxHistory(LoginRequiredMixin, generic.ListView):
@@ -81,7 +81,7 @@
                                             {% endif %}
                                             <a href="" class="pull-right action_icon"><i class="fa fa-bar-chart" aria-hidden="true"></i></a>
-                                            <a href="" class="pull-right action_icon">
+                                            <a href="{% url 'notifications:manage_cat' category.slug %}" class="pull-right action_icon">
                                                 <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
                                                 {% notifies_cat_number category request.user %}
                                             </a>
	@@ -3,6 +3,7 @@ from . import views		@@ -3,6 +3,7 @@ from . import views
3		3
4	urlpatterns = [	4	urlpatterns = [
5	url(r'^$', views.IndexView.as_view(), name='manage'),	5	url(r'^$', views.IndexView.as_view(), name='manage'),
		6	+ url(r'^category/(?P<slug>[\w_-]+)/$', views.IndexView.as_view(), name='manage_cat'),
6	url(r'^set_goal/$', views.set_goal, name='set_goal'),	7	url(r'^set_goal/$', views.set_goal, name='set_goal'),
7	url(r'^ajax/(?P<id>[\w_-]+)/$', views.AjaxNotifications.as_view(), name='ajax_view'),	8	url(r'^ajax/(?P<id>[\w_-]+)/$', views.AjaxNotifications.as_view(), name='ajax_view'),
8	url(r'^ajax_history/(?P<id>[\w_-]+)/$', views.AjaxHistory.as_view(), name='ajax_history'),	9	url(r'^ajax_history/(?P<id>[\w_-]+)/$', views.AjaxHistory.as_view(), name='ajax_history'),
	@@ -81,7 +81,7 @@		@@ -81,7 +81,7 @@
81	{% endif %}	81	{% endif %}
82		82
83	<a href="" class="pull-right action_icon"><i class="fa fa-bar-chart" aria-hidden="true"></i></a>	83	<a href="" class="pull-right action_icon"><i class="fa fa-bar-chart" aria-hidden="true"></i></a>
84	- <a href="" class="pull-right action_icon">	84	+ <a href="{% url 'notifications:manage_cat' category.slug %}" class="pull-right action_icon">
85	<i class="fa fa-exclamation-triangle" aria-hidden="true"></i>	85	<i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
86	{% notifies_cat_number category request.user %}	86	{% notifies_cat_number category request.user %}
87	</a>	87	</a>