Changeset 79

Timestamp:

03/19/09 03:12:46 (15 years ago)

Author:

nanardon

Message:

• improve results page

Location:

trunk/root

Files:

• static/vote.css (modified) (3 diffs)
• templates/includes/poll.tt (modified) (1 diff)
• templates/includes/poll_results.tt (modified) (3 diffs)
• templates/includes/signing_list.tt (modified) (1 diff)

trunk/root/static/vote.css

@@ -5 +5 @@
 
 td {
+    padding: 4px;
+}
+
+tr {
+    vertical-align: top;
     padding: 4px;
 }
@@ -20 +25 @@
         color:#3344FF;
         font-weight:bold;
+}
+
+ul {
+    margin: 0px;
 }
 
@@ -51 +60 @@
     padding: 5px;
     /* background-color: red; */
+}
+
+div.box {
+    border-style: outset;
+    border-width: 5px;
+    padding: 1em;
+}
+
+.majabs {
+    background-color: #FF9933;
+}
+
+.selected {
+    background-color: #FF9999;
+}
+
+.notselected {
 }
 

trunk/root/templates/includes/poll.tt

@@ -2 +2 @@
 [% thisvote = vote.vote_info(voteid) %]
 
-<div id="poll_summary">
+<div id="poll_summary" class="box">
 <p id="poll_label">[% thisvote.label | html %]</p>
 <p>[% thisvote.description | html %]</p>

trunk/root/templates/includes/poll_results.tt

@@ -1 +1 @@
 [% vote = c.model('Vote') %]
 
-<div id="results">
+<div id="results" class="box">
+[% IF vote.list_vote_ballot_needvalid(voteid).size %]
+<p>Resultats provisoires:</p>
+<p class="alert">Le gestionnaire doit vérifier la validité de certains bulletins</p>
+[% ELSE %]
 <p>Resultats:</p>
+[% END %]
+<p>Nombre de choix à retenir: [% vote.vote_info(voteid).choice_count %]</p>
 <p>Participations: [% vote.vote_signing_count(voteid) %] / [% vote.vote_voting_count(voteid) %]
 [% IF vote.vote_voting_count(voteid) %]
@@ -16 +22 @@
 [% FOREACH res = vote.vote_results_nonull(voteid) %]
 [% IF loop.first %]
+<p>Score:</p>
+<table border="1"><tr>
+<th>Légende:</th>
+<td class="majabs">Majorité Absolue</td>
+<td class="selected">Elus</td>
+<td class="notselected">Non élu</td>
+</tr></table><br>
 <table border="1">
-<tr><th>choix</th><th>Nb voix</th><th>%</th><th></th></tr>
+<tr><th>Score</th><th>choix</th><th>Nb voix</th><th>%</th><th></th></tr>
 [% END %]
+
+[% IF res.count != loop.prev.count && loop.count > 0 %]
+    [% # If equality, we keep same color, even we are over resullts %]
+[% mycount = loop.count %]
 [% IF loop.count <= vote.vote_info(voteid).choice_count %]
-[% IF res.count * 100 / vote.ballot_count_nonull(voteid) > 50 %]
-[% color = ' bgcolor="#FF9933"' %]
+[% IF res.count > vote.ballot_count_nonull(voteid) / 2 + 1 %]
+[% class = 'majabs' %]
 [% ELSE %]
-[% color = ' bgcolor="#FF9999"' %]
+[% class = 'selected' %]
 [% END %]
 [% ELSE %]
-[% color = '' %]
+[% class = 'notselected' %]
 [% END %]
-<tr>
-<td[% color %]>[% res.value | html %]</td>
-<td[% color %]>[% res.count %]</td>
-<td[% color %]>[% res.count * 100 / vote.ballot_count_nonull(voteid) | format('%.2f') %]</td>
-<td[% color %]><img src="[% c.uri_for('/static', 'images', 'green-v.png') %]" 
+[% END %]
+<tr class="[% class %]">
+<td>[% mycount %]</td>
+<td>[% res.value | html %]</td>
+<td>[% res.count %]</td>
+<td>[% res.count * 100 / vote.ballot_count_nonull(voteid) | format('%.2f') %]</td>
+<td><img src="[% c.uri_for('/static', 'images', 'green-v.png') %]" 
 height="10px" width="[% res.count * 400 / vote.ballot_count_nonull(voteid) | format('%d') %]px"></td>
 </tr>
+
 [% IF loop.last %]
 </table>
@@ -46 +66 @@
 [% FOREACH id = vote.list_vote_ballot(voteid) %]
 [% IF loop.first %]
-<div id="ballot_list">
+<div id="ballot_list" class="box">
 <p>Liste des bulletins:</p>
 <table border="1">

trunk/root/templates/includes/signing_list.tt

@@ -4 +4 @@
 [% voting = vote.voting_info(id) %]
 [% IF loop.first %]
-<div id="voting_list">
+<div id="voting_list" class="box">
 <p>Liste des votants:</p>
 <table border="1">
-<tr><th>Votant</th><th>Date du vote</th></tr>
+<tr><th>Numéro</th><th>Votant</th><th>Date du vote</th></tr>
 [% END %]
 <tr>
+<td>[% loop.count %]</td>
 <td>[% voting.label | html %] [% voting.mail | html %]</td>
 <td>[% voting.date %]</td>