Changeset 43

Timestamp:

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

Author:

nanardon

Message:

• add map ballot feature

Location:

trunk

Files:

• lib/Vote/Controller/Admin.pm (modified) (1 diff)
• lib/Vote/Model/Vote.pm (modified) (2 diffs)
• root/static/vote.css (modified) (1 diff)
• root/templates/admin/default.tt (modified) (1 diff)

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)
         }
     );

trunk/root/static/vote.css

@@ -69 +69 @@
 
 #results {}
+
+#map_ballot {}
+
+#ballot_to_valid {}

trunk/root/templates/admin/default.tt

@@ -85 +85 @@
 [% ELSE %]
 
+[% INCLUDE 'includes/poll.tt' %]
+
+[% FOREACH untrusted = vote.vote_ballot_untrusted_values(voteid) %]
+[% IF loop.first %]
+<div id="map_ballot">
+<p>Remapper les valeurs des bulletins</p>
+<table border="1">
+<tr><th>Valeur saisie</th><th>Valeur à considérer</th></tr>
+[% END %]
+<tr>
+<td>[% untrusted | html %]</td>
+<td>
+    <form action="[% c.uri_for('/admin', voteid) %]" method="POST">
+    <input type="hidden" name="mapfrom" value="[% untrusted | html %]">
+    <select name="mapto">
+    [% FOREACH v = vote.vote_ballot_values(voteid) %]
+        [% NEXT IF v == untrusted %]
+        <option>[% v | html %]</options>
+    [% END %]
+    </select>
+    <input type="submit">
+    </form>
+</td>
+</tr>
+[% IF loop.last %]
+</table>
+</div>
+[% END %]
+[% END %]
+
 [% FOREACH bid = vote.list_vote_ballot_needvalid(voteid) %]
     [% IF loop.first %]
     <div id="ballot_to_valid">
-    <p>Bulletins à valider</p>
+    <p>Bulletins à valider:</p>
     <form action="[% c.uri_for(voteid) %]">
     <table border="1">