Changeset 162 for trunk/root

Timestamp:

04/06/09 00:22:17 (15 years ago)

Author:

nanardon

Message:

• get back voting list during vote, but hide who has already voted

Location:

trunk/root/templates

Files:

• includes/signing_list.tt (modified) (2 diffs)
• vote/default.tt (modified) (2 diffs)

trunk/root/templates/includes/signing_list.tt

@@ -1 +1 @@
 [% USE Mail %]
 
-[% vote = c.model('Vote') %]
+[% poll = c.model('Vote').poll(voteid) %]
+[% poll_status = poll.status %]
 
-[% FOREACH id = vote.vote_voting(voteid) %]
-[% voting = vote.voting_info(id) %]
+[% FOREACH id = poll.voting_keys() %]
+[% voting = poll.voting(id).info %]
 [% IF loop.first %]
 <div id="voting_list" class="box">
 <p>Liste des votants:</p>
 <table border="1">
-<tr><th>Numéro</th><th>Electeur</th><th>Emargement</th></tr>
+<tr><th>Numéro</th><th>Electeur</th>
+[% IF poll_status != 'RUNNING' %]<th>Emargement</th>[% END %]
+</tr>
 [% END %]
 <tr>
@@ -17 +20 @@
     [% "&lt;" IF voting.label %][% voting.mail | mail | html %][% "&gt;" IF voting.label %]
 </td>
-<td>[% "A voté" IF voting.date %]</td>
+[% IF poll_status != 'RUNNING' %]<td>[% "A voté" IF voting.date %]</td>[% END %]
 </tr>
 [% IF loop.last %]

trunk/root/templates/vote/default.tt

@@ -2 +2 @@
 
 [% vote = c.model('Vote') %]
+[% poll = c.model('Vote').poll(voteid) %]
 
 [% INCLUDE 'includes/poll.tt' %]
 
-[% SWITCH vote.vote_status(voteid) %]
+[% SWITCH poll.status() %]
+
 [% CASE 'RUNNING' %]
 [% INCLUDE 'includes/poll_running.tt' %]
+[% INCLUDE 'includes/signing_list.tt' %]
+
 [% CASE 'BEFORE' %]
 <div class="page_box">
@@ -13 +17 @@
 </div>
 [% INCLUDE 'includes/signing_list.tt' %]
+
 [% CASE 'AFTER' %]
 [% INCLUDE 'includes/poll_results.tt' %]
 [% INCLUDE 'includes/signing_list.tt' %]
+
 [% END %]
 
-