From 891e2b0d9298a1cc008b0a44fc756f10308ddcdf Mon Sep 17 00:00:00 2001 From: cuom1999 Date: Mon, 4 Apr 2022 17:13:23 -0500 Subject: [PATCH] Add vote count to problem admin --- judge/admin/problem.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/judge/admin/problem.py b/judge/admin/problem.py index 3d81d96..cfa954c 100644 --- a/judge/admin/problem.py +++ b/judge/admin/problem.py @@ -3,7 +3,7 @@ from operator import attrgetter from django import forms from django.contrib import admin from django.db import transaction -from django.db.models import Q, Avg +from django.db.models import Q, Avg, Count from django.db.models.aggregates import StdDev from django.forms import ModelForm from django.urls import reverse_lazy @@ -132,7 +132,7 @@ class ProblemAdmin(VersionAdmin): (_('Justice'), {'fields': ('banned_users',)}), (_('History'), {'fields': ('change_message',)}), ) - list_display = ['code', 'name', 'show_authors', 'points', 'vote_mean', 'vote_std', 'is_public', 'show_public'] + list_display = ['code', 'name', 'show_authors', 'points', 'vote_cnt', 'vote_mean', 'vote_std', 'is_public', 'show_public'] ordering = ['code'] search_fields = ('code', 'name', 'authors__user__username', 'curators__user__username') inlines = [LanguageLimitInline, ProblemClarificationInline, ProblemSolutionInline, ProblemTranslationInline] @@ -201,7 +201,8 @@ class ProblemAdmin(VersionAdmin): queryset = Problem.objects.prefetch_related('authors__user') queryset = queryset.annotate( _vote_mean=Avg('problem_points_votes__points'), - _vote_std=StdDev('problem_points_votes__points') + _vote_std=StdDev('problem_points_votes__points'), + _vote_cnt=Count('problem_points_votes__points') ) if request.user.has_perm('judge.edit_all_problem'): return queryset @@ -250,6 +251,10 @@ class ProblemAdmin(VersionAdmin): return round(obj._vote_std, 1) if obj._vote_std is not None else None vote_std.admin_order_field = '_vote_std' + def vote_cnt(self, obj): + return obj._vote_cnt + vote_cnt.admin_order_field = '_vote_cnt' + class ProblemPointsVoteAdmin(admin.ModelAdmin): list_display = ('vote_points', 'voter', 'voter_rating', 'voter_point', 'problem_name', 'problem_code', 'problem_points')