Changeset 165

Timestamp:

04/06/09 02:13:06 (15 years ago)

Author:

nanardon

Message:

• add Vote::DB::Choice object

Location:

trunk

Files:

• MANIFEST (modified) (1 diff)
• lib/Vote/DB.pm (modified) (2 diffs)
• lib/Vote/DB/Choice.pm (added)
• lib/Vote/DB/Poll.pm (modified) (3 diffs)
• root/templates/includes/ballot_form.tt (modified) (1 diff)

trunk/MANIFEST

@@ -27 +27 @@
 lib/Vote/DB/Voting.pm
 lib/Vote/DB/Ballot.pm
+lib/Vote/DB/Choice.pm
 lib/Vote/Model/Vote.pm
 lib/Vote/Template/Plugin/Mail.pm

trunk/lib/Vote/DB.pm

@@ -11 +11 @@
 use Vote::DB::Ballot; # see ballot()
 use Vote::DB::Voting; # see delete_voting()
+use Vote::DB::Choice;
 
 =head1 NAME
@@ -146 +147 @@
 }
 
-# Choice sub class ??
-
 sub choice_info {
     my ($self, $chid) = @_;
-    my $sth = $self->db->prepare_cached(
-        q{select * from choice where key = ?}
-    );
-    $sth->execute($chid);
-    my $res = $sth->fetchrow_hashref;
-    $sth->finish;
-    $res
-}
-
-sub modify_choice {
-    my ($self, $chid, $label) = @_;
-
-    my $sth = $self->db->prepare_cached(
-        q{update choice set label = ? where key = ?}
-    );
-    $sth->execute($label, $chid);
+    Vote::DB::Choice->new($self->{dbstring}, $chid)->info;
 }
 

trunk/lib/Vote/DB/Poll.pm

@@ -10 +10 @@
 use Vote::DB::Ballot;
 use Vote::DB::Voting;
+use Vote::DB::Choice;
 
 =head1 NAME
@@ -212 +213 @@
 }
 
+sub choice {
+    my ($self, $chid) = @_;
+    
+    my $sth = $self->db->prepare_cached(
+        q{
+        select key from choice where poll = ? and key = ?
+        }
+    );
+    $sth->execute($self->voteid, $chid);
+    my $res = $sth->fetchrow_hashref;
+    $sth->finish;
+    return $res ? Vote::DB::Choice->new($self->{dbstring}, $chid) : undef;
+}
+
 sub choices {
     my ($self) = @_;
@@ -242 +257 @@
 
     1
+}
+
+sub delete_choice {
+    my ($self, $chid) = @_;
+
+    my $sth = $self->db->prepare_cached(
+        q{delete from choice where key = ?}
+    );
+
+    $sth->execute($chid);
 }
 

trunk/root/templates/includes/ballot_form.tt

@@ -4 +4 @@
 
 <!-- $Id$ -->
-[% FOREACH choice = poll.choices() %]
-[% key = vote.choice_info(choice).key %]
+[% FOREACH key = poll.choices() %]
+[% choice = poll.choice(key) %]
 <input type="checkbox" name="sbal" value="[% key %]"[% " checked" IF sbal.$key %]>
-[% vote.choice_info(choice).label | html %]<br>
+[% choice.info.label | html %]<br>
 [% END %]