Changeset 207 for trunk/root

Timestamp:

04/16/09 02:33:03 (15 years ago)

Author:

nanardon

Message:

• cleanup old functions and switch everything to new objects

Location:

trunk/root

Files:

• latex/poll_report.tt (modified) (2 diffs)
• templates/admin/ballot.tt (modified) (2 diffs)
• templates/admin/includes/ballot_validation.tt (modified) (4 diffs)
• templates/admin/index.tt (modified) (1 diff)
• templates/admin/voting.tt (modified) (3 diffs)
• templates/default.tt (modified) (1 diff)
• templates/includes/ballot_form.tt (modified) (2 diffs)
• templates/includes/poll_results.tt (modified) (8 diffs)

trunk/root/latex/poll_report.tt

@@ -94 +94 @@
 \subsection{Liste des bulletins}
 
-[% FOREACH id = poll.list_ballot %]
-[% invalid = '#' _ vote.ballot_info(id).invalid %]
+[% FOREACH id = poll.ballot_keys %]
+[%- ballot = poll.ballot(id) -%]
+[% invalid = '#' _ ballot.info.invalid %]
 [% IF loop.first %]
 \begin{enumerate}
@@ -101 +102 @@
 \item \verb+[% id %]+ [% "\textbf{invalidé}" IF invalid == '#1' %] 
 
-[%- ballot = poll.ballot(id) -%]
 [%- FOREACH item = ballot.items -%]
 [% '\begin{enumerate}' IF loop.first %]

trunk/root/templates/admin/ballot.tt

@@ -3 +3 @@
 [% vote = c.model('Vote') %]
 [% poll = c.model('Vote').poll(voteid) %]
-[% thisvote = poll.info %]
 
 <div style="float: left; width: 35%" class="box">
 <form action="[% c.uri_for(voteid, 'ballot') %]">
 Nombre de choix possible:
-<input type="text" name="choice_count" value="[% c.req.param('choice_count') || thisvote.choice_count | html %]">
+<input type="text" name="choice_count" value="[% c.req.param('choice_count') || poll.info('choice_count') | html %]">
 <br>
 Nombre de choix libres:
-<input type="text" name="free_choice" value="[% c.req.param('free_choice') || thisvote.free_choice || 0 | html %]">
+<input type="text" name="free_choice" value="[% c.req.param('free_choice') || poll.info('free_choice') || 0 | html %]">
 <br>
 <input type="submit" name="pollparam" value="Enregistrer">
@@ -18 +17 @@
 <hr>
 
-[% IF ! vote.vote_choices(voteid).size %]
+[% IF ! poll.choices_keys.size %]
 <p class="alert">Aucun choix configuré</p>
 [% ELSE %]
-[% FOREACH choice = vote.vote_choices(voteid) %]
+[% FOREACH choicek = poll.choices_keys %]
+[% choice = poll.choice(choicek) %]
 <form action="[% c.uri_for(voteid, 'ballot') %]" method="POST">
-[% loop.count %] - [% vote.choice_info(choice).label | html %]
-<input type="hidden" name="delch" value="[% vote.choice_info(choice).key %]">
+[% loop.count %] - [% choice.info.label | html %]
+<input type="hidden" name="delch" value="[% choicek %]">
 <input type="submit" name="del" value="Effacer">
 </form>

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

@@ -3 +3 @@
 
 [% IF poll.status == 'AFTER' %]
-[% FOREACH untrusted = vote.vote_ballot_untrusted_values(voteid) %]
+[% FOREACH untrusted = poll.ballot_untrusted_values %]
 [% IF loop.first %]
 <div id="map_ballot">
@@ -16 +16 @@
     <input type="hidden" name="mapfrom" value="[% untrusted | html %]">
     <select name="mapto">
-    [% FOREACH v = vote.vote_ballot_values(voteid) %]
+    [% FOREACH v = poll.ballot_values %]
         [% NEXT IF v == untrusted %]
         <option>[% v | html %]</options>
@@ -31 +31 @@
 [% END %]
 
-[% FOREACH bid = vote.list_vote_ballot_needvalid(voteid) %]
+[% FOREACH bid = poll.list_ballot_needvalid(voteid) %]
     [% IF loop.first %]
     <div id="ballot_to_valid">
@@ -41 +41 @@
 <td>[% bid %]</td>
 <td>
-[% FOREACH item = vote.ballot_items(bid) %]
+[% FOREACH item = poll.ballot(bid).items %]
 [% loop.count %]- [% item.v %]<br>
 [% END %]

trunk/root/templates/admin/index.tt

@@ -1 +1 @@
 [% vote = c.model('Vote') %]
-[% poll = c.model('Vote').poll('voteid') %]
+[% poll = c.model('Vote').poll(voteid) %]
 
 [% FOREACH voteid = c.model('Vote').list_comming_vote %]
-<a href="[% c.uri_for('/admin', voteid) %]">[% c.model('Vote').poll('voteid').info('label') | html %]</a>
+<a href="[% c.uri_for('/admin', voteid) %]">[% poll.info('label') | html %]</a>
 <br>
 [% END %]

trunk/root/templates/admin/voting.tt

@@ -33 +33 @@
 <div class="box" style="float: right; width: 60%;">
 
-[% IF NOT vote.vote_voting_count(voteid) %]
+[% IF NOT poll.voting_count %]
 <p class="alert">Aucun votant inscrit</p>
 [% ELSE %]
 
-[% signing = vote.vote_voting(voteid) %]
-
-[% FOREACH thisvoting = signing %]
+[% FOREACH votingkey = poll.voting_keys %]
+[% voting = poll.voting(votingkey) %]
 
 [% IF loop.first %]
@@ -45 +44 @@
 [% END %]
 
-[% voting = vote.voting_info(thisvoting) %]
 <tr>
 
-[% IF NOT voting.date %]
+[% IF NOT voting.info.date %]
 [% IF poll.status != 'AFTER' %]
 <form action="[% c.uri_for(voteid, 'voting') %]" method="POST">
-<input type="hidden" name="delvoting" value="[% voting.vkey %]">
+<input type="hidden" name="delvoting" value="[% voting.votingkey %]">
 [% END %]
 [% END %]
 
-<td>[% voting.label | html %] [% voting.mail | html %]</td>
-<td>[% IF voting.passwd %]<i>(pass envoyé)</i>[% END %]</td>
+<td>[% voting.label | html %] [% voting.info.mail | html %]</td>
+<td>[% IF voting.info.passwd %]<i>(pass envoyé)</i>[% END %]</td>
 
-[% IF NOT voting.date %]
+[% IF NOT voting.info.date %]
 <td>
 [% IF poll.status != 'AFTER' %]
@@ -66 +64 @@
 </form>
 [% ELSE %]
-<td>[% voting.date %]</td>
+<td>[% voting.info.date %]</td>
 [% END %]
 

trunk/root/templates/default.tt

@@ -47 +47 @@
 [% END %]
 <tr>
-<td><lu><li><a href="[% c.uri_for( 'vote', id ) %]">[% c.model('Vote').poll(id).info('label') | html %]</a></lu></td></td>
+<td><lu><li><a href="[% c.uri_for( 'vote', id ) %]">[% c.model('Vote').poll(id).info('label') | html %]</a></lu></td>
 </tr>
 [% IF loop.last %]

trunk/root/templates/includes/ballot_form.tt

@@ -1 +1 @@
 [% poll = c.model('Vote').poll(voteid) %]
-[% thisvote = poll.info() %]
 
 <!-- $Id$ -->
@@ -10 +9 @@
 
 [% count = 0 %]
-[% WHILE count < thisvote.free_choice %]
+[% WHILE count < poll.info('free_choice') %]
 <input type="text" name="fsbal" value="[% fsbal.$count %]"><br>
 [% count = count + 1 %]

trunk/root/templates/includes/poll_results.tt

@@ -1 +1 @@
 [% vote = c.model('Vote') %]
-[% poll = c.model('Vote').poll(voteid) %]
+[% poll = c.model('Vote').results(voteid) %]
 
 [% IF poll.can_show_result %]
@@ -8 +8 @@
 <a href="[% c.uri_for('/vote', voteid, 'report.pdf') %]">Rapport en PDF</a>
 </div>
-[% IF vote.list_vote_ballot_needvalid(voteid).size %]
+[% IF poll.list_ballot_needvalid.size %]
 <p>Resultats provisoires:</p>
 <p class="alert">Le gestionnaire doit vérifier la validité de certains bulletins</p>
@@ -15 +15 @@
 [% END %]
 <p>Nombre de choix à retenir: [% poll.info('choice_count') %]</p>
-<p>Participations: [% vote.vote_signing_count(voteid) %] / [% vote.vote_voting_count(voteid) %]
-[% IF vote.vote_voting_count(voteid) %]
-([% vote.vote_signing_count(voteid) * 100 / vote.vote_voting_count(voteid) | format('%.2f') %])
+<p>Participations: [% poll.signing_count %] / [% poll.voting_count %]
+[% IF poll.voting_count %]
+([% poll.signing_count * 100 / poll.voting_count(voteid) | format('%.2f') %])
 [% END %]</p>
-<p>Nombre de vote(s) exprimé(s): [% vote.vote_ballot_count_nonull(voteid) %]
-[% IF vote.vote_ballot_count(voteid) %]
-([% vote.vote_ballot_count_nonull(voteid) * 100 / vote.vote_ballot_count(voteid) | format('%.2f') %]%)
+<p>Nombre de vote(s) exprimé(s): [% poll.ballot_count_nonull %]
+[% IF poll.ballot_count(voteid) %]
+([% poll.ballot_count_nonull * 100 / poll.ballot_count | format('%.2f') %]%)
 [% END %]
 </p>
 
-[% IF vote.vote_ballot_count_nonull(voteid) %]
-[% FOREACH res = vote.vote_results_nonull(voteid) %]
+[% IF poll.ballot_count_nonull %]
+[% FOREACH res = poll.results_nonull %]
 [% IF loop.first %]
 <p>Score:</p>
@@ -43 +43 @@
 [% mycount = loop.count %]
 [% IF loop.count <= poll.info('choice_count') %]
-[% IF res.count >= vote.absolute_majority %]
+[% IF res.count >= poll.absolute_majority %]
 [% class = 'majabs' %]
 [% ELSE %]
@@ -57 +57 @@
 <td>[% res.value | html %]</td>
 <td>[% res.count %]</td>
-<td>[% res.count * 100 / vote.ballot_count_nonull(voteid) | format('%.2f') %]</td>
+<td>[% res.count * 100 / poll.ballot_count_nonull | 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>
+height="10px" width="[% res.count * 400 / poll.ballot_count_nonull(voteid) | format('%d') %]px"></td>
 </tr>
 
@@ -71 +71 @@
 </div>
 
-[% FOREACH id = vote.list_vote_ballot(voteid) %]
+[% FOREACH id = poll.ballot_keys %]
 [% IF loop.first %]
 <div id="ballot_list" class="box">
@@ -87 +87 @@
 <td>[% id | html %]</td>
 <td>
-[% items = vote.ballot_items(id) %]
+[% items = poll.ballot(id).items %]
 [% IF items.size %]
 [% FOREACH item = items %]
@@ -101 +101 @@
 </td>
 <td>
-[% invalid = '#' _ vote.ballot_info(id).invalid %]
+[% invalid = '#' _ poll.ballot(id).info.invalid %]
 [% IF invalid == '#1' %]
 <span class="alert">Invalidé</span>