Commit 1da45e10 authored by Stefan Busemann's avatar Stefan Busemann
Browse files

[BUGFIX] Show result status of an election

parent 2ebf5740
......@@ -202,20 +202,19 @@ class Election extends AbstractEntity
return false;
}
//
// /** @return bool
// */
// public function isElectionPlanned()
// {
// if ($this->getStartDate() === null) {
// return true;
// }
// if ($this->getStartDate()->getTimestamp() > time()) {
// return true;
// }
//
// return false;
// }
/** @return bool
*/
public function isElectionPlanned()
{
if ($this->getStartDate() === null) {
return true;
}
if ($this->getStartDate()->getTimestamp() > time()) {
return true;
}
return false;
}
/**
* @return array
......
......@@ -484,7 +484,7 @@
<trans-unit id="view.fe.election.show.active">
<source>Voting in Progress</source>
</trans-unit>
<trans-unit id="view.fe.election.show.active">
<trans-unit id="view.fe.election.show.planned">
<source>Voting planned</source>
</trans-unit>
<trans-unit id="view.fe.election.show.nominee">
......
......@@ -24,7 +24,7 @@
<f:translate key="view.fe.election.show.nominee"/>
</th>
<th>
Status
<f:translate key="view.fe.election.show.votes"/>
</th>
</tr>
</thead>
......
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