From cc10d5042b20dbfb640620b2a660ba48d2d10717 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sat, 3 Sep 2011 13:53:37 +0200
Subject: [PATCH] Show invalid votes and votes cast for application and
 assignment results.

---
 .../templates/application/poll_view.html      |   5 ++++-
 .../templates/application/view.html           |  12 ++++++-----
 openslides/application/views.py               |   7 +++---
 .../templates/assignment/poll_view.html       |   5 ++++-
 .../assignment/templates/assignment/view.html |  20 +++++++++++++++++-
 openslides/assignment/views.py                |  14 ++++++++----
 openslides/poll/forms.py                      |  11 ++--------
 .../static/images/icons/voting-total.png      | Bin 0 -> 912 bytes
 openslides/static/styles/base.css             |   4 ++++
 9 files changed, 54 insertions(+), 24 deletions(-)
 create mode 100644 openslides/static/images/icons/voting-total.png

diff --git a/openslides/application/templates/application/poll_view.html b/openslides/application/templates/application/poll_view.html
index 37e13cd1f..75246d0c8 100644
--- a/openslides/application/templates/application/poll_view.html
+++ b/openslides/application/templates/application/poll_view.html
@@ -29,9 +29,12 @@
         <p><nobr><label>{%trans "Abstentions" %}:</label></nobr>
         {{ options.0.form.undesided.errors }}{{ options.0.form.undesided }}
         </p>
-        <p><label>{%trans "Invalid" %}:</label>
+        <p><label>{%trans "Invalid votes" %}:</label>
         {{ form.invalid.errors }}{{ form.invalid }}
         </p>
+        <p><label>{%trans "Votes cast" %}:</label>
+        {{ form.votescast.errors }}{{ form.votescast }}
+        </p>
         <p>
         <button type="submit">
             <span class="icon ok">{%trans 'Apply' %}</span>
diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html
index ed7f245af..08946e75e 100644
--- a/openslides/application/templates/application/view.html
+++ b/openslides/application/templates/application/view.html
@@ -70,15 +70,17 @@
             <br>
             {% if poll.has_vote %}
                 {% for option in poll.options %}
-                    {% trans "Yes" %}: {{ option.yes }}<br>
-                    {% trans "No" %}:  {{ option.no }}<br>
-                    {% trans "Abstention" %}: {{ option.undesided }}<br>
-                    {% trans "Invalid" %}: {{ poll.votesinvalid }}
+                    <img src="/static/images/icons/voting-yes.png" title="{% trans 'Yes' %}"> {{ option.yes }}<br>
+                    <img src="/static/images/icons/voting-no.png" title="{% trans 'No' %}"> {{ option.no }}<br>
+                    <img src="/static/images/icons/voting-abstention.png" title="{% trans 'Abstention' %}"> {{ option.undesided }}<br>
+                    <img src="/static/images/icons/voting-invalid.png" title="{% trans 'Invalid' %}"> {{ poll.votesinvalid }}<br>
+                    <div style="border-top: 1px solid; padding-top: 5px; margin: 5px 0; width: 5em;">
+                    <img src="/static/images/icons/voting-total.png" title="{% trans 'Votes cast' %}"> {{ poll.votescast }}
+                    </div>
                 {% endfor %}
                 {% if perms.application.can_manage_application %}
                     {% if forloop.last %}
                     {% if "genpoll" in actions %}
-                    <br>
                     <a href='{% url application_gen_poll application.id %}'>
                         <button><span class="icon poll">{%trans 'New vote' %}</span></button>
                     </a>
diff --git a/openslides/application/views.py b/openslides/application/views.py
index 69c098618..8053ce6da 100644
--- a/openslides/application/views.py
+++ b/openslides/application/views.py
@@ -20,7 +20,7 @@ from openslides.application.models import Application
 from openslides.application.forms import ApplicationForm, \
                                          ApplicationManagerForm
 from openslides.poll.models import Poll
-from openslides.poll.forms import OptionResultForm, PollInvalidForm
+from openslides.poll.forms import OptionResultForm, PollForm
 from openslides.utils.utils import template, permission_required, \
                                    render_to_forbitten, del_confirm_form
 from openslides.utils.pdf import print_application, print_application_poll
@@ -322,9 +322,10 @@ def view_poll(request, poll_id):
     options = poll.options
     if request.user.has_perm('application.can_manage_applications'):
         if request.method == 'POST':
-            form = PollInvalidForm(request.POST, prefix="poll")
+            form = PollForm(request.POST, prefix="poll")
             if form.is_valid():
                 poll.votesinvalid = form.cleaned_data['invalid'] or 0
+                poll.votescast = form.cleaned_data['votescast'] or 0
                 poll.save()
 
             for option in options:
@@ -337,7 +338,7 @@ def view_poll(request, poll_id):
                                            cleaned_data['undesided'] or 0
                     option.save()
         else:
-            form = PollInvalidForm(initial={'invalid': poll.votesinvalid}, prefix="poll")
+            form = PollForm(initial={'invalid': poll.votesinvalid, 'votescast': poll.votescast}, prefix="poll")
             for option in options:
                 option.form = OptionResultForm(initial={
                     'yes': option.voteyes,
diff --git a/openslides/assignment/templates/assignment/poll_view.html b/openslides/assignment/templates/assignment/poll_view.html
index e2c3d47b2..bd96cf983 100644
--- a/openslides/assignment/templates/assignment/poll_view.html
+++ b/openslides/assignment/templates/assignment/poll_view.html
@@ -33,9 +33,12 @@
         {% endfor %}
     </table>
 
-    <label for="id_votesinvalid">{% trans "Invalid" %}:</label>
+    <label for="id_votesinvalid">{% trans "Invalid votes" %}:</label>
     {{ form.invalid.errors }}{{ form.invalid }}
 
+    <label for="id_votescast">{% trans "Votes cast" %}:</label>
+    {{ form.votescast.errors }}{{ form.votescast }}
+
     {% if perms.poll.can_manage_poll %}
         <p>
         <button type="submit">
diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index cf3b43f9c..3a22b53ca 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -123,7 +123,7 @@
     <th>{% trans "Candidates" %}</th>
     {% for poll in assignment.poll_set.all %}
     <th style="vertical-align: top; white-space:nowrap;">{% if perms.assignment.can_manage_assignment %}<a href="{% url assignment_poll_view poll.id %}">{% endif %}
-        {{forloop.counter}}.
+        {{ forloop.counter }}.
         {% if perms.assignment.can_manage_assignment %}
         </a>
         <a href="{% url assignment_poll_delete poll.id %}"><img src="/static/images/icons/edit-delete.png" title="{% trans 'Delete Poll' %}"></a>
@@ -170,6 +170,24 @@
         {% endif %}
     </tr>
     {% endfor %}
+    <tr>
+        <td>{%trans 'Invalid votes' %}</td>
+        {% for p in polls %}
+            <td><img src="/static/images/icons/voting-invalid.png" title="{% trans 'Invalid' %}"> {{ p.votesinvalid }}</td>
+        {% endfor %}
+        {% if assignment.profile.count > 0 and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
+            <td></td>
+        {% endif %}
+    </tr>
+    <tr class="total">
+        <td><b>{%trans 'Votes cast' %}</b></td>
+        {% for p in polls %}
+            <td><img src="/static/images/icons/voting-total.png" title="{% trans 'Votes cast' %}"> <b>{{ p.votescast }}</b></td>
+        {% endfor %}
+        {% if assignment.profile.count > 0 and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
+            <td></td>
+        {% endif %}
+    </tr>
     </table>
 
 {% else %}
diff --git a/openslides/assignment/views.py b/openslides/assignment/views.py
index a415a6395..4d7873769 100644
--- a/openslides/assignment/views.py
+++ b/openslides/assignment/views.py
@@ -17,7 +17,7 @@ from django.contrib.auth.decorators import login_required
 from django.utils.translation import ugettext as _
 
 from poll.models import Poll, Option
-from poll.forms import OptionResultForm, PollInvalidForm
+from poll.forms import OptionResultForm, PollForm
 from assignment.models import Assignment
 from assignment.forms import AssignmentForm, AssignmentRunForm
 from utils.utils import template, permission_required, gen_confirm_form, del_confirm_form, ajax_request
@@ -79,9 +79,14 @@ def view(request, assignment_id=None):
                 tmplist[1].append("-")
         votes.append(tmplist)
 
+    polls = []
+    for poll in assignment.poll_set.filter(assignment=assignment):
+        polls.append(poll)
+    
     return {'assignment': assignment,
             'form': form,
-            'votes': votes}
+            'votes': votes,
+            'polls': polls }
 
 
 @permission_required('assignment.can_manage_assignment')
@@ -192,9 +197,10 @@ def poll_view(request, poll_id):
     assignment = poll.assignment
     if request.user.has_perm('assignment.can_manage_assignment'):
         if request.method == 'POST':
-            form = PollInvalidForm(request.POST, prefix="poll")
+            form = PollForm(request.POST, prefix="poll")
             if form.is_valid():
                 poll.votesinvalid = form.cleaned_data['invalid'] or 0
+                poll.votescast = form.cleaned_data['votescast'] or 0
                 poll.save()
 
             success = 0
@@ -209,7 +215,7 @@ def poll_view(request, poll_id):
             if success == options.count():
                 messages.success(request, _("Votes are successfully saved.") )
         else:
-            form = PollInvalidForm(initial={'invalid': poll.votesinvalid}, prefix="poll")
+            form = PollForm(initial={'invalid': poll.votesinvalid, 'votescast': poll.votescast}, prefix="poll")
             for option in options:
                 option.form = OptionResultForm(initial={
                     'yes': option.voteyes,
diff --git a/openslides/poll/forms.py b/openslides/poll/forms.py
index 3c0df6782..dfa872f99 100644
--- a/openslides/poll/forms.py
+++ b/openslides/poll/forms.py
@@ -20,19 +20,12 @@ class PollForm(ModelForm):
     error_css_class = 'error'
     required_css_class = 'required'
 
-    #votescast = IntegerField(required=False,widget=TextInput(attrs={'class':'small-input'}),label=_("Votes cast"))
-    #invalid = IntegerField(required=False, min_value=0, widget=TextInput(attrs={'class': 'small-input'}), label=_("Invalid"))
+    votescast = IntegerField(required=False,widget=TextInput(attrs={'class':'small-input'}),label=_("Votes cast"))
+    invalid = IntegerField(required=False, min_value=0, widget=TextInput(attrs={'class': 'small-input'}), label=_("Invalid"))
 
     class Meta:
         model = Poll
 
-class PollInvalidForm(Form):
-    error_css_class = 'error'
-    required_css_class = 'required'
-
-    invalid = IntegerField(required=False, min_value=0, widget=TextInput(attrs={'class': 'small-input'}), label=_("Invalid"))
-
-
 class OptionForm(ModelForm):
     error_css_class = 'error'
     required_css_class = 'required'
diff --git a/openslides/static/images/icons/voting-total.png b/openslides/static/images/icons/voting-total.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a1590355055c4ac8066ef7b91672585bfa72077
GIT binary patch
literal 912
zcmV;B18@9^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm0002v0002v0T1TirvLx|8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10}V+;K~y-6Wm8RPR96)K?!EI~GH)`Yjw4DeE@TG(GDMq1w22z5
ziz>KMV^{uws0)!&h_>44#1W(#Nud==F;kJyMQI@kxKJ1VAu6It8Vwjh$s+O+7vp4{
zH!t(vz4vs}Oh<d*91iDv-v{S|!-xpg(cAk=lVMs%h2TlUFcMNq=DMX9v*p=g*C}4^
z>^wD6jb~K?>}ucD?s<{Oaix?YgwUao#kJPR<#O6_O5FE-`My}_KH2&0Y5JEqC&2#v
z>yO8#S<_q_3?h+;BNVbgM3pQSix?grp{c1URxXzxob3FjjfjX55&C}bJ0A&$Pb^uo
z7$P9>{P`F#M+QJ3n1+e=_AMA28^g2FXK)-R)0NJo#j^Oa#s!i2*`Q_dl`B^;&-1W<
z-$4Mtrp;{#)zv|3jY~gW!tRdUShOex+qTImmRhgfxYo~w7RRKNW<0)}0YEGkL-w~`
z4D=7eDV2~+HlVfjGo-%%4o=Yl5us&$3sYJeT;U)Wf+soWIur_3?p?dK5ogYJ;qaj&
zux%SegocJSu&f{mgmAbHwY5R5L7(zKAds-EAg?xzK-l|b2exnj0$&~fy2_9LFwy7&
z4x)7dr6iQrACTwzrsgKJw{Q91oQR;chLVbL*Da5~%jNXPprNNjn91ky`L?Z<x%6da
zKRsnD&-b5l-zyKf?kq193YF!X$v3!h{U-Jw*jFJ>PEKNAU=T!vnVA{na(N-8|Csgs
z+>^A-;FHL_u+i4m%8E`2dv<kT_3BkH3<CgRdipI!{~pD~AG@(};|2`$57NZMgmlX8
zIz~je*mEIc7-lMwh(id0hYuft0hlX{F)#o-cJ9E-@t3%N?>;==JAL`r>^Vk6V2rT~
z-RJKDv?;o9A+@Y;X5nz%2c{JY1>CuHhhDvU&7@Yh>lZKGmQJU2<(U{`ER*R<F~Lts
z>DSblH98uLa?%9bwpIRJUMQt}-}Afb>p%G+olfhIzYzeCN~Ko$$~y#&Mn$?&X`e|?
mjz}e+lwJQyHk%!<#{UBvh2^{AeCnwH0000<MNUMnLSTYgcdPyY

literal 0
HcmV?d00001

diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css
index c395fc778..311bd0a16 100644
--- a/openslides/static/styles/base.css
+++ b/openslides/static/styles/base.css
@@ -248,6 +248,10 @@ table a.table_edit {
     padding: 5px 0;
     font-size:11px;
     margin:0;
+    width: 0;
+}
+tr.total td {
+    border-top: 1px solid #333333;
 }