show only the students who are registed on topic

Matheus Lins
1 parent f2811c41
Showing 2 changed files with 5 additions and 2 deletions Show diff stats
courses/templates/topic/index.html
courses/views.py
@@ -119,7 +119,10 @@
       </div>
     </div>
 </div>
-  <h3>{% trans 'Exercises' %}</h3>
+  <div class="col-md-6">
+      <h3>{% trans 'Students - Especific Exercises' %}</h3>  
+      <br/>  
+  </div>
     {# mostra a lista de usuários caso seja um professor ou admin #}
   {% if user|has_role:'professor' or user|has_role:'system_admin' %}
     {% for user in users %}
@@ -623,7 +623,7 @@ class TopicsView(LoginRequiredMixin, LogMixin, generic.ListView):
         students_activit = User.objects.filter(activities__in = Activity.objects.all())
         materials = Material.objects.filter(topic = topic)
         if has_role(self.request.user, 'professor'):
-            users = User.objects.all()
+            users = User.objects.filter(subject_student__in = Subject.objects.all())
             context['users'] = users
         elif has_role(self.request.user, 'student'):
             exercises = Exercise.objects.all().filter(students=self.request.user)
	@@ -623,7 +623,7 @@ class TopicsView(LoginRequiredMixin, LogMixin, generic.ListView):		@@ -623,7 +623,7 @@ class TopicsView(LoginRequiredMixin, LogMixin, generic.ListView):
623	students_activit = User.objects.filter(activities__in = Activity.objects.all())	623	students_activit = User.objects.filter(activities__in = Activity.objects.all())
624	materials = Material.objects.filter(topic = topic)	624	materials = Material.objects.filter(topic = topic)
625	if has_role(self.request.user, 'professor'):	625	if has_role(self.request.user, 'professor'):
626	- users = User.objects.all()	626	+ users = User.objects.filter(subject_student__in = Subject.objects.all())
627	context['users'] = users	627	context['users'] = users
628	elif has_role(self.request.user, 'student'):	628	elif has_role(self.request.user, 'student'):
629	exercises = Exercise.objects.all().filter(students=self.request.user)	629	exercises = Exercise.objects.all().filter(students=self.request.user)