Merge from head

diff --git a/app/apis/selectricity_api.rb b/app/apis/selectricity_api.rb
index d478a5a8b6f9b26f5548d47cbf0683fb23ca85ac..8a8dce4d8072faca8cbc29b7e9e1d496c2a521c9 100644 (file)
--- a/app/apis/selectricity_api.rb
+++ b/app/apis/selectricity_api.rb
@@ -12,9 +12,10 @@ class CandidateMap < ActionWebService::Struct
   member :errors, [:string]
 end
 class SelectricityAPI < ActionWebService::API::Base
-  api_method :cast_quickvote, :expects => [:int, :int, [[:int]]], :returns => [:string]
+  api_method :cast_quickvote, :expects => [:string, :int, [[:int]]], :returns => [:string]
   api_method :get_quickvote_results, :expects => [:string], :returns => [VoteResultStruct]
   api_method :get_quickvote_candidate_map, :expects => [:string], :returns => [CandidateMap]
+  api_method :quickvote_candidate_ids_to_names, :expects => [:string,[:int]], :returns => [[:string]]
 end
 
 

diff --git a/app/models/selectricity_service.rb b/app/models/selectricity_service.rb
index 75d2e3e775a72e5207ea2ac7146c3c8cbc9f7c70..86458e09f6d6e84d928e62d5c9f2bcd5a2fbc160 100644 (file)
--- a/app/models/selectricity_service.rb
+++ b/app/models/selectricity_service.rb
@@ -2,8 +2,36 @@ require 'action_controller/integration'
 
 class SelectricityService < ActionWebService::Base
   web_service_api SelectricityAPI
-  def cast_quickvote(election_id, vote_id, vote_list)
-    #Obviously not implemented
+  def cast_quickvote(election_name, voter_id, vote_list)
+    election = QuickVote.ident_to_quickvote election_name
+    if election
+      voter = QuickVoter.new
+      voter.election = election
+      voter.session_id = "XMLRPC:#{voter_id}"
+      voter.vote=Vote.new
+      voter.vote.votes=vote_list[0]
+      voter.vote.time = Time.now
+      voter.save!
+      voter.vote.confirm!
+      voter.save!
+    end
+  end
+  def quickvote_candidate_ids_to_names(shortname, id_list)
+    qv=QuickVote.ident_to_quickvote(shortname)
+    candidates={}
+    return [] unless qv
+    qv.results
+    qv.candidates.each {|c| candidates[c.id] = c}
+    results=[]
+    id_list.each { |id|
+      name=candidates[id]
+      if name
+        results << name
+      else
+        results << ""
+      end
+    }
+    results
   end
   def get_quickvote_results(shortname)
     #TODO: Validate shortname