Commit d4ae639d authored by Stefan Busemann's avatar Stefan Busemann
Browse files

[BUGFIX] show nominees at running electiions

parent cfad0caa
......@@ -7,7 +7,39 @@
<div>
{election.description}
</div>
<h2><f:translate key="view.fe.election.show.result"/></h2>
<f:if condition="!{election.ElectionFinished}">
<f:then>
<h2>Current Voting</h2>
<table class="table table-hover">
<thead>
<tr>
<th>
<f:translate key="view.fe.election.show.nominee"/>
</th>
<th>
Status
</th>
</tr>
</thead>
<tbody>
<f:for each="{election.nominees}" as="nominee">
<tr>
<td>
{nominee.lastName}, {nominee.firstName} {nominee.MiddleName}
</td>
<td>
<f:translate key="view.fe.election.show.active"/>
</td>
</tr>
</f:for>
</tbody>
</table>
</f:then>
<f:else>
<h2>
<f:translate key="view.fe.election.show.result"/>
</h2>
<table class="table table-hover">
<thead>
<tr>
......@@ -29,7 +61,9 @@
<f:if condition="{election.ElectionFinished}">
<f:then>
<f:if condition="{result.relativevotes}">
{result.relativevotes}% ({result.votes} <f:translate key="view.fe.election.show.votes"/>)
{result.relativevotes}% ({result.votes}
<f:translate key="view.fe.election.show.votes"/>
)
</f:if>
</f:then>
<f:else>
......@@ -41,4 +75,6 @@
</f:for>
</tbody>
</table>
</f:else>
</f:if>
</f:section>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment