diff --git a/goals/templates/goals/view.html b/goals/templates/goals/view.html index 319057d..c69edb0 100644 --- a/goals/templates/goals/view.html +++ b/goals/templates/goals/view.html @@ -33,7 +33,7 @@ {% endif %} {% resource_permissions request.user goal as has_resource_permissions %} - {% subject_permissions request.user goal as has_subject_permissions %} + {% subject_permissions request.user goal.topic.subject as has_subject_permissions %} {% if goal.visible %}
diff --git a/goals/views.py b/goals/views.py index b5ffee0..25274f2 100644 --- a/goals/views.py +++ b/goals/views.py @@ -215,7 +215,7 @@ class InsideView(LoginRequiredMixin, LogMixin, generic.ListView): slug = self.kwargs.get('slug', '') goal = get_object_or_404(Goals, slug = slug) - if has_subject_permissions(self.request.user, goal): + if has_subject_permissions(self.request.user, goal.topic.subject): self.students = User.objects.filter(subject_student = goal.topic.subject).order_by('social_name', 'username') goals = MyGoals.objects.filter(user = self.students.first(), item__goal = goal) @@ -230,7 +230,7 @@ class InsideView(LoginRequiredMixin, LogMixin, generic.ListView): user = request.POST.get('selected_student', None) - if has_subject_permissions(request.user, goal): + if has_subject_permissions(request.user, goal.topic.subject): self.students = User.objects.filter(subject_student = goal.topic.subject).order_by('social_name', 'username') if not user is None: diff --git a/notifications/templates/notifications/_history.html b/notifications/templates/notifications/_history.html index d37d273..f2d606e 100644 --- a/notifications/templates/notifications/_history.html +++ b/notifications/templates/notifications/_history.html @@ -7,6 +7,7 @@
+
@@ -18,37 +19,37 @@ diff --git a/notifications/templates/notifications/subject.html b/notifications/templates/notifications/subject.html index e09cfe7..4b6de29 100644 --- a/notifications/templates/notifications/subject.html +++ b/notifications/templates/notifications/subject.html @@ -10,6 +10,8 @@ {% endblock %} {% block content %} + {% subject_permissions request.user subject as has_subject_permissions %} + {% if subject.visible %}
@@ -26,11 +28,36 @@
+ {% if has_subject_permissions %} + + {% csrf_token %} + + +
+ {% endif %} +
{% trans 'This pendencies list is updated every 24 hours. Last update was in:' %} {{ last_update|default:_('Not determined') }}
@@ -58,4 +85,10 @@ metaFunctions(); }); +{% endblock %} + +{% block addtional_scripts %} + {% endblock %} \ No newline at end of file diff --git a/notifications/templatetags/notification_filters.py b/notifications/templatetags/notification_filters.py index 83755c6..969da19 100644 --- a/notifications/templatetags/notification_filters.py +++ b/notifications/templatetags/notification_filters.py @@ -85,7 +85,7 @@ def order_href(request, column): if 'order_by' in getvars: order = getvars['order_by'] del getvars['order_by'] - + if not order: if column == "creation_date": order_href = "creation_date" @@ -93,12 +93,28 @@ def order_href(request, column): if column in order: if "-" in order: order_href = column - + if len(getvars) > 0: params = '&%s' % getvars.urlencode() return "?order_by=" + order_href + params +@register.filter(name = 'add_student') +def add_student(request, student): + getvars = request.GET.copy() + params = "" + + if not student is None: + if not student == "": + if 'selected_student' in getvars: + del getvars['selected_student'] + + getvars['selected_student'] = student + + request.GET = getvars + + return request + @register.filter(name = 'order_ajax') def order_ajax(request, column): getvars = request.GET.copy() @@ -109,7 +125,7 @@ def order_ajax(request, column): if 'order_by' in getvars: order = getvars['order_by'] del getvars['order_by'] - + if not order: if column == "creation_date": order_href = "creation_date" @@ -117,7 +133,7 @@ def order_ajax(request, column): if column in order: if "-" in order: order_href = column - + return order_href @register.filter(name = 'observation') diff --git a/notifications/views.py b/notifications/views.py index 24051cd..99d2596 100644 --- a/notifications/views.py +++ b/notifications/views.py @@ -12,10 +12,11 @@ from dateutil import parser from datetime import datetime from django.utils import formats, timezone -from amadeus.permissions import has_subject_view_permissions, has_category_permission +from amadeus.permissions import has_subject_view_permissions, has_category_permission, has_subject_permissions from subjects.models import Subject from categories.models import Category +from users.models import User from log.models import Log from log.mixins import LogMixin @@ -39,6 +40,8 @@ class SubjectNotifications(LoginRequiredMixin, LogMixin, generic.ListView): paginate_by = 10 total = 0 + students = None + def dispatch(self, request, *args, **kwargs): slug = self.kwargs.get('slug', '') subject = get_object_or_404(Subject, slug = slug) @@ -52,14 +55,38 @@ class SubjectNotifications(LoginRequiredMixin, LogMixin, generic.ListView): slug = self.kwargs.get('slug', '') subject = get_object_or_404(Subject, slug = slug) - 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) + if has_subject_permissions(self.request.user, subject): + self.students = User.objects.filter(subject_student = subject).order_by('social_name', 'username') + notifications = Notification.objects.filter(user = self.students.first(), task__resource__topic__subject = subject, creation_date = datetime.now()).order_by("task__limit_date", "task__end_date") + else: + 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 + def post(self, request, *args, **kwargs): + slug = self.kwargs.get('slug', '') + subject = get_object_or_404(Subject, slug = slug) + + user = request.POST.get('selected_student', None) + + if has_subject_permissions(request.user, subject): + self.students = User.objects.filter(subject_student = subject).order_by('social_name', 'username') + + if not user is None: + self.object_list = Notification.objects.filter(user__email = user, task__resource__topic__subject = subject, creation_date = datetime.now()).order_by("task__limit_date", "task__end_date") + else: + self.object_list = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject, creation_date = datetime.now()).order_by("task__limit_date", "task__end_date") + else: + self.object_list = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject, creation_date = datetime.now()).order_by("task__limit_date", "task__end_date") + + self.total = self.object_list.count() + + return self.render_to_response(self.get_context_data()) + def get_context_data(self, **kwargs): context = super(SubjectNotifications, self).get_context_data(**kwargs) @@ -70,6 +97,12 @@ class SubjectNotifications(LoginRequiredMixin, LogMixin, generic.ListView): context['subject'] = subject context['total'] = self.total + if not self.students is None: + context['sub_students'] = self.students + context['student'] = self.request.POST.get('selected_student', self.students.first().email) + else: + context['student'] = None + update_pendencies = Log.objects.filter(action = "cron", component = "notifications").order_by('-datetime') if update_pendencies.count() > 0: @@ -104,6 +137,8 @@ class SubjectHistory(LoginRequiredMixin, LogMixin, generic.ListView): total = 0 num_rows = 0 + students = None + def dispatch(self, request, *args, **kwargs): slug = self.kwargs.get('slug', '') subject = get_object_or_404(Subject, slug = slug) @@ -120,7 +155,17 @@ class SubjectHistory(LoginRequiredMixin, LogMixin, generic.ListView): order = get_order_by(self.request.GET.get("order_by", None)) search = self.request.GET.get("search", None) - notifications = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject).order_by(*order) + if has_subject_permissions(self.request.user, subject): + user = self.request.GET.get("selected_student", None) + + self.students = User.objects.filter(subject_student = subject).order_by('social_name', 'username') + + if not user is None: + notifications = Notification.objects.filter(user__email = user, task__resource__topic__subject = subject).order_by(*order) + else: + notifications = Notification.objects.filter(user = self.students.first(), task__resource__topic__subject = subject).order_by(*order) + else: + notifications = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject).order_by(*order) self.total = notifications.filter(creation_date = datetime.now()).count() @@ -145,6 +190,30 @@ class SubjectHistory(LoginRequiredMixin, LogMixin, generic.ListView): return notifications + def post(self, request, *args, **kwargs): + slug = self.kwargs.get('slug', '') + subject = get_object_or_404(Subject, slug = slug) + + order = get_order_by(self.request.POST.get("order_by", None)) + + user = request.POST.get('selected_student', None) + + if has_subject_permissions(request.user, subject): + self.students = User.objects.filter(subject_student = subject).order_by('social_name', 'username') + + if not user is None: + self.object_list = Notification.objects.filter(user__email = user, task__resource__topic__subject = subject).order_by(*order) + else: + self.object_list = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject).order_by(*order) + else: + self.object_list = Notification.objects.filter(user = self.request.user, task__resource__topic__subject = subject).order_by(*order) + + self.total = self.object_list.filter(creation_date = datetime.now()).count() + + self.num_rows = self.object_list.count() + + return self.render_to_response(self.get_context_data()) + def get_context_data(self, **kwargs): context = super(SubjectHistory, self).get_context_data(**kwargs) @@ -158,6 +227,12 @@ class SubjectHistory(LoginRequiredMixin, LogMixin, generic.ListView): context['rows'] = self.num_rows context['searched'] = self.request.GET.get("search", "") + if not self.students is None: + context['sub_students'] = self.students + context['student'] = self.request.POST.get('selected_student', self.request.GET.get('selected_student', self.students.first().email)) + else: + context['student'] = None + self.log_context['subject_id'] = subject.id self.log_context['subject_name'] = subject.name self.log_context['subject_slug'] = subject.slug -- libgit2 0.21.2
- + {% trans 'Date' %} - + {% trans 'Resource' %} - + {% trans 'Task' %} - + {% trans 'Final Date' %} - + {% trans 'Notification' %} - + {% trans 'Aware' %} - + {% trans 'Observation' %}