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

Merge pull request #2438 from emanuelschuetze/fixAssignmentPollSlide

Browse Source 
Fix to show invalid/valid/casted votes on assignment slide.
This commit is contained in:
Norman Jäckel 2016-09-26 20:51:47 +02:00 committed by GitHub
commit a02a39e7ae
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openslides/assignments/static/templates/assignments/slide_assignment.html
View File

@ -85,17 +85,17 @@
<tr class="total"> <tr class="total">
<td> <td>
<translate>Valid ballots</translate> <translate>Valid ballots</translate>
<td ng-if="poll.has_votes" ng-init="vote = poll.getVote(poll.votesvalid)"> <td ng-if="poll.has_votes" ng-init="vote = poll.getVote('votesvalid')">
{{ vote.value }} {{ vote.percentStr }} {{ vote.value }} {{ vote.percentStr }}
<tr class="total"> <tr class="total">
<td> <td>
<translate>Invalid ballots</translate> <translate>Invalid ballots</translate>
<td ng-if="poll.has_votes" ng-init="vote = poll.getVote(poll.votesinvalid)"> <td ng-if="poll.has_votes" ng-init="vote = poll.getVote('votesinvalid')">
{{ vote.value }} {{ vote.percentStr }} {{ vote.value }} {{ vote.percentStr }}
<tr class="total bg-info"> <tr class="total bg-info">
<td> <td>
<translate>Casted ballots</translate> <translate>Casted ballots</translate>
<td ng-if="poll.has_votes" ng-init="vote = poll.getVote(poll.votescast)"> <td ng-if="poll.has_votes" ng-init="vote = poll.getVote('votescast')">
{{ vote.value }} {{ vote.percentStr }} {{ vote.value }} {{ vote.percentStr }}
</table> </table>
</div> </div>