Merge lp:~ronnie.vd.c/ubuntu-elections/homepage-improved into lp:ubuntu-elections

[Ronnie]

Improved homepage, shows the newest items that changed status (canidacy, voting, results)

[Sense Egbert Hofstede (sense)]

Ziet er goed uit, kan in trunk. Dit is ook wat live draait?

review: Approve

=== modified file 'ubuntu_voting/elections/models.py'
--- ubuntu_voting/elections/models.py	2011-11-20 00:05:21 +0000
+++ ubuntu_voting/elections/models.py	2012-05-27 17:52:18 +0000
@@ -26,6 +26,17 @@
     def __unicode__(self):
         return self.name
         
+    def timedelta_statuschange(self):
+        now = datetime.datetime.now()
+        diff = datetime.timedelta(weeks=-52)
+        if self.is_candidature():
+            diff = now - self.candidature_start
+        if self.is_election_start():
+            diff = now - self.election_start
+        if self.is_election_end():
+            diff = now - self.election_end
+        return diff
+        
     def template(self, base_template='election/incl_election_item_'):
         now = datetime.datetime.now()
         if self.election_end < now:
@@ -104,13 +115,24 @@
         return self.user.get_full_name() or self.user.username
     
     def relative_percentage(self):
-        return self.votes * 100 / Candidate.objects.filter(election=self.election).order_by('-votes')[0].votes
+        relative_percentage = 100
+        max_votes = Candidate.objects.filter(election=self.election).order_by('-votes')[0].votes
+        if max_votes is not 0:
+            relative_percentage = self.votes * 100 / max_votes
+        return relative_percentage
                                                                    
     def percentage(self):
-        return self.votes * 100 / self.election.total_votes()
+        pc = 100
+        total_votes = self.election.total_votes()
+        if total_votes is not 0:
+            pc = self.votes * 100 / total_votes
+        return pc
         
     def chosen(self):
-        last_chosen_votes = self.election.candidate_set.order_by('-votes')[self.election.candidature_amount - 1].votes
+        try:
+            last_chosen_votes = self.election.candidate_set.order_by('-votes')[self.election.candidature_amount - 1].votes
+        except IndexError:
+            return 1 # If there are not enough candidates, all candidates are chosen
         return int(self.votes >= last_chosen_votes)
 
 class Office(models.Model):

=== modified file 'ubuntu_voting/elections/views.py'
--- ubuntu_voting/elections/views.py	2011-11-19 23:38:02 +0000
+++ ubuntu_voting/elections/views.py	2012-05-27 17:52:18 +0000
@@ -22,6 +22,26 @@
     # TODO: Write this view
     return direct_to_template(request, 'election/election_new.html', {})
 
+def home(request):
+    '''Display max 3 elections on the homepage. 
+        The three that are displayed are the newest in the categories (candidature, voting, results)
+    '''
+    now = datetime.datetime.now()
+    start_active_data = now + datetime.timedelta(days=30)
+    final_active_date = now - datetime.timedelta(days=30)
+    
+    # the active elections:
+    elections = Election.objects.filter(candidature_start__gt=start_active_data,
+                                        election_end__gt=final_active_date)
+
+    # is there are less than 3 active elections grab all the elections
+    if elections.count() < 3:
+        elections = Election.objects.all()
+
+    elections = sorted(elections, key=lambda election: election.timedelta_statuschange())
+        
+    return direct_to_template(request, 'election/election_list.html', {'elections': elections[:3]})
+
 def election_queue(request):
     elections = Election.objects.filter(candidature_start__gt=datetime.datetime.now())
     return direct_to_template(request, 'election/election_list.html', {'elections': elections})

=== modified file 'ubuntu_voting/urls.py'
--- ubuntu_voting/urls.py	2011-11-19 21:56:04 +0000
+++ ubuntu_voting/urls.py	2012-05-27 17:52:18 +0000
@@ -8,7 +8,7 @@
 admin.autodiscover()
 
 urlpatterns = patterns('',
-    url(r'^$', 'elections.views.election_active', name='home'),
+    url(r'^$', 'elections.views.home', name='home'),
     url(r'^account/$', 'elections.views.account', name='account'), # to fill in your Full name, because the LP name is not always the right
 
     url(r'^login/$', 'django_openid_auth.views.login_begin', name='login'),