added top subject in student list

Author: suhailvs

README.md

@@ -1,4 +1,4 @@
-# Django School
+# [Django School](https://djangoschools.herokuapp.com/)
 
 [![Python Version](https://img.shields.io/badge/python-3.6-brightgreen.svg)](https://python.org)
 [![Django Version](https://img.shields.io/badge/django-3.0-brightgreen.svg)](https://djangoproject.com)

django_school/classroom/templates/classroom/students/student_list.html

@@ -1,4 +1,4 @@
-<!-- To show list of students and teachers tab for both users -->
+<!-- To show list of students -->
 {% extends 'base.html' %}
 {% load quiz_extras %}
 
@@ -16,7 +16,7 @@
   <div class="row">
     <div class="col-sm-6">
       <div class="input-group mb-3">
-        <input type="text" class="form-control" name='q' value='{{ request.GET.q }}' placeholder="Filter by name">
+        <input type="text" class="form-control" name='q' value='{{ request.GET.q }}' placeholder="Filter by username">
         <div class="input-group-append">
           <button class="btn btn-outline-secondary" type="submit">Search...</button>
         </div>
@@ -26,16 +26,17 @@
 </form>
 <br>
 <div class="row">
-{% for user in users %}
+{% for student in students %}
   <div class="col-sm-3">
     <div class="media">
       <a>
-        <img class="mr-3" src="{{ user.username|gravatar_url:50 }}" alt="{{user.get_full_name}}">
+        <img class="mr-3" src="{{ student.user.username|gravatar_url:50 }}" alt="{{student.user.get_full_name}}">
       </a>
       <div class="media-body" style="font-size: 12px">
         <!-- <a href="#">{{user.get_full_name}}</a><br> -->
-        {{user.username}}<br>
-        <strong>{{user.student.score}}</strong>
+        {{student.user.username}}<br>
+        <strong>{{student.score}}</strong><br>
+        {{student.taken_quizzes.all|top_subject}}
       </div>
     </div>
   </div>

django_school/classroom/templatetags/quiz_extras.py

@@ -1,4 +1,6 @@
 from django import template
+from django.db.models import Sum
+
 from classroom.models import StudentAnswer
 import hashlib
 
@@ -11,11 +13,21 @@ def marked_answer(user,opt):
         if opt.is_correct:
             return 'correct'
         return 'wrong'
-
     return ''
 
 @register.filter
 def gravatar_url(username, size=40):
     # TEMPLATE USE:  {{ email|gravatar_url:150 }}
     username_hash = hashlib.md5(username.lower().encode('utf-8')).hexdigest()
-    return f"https://www.gravatar.com/avatar/{username_hash}?s={size}&d=identicon"
+    return f"https://www.gravatar.com/avatar/{username_hash}?s={size}&d=identicon"
+
+@register.filter
+def top_subject(taken_quizzes):
+    subjects = taken_quizzes.values('quiz__subject__name') \
+        .annotate(score = Sum('score')) \
+        .order_by('-score')
+    if subjects:
+        name = subjects[0]['quiz__subject__name']
+        score = subjects[0]['score']
+        return f"{name} x {score}"
+    return ""

django_school/classroom/views/students.py

@@ -14,8 +14,9 @@
 
 from ..decorators import student_required
 from ..forms import StudentInterestsForm, StudentSignUpForm, TakeQuizForm
-from ..models import Quiz, Student, TakenQuiz, User, Question
+from ..models import Quiz, Student, TakenQuiz, Question
 
+User = get_user_model()
 
 class StudentSignUpView(CreateView):
     model = User
@@ -151,18 +152,18 @@ class StudentList(ListView):
     # model = get_user_model()
     paginate_by = 36
     template_name = 'classroom/students/student_list.html'
-    context_object_name = 'users'
+    context_object_name = 'students'
 
     def get_queryset(self):
         query = self.request.GET.get('q','')
         User = get_user_model()
 
-        queryset = User.objects.filter(is_student = True).order_by('-student__score')
+        queryset = Student.objects.order_by('-score')
         if query:
             # queryset = queryset.annotate(
             #     full_name = Concat('first_name','last_name')
             # ).filter(full_name__icontains = query)
-            queryset = queryset.filter(username__icontains = query)
+            queryset = queryset.filter(user__username__icontains = query)
         return queryset
 
 

django_school/classroom/views/teachers.py

@@ -1,6 +1,8 @@
 from django.contrib import messages
 from django.contrib.auth import login
 from django.contrib.auth.decorators import login_required
+from django.contrib.auth import get_user_model
+
 from django.db import transaction
 from django.db.models import Avg, Count
 from django.forms import inlineformset_factory
@@ -12,8 +14,9 @@
 
 from ..decorators import teacher_required
 from ..forms import BaseAnswerInlineFormSet, QuestionForm, TeacherSignUpForm
-from ..models import Answer, Question, Quiz, User
+from ..models import Answer, Question, Quiz
 
+User = get_user_model()
 
 class TeacherSignUpView(CreateView):
     model = User