Merge lp:~ronnie.vd.c/ubuntu-nl-website/forms-views into lp:~registry/ubuntu-nl-website/voting

[Ronnie]

=== added file 'elections/forms.py'
--- elections/forms.py	1970-01-01 00:00:00 +0000
+++ elections/forms.py	2011-02-14 00:39:53 +0000
@@ -0,0 +1,104 @@
+from django import forms
+
+from elections.models import Election, Candidate, Voter
+
+
+class CreateElectionForm(forms.ModelForm):
+    class Meta:
+        model = Election
+        
+    def clean(self, *args, **kwargs):
+        super(CreateElectionForm, self).clean(*args, **kwargs)
+        cleaned_data = self.cleaned_data
+        
+        candidacy_start = cleaned_data.get('candidacy_start')
+        candidacy_end = cleaned_data.get('candidacy_end')
+        election_start = cleaned_data.get('election_start')
+        election_end = cleaned_data.get('election_end')
+        
+        if candidacy_start > candidacy_end:
+            self._errors['candidacy_end'] = self.error_class(['Eind-datum is eerder dan begin-datum'])
+        
+        if candidacy_end > election_start:
+            self._errors['election_start'] = self.error_class(['De kandidaten moeten gekozen worden voordat de verkiezing begint'])
+            
+        if election_start > election_end:
+            self._errors['election_end'] = self.error_class(['Eind-datum is eerder dan begin-datum'])
+        
+        # Always return the full collection of cleaned data.
+        return cleaned_data
+        
+
+class ApplyForElectionForm(forms.ModelForm):
+    class Meta:
+        model = Candidate
+        fields = ('chair_desired', 'council_desired')
+        
+
+class VoteForm(forms.Form):
+    chair = forms.ModelChoiceField(queryset=Candidate.objects.all())
+    council1 = forms.ModelChoiceField(queryset=Candidate.objects.all())
+    council2 = forms.ModelChoiceField(queryset=Candidate.objects.all())
+    council3 = forms.ModelChoiceField(queryset=Candidate.objects.all())
+    council4 = forms.ModelChoiceField(queryset=Candidate.objects.all())
+    council5 = forms.ModelChoiceField(queryset=Candidate.objects.all())
+    council6 = forms.ModelChoiceField(queryset=Candidate.objects.all())
+    
+    def __init__(self, election, *args, **kwargs):
+        super(VoteForm, self).__init__(*args, **kwargs)
+        chair_choices = Candidate.objects.filter(election=election, chair_desired=True)
+        council_choices = Candidate.objects.filter(election=election, council_desired=True)
+        self.fields['chair'].queryset = chair_choices
+        self.fields['council1'].queryset = council_choices
+        self.fields['council2'].queryset = council_choices
+        self.fields['council3'].queryset = council_choices
+        self.fields['council4'].queryset = council_choices
+        self.fields['council5'].queryset = council_choices
+        self.fields['council6'].queryset = council_choices
+    
+    def clean(self, *args, **kwargs):
+        cleaned_data = self.cleaned_data
+        
+        council = [cleaned_data.get('council1'),
+                   cleaned_data.get('council2'),
+                   cleaned_data.get('council3'),
+                   cleaned_data.get('council4'),
+                   cleaned_data.get('council5'),
+                   cleaned_data.get('council6')]
+        council.reverse()
+        
+        for candidate in council:
+            if council.count(candidate) > 1:
+                for same in range(council.count(candidate) - 1):
+                    index = council.index(candidate)
+                    self._errors['council%d' % (len(council)-index)] = self.error_class(['Je hebt deze persoon al gekozen'])
+                    council.pop(index)
+        
+        # Always return the full collection of cleaned data.
+        return cleaned_data
+    
+        
+    def save(self, *args, **kwargs):
+        cleaned_data = self.cleaned_data
+        
+        votes = [cleaned_data.get('council1'),
+                 cleaned_data.get('council2'),
+                 cleaned_data.get('council3'),
+                 cleaned_data.get('council4'),
+                 cleaned_data.get('council5'),
+                 cleaned_data.get('council6')]
+        
+        for c in range(len(votes)):
+            candidate = votes[c]
+            candidate.council_votes += len(votes) - c
+            candidate.save()
+            
+        chair = cleaned_data.get('chair')
+        if chair in votes: # If the chair is in the votes, the new version is not stored in cleaned_data, so use the database version
+            chair = Candidate.objects.get(pk=cleaned_data.get('chair').pk)
+            
+        chair.chair_votes += 1
+        chair.save()
+        
+        return True
+        

=== modified file 'elections/models.py'
--- elections/models.py	2011-02-11 23:43:01 +0000
+++ elections/models.py	2011-02-14 00:39:53 +0000
@@ -1,16 +1,20 @@
 from django.db import models
+from django.contrib import admin
 from django.contrib.auth.models import User
 
 import datetime
 
 
 class Election(models.Model):
-    name = models.CharField(max_length=128, default="Verkiezing")
+    name = models.CharField(max_length=128, default='Verkiezing')
     candidacy_start = models.DateTimeField(default=datetime.datetime.now())
     candidacy_end = models.DateTimeField(default=datetime.datetime.now()+datetime.timedelta(days=28))
     election_start = models.DateTimeField(default=datetime.datetime.now()+datetime.timedelta(days=28))
     election_end = models.DateTimeField(default=datetime.datetime.now()+datetime.timedelta(days=35))
     live_results = models.BooleanField(default=False) # If true, the votes can be seen immediatly, else the results are shown after the election
+    
+    def __unicode__(self):
+        return self.name
 
     
 class Candidate(models.Model):
@@ -21,6 +25,22 @@
     chair_votes = models.IntegerField(default=0)
     council_votes = models.IntegerField(default=0) # 6 for first choice, 1 for 6th choice
     
+    class Meta:
+        unique_together = ('user', 'election')
+        
+    def __unicode__(self):
+        return '%s (%s)' % (self.user.username, self.election.name)
+    
+
 class Voter(models.Model):
     election = models.ForeignKey(Election)
     voter = models.CharField(max_length=12) # StoreOneWayHashOfOpenIDHere
+    
+    class Meta:
+        unique_together = ('voter', 'election')
+    
+    
+admin.site.register(Election)
+admin.site.register(Candidate)
+admin.site.register(Voter)
+

=== modified file 'elections/urls.py'
--- elections/urls.py	2011-02-11 23:45:49 +0000
+++ elections/urls.py	2011-02-14 00:39:53 +0000
@@ -2,9 +2,9 @@
 
 
 urlpatterns = patterns('',
-    url('^nieuw/$', 'elections.views.election_new', name='election-new'), # Create a new election (check permissions trough admin group)
+    url(r'^nieuw/$', 'elections.views.election_new', name='election-new'), # Create a new election (check permissions trough admin group)
     # Kunnen deze 3 pagina's ook 1 url worden, afhankelijk van de datum (voor,tijdens,na verkiezing?)
-    url('^(?P<electionId>\d+)/(?P<electionName>\w+)/verkiesbaar$', 'elections.views.election_apply', name='election-apply'), # Check/Uncheck (before election starts) if you apply for this
-    url('^(?P<electionId>\d+)/(?P<electionName>\w+)/stem$', 'elections.views.election_vote', name='election-vote'), # Voting happens here (or view / edit? your vote, if already voted)
-    url('^(?P<electionId>\d+)/(?P<electionName>\w+)/uitslag/$', 'elections.views.election_results', name='election-results'), # The link where the results are shown (maybe with some nice effects)
+    url(r'^(?P<electionId>\d+)/(?P<electionName>\w+)/verkiesbaar$', 'elections.views.election_apply', name='election-apply'), # Check/Uncheck (before election starts) if you apply for this
+    url(r'^(?P<electionId>\d+)/(?P<electionName>\w+)/stem$', 'elections.views.election_vote', name='election-vote'), # Voting happens here (or view / edit? your vote, if already voted)
+    url(r'^(?P<electionId>\d+)/(?P<electionName>\w+)/uitslag/$', 'elections.views.election_results', name='election-results'), # The link where the results are shown (maybe with some nice effects)
 )

=== modified file 'elections/views.py'
--- elections/views.py	2011-02-11 23:45:49 +0000
+++ elections/views.py	2011-02-14 00:39:53 +0000
@@ -1,29 +1,90 @@
+from django.contrib.auth.decorators import login_required
+from django.db import IntegrityError
 from django.views.generic.simple import direct_to_template
+from django.shortcuts import redirect
 from django.template import RequestContext
-
-from elections.forms import CreateElectionForm, VoteForm
-
+from django.http import Http404
+
+from elections.models import Election, Candidate, Voter
+from elections.forms import CreateElectionForm, ApplyForElectionForm, VoteForm
+
+import datetime
+
+def account(request):
+    # TODO: Write this view
+    return direct_to_template(request, 'election_new.html', {})
+
+@login_required
 def election_new(request):
-    form = None
-    if request.POST:
-        pass
-        form = CreateElectionForm(request.POST)
-    
-    if not form:
-        pass
-        form = CreateElectionForm()
-        
-    context = {
-        'form': form,
-    }
-        
-    return direct_to_template(request, 'election_new.html', context)
-    
-def election_apply(request):
-    form = ApplyForElectionForm(request.POST)
-    
-def election_vote(request):
-    pass
-    
-def election_results(request):
-    pass
+    # TODO: limit only to admins, to prevent other users to create different elections (for now)
+    form = CreateElectionForm(data=request.POST or None)
+    
+    if request.POST and form.is_valid():
+        election = form.save()
+        # TODO: Link to a succes page
+        return redirect(election_apply, electionId=election.pk, electionName=election.name)
+    
+    return direct_to_template(request, 'election_new.html', {'form': form})
+    
+@login_required
+def election_apply(request, electionId, electionName):
+    election = Election.objects.get(pk=electionId)
+    if datetime.datetime.now() < election.candidacy_start:
+        raise Http404('De kandidaatstelling is nog niet begonnen')
+    if datetime.datetime.now() > election.candidacy_end:
+        raise Http404('De kandidaatstelling is al afgelopen')
+
+    # TODO: check if user has rights
+    candidate, created = Candidate.objects.get_or_create(election=election, user=request.user)
+    form = ApplyForElectionForm(data=request.POST or None, instance=candidate)
+    
+    if request.POST and form.is_valid():
+        form.save()
+        # TODO: Link to a success page and overview page of candidates
+        return redirect(election_vote, electionId=election.pk, electionName=election.name)
+       
+    return direct_to_template(request, 'election_new.html', {'form': form})
+    
+@login_required
+def election_vote(request, electionId, electionName):
+    election = Election.objects.get(pk=electionId)
+    if datetime.datetime.now() < election.election_start:
+        raise Http404('De verkiezing is nog niet begonnen')
+    if datetime.datetime.now() > election.election_end:
+        raise Http404('De verkiezing is al afgelopen')
+    
+    # TODO: check if user has rights to vote
+    user_hash = hash(request.user) # TODO: Do a better hash, and not of the user, but the openid
+    try: # If the voter already exists, it has already vote, raise an exception!
+        Voter.objects.get(election=election, voter=user_hash)
+    except Voter.DoesNotExist:
+        pass
+    else:
+        raise Http404('Je heb al gestemd voor deze verkiezing')
+    
+    form = VoteForm(data=request.POST or None, election=election)
+    
+    if request.POST and form.is_valid():
+        form.save()
+        Voter.objects.create(election=election, voter=user_hash)
+        return redirect(election_results, electionId=election.pk, electionName=election.name)
+        
+    return direct_to_template(request, 'election_new.html', {'form': form})
+
+    
+def election_results(request, electionId, electionName):
+    election = Election.objects.get(pk=electionId)
+    if datetime.datetime.now() < election.election_start:
+        if election.live_results:
+            raise Http404('Het stemming is nog niet begonnen, de eerste resultaten zijn pas zichtbaar op: %s' % election.election_start)
+        else:
+            raise Http404('Het stemming is nog niet begonnen, de eerste resultaten zijn pas zichtbaar op: %s' % election.election_end)
+    if datetime.datetime.now() < election.election_end and not election.live_results:
+        raise Http404('De resultaten zijn pas zichtbaar na de stemming (%s)' % election.election_end)
+    
+    top_chairs = Candidate.objects.filter(chair_desired=True).order_by('-chair_votes')
+    top_council = Candidate.objects.filter(council_desired=True).order_by('-council_votes')
+    return direct_to_template(request, 'election_results.html', {'chairs': top_chairs,
+                                                                 'council': top_council})
+    
+    

=== modified file 'settings.py'
--- settings.py	2011-02-11 23:45:49 +0000
+++ settings.py	2011-02-14 00:39:53 +0000
@@ -95,7 +95,7 @@
     'django.contrib.sites',
     'django.contrib.messages',
     # Uncomment the next line to enable the admin:
-    # 'django.contrib.admin',
+    'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
     

=== added directory 'templates'
=== added file 'templates/election_new.html'
--- templates/election_new.html	1970-01-01 00:00:00 +0000
+++ templates/election_new.html	2011-02-14 00:39:53 +0000
@@ -0,0 +1,10 @@
+<html>
+<body>
+<form method="POST" action="">
+{% csrf_token %}
+{{ form.as_ul }}
+<input type="submit" value="create" />
+</form>
+</body>
+</html>
+

=== added file 'templates/election_results.html'
--- templates/election_results.html	1970-01-01 00:00:00 +0000
+++ templates/election_results.html	2011-02-14 00:39:53 +0000
@@ -0,0 +1,19 @@
+<html>
+<body>
+
+<h3>=== Chairs ===</h3>
+<ul>
+{% for candidate in chairs %}
+    <li>{{ candidate.user.username }} ({{ candidate.chair_votes }} votes)</li>
+{% endfor %}
+</ul>
+
+<h3>=== Council ===</h3>
+<ul>
+{% for candidate in council %}
+    <li>{{ candidate.user.username }} ({{ candidate.council_votes }} votes)</li>
+{% endfor %}
+</ul>
+
+</body>
+</html>

=== added directory 'templates/registration'
=== added file 'templates/registration/login.html'
--- templates/registration/login.html	1970-01-01 00:00:00 +0000
+++ templates/registration/login.html	2011-02-14 00:39:53 +0000
@@ -0,0 +1,5 @@
+<form method="POST">
+    {% csrf_token %}
+    {{ form.as_ul }}
+    <input type="submit" name="Inloggen" />
+</form>

=== modified file 'urls.py'
--- urls.py	2011-02-11 23:45:49 +0000
+++ urls.py	2011-02-14 00:39:53 +0000
@@ -1,12 +1,13 @@
 from django.conf.urls.defaults import *
 
 # Uncomment the next two lines to enable the admin:
-# from django.contrib import admin
-# admin.autodiscover()
+from django.contrib import admin
+admin.autodiscover()
 
 urlpatterns = patterns('',
-    url('^account/$', 'elections.views.account'), # to fill in your Full name, because the LP name is not always the right
-    url('^verkiezing/$', include('ubuntu_nl_voting.elections.urls')),
+    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'^accounts/login/$', 'django.contrib.auth.views.login', name='login'),
+    url(r'^verkiezing/', include('ubuntu_nl_voting.elections.urls')),
     # Example:
     # (r'^ubuntu_nl_voting/', include('ubuntu_nl_voting.foo.urls')),
 
@@ -14,5 +15,5 @@
     # (r'^admin/doc/', include('django.contrib.admindocs.urls')),
 
     # Uncomment the next line to enable the admin:
-    # (r'^admin/', include(admin.site.urls)),
+    (r'^admin/', include(admin.site.urls)),
 )