Adjusting my subjects list

Zambom
1 parent 35b73722
Showing 2 changed files with 18 additions and 4 deletions Show diff stats
subjects/utils.py
subjects/views.py
@@ -0,0 +1,15 @@
+#    File used to store useful subject functions    #
+
+def has_student_profile(user, category):
+	for subject in category.subject_category.all():
+		if user in subject.students.all():
+			return True
+
+	return False
+
+def has_professor_profile(user, category):
+	for subject in category.subject_category.all():
+		if user in subject.professor.all():
+			return True
+
+	return False
 \ No newline at end of file
@@ -25,6 +25,7 @@ from .models import Tag
 import time
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from .forms import CreateSubjectForm
+from .utils import has_student_profile, has_professor_profile
 from users.models import User
@@ -75,10 +76,8 @@ class IndexView(LoginRequiredMixin, ListView):
             if not self.kwargs.get('option'):
                 categories = Category.objects.all()
-                for category in categories:
-                    category.subjects = Subject.objects.filter(category= category)
-
-                categories = [category for category in categories if category.subjects.count() > 0 or self.request.user in category.coordinators.all()] 
+                categories = [category for category in categories if self.request.user in category.coordinators.all() \
+                    or has_professor_profile(self.request.user, category) or has_student_profile(self.request.user, category)] 
                 #So I remove all categories that doesn't have the possibility for the user to be on
         return categories
	@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
		1	+# File used to store useful subject functions #
		2	+
		3	+def has_student_profile(user, category):
		4	+ for subject in category.subject_category.all():
		5	+ if user in subject.students.all():
		6	+ return True
		7	+
		8	+ return False
		9	+
		10	+def has_professor_profile(user, category):
		11	+ for subject in category.subject_category.all():
		12	+ if user in subject.professor.all():
		13	+ return True
		14	+
		15	+ return False
0	\ No newline at end of file	16	\ No newline at end of file