From ff444393510d9bf93d0d5910c97bdffd10838298 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Wed, 4 Jul 2012 16:14:19 +0200
Subject: [PATCH] #266 fix assignment view on the projector

---
 .../assignment/templates/assignment/view.html | 10 ++---
 .../templates/projector/Assignment.html       | 45 ++++++++++---------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index 73f7fc98d..63b1527e1 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -97,7 +97,7 @@
     <p><br></p>
     <h3>{% trans "Election results" %}</h3>
 
-{% if polls %}
+{% if polls.exists %}
     <table id="election_table" style="width: auto;">
 
     <tr>
@@ -160,8 +160,8 @@
         </td>
         {% for poll_dict in poll_list %}
             {% if perms.assignment.can_manage_assignment or poll_dict.published %}
-                <td style="white-space:nowrap;">
-                    {% with vote=poll_dict.votes %}
+                {% with vote=poll_dict.votes %}
+                    <td style="white-space:nowrap;">
                         {% if 'Yes' in vote and 'No' in vote and 'Abstain' in vote %}
                             <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Yes }}<br>
                             <img src="{% static 'images/icons/voting-no.png' %}" title="{% trans 'No' %}"> {{ vote.No }}<br>
@@ -173,8 +173,8 @@
                         {% else %}
                             &nbsp;
                         {% endif %}
-                    {% endwith %}
-                </td>
+                    </td>
+                {% endwith %}
             {% endif %}
         {% endfor %}
         {% if assignment.profile.exists and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
diff --git a/openslides/assignment/templates/projector/Assignment.html b/openslides/assignment/templates/projector/Assignment.html
index 8d4689cba..ef9aa7909 100644
--- a/openslides/assignment/templates/projector/Assignment.html
+++ b/openslides/assignment/templates/projector/Assignment.html
@@ -5,10 +5,12 @@
 {% load staticfiles %}
 
 {% block title %}{{ block.super }} - {{ assignment }}{% endblock %}
+
 {% block header %}
     <link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/assignment.css' %}" />
     <script type="text/javascript" src="{% static 'javascript/assignment.js' %}"></script>
 {% endblock %}
+
 {% block content %}
     {% if assignment.status != "fin" %}
     <div id="sidebar">
@@ -49,7 +51,7 @@
     {% if polls.exists %}
         <h3>{% trans "Election results" %}</h3>
         <table>
-        
+
         <tr>
             <th>{% trans "Candidates" %}</th>
             {% for poll in assignment.poll_set.all %}
@@ -58,8 +60,8 @@
                 {% endif %}
             {% endfor %}
         </tr>
-        
-        {% for candidate, votes in vote_results.items %}
+
+        {% for candidate, poll_list in vote_results.items %}
             <tr class="{% cycle 'odd' '' %}">
                 <td class="candidate{% if candidate.1 %} elected{% endif %}">
                     {% if candidate in assignment.elected.all %}
@@ -69,25 +71,28 @@
                     {% endif %}
                     {{ candidate }}
                 </td>
-            {% for vote in votes %}
-                {# Hier stimmt es noch nicht. Es muss rein, dass nur veröffentlichte Wahlergebnisse angezeigt werden sollen #}
-                <td style="white-space:nowrap;"{% if candidate in assignment.elected.all %} class="elected"{% endif %}>
-                     {% if 'Yes' in vote and 'No' in vote and 'Abstain' in vote %}
-                        <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Yes }}<br>
-                        <img src="{% static 'images/icons/voting-no.png' %}" title="{% trans 'No' %}"> {{ vote.No }}<br>
-                        <img src="{% static 'images/icons/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ vote.Abstain }}<br>
-                    {% elif 'Votes' in vote %}
-                        <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Votes }}
-                    {% elif vote == None %}
-                        {% trans 'was not a <br> candidate'%}
-                    {% else %}
-                        &nbsp;
-                    {% endif %}
-                </td>
+            {% for poll_dict in poll_list %}
+                {% if poll_dict.published %}
+                    {% with vote=poll_dict.votes %}
+                        <td style="white-space:nowrap;"{% if candidate in assignment.elected.all %} class="elected"{% endif %}>
+                             {% if 'Yes' in vote and 'No' in vote and 'Abstain' in vote %}
+                                <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Yes }}<br>
+                                <img src="{% static 'images/icons/voting-no.png' %}" title="{% trans 'No' %}"> {{ vote.No }}<br>
+                                <img src="{% static 'images/icons/voting-abstention.png' %}" title="{% trans 'Abstention' %}"> {{ vote.Abstain }}<br>
+                            {% elif 'Votes' in vote %}
+                                <img src="{% static 'images/icons/voting-yes.png' %}" title="{% trans 'Yes' %}"> {{ vote.Votes }}
+                            {% elif vote == None %}
+                                {% trans 'was not a <br> candidate'%}
+                            {% else %}
+                                &nbsp;
+                            {% endif %}
+                        </td>
+                    {% endwith %}
+                {% endif %}
             {% endfor %}
             </tr>
         {% endfor %}
-    
+
         <tr>
             <td>{%trans 'Invalid votes' %}</td>
             {% for poll in polls %}
@@ -96,7 +101,7 @@
                 {% endif %}
             {% endfor %}
         </tr>
-        
+
         <tr class="total">
             <td><b>{%trans 'Votes cast' %}</b></td>
             {% for poll in polls %}