lkva/NDOJ
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add vote count to problem admin

Browse source
This commit is contained in:
cuom1999 2022-04-04 17:13:23 -05:00
parent 30a856dcb9
commit 891e2b0d92
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
judge/admin/problem.py
View file

@ -3,7 +3,7 @@ from operator import attrgetter
from django import forms from django import forms
from django.contrib import admin from django.contrib import admin
from django.db import transaction 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.db.models.aggregates import StdDev
from django.forms import ModelForm from django.forms import ModelForm
from django.urls import reverse_lazy from django.urls import reverse_lazy
@ -132,7 +132,7 @@ class ProblemAdmin(VersionAdmin):
(_('Justice'), {'fields': ('banned_users',)}), (_('Justice'), {'fields': ('banned_users',)}),
(_('History'), {'fields': ('change_message',)}), (_('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'] ordering = ['code']
search_fields = ('code', 'name', 'authors__user__username', 'curators__user__username') search_fields = ('code', 'name', 'authors__user__username', 'curators__user__username')
inlines = [LanguageLimitInline, ProblemClarificationInline, ProblemSolutionInline, ProblemTranslationInline] inlines = [LanguageLimitInline, ProblemClarificationInline, ProblemSolutionInline, ProblemTranslationInline]
@ -201,7 +201,8 @@ class ProblemAdmin(VersionAdmin):
queryset = Problem.objects.prefetch_related('authors__user') queryset = Problem.objects.prefetch_related('authors__user')
queryset = queryset.annotate( queryset = queryset.annotate(
_vote_mean=Avg('problem_points_votes__points'), _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'): if request.user.has_perm('judge.edit_all_problem'):
return queryset return queryset
@ -250,6 +251,10 @@ class ProblemAdmin(VersionAdmin):
return round(obj._vote_std, 1) if obj._vote_std is not None else None return round(obj._vote_std, 1) if obj._vote_std is not None else None
vote_std.admin_order_field = '_vote_std' 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): class ProblemPointsVoteAdmin(admin.ModelAdmin):
list_display = ('vote_points', 'voter', 'voter_rating', 'voter_point', 'problem_name', 'problem_code', 'problem_points') list_display = ('vote_points', 'voter', 'voter_rating', 'voter_point', 'problem_name', 'problem_code', 'problem_points')