Merged from John.

[selectricity] / app / models / selectricity_service.rb

diff --git a/app/models/selectricity_service.rb b/app/models/selectricity_service.rb
index e13037535bf04b37e290244feff0c21b597ee458..7da46e18abf7183abd8ef9498341771372cb08d4 100644 (file)
--- a/app/models/selectricity_service.rb
+++ b/app/models/selectricity_service.rb
@@ -5,6 +5,12 @@ class SelectricityService < ActionWebService::Base
   def cast_quickvote(election_name, voter_id, vote_list)
     election = QuickVote.ident_to_quickvote election_name
     if election
   def cast_quickvote(election_name, voter_id, vote_list)
     election = QuickVote.ident_to_quickvote election_name
     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)
+      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!

       voter = QuickVoter.new
       voter.election = election
       voter.ipaddress = "XMLRPC Request"
       voter = QuickVoter.new
       voter.election = election
       voter.ipaddress = "XMLRPC Request"


@@ -15,6 +21,8 @@ class SelectricityService < ActionWebService::Base
       voter.save!
       voter.vote.confirm!
       voter.save!
       voter.save!
       voter.vote.confirm!
       voter.save!

+    else
+      raise ArgumentError.new "Cannot find election #{election_name}"

     end
   end
   def quickvote_candidate_ids_to_names(shortname, id_list)
     end
   end
   def quickvote_candidate_ids_to_names(shortname, id_list)


@@ -79,8 +87,18 @@ class SelectricityService < ActionWebService::Base
   def list_quickvotes()
     all=Array.new
     QuickVote.find_all.each do |election|
   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 } )
+      all << get_quickvote(election.name)

     end
     return all
   end
     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 } )
+  end
+  def create_quickvote(election)
+    qv=QuickVote.new(:name => election.name, :description => election.description)
+    qv.candidatelist=election.candidate_names
+    return qv.save.to_s
+  end
+

 end
 end