From 4d2bc303c7119ae3b66278b34bc3a70d682a8d81 Mon Sep 17 00:00:00 2001
From: Oscar Carballal Prego <info@oscarcp.com>
Date: Thu, 27 Dec 2012 04:38:35 +0100
Subject: [PATCH] Several changes in the data models, tempaltes and functions.
 Revamped the voting function to make double check.

---
 src/apps/ecidadania/voting/models.py               | 16 ++++--
 .../voting/templates/voting/poll_results.html      | 13 +++--
 src/apps/ecidadania/voting/url_names.py            |  2 +
 src/apps/ecidadania/voting/urls.py                 | 10 +++-
 src/apps/ecidadania/voting/views/polls.py          | 64 +++++++++++++++++-----
 5 files changed, 78 insertions(+), 27 deletions(-)

diff --git a/src/apps/ecidadania/voting/models.py b/src/apps/ecidadania/voting/models.py
index 6faf6cc6..f04a3854 100755
--- a/src/apps/ecidadania/voting/models.py
+++ b/src/apps/ecidadania/voting/models.py
@@ -37,7 +37,12 @@ PONDERATIONS = (
 class Poll(models.Model):
     
     """
-    Model of a new Poll
+    Data model for Polls. It stores the question and some data like the space
+    and dates. The most important field is "participants". It allows us to
+    limit the times a user can vote in a Poll, using it with the vote field in
+    Choices model.
+
+    .. versionadded:: 0.1.5
     """
 
     question = models.CharField(_('Question'), max_length=200,
@@ -45,12 +50,14 @@ class Poll(models.Model):
     pub_date = models.DateTimeField(_('Date'), auto_now_add=True)
     poll_lastup = models.DateTimeField(_('Last update'), auto_now=True)
     author = models.ForeignKey(User, verbose_name=_('Author'), blank=True,
-        null=True, help_text=_('Change the user that will figure as the author'))
+        null=True, help_text=_('Change the user that will figure as the \
+        author'), related_name='poll-author')
+    participants = models.ManyToManyField(User, blank=True, null=True)
     space = models.ForeignKey(Space, verbose_name=_('Publish in'), blank=True,
         null=True, help_text=_('If you want to post to the index leave this \
         blank'))
     poll_tags = TagField(help_text=_('Insert here relevant words related with \
-                            the poll'))
+        the poll'))
 
     def __unicode__(self):
         return self.question
@@ -75,7 +82,8 @@ class Poll(models.Model):
 class Choice(models.Model):
     poll = models.ForeignKey(Poll)
     choice_text = models.CharField(_('Choice'), max_length=200, blank=True, null=True, help_text=_('Enter choice to be voted upon'))
-    votes = models.IntegerField(blank=True, null=True, default='0')
+    #votes = models.IntegerField(blank=True, null=True, default='0')
+    votes = models.ManyToManyField(User, blank=True, null=True)
     
     @models.permalink
     def get_absolute_url(self):
diff --git a/src/apps/ecidadania/voting/templates/voting/poll_results.html b/src/apps/ecidadania/voting/templates/voting/poll_results.html
index b1b0b27d..8abcc36a 100644
--- a/src/apps/ecidadania/voting/templates/voting/poll_results.html
+++ b/src/apps/ecidadania/voting/templates/voting/poll_results.html
@@ -3,10 +3,9 @@
 {% load wysiwyg %}
 
 {% block title %}
-{% trans "Results" %}{{ poll.question }}
+    {% trans "Results" %}{{ poll.question }}
 {% endblock %}
 
-
 {% block logo %}
     {% if get_place %}
         <a href="{{ get_place.get_absolute_url }}"><img src="{{ MEDIA_URL }}/{{ get_place.logo }}" /></a>
@@ -22,6 +21,7 @@
         <img src="{{ STATIC_URL }}/assets/banners/index.png" />
     {% endif %}
 {% endblock %}
+
 {% block space %}
     {% if get_place %}
         <a class="brand" href="{{ get_place.get_absolute_url }}">{{ get_place.name }}</a>
@@ -29,12 +29,13 @@
         <a class="brand" href="{% url 'site-index' %}">e-cidadania</a>
     {% endif %}
 {% endblock %}
+
 {% block content %}
-<h1>{{ poll.question }}</h1>
+    <h1>{{ poll.question }}</h1>
 
-<ul>
-    {% for choice in poll.choice_set.all %}
-    <li>{{ choice.choice_text }} -- {{ choice.votes }} {% trans "vote" %}{{ choice.votes|pluralize }}</li>
+    <ul>
+        {% for choice in poll.choice_set.all %}
+            <li>{{ choice.choice_text }} -- {{ votes_count }} {% trans "vote" %}{{ choice.votes|pluralize }}</li>
         {% endfor %}
     </ul>
 
diff --git a/src/apps/ecidadania/voting/url_names.py b/src/apps/ecidadania/voting/url_names.py
index e1f1de7d..bd4ad512 100644
--- a/src/apps/ecidadania/voting/url_names.py
+++ b/src/apps/ecidadania/voting/url_names.py
@@ -29,6 +29,8 @@ DELETE_POLL = 'delete-poll'
 
 VIEW_POLL = 'view-poll'
 
+VIEW_RESULT = 'view-result'
+
 LIST_POLL = 'list-polls'
 
 VOTE_POLL = 'vote-poll'
diff --git a/src/apps/ecidadania/voting/urls.py b/src/apps/ecidadania/voting/urls.py
index 351e6e81..81945d72 100644
--- a/src/apps/ecidadania/voting/urls.py
+++ b/src/apps/ecidadania/voting/urls.py
@@ -23,7 +23,8 @@ from django.conf import settings
 from django.conf.urls.i18n import i18n_patterns
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-from apps.ecidadania.voting.views.polls import ViewPoll, DeletePoll, ListPolls
+from apps.ecidadania.voting.views.polls import ViewPoll, DeletePoll, \
+    ListPolls, ViewPollResults
 from apps.ecidadania.voting.views.voting import ViewVoting, ListVotings, \
     AddVoting, EditVoting, DeleteVoting
 from apps.ecidadania.voting.url_names import *
@@ -31,9 +32,9 @@ from apps.ecidadania.voting.url_names import *
 
 urlpatterns = patterns('apps.ecidadania.voting.views',
 
-    url(r'^list/$', ListVotings.as_view(), name=LIST_VOTING),
+    url(r'^$', ListVotings.as_view(), name=LIST_VOTING),
 
-    url(r'^list/polls/$', ListPolls.as_view(), name=LIST_POLL),
+    url(r'^polls/$', ListPolls.as_view(), name=LIST_POLL),
 
     url(r'^add/$', AddVoting.as_view(), name=ADD_VOTING),
 
@@ -52,6 +53,9 @@ urlpatterns = patterns('apps.ecidadania.voting.views',
         
     url(_(r'^poll/(?P<pk>\d+)/$'), ViewPoll.as_view(), name=VIEW_POLL),
 
+    url(_(r'^poll/(?P<pk>\d+)/results/$'), ViewPollResults.as_view(),
+        name=VIEW_RESULT),
+
     url(r'^(?P<voting_id>\d+)/$', ViewVoting.as_view(), name=VIEW_VOTING),
 
     url(r'^vote/poll/(?P<poll_id>\d+)/$', 'polls.vote_poll', name=VOTE_POLL),
diff --git a/src/apps/ecidadania/voting/views/polls.py b/src/apps/ecidadania/voting/views/polls.py
index f4104116..1c8b9d6a 100644
--- a/src/apps/ecidadania/voting/views/polls.py
+++ b/src/apps/ecidadania/voting/views/polls.py
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with e-cidadania. If not, see <http://www.gnu.org/licenses/>.
 
-from django.http import HttpResponseRedirect
+from django.http import HttpResponseRedirect, HttpResponse
 from django.shortcuts import render_to_response, get_object_or_404, redirect
 from django.utils.decorators import method_decorator
 from django.contrib.auth.decorators import login_required, permission_required
@@ -36,6 +36,7 @@ from django.core.exceptions import ObjectDoesNotExist
 from helpers.cache import get_or_insert_object_in_cache
 from django.core.urlresolvers import NoReverseMatch, reverse
 from django.template.response import TemplateResponse
+from django.db.models import Count
 
 from core.spaces.models import Space
 from core.spaces import url_names as urln
@@ -109,6 +110,34 @@ class ViewPoll(DetailView):
         return context
 
 
+class ViewPollResults(DetailView):
+
+    """
+    Displays an specific poll.
+    """
+    context_object_name = 'poll'
+    template_name = 'voting/poll_results.html'
+
+    def get_object(self):
+        poll = get_object_or_404(Poll, pk=self.kwargs['pk'])
+        return poll
+
+    def get_context_data(self, **kwargs):
+        context = super(ViewPollResults, self).get_context_data(**kwargs)
+        space = get_object_or_404(Space, url=self.kwargs['space_url'])
+        poll = get_object_or_404(Poll, pk=self.kwargs['pk'])
+        context['get_place'] = space
+
+        votes_count = Choice.objects.filter(poll=poll)\
+            .annotate(Count('votes'))
+
+        for i,x in enumerate(votes_count):
+            if x.id == int(self.kwargs['pk']):
+                self.get_position = i
+        context['votes_count'] = votes_count[int(self.get_position)].votes__count
+        return context
+
+
 def edit_poll(request, space_url, poll_id):
 
     """
@@ -206,17 +235,24 @@ class ListPolls(ListView):
 
 
 def vote_poll(request, poll_id, space_url):
-    place = get_object_or_404(Space, url=space_url)
-    p = get_object_or_404(Poll, pk=poll_id)
-    try:
-        selected_choice = p.choice_set.get(pk=request.POST['choice'])
-    except (KeyError, Choice.DoesNotExist):
-        return render_to_response('voting/poll_detail.html', {
-            'poll': p,
-            'error_message': "You didn't select a choice.",
-        }, context_instance=RequestContext(request))
+
+    """
+    Vote on a choice inside the polls.
+
+    .. versionadded:: 0.1.5
+    """
+    space = get_object_or_404(Space, url=space_url)
+    choice = get_object_or_404(Choice, pk=request.POST['choice'])
+    poll = get_object_or_404(Poll, pk=poll_id)
+
+    if request.method == 'POST' and has_space_permission(request.user, space,
+    allow=['admins', 'mods', 'users']):
+        poll.participants.add(request.user)
+        choice.votes.add(request.user)
+        return render_to_response('voting/poll_results.html',
+            {'poll': poll, 'get_place': space, 'error_message': "You didn't \
+            select a choice."}, context_instance=RequestContext(request))
+
     else:
-        selected_choice.votes += 1
-        selected_choice.save()
-        return TemplateResponse(request, 'voting/poll_results.html',
-            {'poll':p, 'get_place': place})
+        return HttpResponse("Error P02: Couldn't emit the vote. You're not \
+            allowed.")
\ No newline at end of file
-- 
2.11.4.GIT