Changeset 217 for trunk/root

Timestamp:

04/18/09 04:57:22 (15 years ago)

Author:

nanardon

Message:

• make difference between settings and their raw value
• simplify template
• allow to have a different number of elected people than choice in ballot

Location:

trunk/root

Files:

• latex/poll_report.tt (modified) (3 diffs)
• templates/admin/ballot.tt (modified) (1 diff)
• templates/admin/includes/poll_settings.tt (modified) (1 diff)
• templates/includes/poll_results.tt (modified) (2 diffs)

trunk/root/latex/poll_report.tt

@@ -8 +8 @@
 \section{Description du vote}
 
-[%- poll.info.description -%]
+[%- poll.info('description') -%]
 
 
-[% poll.info.choice_count %] choix étaient à retenir.
+[% poll.info('choice_count') %] choix étaient à retenir.
 
 Etait candidats:
@@ -49 +49 @@
 [%- IF poll.ballot_count_nonull -%]
 [%- FOREACH res = poll.results -%]
-[%- IF res.count != loop.prev.count && loop.count > 0 -%]
-[%- mycount = loop.count -%]
-[%- END -%]
 
-[%- IF loop.count <= poll.info.choice_count -%]
-[%- IF res.count >= poll.absolute_majority -%]
-[%- comment = 'majorité absolue' -%]
+[% IF res.elected %]
+[% IF res.abs_maj %]
+[%- comment = 'Elu, majorité absolue' -%]
 [%- ELSE -%]
 [%- comment = 'Elu' -%]
@@ -70 +67 @@
 \hline
 [% END %]
-[% mycount %]& [% res.value %]& [% res.count %]& [% res.count * 100 / poll.ballot_count_nonull | format('%.2f') %]& [% comment %]\\
+[% res.order %]& [% res.value %]& [% res.count %]& [% res.count * 100 / poll.ballot_count_nonull | format('%.2f') %]& [% comment %]\\
 \hline
 

trunk/root/templates/admin/ballot.tt

@@ -4 +4 @@
 [% poll = c.model('Vote').poll(voteid) %]
 
-<div style="float: left; width: 35%" class="box">
-<form action="[% c.uri_for(voteid, 'ballot') %]">
-Nombre de choix possible:
-<input type="text" name="choice_count" value="[% c.req.param('choice_count') || poll.info('choice_count') | html %]">
-<br>
-Nombre de choix libres:
-<input type="text" name="free_choice" value="[% c.req.param('free_choice') || poll.info('free_choice') || 0 | html %]">
-<br>
+<div style="float: left; width: 55%" class="box">
+<form action="[% c.uri_for(voteid, 'ballot') %]" method="POST">
+<table border=1>
+<tr>
+<td>Nombre de choix possible:</td>
+<td><input type="text" size="3" name="choice_count" value="[% c.req.param('choice_count') || poll.info('choice_count') | html %]"></td>
+</tr>
+
+<tr>
+<td>Nombre d'élu(s)<br>(si différent du nombre de choix)</td>
+<td><input type="text" size="3" name="elected_count" value="[% c.req.param('elected_count') || poll.raw_info('elected_count') | html %]"></td>
+</tr>
+
+<tr>
+<td>Nombre de choix libres:</td>
+<td><input type="text" size="3" name="free_choice" value="[% c.req.param('free_choice') || poll.info('free_choice') || 0 | html %]"></td>
+</tr>
+
+</table>
 <input type="submit" name="pollparam" value="Enregistrer">
 </form>

trunk/root/templates/admin/includes/poll_settings.tt

@@ -36 +36 @@
 </form>
 </div>
+
+<!-- Crypt settings -->
 <div class="box" style="float:right; width: 35%">
 [% IF poll.is_crypted %]

trunk/root/templates/includes/poll_results.tt

@@ -39 +39 @@
 [% END %]
 
-[% IF res.count != loop.prev.count && loop.count > 0 %]
-    [% # If equality, we keep same color, even we are over resullts %]
-[% mycount = loop.count %]
-[% IF loop.count <= poll.info('choice_count') %]
-[% IF res.count >= poll.absolute_majority %]
+[% IF res.elected %]
+[% IF res.abs_maj %]
 [% class = 'majabs' %]
 [% ELSE %]
@@ -51 +48 @@
 [% class = 'notselected' %]
 [% END %]
-[% END %]
 <tr class="[% class %]">
-<td>[% mycount %]</td>
+<td>[% res.order %]</td>
 <td>[% loop.count %]</td>
 <td>[% res.value | html %]</td>