diff --git a/studs.php b/studs.php
index 6cef3eecd505ce9683aa15cd0c415bfa24520214..addce34780a0aed09a3c443ea1c9d92f477536f0 100644
--- a/studs.php
+++ b/studs.php
@@ -50,6 +50,8 @@ $resultPubliclyVisible = true;
$slots = [];
$votes = [];
$comments = [];
+$selectedNewVotes = [];
+
/* Services */
/*----------*/
@@ -180,6 +182,7 @@ if ($accessGranted) {
}
} catch (AlreadyExistsException $aee) {
$message = new Message('danger', __('Error', 'You already voted'));
+ $selectedNewVotes = $choices;
} catch (ConcurrentEditionException $cee) {
$message = new Message('danger', __('Error', 'Poll has been updated before you vote'));
} catch (ConcurrentVoteException $cve) {
@@ -237,5 +240,6 @@ $smarty->assign('accessGranted', $accessGranted);
$smarty->assign('resultPubliclyVisible', $resultPubliclyVisible);
$smarty->assign('editedVoteUniqueId', $editedVoteUniqueId);
$smarty->assign('ValueMax', $poll->ValueMax);
+$smarty->assign('selectedNewVotes', $selectedNewVotes);
$smarty->display('studs.tpl');
diff --git a/tpl/part/vote_table_classic.tpl b/tpl/part/vote_table_classic.tpl
index 97d3c33d1f17098b8cb1d3320c5668ad3256f4b3..ba473d3020fc74c178e1c9f02fae626bcfafabb5 100644
--- a/tpl/part/vote_table_classic.tpl
+++ b/tpl/part/vote_table_classic.tpl
@@ -180,26 +180,34 @@
<ul class="list-unstyled choice">
{if $poll->ValueMax eq NULL || $best_choices['y'][$i] lt $poll->ValueMax}
<li class="yes">
- <input type="radio" id="y-choice-{$id}" name="choices[{$id}]" value="2" />
+ <input type="radio" id="y-choice-{$id}" name="choices[{$id}]" value="2"
+ {(!isset($selectedNewVotes[$id]) || ("2" !== $selectedNewVotes[$id])) ? "" : " checked=\"checked\""}
+ />
<label class="btn btn-default btn-xs" for="y-choice-{$id}" title="{__('Poll results', 'Vote yes for')|html} {$slot->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" />
+ <input type="radio" id="i-choice-{$id}" name="choices[{$id}]" value="1"
+ {(!isset($selectedNewVotes[$id]) || ("1" !== $selectedNewVotes[$id])) ? "" : " checked=\"checked\""}
+ />
<label class="btn btn-default btn-xs" for="i-choice-{$id}" title="{__('Poll results', 'Vote ifneedbe for')|html} {$slot->title|html}">
(<i class="glyphicon glyphicon-ok"></i>)<span class="sr-only">{__('Generic', 'Ifneedbe')}</span>
</label>
</li>
{/if}
<li class="no">
- <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}">
+ <input type="radio" id="n-choice-{$id}" name="choices[{$id}]" value="0"
+ {(!isset($selectedNewVotes[$id]) || ("0" !== $selectedNewVotes[$id])) ? "" : " checked=\"checked\""}
+ />
+ <label class="btn btn-default btn-xs {(!isset($selectedNewVotes[$id]) || ("0" !== $selectedNewVotes[$id])) ? "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 class="hide">
- <input type="radio" id="n-choice-{$id}" name="choices[{$id}]" value=" " checked/>
+ <input type="radio" id="n-choice-{$id}" name="choices[{$id}]" value=" "
+ {(isset($selectedNewVotes[$id]) || ("" !== $selectedNewVotes[$id])) ? "" : " checked=\"checked\""}
+ />
</li>
</ul>
</td>
diff --git a/tpl/part/vote_table_date.tpl b/tpl/part/vote_table_date.tpl
index ddfdeedb6ca40b79169ce922d8a1a38e3f0a1ac4..cb35ff83f009d63e45ea283dbd6c913c7952efb0 100644
--- a/tpl/part/vote_table_date.tpl
+++ b/tpl/part/vote_table_date.tpl
@@ -238,40 +238,43 @@
{foreach $slots as $slot}
{foreach $slot->moments as $moment}
-
-
<td class="bg-info" headers="M{$headersM[$i]} D{$headersD[$i]} H{$headersH[$i]}">
<ul class="list-unstyled choice">
{if $poll->ValueMax eq NULL || $best_choices['y'][$i] lt $poll->ValueMax}
<li class="yes">
- <input type="radio" id="y-choice-{$i}" name="choices[{$i}]" value="2" />
+ <input type="radio" id="y-choice-{$i}" name="choices[{$i}]" value="2"
+ {(!isset($selectedNewVotes[$i]) || ("2" !== $selectedNewVotes[$i])) ? "" : " checked=\"checked\""}
+ />
<label class="btn btn-default btn-xs" for="y-choice-{$i}" title="{__('Poll results', 'Vote yes for')|html} {$slot->day|date_format:$date_format.txt_short|html} - {$moment|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-{$i}" name="choices[{$i}]" value="1" />
+ <input type="radio" id="i-choice-{$i}" name="choices[{$i}]" value="1"
+ {(!isset($selectedNewVotes[$i]) || ("1" !== $selectedNewVotes[$i])) ? "" : " checked=\"checked\""}
+ />
<label class="btn btn-default btn-xs" for="i-choice-{$i}" title="{__('Poll results', 'Vote ifneedbe for')|html} {$slot->day|date_format:$date_format.txt_short|html} - {$moment|html}">
(<i class="glyphicon glyphicon-ok"></i>)<span class="sr-only">{__('Generic', 'Ifneedbe')}</span>
</label>
</li>
-
- {/if}
+ {/if}
<li class="no">
- <input type="radio" id="n-choice-{$i}" name="choices[{$i}]" value="0" />
+ <input type="radio" id="n-choice-{$i}" name="choices[{$i}]" value="0"
+ {(!isset($selectedNewVotes[$i]) || ("0" !== $selectedNewVotes[$i])) ? "" : " checked=\"checked\""}
+ />
<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 class="hide">
- <input type="radio" id="n-choice-{$i}" name="choices[{$i}]" value=" " checked/>
+ <input type="radio" id="n-choice-{$i}" name="choices[{$i}]" value=" "
+ {(isset($selectedNewVotes[$i]) || ("" !== $selectedNewVotes[$i])) ? "" : " checked=\"checked\""}
+ />
</li>
</ul>
</td>
-
-
{$i = $i+1}
{/foreach}
{/foreach}