added reputation

Author: suhailvs

django_school/classroom/migrations/0003_auto_20191008_0704.py

@@ -0,0 +1,29 @@
+# Generated by Django 2.2.3 on 2019-10-08 07:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('classroom', '0002_create_initial_subjects'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='student',
+            name='score',
+            field=models.IntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name='takenquiz',
+            name='percentage',
+            field=models.FloatField(default=0),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='takenquiz',
+            name='score',
+            field=models.IntegerField(),
+        ),
+    ]

django_school/classroom/models.py

@@ -52,6 +52,9 @@ class Student(models.Model):
     user = models.OneToOneField(User, on_delete=models.CASCADE, primary_key=True)
     quizzes = models.ManyToManyField(Quiz, through='TakenQuiz')
     interests = models.ManyToManyField(Subject, related_name='interested_students')
+    
+    # User reputation score.
+    score = models.IntegerField(default=0)
 
     def get_unanswered_questions(self, quiz):
         answered_questions = self.quiz_answers \
@@ -67,7 +70,8 @@ def __str__(self):
 class TakenQuiz(models.Model):
     student = models.ForeignKey(Student, on_delete=models.CASCADE, related_name='taken_quizzes')
     quiz = models.ForeignKey(Quiz, on_delete=models.CASCADE, related_name='taken_quizzes')
-    score = models.FloatField()
+    score = models.IntegerField()
+    percentage = models.FloatField()
     date = models.DateTimeField(auto_now_add=True)
 
 

django_school/classroom/templates/classroom/students/quiz_result.html

@@ -6,6 +6,11 @@
 
 <h2>{{quiz.name}}</h2>
 {{ quiz.subject.get_html_badge }}
+
+<div class="progress">
+  <div class="progress-bar progress-bar-striped bg-success" role="progressbar" style="width: {{percentage}}%" aria-valuenow="{{percentage}}" aria-valuemin="0" aria-valuemax="100">{{percentage}}%</div>
+</div>
+<hr>
 {% for question in questions %}
 <div class="card">
   <div class="card-body">

django_school/classroom/templates/classroom/students/taken_quiz_list.html

@@ -8,15 +8,15 @@
         <tr>
           <th>Quiz</th>
           <th>Subject</th>
-          <th>Score</th>
+          <th>%</th>
         </tr>
       </thead>
       <tbody>
         {% for taken_quiz in taken_quizzes %}
           <tr>
             <td><a href="{% url 'students:student_quiz_results' taken_quiz.quiz.id %}">{{ taken_quiz.quiz.name }}</a></td>
             <td>{{ taken_quiz.quiz.subject.get_html_badge }}</td>
-            <td>{{ taken_quiz.score }}</td>
+            <td>{{ taken_quiz.percentage }}</td>
           </tr>
         {% empty %}
           <tr>

django_school/classroom/templates/classroom/teachers/quiz_results.html

@@ -22,15 +22,15 @@ <h2 class="mb-3">{{ quiz.name }} Results</h2>
         <tr>
           <th>Student</th>
           <th>Date</th>
-          <th>Score</th>
+          <th>Percentage</th>
         </tr>
       </thead>
       <tbody>
         {% for taken_quiz in taken_quizzes %}
           <tr>
             <td>{{ taken_quiz.student.user.username }}</td>
             <td>{{ taken_quiz.date|naturaltime }}</td>
-            <td>{{ taken_quiz.score }}</td>
+            <td>{{ taken_quiz.percentage }}</td>
           </tr>
         {% endfor %}
       </tbody>

django_school/classroom/views/students.py

@@ -2,7 +2,7 @@
 from django.contrib.auth import login
 from django.contrib.auth.decorators import login_required
 from django.db import transaction
-from django.db.models import Count
+from django.db.models import Count, Sum
 from django.shortcuts import get_object_or_404, redirect, render
 from django.urls import reverse_lazy
 from django.utils.decorators import method_decorator
@@ -68,15 +68,17 @@ class QuizResultsView(View):
 
     def get(self, request, *args, **kwargs):        
         quiz = Quiz.objects.get(id = kwargs['pk'])
-        if not TakenQuiz.objects.filter(student = request.user.student, quiz = quiz):
+        taken_quiz = TakenQuiz.objects.filter(student = request.user.student, quiz = quiz)
+        if not taken_quiz:
             """
             Don't show the result if the user didn't attempted the quiz
             """
             return render(request, '404.html')
         questions = Question.objects.filter(quiz =quiz)
 
         # questions = self.form_class(initial=self.initial)
-        return render(request, self.template_name, {'questions':questions, 'quiz':quiz})
+        return render(request, self.template_name, {'questions':questions, 
+            'quiz':quiz, 'percentage': taken_quiz[0].percentage})
 
 
 @method_decorator([login_required, student_required], name='dispatch')
@@ -118,12 +120,14 @@ def take_quiz(request, pk):
                     return redirect('students:take_quiz', pk)
                 else:
                     correct_answers = student.quiz_answers.filter(answer__question__quiz=quiz, answer__is_correct=True).count()
-                    score = round((correct_answers / total_questions) * 100.0, 2)
-                    TakenQuiz.objects.create(student=student, quiz=quiz, score=score)
-                    if score < 50.0:
-                        messages.warning(request, 'Better luck next time! Your score for the quiz %s was %s.' % (quiz.name, score))
+                    percentage = round((correct_answers / total_questions) * 100.0, 2)
+                    TakenQuiz.objects.create(student=student, quiz=quiz, score=correct_answers, percentage= percentage)
+                    student.score = TakenQuiz.objects.filter(student=student).aggregate(Sum('score'))['score__sum']
+                    student.save()
+                    if percentage < 50.0:
+                        messages.warning(request, 'Better luck next time! Your score for the quiz %s was %s.' % (quiz.name, percentage))
                     else:
-                        messages.success(request, 'Congratulations! You completed the quiz %s with success! You scored %s points.' % (quiz.name, score))
+                        messages.success(request, 'Congratulations! You completed the quiz %s with success! You scored %s points.' % (quiz.name, percentage))
                     return redirect('students:quiz_list')
     else:
         form = TakeQuizForm(question=question)

django_school/templates/base.html

@@ -37,7 +37,7 @@ <h1 class="logo">
             </div>
             <div class="col-6 text-right">
               {% if user.is_authenticated %}
-                <p class="pt-3">Logged in as <strong>{{ user.username }}</strong>. <a href="{% url 'logout' %}">Log out</a>.</p>
+                <p class="pt-3"><strong>{{ user.username }}{% if user.is_student %} - {{user.student.score}}{% endif %}</strong> | <a href="{% url 'logout' %}">Log out</a>.</p>
               {% else %}
                 <a href="{% url 'login' %}" class="btn btn-light" role="button">Log in</a>
                 <a href="{% url 'signup' %}" class="btn btn-primary" role="button">Sign up</a>
@@ -49,9 +49,9 @@ <h1 class="logo">
               {% for message in messages %}
                 <div class="alert {{ message.tags }} alert-dismissible fade show" role="alert">
                   {{ message }}
-                  <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                  <!-- <button type="button" class="close" data-dismiss="alert" aria-label="Close">
                     <span aria-hidden="true">&times;</span>
-                  </button>
+                  </button> -->
                 </div>
               {% endfor %}
               {% block content %}