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

Felipe Henrique de Almeida Bormann
2 parents 68135020 961f5ed0
Showing 4 changed files with 23 additions and 18 deletions Show diff stats
subjects/templates/subjects/initial.html
subjects/templates/subjects/subject_card.html
subjects/utils.py
subjects/views.py
@@ -16,7 +16,7 @@
 	</div>
 	<div class="col-md-12 cards-content">
-	<h2 class=" my-subjects-title"><b><i>{% trans "Meus Assuntos" %}</i></b></h2>
+		<h2 class=" my-subjects-title"><b><i>{% trans "Meus Assuntos" %}</i></b></h2>
     	<div class="panel-group" id="subject-accordion" role="tablist" aria-multiselectable="true">
 			{% for subject in subjects %}
 				{% include "subjects/subject_card.html" with accordion_id="subject-accordion" %}
@@ -57,7 +57,7 @@
             {% endif %}
         </div>
     </div>
-{% elif request.user in subject.professor.all or request.user in category.coordinators.all %}
+{% elif request.user in subject.professor.all or request.user in subject.category.coordinators.all or request.user.is_staff %}
     <div class="panel panel-info subject-panel-invisible">
         <div class="panel-heading panel-invisible">
             <div class="row">
@@ -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
@@ -38,14 +39,12 @@ class HomeView(LoginRequiredMixin, ListView):
     def get_queryset(self):
         if self.request.user.is_staff:
-            subjects = Subject.objects.all()
+            subjects = Subject.objects.all().order_by("name")
         else:
-            subjects = Subject.objects.all()
+            subjects = Subject.objects.all().order_by("name")
             subjects = [subject for subject in subjects if self.request.user in subject.students.all() or self.request.user in subject.professor.all() or self.request.user in subject.category.coordinators.all()]
-           
-        paginator = Paginator(subjects, 10)
-
+        print(subjects)
         return subjects
@@ -75,10 +74,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
@@ -166,11 +163,9 @@ class SubjectCreateView(CreateView):
         return super(SubjectCreateView, self).form_valid(form)
     def get_success_url(self):
-
         if not self.object.category.visible:
             self.object.visible = False
             self.object.save()
-        
         messages.success(self.request, _('Subject "%s" was registered on "%s" successfully!')%(self.object.name, self.object.category.name ))
         return reverse_lazy('subjects:index')
@@ -192,17 +187,13 @@ class SubjectUpdateView(LogMixin, UpdateView):
         return context
     def get_success_url(self):
-
         if not self.object.category.visible:
             self.object.visible = False
             self.object.save()
-
         messages.success(self.request, _('Subject "%s" was updated on "%s" successfully!')%(self.object.name, self.object.category.name ))
         return reverse_lazy('subjects:index')
-
-
 class SubjectDeleteView(LoginRequiredMixin, LogMixin, DeleteView):
     login_url = reverse_lazy("users:login")
@@ -228,7 +219,6 @@ class SubjectDeleteView(LoginRequiredMixin, LogMixin, DeleteView):
     def get_success_url(self):
         messages.success(self.request, _('Subject removed successfully!'))
-
         return reverse_lazy('subjects:index')
	@@ -16,7 +16,7 @@		@@ -16,7 +16,7 @@
16	</div>	16	</div>
17		17
18	<div class="col-md-12 cards-content">	18	<div class="col-md-12 cards-content">
19	- <h2 class=" my-subjects-title"><b><i>{% trans "Meus Assuntos" %}</i></b></h2>	19	+ <h2 class=" my-subjects-title"><b><i>{% trans "Meus Assuntos" %}</i></b></h2>
20	<div class="panel-group" id="subject-accordion" role="tablist" aria-multiselectable="true">	20	<div class="panel-group" id="subject-accordion" role="tablist" aria-multiselectable="true">
21	{% for subject in subjects %}	21	{% for subject in subjects %}
22	{% include "subjects/subject_card.html" with accordion_id="subject-accordion" %}	22	{% include "subjects/subject_card.html" with accordion_id="subject-accordion" %}
	@@ -57,7 +57,7 @@		@@ -57,7 +57,7 @@
57	{% endif %}	57	{% endif %}
58	</div>	58	</div>
59	</div>	59	</div>
60	-{% elif request.user in subject.professor.all or request.user in category.coordinators.all %}	60	+{% elif request.user in subject.professor.all or request.user in subject.category.coordinators.all or request.user.is_staff %}
61	<div class="panel panel-info subject-panel-invisible">	61	<div class="panel panel-info subject-panel-invisible">
62	<div class="panel-heading panel-invisible">	62	<div class="panel-heading panel-invisible">
63	<div class="row">	63	<div class="row">
	@@ -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