From e5551869b18bf3d4c838dc972d31c1d7efb958fd Mon Sep 17 00:00:00 2001
From: Luc Rocher <luc@rocher.lc>
Date: Sun, 23 Apr 2017 18:12:58 +0200
Subject: [PATCH] Add scores for up and down vote

---
 apps/rp/models/vote.py                 | 11 ++++++++++-
 apps/rp/templates/rp/article_list.html |  4 ++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/apps/rp/models/vote.py b/apps/rp/models/vote.py
index b91576b..6fe502d 100644
--- a/apps/rp/models/vote.py
+++ b/apps/rp/models/vote.py
@@ -39,6 +39,8 @@ class UnDVotedMixin(models.Model):
     und_votes = GenericRelation(UnDVotes)
     #: Score of the model
     und_score = models.IntegerField(default=0)
+    und_score_up = models.IntegerField(default=0)
+    und_score_down = models.IntegerField(default=0)
 
     class Meta:
         abstract = True
@@ -63,6 +65,7 @@ class UnDVotedMixin(models.Model):
             diff_score = 1
 
         self.und_score += diff_score
+        self.und_score_up += diff_score
         # Update self score, use update and filter to avoid triggering signals
         self.__class__.objects.filter(id=self.id).update(
             und_score=F("und_score") + diff_score)
@@ -87,13 +90,19 @@ class UnDVotedMixin(models.Model):
             diff_score = -1
 
         self.und_score += diff_score
+        self.und_score_down += diff_score
         # Update self score, use update and filter to avoid triggering signals
         self.__class__.objects.filter(id=self.id).update(
             und_score=F("und_score") + diff_score)
 
     def update_und_score(self):
         """Reset score to the correct count (should not be necessary)"""
-        score = self.und_votes.aggregate(Sum("score"))["score__sum"] or 0
+        score_up = self.und_votes.filter(score=1).count()
+        score_down = self.und_votes.filter(score=-1).count()
+        score = score_up + score_down
+
+        self.und_score_up = score_up
+        self.und_score_down = score_down
         self.und_score = score
         # Update self score, use update and filter to avoid triggering signals
         self.__class__.objects.filter(id=self.id).update(und_score=score)
diff --git a/apps/rp/templates/rp/article_list.html b/apps/rp/templates/rp/article_list.html
index 2d688f5..1f730ce 100644
--- a/apps/rp/templates/rp/article_list.html
+++ b/apps/rp/templates/rp/article_list.html
@@ -61,8 +61,8 @@
         <td class="title-cell"><a target="_blank" href="{{article.url}}"><strong>{{article.title}}</strong></a></td>
         <td>
           <ul class="votes-list">
-            <li><a href="">+3 <i class="fa fa-thumbs-up" aria-hidden="true" style="color:green"></i></a></li>
-            <li><a href="">-2 <i class="fa fa-thumbs-down" aria-hidden="true" style="color:red"></i></a></li>
+            <li><a href="">+{{article.und_score_up}} <i class="fa fa-thumbs-up" aria-hidden="true" style="color:green"></i></a></li>
+            <li><a href="">-{{article.und_score_down}} <i class="fa fa-thumbs-down" aria-hidden="true" style="color:red"></i></a></li>
           </ul>
         </td>
         <td>{{article.und_votes.first.username}}</td>
-- 
GitLab