From da8c3c0bba070981b620ad77eb35bfedd7c0f446 Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Mon, 16 Apr 2012 17:21:41 +0200 Subject: [PATCH] show pollresults in application projector --- .../templates/projector/Application.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/openslides/application/templates/projector/Application.html b/openslides/application/templates/projector/Application.html index bcc354587..62913277a 100644 --- a/openslides/application/templates/projector/Application.html +++ b/openslides/application/templates/projector/Application.html @@ -21,23 +21,23 @@

{% trans "Submitter" %}:
{{ application.submitter.profile }}

- {% with application.poll_set.all as polls %} - {% if polls|length > 0 and polls.0.has_vote %} + {% with application.polls as polls %} + {% if polls.exists and polls.0.has_votes %}

{% trans "Poll result" %}:

- {% for p in polls %} - {% if p.has_vote %} + {% for poll in polls %} + {% if poll.has_votes %} {% if polls|length > 1 %} {{forloop.counter}}. {% trans "Vote" %}:
{% endif %} - {% for option in p.options %} + {% with poll.get_options.0 as option %} {{ option.yes }}
{{ option.no }}
- {{ option.undesided }}
- {{ p.votesinvalidf }}
+ {{ option.contained }}
+ {{ poll.print_votesinvalid }}
- {{ p.votescastf }} + {{ poll.print_votescast }}
- {% endfor %} + {% endwith %}
{% else %} {% if poll|length == 1 %}