diff --git a/symposion/reviews/models.py b/symposion/reviews/models.py index 1419e134..ecfcde60 100644 --- a/symposion/reviews/models.py +++ b/symposion/reviews/models.py @@ -17,22 +17,22 @@ from symposion.schedule.models import Presentation def score_expression(): return ( - (3 * F("plus_one") + F("plus_zero")) - - (F("minus_zero") + 3 * F("minus_one")) + (2 * F("plus_two") + F("plus_one")) - + (F("minus_one") + 2 * F("minus_two")) ) class Votes(object): + PLUS_TWO = "+2" PLUS_ONE = "+1" - PLUS_ZERO = "+0" - MINUS_ZERO = "−0" MINUS_ONE = "−1" + MINUS_TWO = "−2" CHOICES = [ - (PLUS_ONE, _("+1 — Good proposal and I will argue for it to be accepted.")), - (PLUS_ZERO, _("+0 — OK proposal, but I will not argue for it to be accepted.")), - (MINUS_ZERO, _("−0 — Weak proposal, but I will not argue strongly against acceptance.")), - (MINUS_ONE, _("−1 — Serious issues and I will argue to reject this proposal.")), + (PLUS_TWO, _("+2 — Good proposal and I will argue for it to be accepted.")), + (PLUS_ONE, _("+1 — OK proposal, but I will not argue for it to be accepted.")), + (MINUS_ONE, _("−1 — Weak proposal, but I will not argue strongly against acceptance.")), + (MINUS_TWO, _("−2 — Serious issues and I will argue to reject this proposal.")), ] VOTES = Votes() @@ -222,10 +222,10 @@ class ProposalResult(models.Model): score = models.DecimalField(max_digits=5, decimal_places=2, default=Decimal("0.00"), verbose_name=_("Score")) comment_count = models.PositiveIntegerField(default=0, verbose_name=_("Comment count")) vote_count = models.PositiveIntegerField(default=0, verbose_name=_("Vote count")) + plus_two = models.PositiveIntegerField(default=0, verbose_name=_("Plus two")) plus_one = models.PositiveIntegerField(default=0, verbose_name=_("Plus one")) - plus_zero = models.PositiveIntegerField(default=0, verbose_name=_("Plus zero")) - minus_zero = models.PositiveIntegerField(default=0, verbose_name=_("Minus zero")) minus_one = models.PositiveIntegerField(default=0, verbose_name=_("Minus one")) + minus_two = models.PositiveIntegerField(default=0, verbose_name=_("Minus two")) accepted = models.NullBooleanField(choices=[ (True, "accepted"), (False, "rejected"), @@ -244,31 +244,31 @@ class ProposalResult(models.Model): result, created = cls._default_manager.get_or_create(proposal=proposal) result.comment_count = Review.objects.filter(proposal=proposal).count() result.vote_count = LatestVote.objects.filter(proposal=proposal).count() + result.plus_two = LatestVote.objects.filter( + proposal=proposal, + vote=VOTES.PLUS_TWO + ).count() result.plus_one = LatestVote.objects.filter( proposal=proposal, vote=VOTES.PLUS_ONE ).count() - result.plus_zero = LatestVote.objects.filter( - proposal=proposal, - vote=VOTES.PLUS_ZERO - ).count() - result.minus_zero = LatestVote.objects.filter( - proposal=proposal, - vote=VOTES.MINUS_ZERO - ).count() result.minus_one = LatestVote.objects.filter( proposal=proposal, vote=VOTES.MINUS_ONE ).count() + result.minus_two = LatestVote.objects.filter( + proposal=proposal, + vote=VOTES.MINUS_TWO + ).count() result.save() cls._default_manager.filter(pk=result.pk).update(score=score_expression()) def update_vote(self, vote, previous=None, removal=False): mapping = { + VOTES.PLUS_TWO: "plus_two", VOTES.PLUS_ONE: "plus_one", - VOTES.PLUS_ZERO: "plus_zero", - VOTES.MINUS_ZERO: "minus_zero", VOTES.MINUS_ONE: "minus_one", + VOTES.MINUS_TWO: "minus_two", } if previous: if previous == vote: diff --git a/symposion/reviews/views.py b/symposion/reviews/views.py index 83cdc8bf..037c6742 100644 --- a/symposion/reviews/views.py +++ b/symposion/reviews/views.py @@ -41,10 +41,10 @@ def proposals_generator(request, queryset, user_pk=None, check_speaker=True): obj.comment_count = obj.result.comment_count obj.total_votes = obj.result.vote_count + obj.plus_two = obj.result.plus_two obj.plus_one = obj.result.plus_one - obj.plus_zero = obj.result.plus_zero - obj.minus_zero = obj.result.minus_zero obj.minus_one = obj.result.minus_one + obj.minus_two = obj.result.minus_two lookup_params = dict(proposal=obj) if user_pk: @@ -144,22 +144,22 @@ def review_admin(request, section_slug): user.comment_count = Review.objects.filter(user=user).count() user.total_votes = LatestVote.objects.filter(user=user).count() + user.plus_two = LatestVote.objects.filter( + user=user, + vote=LatestVote.VOTES.PLUS_TWO + ).count() user.plus_one = LatestVote.objects.filter( user=user, vote=LatestVote.VOTES.PLUS_ONE ).count() - user.plus_zero = LatestVote.objects.filter( - user=user, - vote=LatestVote.VOTES.PLUS_ZERO - ).count() - user.minus_zero = LatestVote.objects.filter( - user=user, - vote=LatestVote.VOTES.MINUS_ZERO - ).count() user.minus_one = LatestVote.objects.filter( user=user, vote=LatestVote.VOTES.MINUS_ONE ).count() + user.minus_two = LatestVote.objects.filter( + user=user, + vote=LatestVote.VOTES.MINUS_TWO + ).count() yield user @@ -268,10 +268,10 @@ def review_detail(request, pk): proposal.comment_count = proposal.result.comment_count proposal.total_votes = proposal.result.vote_count + proposal.plus_two = proposal.result.plus_two proposal.plus_one = proposal.result.plus_one - proposal.plus_zero = proposal.result.plus_zero - proposal.minus_zero = proposal.result.minus_zero proposal.minus_one = proposal.result.minus_one + proposal.minus_two = proposal.result.minus_two reviews = Review.objects.filter(proposal=proposal).order_by("-submitted_at") messages = proposal.messages.order_by("submitted_at") @@ -319,22 +319,22 @@ def review_status(request, section_slug=None, key=None): queryset = queryset.filter(kind__section__slug=section_slug) proposals = { - # proposals with at least VOTE_THRESHOLD reviews and at least one +1 and no -1s, sorted by + # proposals with at least VOTE_THRESHOLD reviews and at least one +2 and no -2s, sorted by # the 'score' - "positive": queryset.filter(result__vote_count__gte=VOTE_THRESHOLD, result__plus_one__gt=0, - result__minus_one=0).order_by("-result__score"), - # proposals with at least VOTE_THRESHOLD reviews and at least one -1 and no +1s, reverse + "positive": queryset.filter(result__vote_count__gte=VOTE_THRESHOLD, result__plus_two__gt=0, + result__minus_two=0).order_by("-result__score"), + # proposals with at least VOTE_THRESHOLD reviews and at least one -2 and no +2s, reverse # sorted by the 'score' - "negative": queryset.filter(result__vote_count__gte=VOTE_THRESHOLD, result__minus_one__gt=0, - result__plus_one=0).order_by("result__score"), - # proposals with at least VOTE_THRESHOLD reviews and neither a +1 or a -1, sorted by total + "negative": queryset.filter(result__vote_count__gte=VOTE_THRESHOLD, result__minus_two__gt=0, + result__plus_two=0).order_by("result__score"), + # proposals with at least VOTE_THRESHOLD reviews and neither a +2 or a -2, sorted by total # votes (lowest first) - "indifferent": queryset.filter(result__vote_count__gte=VOTE_THRESHOLD, result__minus_one=0, - result__plus_one=0).order_by("result__vote_count"), - # proposals with at least VOTE_THRESHOLD reviews and both a +1 and -1, sorted by total + "indifferent": queryset.filter(result__vote_count__gte=VOTE_THRESHOLD, result__minus_two=0, + result__plus_two=0).order_by("result__vote_count"), + # proposals with at least VOTE_THRESHOLD reviews and both a +2 and -2, sorted by total # votes (highest first) "controversial": queryset.filter(result__vote_count__gte=VOTE_THRESHOLD, - result__plus_one__gt=0, result__minus_one__gt=0) + result__plus_two__gt=0, result__minus_two__gt=0) .order_by("-result__vote_count"), # proposals with fewer than VOTE_THRESHOLD reviews "too_few": queryset.filter(result__vote_count__lt=VOTE_THRESHOLD)