Also expose voter's Session ID

[selectricity-live] / app / models / selectricity_service.rb

diff --git a/app/models/selectricity_service.rb b/app/models/selectricity_service.rb
index 9e276ef502e89b0a41acde7c7f9ef25412cb3342..add8154ed31df51b025f99d2c33234cd7b7dea80 100644 (file)
--- a/app/models/selectricity_service.rb
+++ b/app/models/selectricity_service.rb
@@ -7,10 +7,10 @@ class SelectricityService < ActionWebService::Base
     if election
       candidates=election.candidates.collect { |c| c.id }
       vote_list[0].each do |vote|
-        raise ArgumentError.new "Invalid Candidate ID #{vote}" unless candidates.index(vote)
+        raise ArgumentError.new("Invalid Candidate ID #{vote}") unless candidates.index(vote)
       end
-      raise ArgumentError.new "You must rank all candidates" unless candidates.length <= vote_list[0].length
-      raise ArgumentError.new "Please rank each candidate only once" if vote_list[0].uniq!
+      raise ArgumentError.new("You must rank all candidates") unless candidates.length <= vote_list[0].length
+      raise ArgumentError.new("Please rank each candidate only once") if vote_list[0].uniq!
       voter = QuickVoter.new
       voter.election = election
       voter.ipaddress = "XMLRPC Request"
@@ -22,7 +22,7 @@ class SelectricityService < ActionWebService::Base
       voter.vote.confirm!
       voter.save!
     else
-      raise ArgumentError.new "Cannot find election #{election_name}"
+      raise ArgumentError.new("Cannot find election #{election_name}")
     end
   end
   def quickvote_candidate_ids_to_names(shortname, id_list)
@@ -80,20 +80,20 @@ class SelectricityService < ActionWebService::Base
       return result
     end
     qv.votes.each  do |vote|
-      votes << VoteInfo.new(:voter_id => vote.voter.id, :voter_ipaddress => vote.voter.ipaddress, :vote_time => vote.time.to_i, :vote => vote.votes)
+      votes << VoteInfo.new(:voter_id => vote.voter.id, :voter_ipaddress => vote.voter.ipaddress, :vote_time => vote.time.to_i, :vote => vote.votes, :voter_session_id => vote.voter.session_id )
     end
     return votes
   end
   def list_quickvotes()
     all=Array.new
-    QuickVote.find_all.each do |election|
+    QuickVote.find(:all).each do |election|
       all << get_quickvote(election.name)
     end
     return all
   end
   def get_quickvote(shortname)
     return ElectionStruct.new unless election=QuickVote.ident_to_quickvote(shortname)
-    return ElectionStruct.new (:id => election.id, :name => election.name, :description => election.description, :candidate_ids => election.candidates.collect {|c| c.id }, :candidate_names => election.candidates.collect {|c| c.name } )
+    return ElectionStruct.new(:id => election.id, :name => election.name, :description => election.description, :candidate_ids => election.candidates.collect {|c| c.id }, :candidate_names => election.candidates.collect {|c| c.name } )
   end
   def create_quickvote(election)
     qv=QuickVote.new(:name => election.name, :description => election.description)