Changeset 218 for trunk/lib

Timestamp:

04/18/09 17:20:17 (15 years ago)

Author:

nanardon

Message:

• improve poll results view

Location:

trunk/lib/Vote

Files:

• Controller/Vote.pm (modified) (2 diffs)
• DB/Poll/Results.pm (modified) (3 diffs)

trunk/lib/Vote/Controller/Vote.pm

@@ -41 +41 @@
 }
 
-sub report: LocalRegex('^(\d+)/report.(\w+)$') {
+sub report: LocalRegex('^(\d+)/(results|report).(\w+)$') {
     my ($self, $c, $id, @sub) = @_;
-    ($c->stash->{voteid}, $c->stash->{format}) = @{ $c->req->snippets || [] };
+    my $doc;
+    ($c->stash->{voteid}, $doc, $c->stash->{format}) = @{ $c->req->snippets || [] };
     my $vote = $c->model('Vote');
     $c->stash->{template} = 'default.tt';
@@ -58 +59 @@
 
 
-    $c->stash->{template} = 'poll_report.tt';
+    $c->stash->{template} = "poll_$doc.tt";
     $c->stash->{latex} = 1;
 }

trunk/lib/Vote/DB/Poll/Results.pm

@@ -52 +52 @@
 sub voices_ballot_count {
     my ($self) = @_;
-    return $self->not_empty_ballot_count +
-        ($self->info('empty_ballot_has_voice')
-            ? $self->empty_ballot_count
-            : 0);
-}
-
+    return $self->info('empty_ballot_has_voice')
+            ? $self->valid_ballot_count
+            : $self->not_empty_ballot_count;
+}
+
+sub valid_ballot_count {
+    my ($self) = @_;
+
+    my $sth = $self->db->prepare_cached(
+        q{
+        select count(*) from ballot where poll = ?
+        and (invalid = 'f' or invalid is NULL)
+        }
+    );
+
+    $sth->execute($self->voteid);
+    my $res = $sth->fetchrow_hashref;
+    $sth->finish;
+    $res->{count}
+}
+
+sub invalid_ballot_count {
+    my ($self) = @_;
+
+    my $sth = $self->db->prepare_cached(
+        q{
+        select count(*) from ballot where poll = ?
+        and invalid = 't'
+        }
+    );
+
+    $sth->execute($self->voteid);
+    my $res = $sth->fetchrow_hashref;
+    $sth->finish;
+    $res->{count}
+}
 
 sub empty_ballot_count {
@@ -65 +95 @@
         q{
         select count(*) from ballot where poll = ?
-        and id not in (select id from ballot_item) and
-        (invalid = 'false' or invalid is null)
+        and id not in (select id from ballot_item)
+        and (invalid = 'false' or invalid is null)
         }
     );
@@ -82 +112 @@
         q{
         select count(*) from ballot where poll = ?
-        and id in (select id from ballot_item) and
-        (invalid = 'false' or invalid is null)
+        and id in (select id from ballot_item)
+        and (invalid = 'false' or invalid is null)
         }
     );