From 93d2dc8d7d17b1799e8e3ffcebbdbde2c01854c8 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 19 Nov 2012 22:54:09 +0100
Subject: [PATCH] Restructuring and optimization of assignment templates. (Now:
 elected candidates are marked in candidate list; blocked candidates not
 visible for status 'finished')

---
 .../templates/assignment/overview.html        |  5 +-
 .../assignment/templates/assignment/view.html | 47 ++++++-------------
 .../templates/projector/Assignment.html       |  4 --
 3 files changed, 17 insertions(+), 39 deletions(-)

diff --git a/openslides/assignment/templates/assignment/overview.html b/openslides/assignment/templates/assignment/overview.html
index 717ff1538..ed3ba8ded 100644
--- a/openslides/assignment/templates/assignment/overview.html
+++ b/openslides/assignment/templates/assignment/overview.html
@@ -32,10 +32,11 @@
             {% if assignment.active %}activeline{% endif %}">
             <td><a href="{% url assignment_view assignment.id %}">{{ assignment }}</a></td>
             <td>
-                {{ assignment.posts }} {% trans "posts" %} / {{ assignment.elected|length }} {% trans "elected" %}
+                {% trans "posts" %}: {{ assignment.posts }}
                 {% if assignment.status != 'fin' %}
-                    / {{ assignment.candidates|length }} {% trans "candidates" %}
+                    | {% trans "candidates" %}: {{ assignment.get_participants|length }}
                 {% endif %}
+                | {% trans "elected" %}: {{ assignment.elected|length }}
             </td>
             <td>{{ assignment.get_status_display }}</td>
             <td>
diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index a900a28fc..47b6d0e2b 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -33,9 +33,10 @@
     <h1>{{ assignment }}</h1>
     <p>{{ assignment.description|linebreaks }}</p>
 
+{% if assignment.status != "fin" %}
     <h3>{% trans "Candidates" %}</h3>
     <ol>
-    {% for person in assignment.candidates %}
+    {% for person in assignment.get_participants %}
         <li>
             {{ person }}
             {% if perms.assignment.can_manage_assignment %}
@@ -43,6 +44,14 @@
                     <a href="{% url assignment_delother assignment.id person.person_id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Remove candidate' %}"></a>
                 {% endif %}
             {% endif %}
+            {% if person in assignment.elected %}
+                | <b>{% trans "elected" %}</b>
+                {% if perms.assignment.can_manage_assignment %}
+                    {% if assignment.status == "sea" or assignment.status == "vot" %}
+                        <a href="{% url assignment_user_not_elected assignment.id person.person_id %}"><img src="{% static 'images/icons/dialog-cancel.png' %}" title="{% trans 'Mark candidate as not elected' %}"></a>
+                    {% endif %}
+                {% endif %}
+            {% endif %}
         </li>
     {% empty %}
         <li style="list-style: none outside none;"><i>{% trans "No candidates available." %}</i></li>
@@ -85,29 +94,11 @@
             </p>
         {% endif %}
     </form>
-
     {% endif %}
     {% endif %}
-
-{% if assignment.elected %}
-    <h3>{% trans "Elected Candidates" %}</h3>
-    <ul>
-    {% for person in assignment.elected %}
-        <li>
-            {{ person }}
-            {% if perms.assignment.can_manage_assignment %}
-                {% if assignment.status == "sea" or assignment.status == "vot" %}
-                    <a href="{% url assignment_user_not_elected assignment.id person.person_id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Remove candidate' %}"></a>
-                {% endif %}
-            {% endif %}
-        </li>
-    {% empty %}
-        <li>{% trans "No elected candidates available." %}</li>
-    {% endfor %}
-    </ul>
 {% endif %}
 
-{% if perms.assignment.can_manage_assignments and blocked_candidates %}
+{% if perms.assignment.can_manage_assignments and blocked_candidates and assignment.status != "fin" %}
     <h3>{% trans "Blocked Candidates" %}</h3>
     <ul>
     {% for person in blocked_candidates %}
@@ -123,18 +114,8 @@
 {% if assignment.status != "sea" %}
     <h3>{% trans "Election results" %}</h3>
 
-{% if polls.exists %}
+    {% if polls.exists %}
     <table id="election_table" style="width: auto;">
-
-    <tr>
-        <th></th>
-        {% with ballotnumber=polls.count %}
-        <th colspan="{{ ballotnumber|add:'1' }}" style="text-align: center;">
-            {% trans "ballot" %}
-        </th>
-        {% endwith %}
-    </tr>
-
     <tr>
         <th>{% trans "Candidates" %}</th>
         {% for poll in polls %}
@@ -235,7 +216,7 @@
         {% endif %}
     </tr>
     </table>
-{% else %}
+    {% else %}
     <i>{% trans "No results available." %}</i>
     {% if assignment.candidates and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
         <p><a href='{% url assignment_gen_poll assignment.id %}'>
@@ -244,7 +225,7 @@
         </span>
         </a></p>
     {% endif %}
-{% endif %}
+    {% endif %}
 {% endif %}
 </div>
 {% endblock %}
diff --git a/openslides/assignment/templates/projector/Assignment.html b/openslides/assignment/templates/projector/Assignment.html
index 6a2a59b3c..937328d0e 100644
--- a/openslides/assignment/templates/projector/Assignment.html
+++ b/openslides/assignment/templates/projector/Assignment.html
@@ -120,10 +120,6 @@
                 </td>
             {% endfor %}
         </tr>
-
         </table>
-    {% elif some_polls_available %}
-        <i>{% trans "Vote results are not published yet." %}</i>
     {% endif %}
-    <br>
 {% endblock %}