Changeset 221 for trunk

Timestamp:

04/20/09 03:24:26 (15 years ago)

Author:

nanardon

Message:

• add a select build from voting list on ballot

Location:

trunk

Files:

• lib/Vote/Controller/Admin.pm (modified) (1 diff)
• lib/Vote/Controller/Ballot.pm (modified) (1 diff)
• root/templates/admin/ballot.tt (modified) (1 diff)
• root/templates/ballot/default.tt (modified) (1 diff)
• root/templates/includes/ballot_form.tt (modified) (2 diffs)

trunk/lib/Vote/Controller/Admin.pm

@@ -74 +74 @@
                 map { $_ => ($c->req->param($_) || undef) }
                 grep { exists($c->req->params->{$_}) }
-                qw(label description start end choice_count free_choice elected_count)
+                qw(label description start end choice_count free_choice elected_count elected_choice)
             ) and $poll->commit;
         } elsif ($c->req->param('encrypted')) {

trunk/lib/Vote/Controller/Ballot.pm

@@ -84 +84 @@
         lc($_)
     } ($c->req->param('fsbal')) ];
+    $c->stash->{esbal} = [ grep { $_ } $c->req->param('esbal') ];
+
     $c->request->parameters->{fsbal} = $c->stash->{fsbal};
 
     my @sbalval = grep { $_ } map { lc($choices{$_} || '') } $c->req->param('sbal');
 
-    my @ballot = grep { $_ } (@sbalval, @{$c->stash->{fsbal} || []});
+    my @ballot = grep { $_ } (
+        @sbalval,
+        @{$c->stash->{fsbal} || []},
+        @{$c->stash->{esbal} || []},
+    );
     if (scalar(@ballot) > $poll->info('choice_count')) {
         $c->req->parameters->{'ballot'} = '';

trunk/root/templates/admin/ballot.tt

@@ -20 +20 @@
 <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>
+
+<tr>
+<td>Nombre de choix à partir de la liste des électeurs:</td>
+<td><input type="text" size="3" name="elected_choice" value="[% c.req.param('elected_choice') || poll.info('elected_choice') || 0 | html %]"></td>
 </tr>
 

trunk/root/templates/ballot/default.tt

@@ -24 +24 @@
 <input type="hidden" name="fsbal" value="[% ch %]">
 [% END %]
-[% IF ! c.req.param('fsbal').size && ! c.req.param('sbal').size %]
+[% FOREACH ch = c.req.param('esbal') %]
+[% ch | html %]<br>
+<input type="hidden" name="esbal" value="[% ch %]">
+[% END %]
+[% IF ! c.req.param('fsbal').size && ! c.req.param('sbal').size && ! c.req.param('esbal').size %]
 <i>Vote blanc</i><br>
 [% END %]

trunk/root/templates/includes/ballot_form.tt

@@ -3 +3 @@
 <!-- $Id$ -->
 [% FOREACH key = poll.choices() %]
+[% "<p>Candidats:</p>" IF loop.first %]
 [% choice = poll.choice(key) %]
 <input type="checkbox" name="sbal" value="[% key %]"[% " checked" IF sbal.$key %]>
@@ -10 +11 @@
 [% count = 0 %]
 [% WHILE count < (poll.info('elected_choice') || 0) %]
+[% "<p>Depuis la liste électorale</p>" IF count == 0 %]
 [% FOREACH vkey = poll.voting_keys %]
 [% voting = poll.voting(vkey) %]
 [% '<select name="esbal"><option value=""></option>' IF loop.first %]
-<option value="[% voting.info.id || voting.info.mail | html %]">
-    [% voting.info.id || voting.info.mail | html %]
+<option value="[% voting.info.label || voting.info.mail | html %]"
+    [% " selected" IF esbal.$count == (voting.info.label || voting.info.mail) %]>
+    [% voting.info.label || voting.info.mail | html %]
 </option>
 [% '</select>' IF loop.last %]