Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

merging the same days in the poll table

  • Loading branch information...
commit dae348d84294f028dc22bcf1fdad097f5f046356 1 parent 3df87e0
@romaindeveaud romaindeveaud authored
View
1  TODO.markdown
@@ -27,7 +27,6 @@ Features that would be nice
RdvZ evolution
==============
-* merging identical dates when showing the poll table.
* installer : set default values on user input.
* bugfixes.
* deployment procedures improvement.
View
6 apps/frontend/modules/meeting/templates/showSuccess.php
@@ -57,10 +57,14 @@
<!-- La ligne qui affiche les jours... -->
<td class="poll_empty"></td>
<?php foreach($dates as $m => $days): ?>
+ <?php $displayed_days = array() ?>
+ <?php $days_values = array_count_values($days->getRawValue()) ?>
<?php foreach($days as $d): ?>
- <td colspan="1" class="poll_td">
+ <?php if(in_array($d, $displayed_days)) continue ?>
+ <td colspan="<?php echo $days_values[$d] ?>" class="poll_td">
<?php echo $d ?>
</td>
+ <?php $displayed_days[] = $d ?>
<?php endforeach; ?>
<?php endforeach; ?>
</tr>
View
2  lib/model/doctrine/meeting.class.php
@@ -80,7 +80,7 @@ public function processShow($user_culture)
{
// Little trick : if there is no vote associated to this date, it means that
// the owner of the meeting probably added it afterwards.
- // We have to handle it and create 'fake' votes wich are blanks and penalized.
+ // We have to handle it and create 'fake' votes which are blanks and penalized.
// To do this, we retrieve all the users who already voted for this meeting
// and add them this 'fake' vote.
Please sign in to comment.
Something went wrong with that request. Please try again.