From c857eac91c9f6731234ab3854fb83b77a272cd35 Mon Sep 17 00:00:00 2001
From: ecmu <ecmu@free.fr>
Date: Sat, 19 Mar 2016 10:30:49 +0100
Subject: [PATCH] #51 : make empty vote different from 'No'
---
tpl/part/vote_table_classic.tpl | 26 ++++++++++++++++++++------
tpl/part/vote_table_date.tpl | 26 ++++++++++++++++++++------
2 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/tpl/part/vote_table_classic.tpl b/tpl/part/vote_table_classic.tpl
index e5b9836b..a9c05071 100644
--- a/tpl/part/vote_table_classic.tpl
+++ b/tpl/part/vote_table_classic.tpl
@@ -51,8 +51,11 @@
</div>
</td>
- {foreach $slots as $id=>$slot} {* Parcourt "slots" et non "choices" pour prendre en compte aussi les colonnes non renseignées *}
- {assign var='choice' value=$vote->choices[$id]}
+ {$id=0} {* #51 : Parcoure les slots/moments pour y inclure les nouveaux items sans vote }
+ {foreach $slots as $slot}
+ {foreach $slot->moments as $moment}
+ {$choice=$vote->choices[$id]}
+
<td class="bg-info" headers="C{$id}">
<ul class="list-unstyled choice">
@@ -79,7 +82,11 @@
</li>
</ul>
</td>
+
+ {$id=$id + 1}
+ {/foreach}
{/foreach}
+
<td style="padding:5px"><button type="submit" class="btn btn-success btn-xs" name="save" value="{$vote->id|html}" title="{__('Poll results', 'Save the choices')} {$vote->name|html}">{__('Generic', 'Save')}</button></td>
</tr>
{elseif !$hidden} {* Voted line *}
@@ -87,8 +94,10 @@
<th class="bg-info">{$vote->name|html}</th>
- {foreach $slots as $id=>$slot}
- {assign var='choice' value=$vote->choices[$id]}
+ {$id=0} {* #51 : Parcoure les slots/moments pour y inclure les nouveaux items sans vote }
+ {foreach $slots as $slot}
+ {foreach $slot->moments as $moment}
+ {$choice=$vote->choices[$id]}
{if $choice=='2'}
<td class="bg-success text-success" headers="C{$id}"><i class="glyphicon glyphicon-ok"></i><span class="sr-only">{__('Generic', 'Yes')}</span></td>
@@ -96,10 +105,12 @@
<td class="bg-warning text-warning" headers="C{$id}">(<i class="glyphicon glyphicon-ok"></i>)<span class="sr-only">{__('Generic', 'Ifneedbe')}</span></td>
{elseif $choice=='0'}
<td class="bg-danger text-danger" headers="C{$id}"><i class="glyphicon glyphicon-ban-circle"></i><span class="sr-only">{__('Generic', 'No')}</span></td>
- {else}
+ {else} {* #51 : default value for unselected vote (new dates) *}
<td class="" headers="C{$id}">?<span class="sr-only">{__('Generic', 'Unknown')}</span></td>
{/if}
+ {$id=$id + 1}
+ {/foreach}
{/foreach}
{if $active && !$expired &&
@@ -155,11 +166,14 @@
</label>
</li>
<li class="no">
- <input type="radio" id="n-choice-{$id}" name="choices[{$id}]" value="0" checked/>
+ <input type="radio" id="n-choice-{$id}" name="choices[{$id}]" value="0" />
<label class="btn btn-default btn-xs startunchecked" for="n-choice-{$id}" title="{__('Poll results', 'Vote no for')|html} {$slot->title|html}">
<i class="glyphicon glyphicon-ban-circle"></i><span class="sr-only">{__('Generic', 'No')}</span>
</label>
</li>
+ <li style='display:none'> {* #51 : default value for unselected vote *}
+ <input type="radio" id="n-choice-{$id}" name="choices[{$id}]" value=" " checked/>
+ </li>
</ul>
</td>
{/foreach}
diff --git a/tpl/part/vote_table_date.tpl b/tpl/part/vote_table_date.tpl
index ecfa39b6..0ef9f646 100644
--- a/tpl/part/vote_table_date.tpl
+++ b/tpl/part/vote_table_date.tpl
@@ -99,8 +99,11 @@
</div>
</td>
- {foreach $slots as $k=>$slot}
- {assign var='choice' value=$vote->choices[$k]}
+ {$k=0} {* #51 : Parcoure les slots/moments pour y inclure les nouveaux items sans vote }
+ {foreach $slots as $slot}
+ {foreach $slot->moments as $moment}
+ {$choice=$vote->choices[$k]}
+
<td class="bg-info" headers="M{$headersM[$k]} D{$headersD[$k]} H{$headersH[$k]}">
<ul class="list-unstyled choice">
@@ -127,7 +130,11 @@
</li>
</ul>
</td>
+
+ {$k=$k + 1}
+ {/foreach}
{/foreach}
+
<td style="padding:5px"><button type="submit" class="btn btn-success btn-xs" name="save" value="{$vote->id|html}" title="{__('Poll results', 'Save the choices')} {$vote->name|html}">{__('Generic', 'Save')}</button></td>
</tr>
@@ -138,8 +145,10 @@
<th class="bg-info">{$vote->name|html}</th>
- {foreach $slots as $k=>$slot}
- {assign var='choice' value=$vote->choices[$k]}
+ {$k=0} {* #51 : Parcoure les slots/moments pour y inclure les nouveaux items sans vote }
+ {foreach $slots as $slot}
+ {foreach $slot->moments as $moment}
+ {$choice=$vote->choices[$k]}
{if $choice=='2'}
<td class="bg-success text-success" headers="M{$headersM[$k]} D{$headersD[$k]} H{$k}"><i class="glyphicon glyphicon-ok"></i><span class="sr-only">{__('Generic', 'Yes')}</span></td>
@@ -147,10 +156,12 @@
<td class="bg-warning text-warning" headers="M{$headersM[$k]} D{$headersD[$k]} H{$k}">(<i class="glyphicon glyphicon-ok"></i>)<span class="sr-only">{__('Generic', 'Ifneedbe')}</span></td>
{elseif $choice=='0'}
<td class="bg-danger text-danger" headers="M{$headersM[$k]} D{$headersD[$k]} H{$k}"><i class="glyphicon glyphicon-ban-circle"></i><span class="sr-only">{__('Generic', 'No')}</span></td>
- {else}
+ {else} {* #51 : default value for unselected vote (new dates) *}
<td class="" headers="M{$headersM[$k]} D{$headersD[$k]} H{$k}">?<span class="sr-only">{__('Generic', 'Unknown')}</span></td>
{/if}
+ {$k=$k + 1}
+ {/foreach}
{/foreach}
{if $active && !$expired &&
@@ -207,11 +218,14 @@
</label>
</li>
<li class="no">
- <input type="radio" id="n-choice-{$i}" name="choices[{$i}]" value="0" checked/>
+ <input type="radio" id="n-choice-{$i}" name="choices[{$i}]" value="0" />
<label class="btn btn-default btn-xs startunchecked" for="n-choice-{$i}" title="{__('Poll results', 'Vote no for')|html} {$slot->day|date_format:$date_format.txt_short|html} - {$moment|html}">
<i class="glyphicon glyphicon-ban-circle"></i><span class="sr-only">{__('Generic', 'No')}</span>
</label>
</li>
+ <li style='display:none'> {* #51 : default value for unselected vote *}
+ <input type="radio" id="n-choice-{$i}" name="choices[{$i}]" value=" " checked/>
+ </li>
</ul>
</td>
{$i = $i+1}
--
GitLab