list_quickvotes XMLRPC returns candidate ID's instead of names

[selectricity] / app / models / selectricity_service.rb

diff --git a/app/models/selectricity_service.rb b/app/models/selectricity_service.rb
index 86458e09f6d6e84d928e62d5c9f2bcd5a2fbc160..e13037535bf04b37e290244feff0c21b597ee458 100644 (file)
--- a/app/models/selectricity_service.rb
+++ b/app/models/selectricity_service.rb
@@ -7,6 +7,7 @@ class SelectricityService < ActionWebService::Base
     if election
       voter = QuickVoter.new
       voter.election = election
+      voter.ipaddress = "XMLRPC Request"
       voter.session_id = "XMLRPC:#{voter_id}"
       voter.vote=Vote.new
       voter.vote.votes=vote_list[0]
@@ -64,5 +65,22 @@ class SelectricityService < ActionWebService::Base
     result.candidate_names=candidates.values
     result
   end
-    
+  def get_quickvote_votes(shortname)
+    qv=QuickVote.ident_to_quickvote(shortname)
+    votes=Array.new
+    unless qv
+      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)
+    end
+    return votes
+  end
+  def list_quickvotes()
+    all=Array.new
+    QuickVote.find_all.each do |election|
+      all << ElectionStruct.new (:id => election.id, :name => election.name, :description => election.description, :candidates => election.candidates.collect {|c| c.id } )
+    end
+    return all
+  end
 end