Changeset 205

Timestamp:

04/15/09 18:47:31 (15 years ago)

Author:

nanardon

Message:

• cleanup code

Location:

trunk

Files:

• lib/Vote/Controller/Admin.pm (modified) (2 diffs)
• lib/Vote/Controller/Ballot.pm (modified) (1 diff)
• lib/Vote/DB.pm (modified) (2 diffs)
• lib/Vote/DB/Poll.pm (modified) (1 diff)
• root/templates/admin/includes/poll_settings.tt (modified) (1 diff)
• root/templates/admin/voting.tt (modified) (4 diffs)
• root/templates/ballot/closed.tt (modified) (1 diff)

trunk/lib/Vote/Controller/Admin.pm

@@ -39 +39 @@
     my $vote = $c->model('Vote');
     my $poll = $c->model('Vote')->poll($id);
-    for ($vote->vote_status($id) || '') {
+    for ($poll->status || '') {
     /^BEFORE$/ and do {
         if ($c->req->param('addch')) {
@@ -72 +72 @@
                 next;
             }
-            $vote->vote_param(
-                $id,
+            $poll->param(
                 map { $_ => ($c->req->param($_) || undef) }
                 grep { exists($c->req->params->{$_}) }

trunk/lib/Vote/Controller/Ballot.pm

@@ -38 +38 @@
     $c->stash->{voteid} = $id;
 
-    if ($c->model('Vote')->vote_status($id) ne 'RUNNING') {
+    if ($c->model('Vote')->poll($id)->status ne 'RUNNING') {
         $c->stash->{template} = 'ballot/closed.tt';
         return;

trunk/lib/Vote/DB.pm

@@ -106 +106 @@
 }
 
+# TODO
 sub vote_param {
     my ($self, $voteid, %attr) = @_;
-    warn "# vote_param";
+    die "# vote_param" . join(' ',caller());
     $self->poll($voteid)->param(%attr);
 }
 
+# TODO kill this
 sub vote_status {
     my ($self, $id) = @_;
-    warn "# vote_status";
+    die "# vote_status" . join(' ',caller());
     $self->poll($id)->status;
 }
@@ -216 +218 @@
 sub voting_has_sign {
     my ($self, $poll, $user) = @_;
-    warn $user;
     $self->poll($poll)->voting_has_sign($user);
 }

trunk/lib/Vote/DB/Poll.pm

@@ -605 +605 @@
 sub voting_has_sign {
     my ($self, $user) = @_;
-    warn $user;
     $self->voting_from_mail($user)->has_sign;
 }

trunk/root/templates/admin/includes/poll_settings.tt

@@ -4 +4 @@
 <DIV ID="testdiv1" STYLE="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;"></DIV>
 
-[% IF vote.vote_status(voteid) == 'BEFORE' %]
+[% IF poll.status == 'BEFORE' %]
 <div class="box" style="float: left; width: 55%;">
 <form action="[% c.uri_for(voteid) %]" method="POST">

trunk/root/templates/admin/voting.tt

@@ -1 +1 @@
 [% vote = c.model('Vote') %]
+[% poll = c.model('Vote').poll(voteid) %]
 
 [% INCLUDE 'includes/admin_menu.tt' %]
 
-[% IF vote.vote_status(voteid) != 'AFTER' %]
+[% IF poll.status() != 'AFTER' %]
 <div style="float: left; width: 30%;" class="box">
 <p>Ajouter un votant</p>
@@ -16 +17 @@
 <form method="POST" ENCTYPE="multipart/form-data" action="[% c.uri_for(voteid, 'voting') %]">
 <input type="file" name="votinglist"><br>
-[% IF vote.vote_status(voteid) == 'BEFORE' %]
+[% IF poll.status == 'BEFORE' %]
 <input type="checkbox" name="delete">Effacer la liste des votants<br>
 [% END %]
@@ -48 +49 @@
 
 [% IF NOT voting.date %]
-[% IF vote.vote_status(voteid) != 'AFTER' %]
+[% IF poll.status != 'AFTER' %]
 <form action="[% c.uri_for(voteid, 'voting') %]" method="POST">
 <input type="hidden" name="delvoting" value="[% voting.vkey %]">
@@ -59 +60 @@
 [% IF NOT voting.date %]
 <td>
-[% IF vote.vote_status(voteid) != 'AFTER' %]
+[% IF poll.status != 'AFTER' %]
 <input type="submit" name="delete" value="delete">
 [% END %]

trunk/root/templates/ballot/closed.tt

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