#140 - change discipline to take only data from current knesset

ofri · Oct 7, 2013 · af37d15 · af37d15
1 parent bce9a4f
commit af37d15
Showing 1 changed file with 21 additions and 7 deletions.
diff --git a/laws/models.py b/laws/models.py
@@ -60,7 +60,11 @@ class PartyVotingStatistics(models.Model):
     party = models.OneToOneField('mks.Party', related_name='voting_statistics')
 
     def votes_against_party_count(self):
-        return VoteAction.objects.filter(member__current_party=self.party, against_party=True).count()
+        d = Knesset.objects.current_knesset().start_date
+        return VoteAction.objects.filter(
+            vote__time__gt=d,
+            member__current_party=self.party,
+            against_party=True).count()
 
     def votes_count(self):
         d = Knesset.objects.current_knesset().start_date
@@ -69,23 +73,33 @@ def votes_count(self):
             vote__time__gt=d).exclude(type='no-vote').count()
 
     def votes_per_seat(self):
-        return round(float(self.votes_count()) / self.party.number_of_seats,1)
+        return round(float(self.votes_count()) / self.party.number_of_seats, 1)
 
     def discipline(self):
         total_votes = self.votes_count()
         if total_votes:
             votes_against_party = self.votes_against_party_count()
-            return round(100.0*(total_votes - votes_against_party) / total_votes, 1)
+            return round(100.0 * (total_votes - votes_against_party) /
+                         total_votes, 1)
         return _('N/A')
 
-    def coalition_discipline(self): # if party is in opposition this actually returns opposition_discipline
+    def coalition_discipline(self):  # if party is in opposition this actually
+                                     # returns opposition_discipline
+        d = Knesset.objects.current_knesset().start_date
         total_votes = self.votes_count()
         if total_votes:
             if self.party.is_coalition:
-                votes_against_coalition = VoteAction.objects.filter(member__current_party=self.party, against_coalition=True).count()
+                votes_against_coalition = VoteAction.objects.filter(
+                    vote__time__gt=d,
+                    member__current_party=self.party,
+                    against_coalition=True).count()
             else:
-                votes_against_coalition = VoteAction.objects.filter(member__current_party=self.party, against_opposition=True).count()
-            return round(100.0*(total_votes - votes_against_coalition) / total_votes, 1)
+                votes_against_coalition = VoteAction.objects.filter(
+                    vote__time__gt=d,
+                    member__current_party=self.party,
+                    against_opposition=True).count()
+            return round(100.0 * (total_votes - votes_against_coalition) /
+                         total_votes, 1)
         return _('N/A')
 
     def __unicode__(self):