Changeset 43 for trunk/lib

Timestamp:

03/16/09 23:01:09 (15 years ago)

Author:

nanardon

Message:

• add map ballot feature

Location:

trunk/lib/Vote

Files:

• Controller/Admin.pm (modified) (1 diff)
• Model/Vote.pm (modified) (2 diffs)

trunk/lib/Vote/Controller/Admin.pm

@@ -71 +71 @@
         }
     } elsif ($vote->vote_status($id) eq 'AFTER') {
+        if ($c->req->param('mapfrom') && $c->req->param('mapto')) {
+            $vote->vote_map_value(
+                $id,
+                $c->req->param('mapfrom'),
+                $c->req->param('mapto'),
+            );
+        }
         foreach my $bid ($vote->list_vote_ballot_needvalid($id)) {
             if (!$c->req->param($bid)) {

trunk/lib/Vote/Model/Vote.pm

@@ -631 +631 @@
         select value from ballot join ballot_item
         on ballot.id = ballot_item.id
-        where poll = ? and fromlist = false
+        where poll = ? and fromlist = false and corrected is null
         group by value order by value
         }
@@ -648 +648 @@
     my $getval = $self->db->prepare_cached(
         q{
-        select value from ballot join ballot_item
+        select coalesce(corrected, value) as value from ballot join ballot_item
         on ballot.id = ballot_item.id
         where poll = ?
-        group by value order by value
+        group by coalesce(corrected, value) order by coalesce(corrected, value)
         }
     );