Changeset 217 for trunk/root/latex/poll_report.tt

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

File:

• trunk/root/latex/poll_report.tt (modified) (3 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