From af19e08b020a567abada2b1a339be6574cb26555 Mon Sep 17 00:00:00 2001
From: Ecmu <ecmu@free.fr>
Date: Sun, 6 Mar 2016 20:36:22 +0100
Subject: [PATCH 1/7] #51 : make empty vote different from 'No'

---
 tpl/part/vote_table_classic.tpl | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/tpl/part/vote_table_classic.tpl b/tpl/part/vote_table_classic.tpl
index e1feac7..f2a6f2d 100644
--- a/tpl/part/vote_table_classic.tpl
+++ b/tpl/part/vote_table_classic.tpl
@@ -51,24 +51,25 @@
                         </div>
                     </td>
 
-                    {foreach $vote->choices as $id=>$choice}
+					{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]}
 
                         <td class="bg-info" headers="C{$id}">
                             <ul class="list-unstyled choice">
                                 <li class="yes">
-                                    <input type="radio" id="y-choice-{$id}" name="choices[{$id}]" value="2" {if $choice==2}checked {/if}/>
+                                    <input type="radio" id="y-choice-{$id}" name="choices[{$id}]" value="2" {if $choice=='2'}checked {/if}/>
                                     <label class="btn btn-default btn-xs" for="y-choice-{$id}" title="{__('Poll results', 'Vote yes for')|html} {$slots[$id]->title|html}">
                                         <i class="glyphicon glyphicon-ok"></i><span class="sr-only">{__('Generic', 'Yes')}</span>
                                     </label>
                                 </li>
                                 <li class="ifneedbe">
-                                    <input type="radio" id="i-choice-{$id}" name="choices[{$id}]" value="1" {if $choice==1}checked {/if}/>
+                                    <input type="radio" id="i-choice-{$id}" name="choices[{$id}]" value="1" {if $choice=='1'}checked {/if}/>
                                     <label class="btn btn-default btn-xs" for="i-choice-{$id}" title="{__('Poll results', 'Vote ifneedbe for')|html} {$slots[$id]->title|html}">
                                         (<i class="glyphicon glyphicon-ok"></i>)<span class="sr-only">{__('Generic', 'Ifneedbe')}</span>
                                     </label>
                                 </li>
                                 <li class="no">
-                                    <input type="radio" id="n-choice-{$id}" name="choices[{$id}]" value="0" {if $choice==0}checked {/if}/>
+                                    <input type="radio" id="n-choice-{$id}" name="choices[{$id}]" value="0" {if $choice=='0'}checked {/if}/>
                                     <label class="btn btn-default btn-xs" for="n-choice-{$id}" title="{__('Poll results', 'Vote no for')|html} {$slots[$id]->title|html}">
                                         <i class="glyphicon glyphicon-ban-circle"></i><span class="sr-only">{__('Generic', 'No')}</span>
                                     </label>
@@ -83,14 +84,17 @@
 
                     <th class="bg-info">{$vote->name|html}</th>
 
-                    {foreach $vote->choices as $id=>$choice}
+					{foreach $slots as $id=>$slot}
+						{assign var='choice' value=$vote->choices[$id]}
 
-                        {if $choice==2}
+                        {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>
-                        {elseif $choice==1}
+                        {elseif $choice=='1'}
                             <td class="bg-warning text-warning" headers="C{$id}">(<i class="glyphicon glyphicon-ok"></i>)<span class="sr-only">{__('Generic', 'Ifneedbe')}</span></td>
-                        {else}
+                        {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}
+                            <td class="" headers="C{$id}">?<span class="sr-only">{__('Generic', 'Unknown')}</span></td>
                         {/if}
 
                     {/foreach}
@@ -293,4 +297,4 @@
             </div>
         </div>
     {/if}
-{/if}
+{/if}
\ No newline at end of file

From 84414aeb97f3a05886d6852415854ff1fc2b811f Mon Sep 17 00:00:00 2001
From: Ecmu <ecmu@free.fr>
Date: Sun, 6 Mar 2016 20:50:59 +0100
Subject: [PATCH 2/7] #51 : make empty vote different from 'No'

---
 tpl/part/vote_table_date.tpl | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/tpl/part/vote_table_date.tpl b/tpl/part/vote_table_date.tpl
index 762f2b7..0c3554c 100644
--- a/tpl/part/vote_table_date.tpl
+++ b/tpl/part/vote_table_date.tpl
@@ -99,24 +99,25 @@
                         </div>
                     </td>
 
-                    {foreach $vote->choices as $k=>$choice}
+					{foreach $slots as $k=>$slot}
+						{assign var='choice' value=$vote->choices[$k]}
 
                         <td class="bg-info" headers="M{$headersM[$k]} D{$headersD[$k]} H{$headersH[$k]}">
                             <ul class="list-unstyled choice">
                                 <li class="yes">
-                                    <input type="radio" id="y-choice-{$k}" name="choices[{$k}]" value="2" {if $choice==2}checked {/if}/>
+                                    <input type="radio" id="y-choice-{$k}" name="choices[{$k}]" value="2" {if $choice=='2'}checked {/if}/>
                                     <label class="btn btn-default btn-xs" for="y-choice-{$k}" title="{__('Poll results', 'Vote yes for')|html} {$slots_raw[$k]}">
                                         <i class="glyphicon glyphicon-ok"></i><span class="sr-only">{__('Generic', 'Yes')}</span>
                                     </label>
                                 </li>
                                 <li class="ifneedbe">
-                                    <input type="radio" id="i-choice-{$k}" name="choices[{$k}]" value="1" {if $choice==1}checked {/if}/>
+                                    <input type="radio" id="i-choice-{$k}" name="choices[{$k}]" value="1" {if $choice=='1'}checked {/if}/>
                                     <label class="btn btn-default btn-xs" for="i-choice-{$k}" title="{__('Poll results', 'Vote ifneedbe for')|html} {$slots_raw[$k]}">
                                         (<i class="glyphicon glyphicon-ok"></i>)<span class="sr-only">{__('Generic', 'Ifneedbe')}</span>
                                     </label>
                                 </li>
                                 <li class="no">
-                                    <input type="radio" id="n-choice-{$k}" name="choices[{$k}]" value="0" {if $choice==0}checked {/if}/>
+                                    <input type="radio" id="n-choice-{$k}" name="choices[{$k}]" value="0" {if $choice=='0'}checked {/if}/>
                                     <label class="btn btn-default btn-xs" for="n-choice-{$k}" title="{__('Poll results', 'Vote no for')|html} {$slots_raw[$k]}">
                                         <i class="glyphicon glyphicon-ban-circle"></i><span class="sr-only">{__('Generic', 'No')}</span>
                                     </label>
@@ -134,14 +135,17 @@
 
                     <th class="bg-info">{$vote->name|html}</th>
 
-                    {foreach $vote->choices as $k=>$choice}
+					{foreach $slots as $k=>$slot}
+						{assign var='choice' value=$vote->choices[$k]}
 
-                        {if $choice==2}
+                        {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>
-                        {elseif $choice==1}
+                        {elseif $choice=='1'}
                             <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>
-                        {else}
+                        {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}
+                            <td class="" headers="M{$headersM[$k]} D{$headersD[$k]} H{$k}">?<span class="sr-only">{__('Generic', 'Unknown')}</span></td>
                         {/if}
 
                     {/foreach}
@@ -348,4 +352,4 @@
             </div>
         </div>
     {/if}
-{/if}
+{/if}
\ No newline at end of file

From 8216bcbaa665a563470ac7fd5126e35033a20bc4 Mon Sep 17 00:00:00 2001
From: ecmu <ecmu@free.fr>
Date: Sun, 13 Mar 2016 16:20:38 +0100
Subject: [PATCH 3/7] #51 : make empty vote different from 'No'

---
 app/classes/Framadate/Repositories/VoteRepository.php | 2 +-
 tpl/part/vote_table_classic.tpl                       | 5 ++++-
 tpl/part/vote_table_date.tpl                          | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/classes/Framadate/Repositories/VoteRepository.php b/app/classes/Framadate/Repositories/VoteRepository.php
index 9008c5a..efd7b36 100644
--- a/app/classes/Framadate/Repositories/VoteRepository.php
+++ b/app/classes/Framadate/Repositories/VoteRepository.php
@@ -18,7 +18,7 @@ class VoteRepository extends AbstractRepository {
     }
 
     function insertDefault($poll_id, $insert_position) {
-        $prepared = $this->prepare('UPDATE `' . Utils::table('vote') . '` SET choices = CONCAT(SUBSTRING(choices, 1, ?), "0", SUBSTRING(choices, ?)) WHERE poll_id = ?');
+        $prepared = $this->prepare('UPDATE `' . Utils::table('vote') . '` SET choices = CONCAT(SUBSTRING(choices, 1, ?), " ", SUBSTRING(choices, ?)) WHERE poll_id = ?'); //#51 : default value for unselected vote
 
         return $prepared->execute([$insert_position, $insert_position + 1, $poll_id]);
     }
diff --git a/tpl/part/vote_table_classic.tpl b/tpl/part/vote_table_classic.tpl
index f2a6f2d..e5b9836 100644
--- a/tpl/part/vote_table_classic.tpl
+++ b/tpl/part/vote_table_classic.tpl
@@ -74,6 +74,9 @@
                                         <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=" " {if $choice!='2' && $choice!='1' && $choice!='0'}checked {/if}/>
+                                </li>
                             </ul>
                         </td>
                     {/foreach}
@@ -297,4 +300,4 @@
             </div>
         </div>
     {/if}
-{/if}
\ No newline at end of file
+{/if}
diff --git a/tpl/part/vote_table_date.tpl b/tpl/part/vote_table_date.tpl
index 0c3554c..ecfa39b 100644
--- a/tpl/part/vote_table_date.tpl
+++ b/tpl/part/vote_table_date.tpl
@@ -122,6 +122,9 @@
                                         <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-{$k}" name="choices[{$k}]" value=" " {if $choice!='2' && $choice!='1' && $choice!='0'}checked {/if}/>
+                                </li>
                             </ul>
                         </td>
                     {/foreach}
@@ -352,4 +355,4 @@
             </div>
         </div>
     {/if}
-{/if}
\ No newline at end of file
+{/if}

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 4/7] #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 e5b9836..a9c0507 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 ecfa39b..0ef9f64 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}

From 8a3e74cadbe2ba429cd059da1930ea4079365c82 Mon Sep 17 00:00:00 2001
From: Olivier Perez <olivier@olivierperez.fr>
Date: Wed, 27 Apr 2016 00:59:20 +0200
Subject: [PATCH 5/7] Clean code

---
 tpl/part/vote_table_classic.tpl | 12 ++++++------
 tpl/part/vote_table_date.tpl    | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tpl/part/vote_table_classic.tpl b/tpl/part/vote_table_classic.tpl
index a9c0507..7c83e24 100644
--- a/tpl/part/vote_table_classic.tpl
+++ b/tpl/part/vote_table_classic.tpl
@@ -51,7 +51,7 @@
                         </div>
                     </td>
 
-                    {$id=0} {* #51 : Parcoure les slots/moments pour y inclure les nouveaux items sans vote }
+                    {$id=0}
                     {foreach $slots as $slot}
                       {foreach $slot->moments as $moment}
                         {$choice=$vote->choices[$id]}
@@ -77,7 +77,7 @@
                                         <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 *}
+                                <li style="display:none">
                                     <input type="radio" id="n-choice-{$id}" name="choices[{$id}]" value=" " {if $choice!='2' && $choice!='1' && $choice!='0'}checked {/if}/>
                                 </li>
                             </ul>
@@ -94,7 +94,7 @@
 
                     <th class="bg-info">{$vote->name|html}</th>
 
-                    {$id=0} {* #51 : Parcoure les slots/moments pour y inclure les nouveaux items sans vote }
+                    {$id=0}
                     {foreach $slots as $slot}
                       {foreach $slot->moments as $moment}
                         {$choice=$vote->choices[$id]}
@@ -105,8 +105,8 @@
                             <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} {* #51 : default value for unselected vote (new dates) *}
-                            <td class="" headers="C{$id}">?<span class="sr-only">{__('Generic', 'Unknown')}</span></td>
+                        {else}
+                            <td headers="C{$id}">?<span class="sr-only">{__('Generic', 'Unknown')}</span></td>
                         {/if}
 
                         {$id=$id + 1}
@@ -171,7 +171,7 @@
                                         <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 *}
+                                <li style="display:none">
                                   <input type="radio" id="n-choice-{$id}" name="choices[{$id}]" value=" " checked/>
                                 </li>
                             </ul>
diff --git a/tpl/part/vote_table_date.tpl b/tpl/part/vote_table_date.tpl
index 0ef9f64..4b44b0e 100644
--- a/tpl/part/vote_table_date.tpl
+++ b/tpl/part/vote_table_date.tpl
@@ -99,7 +99,7 @@
                         </div>
                     </td>
 
-                    {$k=0} {* #51 : Parcoure les slots/moments pour y inclure les nouveaux items sans vote }
+                    {$k=0}
                     {foreach $slots as $slot}
                       {foreach $slot->moments as $moment}
                         {$choice=$vote->choices[$k]}
@@ -125,7 +125,7 @@
                                         <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 *}
+                                <li style="display:none">
                                     <input type="radio" id="n-choice-{$k}" name="choices[{$k}]" value=" " {if $choice!='2' && $choice!='1' && $choice!='0'}checked {/if}/>
                                 </li>
                             </ul>
@@ -145,7 +145,7 @@
 
                     <th class="bg-info">{$vote->name|html}</th>
 
-                    {$k=0} {* #51 : Parcoure les slots/moments pour y inclure les nouveaux items sans vote }
+                    {$k=0}
                     {foreach $slots as $slot}
                       {foreach $slot->moments as $moment}
                         {$choice=$vote->choices[$k]}
@@ -156,8 +156,8 @@
                             <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} {* #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>
+                        {else}
+                            <td headers="M{$headersM[$k]} D{$headersD[$k]} H{$k}">?<span class="sr-only">{__('Generic', 'Unknown')}</span></td>
                         {/if}
 
                         {$k=$k + 1}
@@ -223,7 +223,7 @@
                                             <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 *}
+                                    <li style="display:none">
                                       <input type="radio" id="n-choice-{$i}" name="choices[{$i}]" value=" " checked/>
                                     </li>
                                 </ul>

From 11ff60a170d3314c04447bcc36824f4b5c29edab Mon Sep 17 00:00:00 2001
From: Olivier Perez <olivier@olivierperez.fr>
Date: Wed, 27 Apr 2016 01:01:23 +0200
Subject: [PATCH 6/7] Fix CHOICE_REGEX to allow space

---
 app/inc/constants.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/inc/constants.php b/app/inc/constants.php
index d82a95e..06128ac 100644
--- a/app/inc/constants.php
+++ b/app/inc/constants.php
@@ -22,7 +22,7 @@ const VERSION = '0.9';
 
 // Regex
 const POLL_REGEX = '/^[a-z0-9]+$/i';
-const CHOICE_REGEX = '/^[012]$/';
+const CHOICE_REGEX = '/^[ 012]$/';
 const BOOLEAN_REGEX = '/^(on|off|true|false|1|0)$/i';
 const BOOLEAN_TRUE_REGEX = '/^(on|true|1)$/i';
 const EDITABLE_CHOICE_REGEX = '/^[0-2]$/';

From 4fc2d1022e8de1411e91365b03e87c43e05aff8b Mon Sep 17 00:00:00 2001
From: Olivier Perez <olivier@olivierperez.fr>
Date: Wed, 27 Apr 2016 01:03:59 +0200
Subject: [PATCH 7/7] Use bg-info background instead of '?' for unanswered
 slots

---
 tpl/part/vote_table_classic.tpl | 2 +-
 tpl/part/vote_table_date.tpl    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tpl/part/vote_table_classic.tpl b/tpl/part/vote_table_classic.tpl
index 7c83e24..07ee275 100644
--- a/tpl/part/vote_table_classic.tpl
+++ b/tpl/part/vote_table_classic.tpl
@@ -106,7 +106,7 @@
                         {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}
-                            <td headers="C{$id}">?<span class="sr-only">{__('Generic', 'Unknown')}</span></td>
+                            <td class="bg-info" headers="C{$id}"><span class="sr-only">{__('Generic', 'Unknown')}</span></td>
                         {/if}
 
                         {$id=$id + 1}
diff --git a/tpl/part/vote_table_date.tpl b/tpl/part/vote_table_date.tpl
index 4b44b0e..41b233a 100644
--- a/tpl/part/vote_table_date.tpl
+++ b/tpl/part/vote_table_date.tpl
@@ -157,7 +157,7 @@
                         {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}
-                            <td headers="M{$headersM[$k]} D{$headersD[$k]} H{$k}">?<span class="sr-only">{__('Generic', 'Unknown')}</span></td>
+                            <td class="bg-info" headers="M{$headersM[$k]} D{$headersD[$k]} H{$k}"><span class="sr-only">{__('Generic', 'Unknown')}</span></td>
                         {/if}
 
                         {$k=$k + 1}