Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vote_count now only counts non-abstaining votes. Fixes #19

Browse source
This commit is contained in:
Christopher Neugebauer 2016-06-19 18:39:07 +10:00
parent 14dea7eafa
commit 7f3ed91dae
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
symposion/reviews/models.py
View file

@ -24,11 +24,11 @@ def score_expression():
(2 * F("plus_two") + F("plus_one")) - (2 * F("plus_two") + F("plus_one")) -
(F("minus_one") + 2 * F("minus_two")) (F("minus_one") + 2 * F("minus_two"))
) / ( ) / (
F("vote_count") - F("abstain") * 1.0 F("vote_count") * 1.0
) )
return Case( return Case(
When(vote_count=F("abstain"), then=Value("0")), # no divide by zero When(vote_count=0, then=Value("0")), # no divide by zero
default=score, default=score,
) )
@ -247,6 +247,7 @@ class ProposalResult(models.Model):
proposal = models.OneToOneField(ProposalBase, related_name="result", verbose_name=_("Proposal")) proposal = models.OneToOneField(ProposalBase, related_name="result", verbose_name=_("Proposal"))
score = models.DecimalField(max_digits=5, decimal_places=2, default=Decimal("0.00"), verbose_name=_("Score")) 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")) comment_count = models.PositiveIntegerField(default=0, verbose_name=_("Comment count"))
# vote_count only counts non-abstain votes.
vote_count = models.PositiveIntegerField(default=0, verbose_name=_("Vote count")) vote_count = models.PositiveIntegerField(default=0, verbose_name=_("Vote count"))
abstain = models.PositiveIntegerField(default=0, verbose_name=_("Abstain")) abstain = models.PositiveIntegerField(default=0, verbose_name=_("Abstain"))
plus_two = models.PositiveIntegerField(default=0, verbose_name=_("Plus two")) plus_two = models.PositiveIntegerField(default=0, verbose_name=_("Plus two"))
@ -292,7 +293,7 @@ class ProposalResult(models.Model):
self.plus_one = vote_count[VOTES.PLUS_ONE] self.plus_one = vote_count[VOTES.PLUS_ONE]
self.minus_one = vote_count[VOTES.MINUS_ONE] self.minus_one = vote_count[VOTES.MINUS_ONE]
self.minus_two = vote_count[VOTES.MINUS_TWO] self.minus_two = vote_count[VOTES.MINUS_TWO]
self.vote_count = sum(i[1] for i in vote_count.items()) self.vote_count = sum(i[1] for i in vote_count.items()) - self.abstain
self.save() self.save()
model = self.__class__ model = self.__class__
model._default_manager.filter(pk=self.pk).update(score=score_expression()) model._default_manager.filter(pk=self.pk).update(score=score_expression())