ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2015 from emanuelschuetze/fix2009

Browse Source 
Show special vote values for motion polls on projector.
This commit is contained in:
Norman Jäckel 2016-02-27 20:57:21 +01:00
commit ea429adefe
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
openslides/motions/static/templates/motions/slide_motion.html
View File

@ -15,37 +15,45 @@
<h3 ng-if="motion.polls.length > 0" translate>Voting result</h3> <h3 ng-if="motion.polls.length > 0" translate>Voting result</h3>
<div ng-repeat="poll in motion.polls | orderBy:'-id'" class="spacer"> <div ng-repeat="poll in motion.polls | orderBy:'-id'" class="spacer">
<div ng-show="poll.has_votes" class="pollresults"> <div ng-show="poll.has_votes" class="pollresults">
<strong ng-if="motion.polls.length > 1"><translate>Vote</translate> {{ motion.polls.length - $index }}:</strong> <strong ng-if="motion.polls.length > 1">
<translate>Vote</translate> {{ motion.polls.length - $index }}:
</strong>
<table class="transparentTable spacer"> <table class="transparentTable spacer">
<!-- yes --> <!-- yes -->
<tr> <tr>
<td class="icon"> <td class="icon">
<i class="fa fa-thumbs-up fa-2x"></i> <i class="fa fa-thumbs-up fa-2x"></i>
<td> <td ng-init="voteYes = poll.getVote(poll.yes)">
<span class="result_label"><translate>Yes</translate>:</span> <span class="result_label"><translate>Yes</translate>:</span>
<span class="result_value">{{ poll.yes }} {{ poll.getYesPercent() }}</span> <span class="result_value">
<div ng-if="poll.getYesPercent(true)"> {{ voteYes.value }} {{ voteYes.percentStr }}
<uib-progressbar value="poll.getYesPercent(true)" type="success"></uib-progressbar> </span>
<div ng-if="voteYes.percentNumber">
<uib-progressbar value="voteYes.percentNumber" type="success"></uib-progressbar>
</div> </div>
<!-- no --> <!-- no -->
<tr> <tr>
<td class="icon"> <td class="icon">
<i class="fa fa-thumbs-down fa-2x"></i> <i class="fa fa-thumbs-down fa-2x"></i>
<td> <td ng-init="voteNo = poll.getVote(poll.no)">
<span class="result_label"><translate>No</translate>:</span> <span class="result_label"><translate>No</translate>:</span>
<span class="result_value">{{ poll.no }} {{ poll.getNoPercent() }}</span> <span class="result_value" >
<div ng-if="poll.getNoPercent(true)"> {{ voteNo.value }} {{ voteNo.percentStr }}
<uib-progressbar value="poll.getNoPercent(true)" type="danger"></uib-progressbar> </span>
<div ng-if="voteNo.percentNumber">
<uib-progressbar value="voteNo.percentNumber" type="danger"></uib-progressbar>
</div> </div>
<!-- abstain --> <!-- abstain -->
<tr> <tr>
<td class="icon"> <td class="icon">
<strong style="font-size: 26px">&empty;</strong> <strong style="font-size: 26px">&empty;</strong>
<td> <td ng-init="voteAbstain = poll.getVote(poll.abstain)">
<span class="result_label"><translate>Abstain</translate>:</span> <span class="result_label"><translate>Abstain</translate>:</span>
<span class="result_value">{{ poll.abstain }} {{ poll.getAbstainPercent() }}</span> <span class="result_value">
<div ng-if="poll.getAbstainPercent(true)"> {{ voteAbstain.value }} {{ voteAbstain.percentStr }}
<uib-progressbar value="poll.getAbstainPercent(true)" type="warning"></uib-progressbar> </span>
<div ng-if="voteAbstain.percentNumber">
<uib-progressbar value="voteAbstain.percentNumber" type="warning"></uib-progressbar>
</div> </div>
</table> </table>
</div> </div>