From 113aac59b3eb98da9075c8816221c7ca0e3140bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= <emanuel@intevation.de>
Date: Sat, 14 Jan 2017 10:21:19 +0100
Subject: [PATCH] Added text to empty assignment poll result slide (Fixed
 #2421)

---
 .../assignments/slide_assignment.html         | 121 +++++++++---------
 1 file changed, 64 insertions(+), 57 deletions(-)

diff --git a/openslides/assignments/static/templates/assignments/slide_assignment.html b/openslides/assignments/static/templates/assignments/slide_assignment.html
index c44c914cd..0973e7a9b 100644
--- a/openslides/assignments/static/templates/assignments/slide_assignment.html
+++ b/openslides/assignments/static/templates/assignments/slide_assignment.html
@@ -24,69 +24,76 @@
   </div>
 
   <!-- vote results -->
-  <div ng-show="showResult" class="electionresults spacer" ng-repeat="poll in assignment.polls | filter: {id: element.poll}">
-    <table class="table table-bordered table-striped minimumTable">
-    <tr>
-      <th translate>Candidates
-      <th ng-if="poll.has_votes" class="col-sm-6" translate>Votes</th>
+  <div ng-show="showResult">
+    <div ng-if="(assignment.polls | filter: {id: element.poll}).length == 0" translate>
+        Waiting for results ...
+    </div>
 
-    <!-- candidates (poll options) -->
-    <tr ng-repeat="option in poll.options | orderBy:'weight'">
+    <div ng-repeat="poll in assignment.polls | filter: {id: element.poll}" class="electionresults spacer">
+      <table class="table table-bordered table-striped minimumTable">
+      <tr>
+        <th translate>Candidates
+        <th ng-if="poll.has_votes" class="col-sm-6" translate>Votes</th>
 
-      <!-- candidate name -->
-      <td>
-        <i ng-if="option.is_elected" class="fa fa-star" title="{{ 'is elected' | translate }}"></i>
-        <strong>{{ option.candidate.get_full_name() }}</strong>
+      <!-- candidates (poll options) -->
+      <tr ng-repeat="option in poll.options | orderBy:'weight'">
 
-      <!-- votes -->
-      <td ng-if="poll.has_votes">
-        <div ng-init="votes = option.getVotes()">
-          <div ng-show="poll.pollmethod == 'yna' || poll.pollmethod == 'yn'">
-            <span ng-show="poll.pollmethod == 'yna'">
-              {{ votes[0].label }}: <strong>{{ votes[0].value }}</strong> ·
-              {{ votes[1].label }}: {{ votes[1].value }} ·
-              {{ votes[2].label }}: {{ votes[2].value }} </span>
-            <span ng-show="poll.pollmethod == 'yn'">
-              {{ votes[0].label }}: <strong>{{ votes[0].value }}</strong> ·
-              {{ votes[1].label }}: {{ votes[1].value }}</span>
-            <uib-progress ng-if="votes[0].percentNumber>=0">
-              <uib-bar value="votes[0].percentNumber" type="success">
-                <span ng-hide="votes[0].percentNumber < 5">{{votes[0].percentNumber}} %</span>
-              </uib-bar>
-              <uib-bar value="votes[1].percentNumber" type="danger">
-                <span ng-hide="votes[1].percentNumber < 5">{{votes[1].percentNumber}} %</span>
-              </uib-bar>
-              <uib-bar value="votes[2].percentNumber" type="warning">
-                <span ng-hide="votes[2].percentNumber < 5">{{votes[2].percentNumber}} %</span>
-              </uib-bar>
-            </uib-progress>
-          </div>
-          <div ng-show="poll.pollmethod == 'votes'">
-            <div ng-repeat="vote in votes">
-              {{ vote.value }} {{ vote.percentStr }}
-              <div ng-if="vote.percentNumber >= 0">
-                <uib-progressbar value="vote.percentNumber" type="success"></uib-progressbar>
+        <!-- candidate name -->
+        <td>
+          <i ng-if="option.is_elected" class="fa fa-star" title="{{ 'is elected' | translate }}"></i>
+          <strong>{{ option.candidate.get_full_name() }}</strong>
+
+        <!-- votes -->
+        <td ng-if="poll.has_votes">
+          <div ng-init="votes = option.getVotes()">
+            <div ng-show="poll.pollmethod == 'yna' || poll.pollmethod == 'yn'">
+              <span ng-show="poll.pollmethod == 'yna'">
+                {{ votes[0].label }}: <strong>{{ votes[0].value }}</strong> ·
+                {{ votes[1].label }}: {{ votes[1].value }} ·
+                {{ votes[2].label }}: {{ votes[2].value }} </span>
+              <span ng-show="poll.pollmethod == 'yn'">
+                {{ votes[0].label }}: <strong>{{ votes[0].value }}</strong> ·
+                {{ votes[1].label }}: {{ votes[1].value }}</span>
+              <uib-progress ng-if="votes[0].percentNumber>=0">
+                <uib-bar value="votes[0].percentNumber" type="success">
+                  <span ng-hide="votes[0].percentNumber < 5">{{votes[0].percentNumber}} %</span>
+                </uib-bar>
+                <uib-bar value="votes[1].percentNumber" type="danger">
+                  <span ng-hide="votes[1].percentNumber < 5">{{votes[1].percentNumber}} %</span>
+                </uib-bar>
+                <uib-bar value="votes[2].percentNumber" type="warning">
+                  <span ng-hide="votes[2].percentNumber < 5">{{votes[2].percentNumber}} %</span>
+                </uib-bar>
+              </uib-progress>
+            </div>
+            <div ng-show="poll.pollmethod == 'votes'">
+              <div ng-repeat="vote in votes">
+                {{ vote.value }} {{ vote.percentStr }}
+                <div ng-if="vote.percentNumber >= 0">
+                  <uib-progressbar value="vote.percentNumber" type="success"></uib-progressbar>
+                </div>
               </div>
             </div>
           </div>
-        </div>
 
-    <!-- total votes (valid/invalid/casts) -->
-    <tr class="total">
-      <td>
-        <translate>Valid ballots</translate>
-      <td ng-if="poll.has_votes" ng-init="vote = poll.getVote('votesvalid')">
-        {{ vote.value }} {{ vote.percentStr }}
-    <tr class="total">
-      <td>
-        <translate>Invalid ballots</translate>
-      <td ng-if="poll.has_votes" ng-init="vote = poll.getVote('votesinvalid')">
-        {{ vote.value }} {{ vote.percentStr }}
-    <tr class="total bg-info">
-      <td>
-        <translate>Casted ballots</translate>
-      <td ng-if="poll.has_votes" ng-init="vote = poll.getVote('votescast')">
-        {{ vote.value }} {{ vote.percentStr }}
-    </table>
+      <!-- total votes (valid/invalid/casts) -->
+      <tr class="total">
+        <td>
+          <translate>Valid ballots</translate>
+        <td ng-if="poll.has_votes" ng-init="vote = poll.getVote('votesvalid')">
+          {{ vote.value }} {{ vote.percentStr }}
+      <tr class="total">
+        <td>
+          <translate>Invalid ballots</translate>
+        <td ng-if="poll.has_votes" ng-init="vote = poll.getVote('votesinvalid')">
+          {{ vote.value }} {{ vote.percentStr }}
+      <tr class="total bg-info">
+        <td>
+          <translate>Casted ballots</translate>
+        <td ng-if="poll.has_votes" ng-init="vote = poll.getVote('votescast')">
+          {{ vote.value }} {{ vote.percentStr }}
+      </table>
+    </div>
+
   </div>
 </div>