Changeset 17

Timestamp:

03/07/09 18:44:50 (15 years ago)

Author:

nanardon

Message:

• check count of selected items

Location:

trunk

Files:

• lib/Vote/Controller/Ballot.pm (modified) (2 diffs)
• root/templates/ballot/default.tt (modified) (4 diffs)

trunk/lib/Vote/Controller/Ballot.pm

@@ -59 +59 @@
     $c->stash->{choices} = { %choices };
     $c->stash->{sbal} = { map { $_ => 1 } $c->req->param('sbal') };
+    $c->stash->{fsbal} = [ map {
+        s/^\s+//;
+        s/\s+$//;
+        s/\s+/ /g;
+        $_
+    } ($c->req->param('fsbal')) ];
+
+    my @torecord = grep { $_ } (
+        (map { $choices{$_} } $c->req->param('sbal')),
+        @{ $c->stash->{fsbal} }
+    );
+    
+    warn $vote->vote_info($id)->{choice_count};
+    warn scalar(@torecord);
+    warn $_ foreach(@torecord);
+    if (scalar(@torecord) > $vote->vote_info($id)->{choice_count}) {
+        $c->req->param('ballot', '');
+        $c->stash->{vote_error} = 'Seulement ' .
+            $vote->vote_info($id)->{choice_count} . ' choix possible';
+        return;
+    }
 
     if ($c->req->param('confirm')) {
@@ -64 +85 @@
             $uid,
             $id,
-            [ grep { $_ } (
-              map { $choices{$_} } $c->req->param('sbal'),
-              $c->req->param('fsbal'),
-            ) ],
+            [ @torecord ],
             $c->req->address,
         ); # TODO trap error

trunk/root/templates/ballot/default.tt

@@ -1 +1 @@
 [% vote = c.model('Vote') %]
 
-[% INLCUDE 'includes/poll.tt' %]
+[% thisvote = vote.vote_info(voteid) %]
+
+[% INCLUDE 'includes/poll.tt' %]
 
 [% IF c.req.param('ballot') %]
@@ -13 +15 @@
 [% FOREACH ch = c.req.param('fsbal') %]
 [% ch | html %]<br>
-<input type="hidden" name="sbal" value="[% ch %]">
+<input type="hidden" name="fsbal" value="[% ch %]">
 [% END %]
 <input type="submit" name="confirm">
@@ -20 +22 @@
 
 [% ELSE %]
+
+[% IF vote_error %][% vote_error %][% END %]
 
 <form action="[% c.uri_for(voteid) %]">
@@ -30 +34 @@
 [% count = 0 %]
 [% WHILE count < thisvote.free_choice %]
-<input type="text" name="fsbal" value="[% c.req.param('fsbal').count %]"><br>
+<input type="text" name="fsbal" value="[% fsbal.$count %]"><br>
 [% count = count + 1 %]
 [% END %]