Display score change in submissions admin

Author: MasloMaslane

oioioi/acm/controllers.py

@@ -201,6 +201,9 @@ def can_see_round(self, request_or_context, round, no_admin=False):
     def get_default_safe_exec_mode(self):
         return 'cpu'
 
+    def calculate_score_diff(self):
+        return False
+
 
 class ACMOpenContestController(ACMContestController):
     description = _("ACM style contest (open)")

oioioi/contests/admin.py

@@ -712,6 +712,8 @@ def get_list_display(self, request):
         ]
         if request.contest:
             list_display.remove('contest_display')
+            if request.contest.controller.calculate_score_diff():
+                list_display.append('score_diff_display')
         return list_display
 
     def get_list_display_links(self, request, list_display):
@@ -848,6 +850,14 @@ def score_display(self, instance):
     score_display.short_description = _("Score")
     score_display.admin_order_field = 'score_with_nulls_smallest'
 
+    def score_diff_display(self, instance):
+        if instance.score_diff is not None:
+            return format_html(instance.problem_instance.contest.controller.render_score_diff(instance.score_diff))
+        return format_html('<span class="text-secondary">-</span>')
+
+    score_diff_display.short_description = _("Score change")
+    score_diff_display.admin_order_field = 'score'
+
     def contest_display(self, instance):
         return instance.problem_instance.contest
 

oioioi/contests/controllers.py

@@ -33,6 +33,7 @@
     UserResultForRound,
     submission_kinds,
 )
+from oioioi.contests.scores import IntegerScore
 from oioioi.contests.utils import (
     generic_rounds_times,
     has_any_active_round,
@@ -756,7 +757,7 @@ def update_user_result_for_contest(self, result):
         )
         result.score = self._sum_scores(scores)
 
-    def update_user_results(self, user, problem_instance):
+    def update_user_results(self, user, problem_instance, submission):
         """Updates score for problem instance, round and contest.
 
         Usually this method creates instances (if they don't exist) of:
@@ -777,7 +778,7 @@ def update_user_results(self, user, problem_instance):
 
         # First: UserResultForProblem
 
-        problem.controller.update_user_results(user, problem_instance)
+        problem.controller.update_user_results(user, problem_instance, submission)
 
         # Second: UserResultForRound
         with transaction.atomic():
@@ -974,6 +975,25 @@ def _is_partial_score(self, test_report):
     def show_default_fields(self, problem_instance):
         return problem_instance.problem.controller.show_default_fields(problem_instance)
 
+    def calculate_score_diff(self):
+        return True
+
+    def score_diff(self, before, after):
+        print(before, after)
+        if before is None:
+            return after
+        return IntegerScore(after.to_int() - before.to_int())
+
+    def render_score_diff(self, diff):
+        print(diff)
+        if diff is None:
+            return '<span class="text-secondary">-</span>'
+        if diff.to_int() == 0:
+            return '<span class="text-secondary">0</span>'
+        if diff.to_int() > 0:
+            return f'<span class="text-success">+{diff.to_int()}</span>'
+        return f'<span class="text-danger">{diff.to_int()}</span>'
+
 
 class PastRoundsHiddenContestControllerMixin(object):
     """ContestController mixin that hides past rounds

oioioi/contests/handlers.py

@@ -104,7 +104,7 @@ def update_user_results(env, **kwargs):
             assert 'round_id' not in env
             assert 'contest_id' not in env
 
-    problem_instance.controller.update_user_results(user, problem_instance)
+    problem_instance.controller.update_user_results(user, problem_instance, submission)
 
     return env
 

oioioi/contests/migrations/0019_submission_score_diff.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.16 on 2024-09-12 12:25
+
+from django.db import migrations
+import oioioi.contests.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contests', '0018_contest_show_contest_rules'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='submission',
+            name='score_diff',
+            field=oioioi.contests.fields.ScoreField(blank=True, max_length=255, null=True),
+        ),
+    ]

oioioi/contests/models.py

@@ -516,6 +516,7 @@ class Submission(models.Model):
     score = ScoreField(blank=True, null=True, verbose_name=_("score"))
     status = EnumField(submission_statuses, default='?', verbose_name=_("status"))
     comment = models.TextField(blank=True, verbose_name=_("comment"))
+    score_diff = ScoreField(blank=True, null=True)
 
     @property
     def problem(self):

oioioi/contests/tests/tests.py

@@ -4200,3 +4200,39 @@ def test_score_badge(self):
         self.assertIn('badge-warning', self._get_badge_for_problem(response.content, 'zad2'))
         self.assertIn('badge-danger', self._get_badge_for_problem(response.content, 'zad3'))
 
+
+class TestScoreDiff(TestCase):
+    fixtures = [
+        'test_users',
+        'test_contest',
+        'test_full_package',
+        'test_problem_instance',
+        'test_submission',
+    ]
+
+    def _test_diff(self, new_score, expected_diff):
+        pi = ProblemInstance.objects.get()
+        user = User.objects.get(username='test_user')
+        new_submission = Submission.objects.create(
+            problem_instance=pi,
+            user=user,
+            score=IntegerScore(new_score),
+            status='OK',
+        )
+        pi.controller.update_user_results(user, pi, new_submission)
+        assert new_submission.score_diff == IntegerScore(expected_diff)
+
+    def test_simple_programming_contest(self):
+        # Simple programming contest takes last score as the final one.
+        self._test_diff(50, 50 - 34)
+        self._test_diff(100, 100 - 50)
+        self._test_diff(20, 20 - 100)
+
+    def test_oi_finals_contest(self):
+        # OI finals contest takes the best score as the final one.
+        contest = Contest.objects.get()
+        contest.controller_name = 'oioioi.oi.controllers.OIFinalOnsiteContestController'
+        contest.save()
+        self._test_diff(50, 50 - 34)
+        self._test_diff(100, 100 - 50)
+        self._test_diff(20, 0)

oioioi/oi/controllers.py

@@ -279,7 +279,7 @@ def can_see_test_comments(self, request, submissionreport):
 
     def reveal_score(self, request, submission):
         super(BOIOnsiteContestController, self).reveal_score(request, submission)
-        self.update_user_results(submission.user, submission.problem_instance)
+        self.update_user_results(submission.user, submission.problem_instance, submission)
 
     def update_user_result_for_problem(self, result):
         try:

oioioi/pa/tests.py

@@ -347,7 +347,13 @@ def test_pa_user_results(self):
             [result.score for result in UserResultForProblem.objects.filter(user=user)]
         )
         for pi in ProblemInstance.objects.all():
-            contest.controller.update_user_results(user, pi)
+            contest.controller.update_user_results(
+                user,
+                pi,
+                Submission.objects.filter(
+                    problem_instance=pi,
+                ).first(),
+            )
         new_results = sorted(
             [result.score for result in UserResultForProblem.objects.filter(user=user)]
         )

oioioi/problems/controllers.py

@@ -464,7 +464,7 @@ def update_report_statuses(self, submission, queryset):
         controller._activate_newest_report(submission, queryset, kind=['INITIAL'])
         controller._activate_newest_report(submission, queryset, kind=['USER_OUTS'])
 
-    def update_user_results(self, user, problem_instance):
+    def update_user_results(self, user, problem_instance, submission):
         """Updates score for problem instance.
 
         Usually this method creates instances (if they don't exist) of:
@@ -480,8 +480,19 @@ def update_user_results(self, user, problem_instance):
             ) = UserResultForProblem.objects.select_for_update().get_or_create(
                 user=user, problem_instance=problem_instance
             )
+            if problem_instance.controller.calculate_score_diff():
+                if created:
+                    score_before = None
+                else:
+                    score_before = result.score
             problem_instance.controller.update_user_result_for_problem(result)
             result.save()
+            if problem_instance.controller.calculate_score_diff():
+                score_after = result.score
+                submission.score_diff = problem_instance.controller.score_diff(
+                    score_before, score_after
+                )
+                submission.save()
 
     def validate_submission_form(self, request, problem_instance, form, cleaned_data):
         return cleaned_data
@@ -660,7 +671,7 @@ def change_submission_kind(self, submission, kind):
             submission.problem_instance.controller.judge(submission, is_rejudge=True)
         if submission.user:
             submission.problem_instance.controller.update_user_results(
-                submission.user, submission.problem_instance
+                submission.user, submission.problem_instance, submission
             )
             if old_kind == 'NORMAL' or kind == 'NORMAL':
                 submission.problem_instance.problem.controller.recalculate_statistics_for_user(