leaderboard fix

Author: rohitsh16

interface/models.py

@@ -146,6 +146,7 @@ class Answer(models.Model):
     ques_name = models.CharField(max_length=200, blank=True, null=True, help_text="Question name")
     correct = models.IntegerField(default=0, help_text="Number of correct attempts of the Question")
     wrong = models.IntegerField(default=0, help_text="Number of wrong attempts of the Question")
+    score = models.IntegerField(default=0, help_text="Score of the Question")
     timestamp = models.DateTimeField(default=t.now, help_text="Time of submission")
 
     def __str__(self):
@@ -156,7 +157,7 @@ class Contest_Score(models.Model):
     contest = models.ForeignKey(Contest, on_delete=models.CASCADE)
     coder = models.ForeignKey(Coder, on_delete=models.CASCADE)
     score = models.IntegerField(default=0, help_text="Score of the given user in the given contest")
-    timestamp = models.DateTimeField(blank=True, help_text="Latest submission + penalty for leaderboard")
+    timestamp = models.DateTimeField(blank=True, help_text="For Penalty in questions")
 
     def __str__(self):
         return self.contest.contest_name + " " + self.coder.name

interface/serializers.py

@@ -54,7 +54,7 @@ class Meta:
 class AnswerSerializer(serializers.ModelSerializer):
     class Meta:
         model = Answer
-        fields = ('ques_name', 'correct', 'wrong', 'score', 'time_out', 'timestamp')
+        fields = ('ques_name', 'correct', 'wrong', 'score', 'timestamp')
 
 
 class EditorialSerializer(serializers.ModelSerializer):

interface/views.py

@@ -142,6 +142,7 @@ def status(request):
                 answer.correct += 1
                 if contest.isOver() == False and contest.isStarted():
                     coder_contest_score.score += question.question_score
+                    answer.score = question.question_score
                     answer.timestamp = t.now() + timedelta(minutes=10*answer.wrong)
                     coder_contest_score.timestamp += answer.timestamp
         else:
@@ -162,8 +163,8 @@ def status(request):
 def leaderboard(request):
     coder_array = []
     rank_cnt = 1
-    time = Contest_Score.objects.filter(contest=contest).order_by('-score', 'timestamp')[0].timestamp
     contest = Contest.objects.get(contest_code=request.GET['contest_id'])
+    time = Contest_Score.objects.filter(contest=contest).order_by('-score', 'timestamp')[0].timestamp
     for (rank,
          participant) in enumerate(Contest_Score.objects.filter(contest=contest).order_by('-score', 'timestamp'),
                                    start=1):