Changed minor CSS issue.

[selectricity] / app / models / selectricity_service.rb

diff --git a/app/models/selectricity_service.rb b/app/models/selectricity_service.rb
index 9d7d91ee258e095fbb226b4406a9a583b29f6507..544b618d7c78fddce9fb5d91f8a3a65cf263264c 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|
     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
       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"
       voter = QuickVoter.new
       voter.election = election
       voter.ipaddress = "XMLRPC Request"


@@ -22,13 +22,13 @@ class SelectricityService < ActionWebService::Base
       voter.vote.confirm!
       voter.save!
     else
       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)
     qv=QuickVote.ident_to_quickvote(shortname)
     candidates={}
     end
   end
   def quickvote_candidate_ids_to_names(shortname, id_list)
     qv=QuickVote.ident_to_quickvote(shortname)
     candidates={}

-    return [] unless qv
+    raise ArgumentError.new("Quickvote by name #{shortname} doesn't exist") unless qv

     qv.results
     qv.candidates.each {|c| candidates[c.id] = c}
     results=[]
     qv.results
     qv.candidates.each {|c| candidates[c.id] = c}
     results=[]


@@ -46,10 +46,8 @@ class SelectricityService < ActionWebService::Base
     #TODO: Validate shortname
     qv=QuickVote.ident_to_quickvote(shortname)
     result=VoteResultStruct.new
     #TODO: Validate shortname
     qv=QuickVote.ident_to_quickvote(shortname)
     result=VoteResultStruct.new

-    result.errors=[]

     unless qv
     unless qv

-      result.errors << "No quickvote with name #{shortname} found!"
-      return result
+      raise ArgumentError.new("No quickvote with name #{shortname} found!")

     end
     qv.results
     result.plurality_winners=qv.plurality_result.winners
     end
     qv.results
     result.plurality_winners=qv.plurality_result.winners


@@ -62,10 +60,8 @@ class SelectricityService < ActionWebService::Base
   def get_quickvote_candidate_map(shortname)
     qv=QuickVote.ident_to_quickvote(shortname)
     result=CandidateMap.new
   def get_quickvote_candidate_map(shortname)
     qv=QuickVote.ident_to_quickvote(shortname)
     result=CandidateMap.new

-    result.errors=[]

     unless qv
     unless qv

-      result.errors << "No quickvote with name #{shortname} found!"
-      return result
+      raise ArgumentError.new("No quickvote with name #{shortname} found!")

     end
     candidates={}
     qv.candidates.each {|c| candidates[c.id] = c.name}
     end
     candidates={}
     qv.candidates.each {|c| candidates[c.id] = c.name}


@@ -73,35 +69,51 @@ class SelectricityService < ActionWebService::Base
     result.candidate_names=candidates.values
     result
   end
     result.candidate_names=candidates.values
     result
   end

+

   def get_quickvote_votes(shortname)
   def get_quickvote_votes(shortname)

-    qv=QuickVote.ident_to_quickvote(shortname)
-    votes=Array.new
+    qv = QuickVote.ident_to_quickvote(shortname)
+

     unless qv
     unless qv

-      return result
+      raise ArgumentError.new("Cannot find QuickVote #{shortname}")

     end
     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)
+
+    qv.votes.collect do |vote|
+       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
     end

-    return votes

   end
   end

+

   def list_quickvotes()
   def list_quickvotes()

-    all=Array.new
-    QuickVote.find_all.each do |election|
-      all << get_quickvote(election.name)
+    QuickVote.find(:all).collect do |election|
+      get_quickvote(election.name)

     end
     end

-    return all

   end
   end

+

   def get_quickvote(shortname)
   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 } )
+    unless election = QuickVote.ident_to_quickvote(shortname)
+      raise ArgumentError.new("Cannot find QuickVote named #{shortname}")
+    end
+
+    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
   end

+

   def create_quickvote(election)
   def create_quickvote(election)

-    qv=QuickVote.new(:name => election.name, :description => election.description)
-    qv.candidatelist=election.candidate_names
-    if qv.save.to_s
+    qv = QuickVote.new(:name => election.name,
+                       :description => election.description)
+    qv.candidate_names = election.candidate_names
+
+    if qv.save

       return ""
     else
       return ""
     else

-      return "Saving quickvote FAILED:"+qv.errors.inspect
+      raise ArgumentError.new("Saving quickvote FAILED:"+qv.errors.inspect)

     end
   end
 
     end
   end