Changeset 61 for trunk

Timestamp:

03/17/09 19:11:33 (15 years ago)

Author:

nanardon

Message:

• improve admin page

Location:

trunk

Files:

• lib/Vote/Controller/Admin.pm (modified) (1 diff)
• lib/Vote/Model/Vote.pm (modified) (1 diff)
• root/static/js (added)
• root/static/js/CalendarPopup.js (added)
• root/templates/admin/default.tt (modified) (5 diffs)
• root/templates/includes/header.tt (modified) (1 diff)

trunk/lib/Vote/Controller/Admin.pm

@@ -70 +70 @@
                 and $vote->db->commit;
         } elsif ($c->req->param('label')) {
+            if ($c->req->param('dstart')) {
+                $c->req->param('start',
+                    $c->req->param('dstart') . ' ' . ($c->req->param('hstart') || '')
+                );
+            }
+            if ($c->req->param('dend')) {
+                $c->req->param('end',
+                    $c->req->param('dend') . ' ' . ($c->req->param('hend') || '')
+                );
+            }
             $vote->vote_param(
                 $id,

trunk/lib/Vote/Model/Vote.pm

@@ -165 +165 @@
     my $sth = $self->db->prepare_cached(
         q{
-        select * from poll where id = ?
+        select *,
+        to_char("start", 'DD/MM/YYYY') as dstart,
+        to_char("start", 'HH24:MI:SS') as hstart,
+        to_char("end", 'DD/MM/YYYY') as dend,
+        to_char("end", 'HH24:MI:SS') as hend
+        from poll where id = ?
         }
     );

trunk/root/templates/admin/default.tt

@@ +1 @@
+<DIV ID="testdiv1" STYLE="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;"></DIV>
+
 [% vote = c.model('Vote') %]
 
@@ -18 +20 @@
 <!-- http://www.mattkruse.com/javascript/calendarpopup/ -->
 <i>Les dates sont au format AAAA-MM-JJ HH:MM:SS</i><br>
-Debut du vote:
-<input type="text" name="start" value="[% c.req.param('start') || thisvote.start | html %]">
+
+<SCRIPT LANGUAGE="JavaScript" ID="js13">
+var cal13 = new CalendarPopup();
+</SCRIPT>
+
+Debut du vote:<br>
+Date: <input type="text" name="dstart" value="[% c.req.param('dstart') || thisvote.dstart | html %]">
+<A HREF="#" onClick="cal13.select(document.forms[0].dstart,'anchor13','dd/MM/yyyy'); return false;" TITLE="cal13.select(document.forms[0].dstart,'anchor13','dd/MM/yyyy'); return false;" NAME="anchor13" ID="anchor13">select</A>
+Heure: <input type="text" name="hstart" value="[% c.req.param('hstart') || thisvote.hstart | html %]">
 <br>
-Fin du vote:
-<input type="text" name="end" value="[% c.req.param('end') || thisvote.end | html %]">
+Fin du vote:<br>
+Date: <input type="text" name="dend" value="[% c.req.param('dend') || thisvote.dend | html %]">
+<A HREF="#" onClick="cal13.select(document.forms[0].dend,'anchor14','dd/MM/yyyy',(document.forms[0].dend.value=='')?document.forms[0].dstart.value:null); return false;" TITLE="cal13.select(document.forms[0].dend,'anchor14','dd/MM/yyyy',(document.forms[0].dend.value=='')?document.forms[0].dstart.value:null); return false;" NAME="anchor14" ID="anchor14">select</A>
+Heure: <input type="text" name="hend" value="[% c.req.param('hend') || thisvote.hend | html %]">
 <br>
 <br>
@@ -77 +88 @@
 </td>
 <td valign="TOP">
+<p>Ajouter un votant</p>
 <form action="[% c.uri_for(voteid) %]">
 Nom: <input type="text" name="id"><br>
@@ -83 +95 @@
 </form>
 <hr>
+<p>Soumettre la liste via un fichier csv</p>
+<p>Format: <i>Nom;Mail@domain</i></p>
 <form method="POST" ENCTYPE="multipart/form-data" action="[% c.uri_for(voteid) %]">
 <input type="file" name="votinglist"><br>
@@ -89 +103 @@
 </form>
 <hr>
+<p>Envoyer les mots de passes au nouveaux votants</p>
 <form action="[% c.uri_for(voteid) %]">
 <input type="submit" name="mailpasswd" value="Envoyer les mot de passe">

trunk/root/templates/includes/header.tt

@@ -6 +6 @@
 <link rel="stylesheet" href="[% c.uri_for('/static', 'vote.css') %]" type="text/css">
 <link rel="icon" href="[%- c.uri_for('/static', 'images', 'favicon.ico') -%]" type="image/x-icon">
+
+<script language="JavaScript" src="[% c.uri_for('/static', 'js', 'CalendarPopup.js') %]"></SCRIPT>
 
 </head>