Changeset 193

Timestamp:

04/14/09 18:19:40 (15 years ago)

Author:

nanardon

Message:

• add new objects for poll results

Location:

trunk

Files:

• MANIFEST (modified) (1 diff)
• lib/Vote/DB.pm (modified) (4 diffs)
• lib/Vote/DB/Poll (added)
• lib/Vote/DB/Poll.pm (modified) (2 diffs)
• lib/Vote/DB/Poll/Results.pm (added)
• root/latex/poll_report.tt (modified) (2 diffs)
• root/templates/includes/poll_results.tt (modified) (1 diff)

trunk/MANIFEST

@@ -25 +25 @@
 lib/Vote/DB/common.pm
 lib/Vote/DB/Poll.pm
+lib/Vote/DB/Poll/Results.pm
 lib/Vote/DB/Voting.pm
 lib/Vote/DB/Ballot.pm

trunk/lib/Vote/DB.pm

@@ -8 +8 @@
 use base 'Vote::DB::common';
 use Vote::DB::Poll;
+use Vote::DB::Poll::Results;
 use Vote::DB::Ballot; # see ballot()
 use Vote::DB::Voting; # see delete_voting()
@@ -93 +94 @@
 }
 
+sub results {
+    my ($self, $pollid) = @_;
+    Vote::DB::Poll::Results->new($self->{dbstring}, $pollid);
+}
+
 sub ballot {
     my ($self, $ballotid) = @_;
@@ -194 +200 @@
 sub vote_ballot_count_nonull {
     my ($self, $voteid) = @_;
-    $self->poll($voteid)->ballot_count_nonull;
+    $self->results($voteid)->ballot_count_nonull;
 }
 
@@ -217 +223 @@
 sub vote_results_count {
     my ($self, $voteid) = @_;
-    $self->poll($voteid)->results_count;
+    $self->results($voteid)->results_count;
 }
 
 sub vote_results_nonull {
     my ($self, $voteid) = @_;
-    $self->poll($voteid)->results_nonull;
+    $self->results($voteid)->results_nonull;
 }
 

trunk/lib/Vote/DB/Poll.pm

@@ -527 +527 @@
 }
 
-sub ballot_count_nonull {
-    my ($self) = @_;
-
-    my $sth = $self->db->prepare_cached(
-        q{
-        select count(*) from ballot where poll = ?
-        and id in (select id from ballot_item) and
-        (invalid = 'false' or invalid is null)
-        }
-    );
-
-    $sth->execute($self->voteid);
-    my $res = $sth->fetchrow_hashref;
-    $sth->finish;
-    $res->{count}
-}
-
 sub voting_info_id {
     my ($self, $mail) = @_;
@@ -601 +584 @@
 
     return 1;
-}
-
-sub results_count {
-    my ($self) = @_;
-
-    my $sth = $self->db->prepare(
-        q{
-        select count(ballot.id), value from 
-        (select ballot.id, coalesce(corrected, value) as "value" from ballot left join ballot_item
-        on ballot.id = ballot_item.id where ballot.poll = ? and (invalid = 'false'or invalid is null)
-        group by ballot.id, coalesce(corrected, value)) as ballot
-        group by value
-        order by count desc, value
-        }
-    );
-    $sth->execute($self->voteid);
-    my @results;
-    while (my $res = $sth->fetchrow_hashref) {
-        push(@results, $res);
-    }
-    @results;
-}
-
-sub results_nonull {
-    my ($self) = @_;
-
-    my $sth = $self->db->prepare(
-        q{
-        select count(ballot.id), value from 
-        (select 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 ballot.id, coalesce(corrected, value)) as ballot
-        group by value
-        order by count desc, value
-        }
-    );
-    $sth->execute($self->voteid);
-    my @results;
-    while (my $res = $sth->fetchrow_hashref) {
-        push(@results, $res);
-    }
-    \@results;
 }
 

trunk/root/latex/poll_report.tt

@@ -1 +1 @@
 [% USE Mail %]
-[%- poll = c.model('Vote').poll(voteid) %]
+[%- poll = c.model('Vote').results(voteid) %]
 
 \maketitle
@@ -54 +54 @@
 
 [%- IF loop.count <= poll.info.choice_count -%]
-[%- IF res.count >= poll.ballot_count_nonull / 2 + 1 -%]
+[%- IF res.count >= poll.absolute_majority -%]
 [%- comment = 'majorité absolue' -%]
 [%- ELSE -%]

trunk/root/templates/includes/poll_results.tt

@@ -43 +43 @@
 [% mycount = loop.count %]
 [% IF loop.count <= vote.vote_info(voteid).choice_count %]
-[% IF res.count >= vote.ballot_count_nonull(voteid) / 2 + 1 %]
+[% IF res.count >= vote.absolute_majority %]
 [% class = 'majabs' %]
 [% ELSE %]