Changeset 42

Timestamp:

03/16/09 18:57:18 (15 years ago)

Author:

nanardon

Message:

• html and perl fixes

Location:

trunk

Files:

• lib/Vote/Controller/Admin.pm (modified) (1 diff)
• lib/Vote/Model/Vote.pm (modified) (5 diffs)
• root/templates/admin/default.tt (modified) (3 diffs)
• root/templates/ballot/closed.tt (modified) (1 diff)

trunk/lib/Vote/Controller/Admin.pm

@@ -65 +65 @@
                 and $vote->db->commit;
         } elsif ($c->req->param('mail')) {
-            $vote->addupd_voting($id, $c->req->param('id'), $c->req->param('mail'))
+            $vote->addupd_voting($id, $c->req->param('mail'), $c->req->param('id'))
                 and $vote->db->commit;
         } elsif($c->req->param('mailpasswd')) {

trunk/lib/Vote/Model/Vote.pm

@@ -458 +458 @@
         q{
         select count(*) from ballot where poll = ?
-        and id in (select id from ballot_item) and invalid = 'false'
+        and id in (select id from ballot_item) and
+        (invalid = 'false' or invalid is null)
         }
     );
@@ -486 +487 @@
 
     $vinfo->{password} or return;
-    warn $vinfo->{password};
     if (crypt($passwd, $vinfo->{password} || '') eq $vinfo->{password}) {
         return 1;
@@ -537 +537 @@
     my $sth = $self->db->prepare(
         q{
-        select count(ballot.id), value from ballot join ballot_item
-        on ballot.id = ballot_item.id where ballot.poll = ? and invalid = 'false'
-        group by value
+        select count(ballot.id), coalesce(corrected, value) as value
+        from ballot join ballot_item
+        on ballot.id = ballot_item.id where ballot.poll = ? and
+        (invalid = 'false' or invalid is null)
+        group by coalesce(corrected, value)
         order by count desc
         }
@@ -622 +624 @@
 }
 
+sub vote_ballot_untrusted_values {
+    my ($self, $voteid) = @_;
+
+    my $getval = $self->db->prepare_cached(
+        q{
+        select value from ballot join ballot_item
+        on ballot.id = ballot_item.id
+        where poll = ? and fromlist = false
+        group by value order by value
+        }
+    );
+    $getval->execute($voteid);
+    my @vals;
+    while (my $res = $getval->fetchrow_hashref) {
+        push(@vals, $res->{value});
+    }
+    @vals
+}
+
+sub vote_ballot_values {
+    my ($self, $voteid) = @_;
+
+    my $getval = $self->db->prepare_cached(
+        q{
+        select value from ballot join ballot_item
+        on ballot.id = ballot_item.id
+        where poll = ?
+        group by value order by value
+        }
+    );
+    $getval->execute($voteid);
+    my @vals;
+    while (my $res = $getval->fetchrow_hashref) {
+        push(@vals, $res->{value});
+    }
+    @vals
+}
+
+sub vote_map_value {
+    my ($self, $voteid, $from, $to) = @_;
+
+    my $sth = $self->db->prepare_cached(
+        q{
+        update ballot_item set corrected = ? where
+        id in (select id from ballot where poll = ?)
+        and value = ?
+        }
+    );
+
+    $sth->execute($to, $voteid, $from) or $self->db->rollback;
+    $self->db->commit;
+}
+
 sub addupd_voting {
     my ($self, $voteid, $mail, $id) = @_;
@@ -631 +686 @@
     );
 
-    if ($upd->execute($mail, $voteid, $id) == 0) {
+    if ($upd->execute($id, $mail, $voteid) == 0) {
         my $add = $self->db->prepare_cached(q{
             insert into voting (poll, label, mail) values (?,?,?)

trunk/root/templates/admin/default.tt

@@ -87 +87 @@
 [% FOREACH bid = vote.list_vote_ballot_needvalid(voteid) %]
     [% IF loop.first %]
+    <div id="ballot_to_valid">
+    <p>Bulletins à valider</p>
     <form action="[% c.uri_for(voteid) %]">
     <table border="1">
@@ -93 +95 @@
 <td>[% bid %]</td>
 <td>
-[% FOREACH item = [ vote.ballot_items(bid) ] %]
-[% item.v %]<br>
+[% FOREACH item = vote.ballot_items(bid) %]
+[% loop.count %]- [% item.v %]<br>
 [% END %]
 </td>
@@ -106 +108 @@
     <input type="submit">
     </form>
+    </div>
     [% END %]
 [% END %]

trunk/root/templates/ballot/closed.tt

@@ -1 @@
-Ce vote est clos.
+[% INCLUDE 'includes/poll.tt' %]
+
+[% vote = c.model('Vote') %]
+
+<div id="ballot">
+[% IF vote.vote_status(voteid) == 'BEFORE' %]
+Ce Vote n'est pas encore ouvert
+[% ELSIF vote.vote_status(voteid) == 'AFTER' %]
+Ce vote est terminé, les résultats sont disponibles
+<a href="[% c.uri_for('/vote', voteid) %]">ici</a>.
+[% END %]
+</div>