Merge from my devel branch

[selectricity-live] / app / apis / selectricity_api.rb

diff --git a/app/apis/selectricity_api.rb b/app/apis/selectricity_api.rb
index e94eaaa87bda85e78589d83d21a97bdb8341399e..8c0f04f64c11b6e61c060926ae977f0424f3d1cc 100644 (file)
--- a/app/apis/selectricity_api.rb
+++ b/app/apis/selectricity_api.rb
@@ -1,10 +1,12 @@
 class VoteResultStruct < ActionWebService::Struct
 class VoteResultStruct < ActionWebService::Struct

-  member :plurality_winners, :string
-  member :approval_winners, :string
-  member :condorcet_winners, :string
-  member :ssd_winners, :string
-  member :borda_winners, :string
-  member :errors, :string
+  member :plurality_winners, [:int]
+  member :approval_winners, [:int]
+  member :condorcet_winners, [:int]
+  member :ssd_winners, [:int]
+  member :borda_winners, [:int]
+  member :candidate_ids, [:int]
+  member :candidate_names, [:string]
+  member :errors, [:string]

 end
 class SelectricityAPI < ActionWebService::API::Base
   api_method :cast_quickvote, :expects => [:int, :int, [[:int]]], :returns => [:string]
 end
 class SelectricityAPI < ActionWebService::API::Base
   api_method :cast_quickvote, :expects => [:int, :int, [[:int]]], :returns => [:string]