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 @@ - {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]} + + + {$id=$id + 1} + {/foreach} {/foreach} + {elseif !$hidden} {* Voted line *} @@ -87,8 +94,10 @@ {$vote->name|html} - {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'} {__('Generic', 'Yes')} @@ -96,10 +105,12 @@ (){__('Generic', 'Ifneedbe')} {elseif $choice=='0'} {__('Generic', 'No')} - {else} + {else} {* #51 : default value for unselected vote (new dates) *} ?{__('Generic', 'Unknown')} {/if} + {$id=$id + 1} + {/foreach} {/foreach} {if $active && !$expired && @@ -155,11 +166,14 @@
  • - +
  • +
  • {* #51 : default value for unselected vote *} + +
  • {/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 @@ - {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]} + + + {$k=$k + 1} + {/foreach} {/foreach} + @@ -138,8 +145,10 @@ {$vote->name|html} - {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'} {__('Generic', 'Yes')} @@ -147,10 +156,12 @@ (){__('Generic', 'Ifneedbe')} {elseif $choice=='0'} {__('Generic', 'No')} - {else} + {else} {* #51 : default value for unselected vote (new dates) *} ?{__('Generic', 'Unknown')} {/if} + {$k=$k + 1} + {/foreach} {/foreach} {if $active && !$expired && @@ -207,11 +218,14 @@
  • - +
  • +
  • {* #51 : default value for unselected vote *} + +
  • {$i = $i+1}