Author: humbedooh
Date: Sun Mar 22 22:30:40 2015
New Revision: 1668498
URL: http://svn.apache.org/r1668498
Log:
also display how many votes were cast in total
Modified:
steve/trunk/pysteve/www/cgi-bin/rest_admin.py
steve/trunk/pysteve/www/htdocs/js/steve_rest.js
Modified: steve/trunk/pysteve/www/cgi-bin/rest_admin.py
URL:
http://svn.apache.org/viewvc/steve/trunk/pysteve/www/cgi-bin/rest_admin.py?rev=1668498&r1=1668497&r2=1668498&view=diff
==============================================================================
--- steve/trunk/pysteve/www/cgi-bin/rest_admin.py (original)
+++ steve/trunk/pysteve/www/cgi-bin/rest_admin.py Sun Mar 22 22:30:40 2015
@@ -501,10 +501,10 @@ else:
if issuedata['type'].startswith("stv"):
numseats = int(issuedata['type'][3])
winners, winnernames, debug =
election.stv(issuedata['candidates'], votes, numseats)
- response.respond(200, {'winners': winners,
'winnernames': winnernames, 'debug': debug})
+ response.respond(200, {'votes': len(votes),
'winners': winners, 'winnernames': winnernames, 'debug': debug})
elif issuedata['type'] == "yna":
yes, no, abstain = election.yna(votes)
- response.respond(200, {'yes': yes, 'no': no,
'abstain': abstain})
+ response.respond(200, {'votes': len(votes), 'yes':
yes, 'no': no, 'abstain': abstain})
else:
response.respond(500, {'message': "Unknown vote
type"})
elif not votes:
Modified: steve/trunk/pysteve/www/htdocs/js/steve_rest.js
URL:
http://svn.apache.org/viewvc/steve/trunk/pysteve/www/htdocs/js/steve_rest.js?rev=1668498&r1=1668497&r2=1668498&view=diff
==============================================================================
--- steve/trunk/pysteve/www/htdocs/js/steve_rest.js (original)
+++ steve/trunk/pysteve/www/htdocs/js/steve_rest.js Sun Mar 22 22:30:40 2015
@@ -138,7 +138,7 @@ function displayTally(code, response, is
var obj = document.getElementById('tally_' + issue)
if (obj) {
if (response.winners) {
- obj.innerHTML = "<ol>"
+ obj.innerHTML = "<i>(" + response.votes + " votes
cast)</i>\n<ol>"
for (i in response.winners) {
var winner = response.winners[i]
var winnerName = response.winnernames[i]
@@ -146,7 +146,8 @@ function displayTally(code, response, is
}
obj.innerHTML += "</ol>"
} else if (response.yes && response.yes != undefined) {
- obj.innerHTML = "<b>Yes: </b>" + response.yes + "\n"
+ obj.innerHTML = "<i>(" + response.votes + " votes
cast)</i>\n\n"
+ obj.innerHTML += "<b>Yes: </b>" + response.yes +
"\n"
obj.innerHTML += "<b>No: </b>" + response.no + "\n"
obj.innerHTML += "<b>Abstain: </b>" + response.abstain
+ "\n"
} else {
