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

Merge pull request #2848 from emanuelschuetze/issue2421

Browse Source 
Added text to empty assignment poll result slide (Fixed #2421)
This commit is contained in:
Norman Jäckel 2017-01-14 10:41:24 +01:00 committed by GitHub
commit 663feff806
1 changed files with 64 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,12 @@
</div> </div>
<!-- vote results --> <!-- vote results -->
<div ng-show="showResult" class="electionresults spacer" ng-repeat="poll in assignment.polls | filter: {id: element.poll}"> <div ng-show="showResult">
<div ng-if="(assignment.polls | filter: {id: element.poll}).length == 0" translate>
Waiting for results ...
</div>
<div ng-repeat="poll in assignment.polls | filter: {id: element.poll}" class="electionresults spacer">
<table class="table table-bordered table-striped minimumTable"> <table class="table table-bordered table-striped minimumTable">
<tr> <tr>
<th translate>Candidates <th translate>Candidates
@ -89,4 +94,6 @@
{{ vote.value }} {{ vote.percentStr }} {{ vote.value }} {{ vote.percentStr }}
</table> </table>
</div> </div>
</div>
</div> </div>