Changeset 217 for trunk/lib

Timestamp:

04/18/09 04:57:22 (15 years ago)

Author:

nanardon

Message:

• make difference between settings and their raw value
• simplify template
• allow to have a different number of elected people than choice in ballot

Location:

trunk/lib/Vote

Files:

• Controller/Admin.pm (modified) (1 diff)
• DB/Poll.pm (modified) (5 diffs)
• DB/Poll/Results.pm (modified) (2 diffs)

trunk/lib/Vote/Controller/Admin.pm

@@ -74 +74 @@
                 map { $_ => ($c->req->param($_) || undef) }
                 grep { exists($c->req->params->{$_}) }
-                qw(label description start end choice_count free_choice)
+                qw(label description start end choice_count free_choice elected_count)
             ) and $poll->commit;
         } elsif ($c->req->param('encrypted')) {

trunk/lib/Vote/DB/Poll.pm

@@ -128 +128 @@
 }
 
-sub info {
+sub raw_info {
     my ($self, $var) = @_;
-
-    my $default = {
-        free_choice => 0, # avoid undef in some case
-    };
 
     if ($var) {
@@ -145 +141 @@
             my $res = $sth->fetchrow_hashref;
             $sth->finish;
-            return defined($res->{val})
-                ? $res->{val}
-                : $default->{$var};
+            return $res->{val}
         }
     }
@@ -159 +153 @@
             $res->{$set->{var}} = $set->{val};
         }
+        return $res
+    }
+    return;
+}
+
+sub info {
+    my ($self, $var) = @_;
+
+    my $default = {
+        free_choice => 0, # avoid undef in some case
+        elected_count => $self->raw_info('choice_count'),
+    };
+
+    if ($var) {
+        my $val = $self->raw_info($var);
+        return defined($val)
+            ? $val
+            : $default->{$var};
+    } elsif (my $res = $self->raw_info) {
         foreach (keys %$default) {
             $res->{$_} = $default->{$_} if (!defined($res->{$_}));
@@ -164 +177 @@
         return $res
     }
+    return;
 }
 
@@ -169 +183 @@
     my ($self, $var, $val) = @_;
 
+    $val = undef if(defined($val) && $val eq '');
     my $upd = $self->db->prepare_cached(
         q{update settings set val = ? where poll = ? and var = ?}

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

@@ -135 +135 @@
     my @results;
     my $abs_maj = $self->absolute_majority;
-    my $wanted_count = $self->info('choice_count');
+    my $wanted_count = $self->info('elected_count');
     my $voice_count = $self->voices_ballot_count;
     while (my $res = $sth->fetchrow_hashref) {
@@ -147 +147 @@
                 if($res->{count} == $results[-1]->{count});
         }
+        if (scalar(@results)) {
+            $res->{order} = ($res->{count} == $results[-1]->{count}
+                ? $results[-1]->{order}
+                : scalar(@results) + 1);
+        } else { $res->{order} = 1 }
         $res->{voices_percent} = $res->{count} / $voice_count * 100
             if($voice_count); # avoid divide by 0