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

Add UI for action bar

Browse source
This commit is contained in:
cuom1999 2022-11-16 18:48:32 -06:00
parent f9e9df6056
commit b75a52fe74
22 changed files with 543 additions and 333 deletions
Download patch file Download diff file Expand all files Collapse all files

75
judge/migrations/0137_auto_20221116_2201.py
View file

@ -7,39 +7,78 @@ import django.db.models.deletion
class Migration(migrations.Migration):
dependencies = [
('judge', '0136_alter_profile_timezone'),
("judge", "0136_alter_profile_timezone"),
]
operations = [
migrations.CreateModel(
name='PageVote',
name="PageVote",
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('page', models.CharField(db_index=True, max_length=30, verbose_name='associated page')),
('score', models.IntegerField(default=0, verbose_name='votes')),
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
(
"page",
models.CharField(
db_index=True, max_length=30, verbose_name="associated page"
),
),
("score", models.IntegerField(default=0, verbose_name="votes")),
],
options={
'verbose_name': 'pagevote',
'verbose_name_plural': 'pagevotes',
"verbose_name": "pagevote",
"verbose_name_plural": "pagevotes",
},
),
migrations.AlterField(
model_name='problemtranslation',
name='language',
field=models.CharField(choices=[('vi', 'Vietnamese'), ('en', 'English')], max_length=7, verbose_name='language'),
model_name="problemtranslation",
name="language",
field=models.CharField(
choices=[("vi", "Vietnamese"), ("en", "English")],
max_length=7,
verbose_name="language",
),
),
migrations.CreateModel(
name='PageVoteVoter',
name="PageVoteVoter",
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('score', models.IntegerField()),
('pagevote', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='votes', to='judge.pagevote')),
('voter', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='voted_page', to='judge.profile')),
(
"id",
models.AutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("score", models.IntegerField()),
(
"pagevote",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="votes",
to="judge.pagevote",
),
),
(
"voter",
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="voted_page",
to="judge.profile",
),
),
],
options={
'verbose_name': 'pagevote vote',
'verbose_name_plural': 'pagevote votes',
'unique_together': {('voter', 'pagevote')},
"verbose_name": "pagevote vote",
"verbose_name_plural": "pagevote votes",
"unique_together": {("voter", "pagevote")},
},
),
]

5
judge/models/pagevote.py
View file

@ -18,7 +18,7 @@ class PageVote(models.Model):
class Meta:
verbose_name = _("pagevote")
verbose_name_plural = _("pagevotes")
def vote_score(self, user):
page_vote = PageVoteVoter.objects.filter(pagevote=self, voter=user)
if page_vote.exists():
@ -29,6 +29,7 @@ class PageVote(models.Model):
def __str__(self):
return f"pagevote for {self.page}"
class PageVoteVoter(models.Model):
voter = models.ForeignKey(Profile, related_name="voted_page", on_delete=CASCADE)
pagevote = models.ForeignKey(PageVote, related_name="votes", on_delete=CASCADE)
@ -37,4 +38,4 @@ class PageVoteVoter(models.Model):
class Meta:
unique_together = ["voter", "pagevote"]
verbose_name = _("pagevote vote")
verbose_name_plural = _("pagevote votes")
verbose_name_plural = _("pagevote votes")

7
judge/views/blog.py
View file

@ -7,7 +7,7 @@ from django.utils.translation import ugettext as _
from django.views.generic import ListView
from judge.comments import CommentedDetailView
from judge.views.pagevote import PageVoteDetailView
from judge.views.pagevote import PageVoteDetailView, PageVoteListView
from judge.models import (
BlogPost,
Comment,
@ -93,7 +93,7 @@ class FeedView(ListView):
return context
class PostList(FeedView):
class PostList(FeedView, PageVoteListView):
model = BlogPost
paginate_by = 10
context_object_name = "posts"
@ -130,6 +130,9 @@ class PostList(FeedView):
return context
def get_comment_page(self, post):
return "b:%s" % post.id
class TicketFeed(FeedView):
model = Ticket

4
judge/views/contests.py
View file

@ -82,6 +82,8 @@ from judge.utils.views import (
generic_message,
)
from judge.widgets import HeavyPreviewPageDownWidget
from judge.views.pagevote import PageVoteDetailView
__all__ = [
"ContestList",
@ -380,7 +382,7 @@ class ContestMixin(object):
)
class ContestDetail(ContestMixin, TitleMixin, CommentedDetailView):
class ContestDetail(ContestMixin, TitleMixin, CommentedDetailView, PageVoteDetailView):
template_name = "contest/contest.html"
def get_comment_page(self):

26
judge/views/pagevote.py
View file

@ -13,7 +13,7 @@ from django.views.generic.base import TemplateResponseMixin
from django.views.generic.detail import SingleObjectMixin
from judge.dblock import LockModel
from django.views.generic import View
from django.views.generic import View, ListView
__all__ = [
@ -21,6 +21,7 @@ __all__ = [
"downvote_page",
]
@login_required
def vote_page(request, delta):
if abs(delta) != 1:
@ -75,7 +76,9 @@ def vote_page(request, delta):
_("You already voted."), content_type="text/plain"
)
vote.delete()
PageVote.objects.filter(id=pagevote_id).update(score=F("score") - vote.score)
PageVote.objects.filter(id=pagevote_id).update(
score=F("score") - vote.score
)
else:
PageVote.objects.filter(id=pagevote_id).update(score=F("score") + delta)
break
@ -89,6 +92,7 @@ def upvote_page(request):
def downvote_page(request):
return vote_page(request, -1)
class PageVoteDetailView(TemplateResponseMixin, SingleObjectMixin, View):
pagevote_page = None
@ -108,13 +112,21 @@ class PageVoteDetailView(TemplateResponseMixin, SingleObjectMixin, View):
def get_context_data(self, **kwargs):
context = super(PageVoteDetailView, self).get_context_data(**kwargs)
queryset = PageVote.objects.filter(page=self.get_comment_page())
if (queryset.exists() == False):
pagevote = PageVote(
page=self.get_comment_page(), score=0
)
if queryset.exists() == False:
pagevote = PageVote(page=self.get_comment_page(), score=0)
pagevote.save()
context["pagevote"] = queryset.first()
return context
class PageVoteListView(ListView):
pagevote_page = None
def get_context_data(self, **kwargs):
context = super(PageVoteListView, self).get_context_data(**kwargs)
for item in context["object_list"]:
pagevote, _ = PageVote.objects.get_or_create(
page=self.get_comment_page(item)
)
setattr(item, "pagevote", pagevote)
return context

16
judge/views/problem.py
View file

@ -86,6 +86,7 @@ from judge.utils.views import (
generic_message,
)
from judge.ml.collab_filter import CollabFilter
from judge.views.pagevote import PageVoteDetailView, PageVoteListView
def get_contest_problem(problem, profile):
@ -172,7 +173,11 @@ class SolvedProblemMixin(object):
class ProblemSolution(
SolvedProblemMixin, ProblemMixin, TitleMixin, CommentedDetailView
SolvedProblemMixin,
ProblemMixin,
TitleMixin,
CommentedDetailView,
PageVoteDetailView,
):
context_object_name = "problem"
template_name = "problem/editorial.html"
@ -237,7 +242,9 @@ class ProblemRaw(
)
class ProblemDetail(ProblemMixin, SolvedProblemMixin, CommentedDetailView):
class ProblemDetail(
ProblemMixin, SolvedProblemMixin, CommentedDetailView, PageVoteDetailView
):
context_object_name = "problem"
template_name = "problem/problem.html"
@ -806,7 +813,7 @@ class ProblemList(QueryStringSortMixin, TitleMixin, SolvedProblemMixin, ListView
return HttpResponseRedirect(request.get_full_path())
class ProblemFeed(ProblemList):
class ProblemFeed(ProblemList, PageVoteListView):
model = Problem
context_object_name = "problems"
template_name = "problem/feed.html"
@ -832,6 +839,9 @@ class ProblemFeed(ProblemList):
**kwargs
)
def get_comment_page(self, problem):
return "p:%s" % problem.code
# arr = [[], [], ..]
def merge_recommendation(self, arr):
seed = datetime.now().strftime("%d%m%Y")