From f0122ea85f561b9d482fec398976ca2433f7f862 Mon Sep 17 00:00:00 2001 From: Matheus Lins Date: Sat, 8 Oct 2016 04:19:01 -0300 Subject: [PATCH] doing same filter from teacher's courses template --- courses/templates/course/index.html | 153 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------- courses/views.py | 1 + 2 files changed, 107 insertions(+), 47 deletions(-) diff --git a/courses/templates/course/index.html b/courses/templates/course/index.html index be8fb0f..eb580b5 100644 --- a/courses/templates/course/index.html +++ b/courses/templates/course/index.html @@ -65,8 +65,13 @@
{% if user|has_role:'professor, system_admin' %} +
+ Todos + {% for category_course in categorys_courses_professor %} + {{category_course.name}} + {% endfor %} +
{% else%} -
Todos {% for category_course in categorys_courses %} @@ -80,55 +85,109 @@ {% if user|has_role:'professor, system_admin' %}
{% if courses|length > 0 %} - {% for course in courses_teacher %} - -
-
-
- -
- {% endfor %} + {% endfor %} + {% else %} + {% for course in courses_teacher %} + {% if course.category.name == request.GET.category %} + +
+
+
+ +
+
+

Course Name: {{course.name}}

+

Duration (in semesters): 09

+

Coordinator: {{course.professors}}

+

+ Description: + + {{course.description}} + +

+ {% trans 'View Course' %}
 +
+
+
+
+
+ {% endif %} + {% endfor %} + {% endif %} {% else %} {% trans 'No courses found' %} {% endif %} diff --git a/courses/views.py b/courses/views.py index 33c4772..17a3a26 100644 --- a/courses/views.py +++ b/courses/views.py @@ -33,6 +33,7 @@ class IndexView(LoginRequiredMixin, NotificationMixin, generic.ListView): context['courses_teacher'] = Course.objects.filter(professors__name = self.request.user.name) context['courses_student'] = Course.objects.filter(students__name = self.request.user.name) context['categorys_courses'] = CourseCategory.objects.filter(course_category__students__name = self.request.user.name).distinct() + context['categorys_courses_professor'] = CourseCategory.objects.filter(course_category__professors__name = self.request.user.name).distinct() courses_category = Course.objects.filter(category__name = self.request.GET.get('category')) context['courses_category'] = courses_category none = None -- libgit2 0.21.2