Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
23
1
Fork 0
Code Issues Pull Requests Releases Activity

Fix display of best choices on classic polls

Browse Source
This commit is contained in:
Olivier PEREZ 2014-12-27 00:19:48 +01:00
parent 60ae6bc364
commit 53048e8488
4 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adminstuds.php
View File

@ -329,7 +329,7 @@ $smarty->assign('poll', $poll);
$smarty->assign('title', _('Poll') . ' - ' . $poll->title);
$smarty->assign('slots', $poll->format === 'D' ? $pollService->splitSlots($slots) : $slots);
$smarty->assign('votes', $pollService->splitVotes($votes));
$smarty->assign('best_moments', $pollService->computeBestMoments($votes));
$smarty->assign('best_choices', $pollService->computeBestChoices($votes));
$smarty->assign('comments', $comments);
$smarty->assign('editingVoteId', $editingVoteId);
$smarty->assign('message', $message);

2
app/classes/Framadate/Services/PollService.php
View File

@ -75,7 +75,7 @@ class PollService {
return $this->connect->insertComment($poll_id, $name, $comment);
}
function computeBestMoments($votes) {
function computeBestChoices($votes) {
$result = [];
foreach ($votes as $vote) {
$choices = str_split($vote->reponses);

2
studs.php
View File

@ -171,7 +171,7 @@ $smarty->assign('poll', $poll);
$smarty->assign('title', _('Poll') . ' - ' . $poll->title);
$smarty->assign('slots', $poll->format === 'D' ? $pollService->splitSlots($slots) : $slots);
$smarty->assign('votes', $pollService->splitVotes($votes));
$smarty->assign('best_moments', $pollService->computeBestMoments($votes));
$smarty->assign('best_choices', $pollService->computeBestChoices($votes));
$smarty->assign('comments', $comments);
$smarty->assign('editingVoteId', $editingVoteId);
$smarty->assign('message', $message);

22
tpl/part/vote_table_classic.tpl
View File

@ -1,5 +1,5 @@
{if !is_array($best_moments) || empty($best_moments)}
{$best_moments = [0]}
{if !is_array($best_choices) || empty($best_choices)}
{$best_choices = [0]}
{/if}
<h3>{_('Votes of the poll')}</h3>
@ -138,12 +138,12 @@
{* Line displaying best moments *}
{$count_bests = 0}
{$max = max($best_moments)}
{$max = max($best_choices)}
{if $max > 0}
<tr id="addition">
<td>{_("Addition")}</td>
{foreach $best_moments as $best_moment}
{if $max == $best_moment}
{foreach $best_choices as $best_choice}
{if $max == $best_choice}
{$count_bests = $count_bests +1}
<td><span class="glyphicon glyphicon-star text-warning"></span><span>{$max}</span></td>
{else}
@ -159,7 +159,7 @@
{* Best votes listing *}
{$max = max($best_moments)}
{$max = max($best_choices)}
{if $max > 0}
<div class="row">
{if $count_bests == 1}
@ -176,12 +176,10 @@
{$i = 0}
<ul style="list-style:none">
{foreach $slots as $slot}
{foreach $slot->moments as $moment}
{if $best_moments[$i] == $max}
<li><strong>{$slot->sujet}</strong></li>
{/if}
{$i = $i+1}
{/foreach}
{if $best_choices[$i] == $max}
<li><strong>{$slot->sujet}</strong></li>
{/if}
{$i = $i+1}
{/foreach}
</ul>
<p>{_("with")} <b>{$max}</b> {if $max==1}{_('vote')}{else}{_('votes')}{/if}.</p>