Merge plurality fix

[selectricity] / app / models / selectricity_service.rb

diff --git a/app/models/selectricity_service.rb b/app/models/selectricity_service.rb
index d383dcd09e01a40d0cdeea9ef9c0e9c1b65f94f0..75d2e3e775a72e5207ea2ac7146c3c8cbc9f7c70 100644 (file)
--- a/app/models/selectricity_service.rb
+++ b/app/models/selectricity_service.rb
@@ -7,15 +7,34 @@ class SelectricityService < ActionWebService::Base
   end
   def get_quickvote_results(shortname)
     #TODO: Validate shortname
   end
   def get_quickvote_results(shortname)
     #TODO: Validate shortname

-    session=ActionController::Integration::Session.new
-    debugger
-    controller=session.get "quickvote/#{shortname}/results"
+    qv=QuickVote.ident_to_quickvote(shortname)

     result=VoteResultStruct.new
     result=VoteResultStruct.new

-    result.plurality_winners=session.controller.plurality_result.winners.inspect
-    result.approval_winners=session.controller.approval_result.winners.inspect
-    result.condorcet_winners=session.controller.condorcet_result.winners.inspect
-    result.ssd_winners=session.controller.ssd_result.winners.inspect
-    result.borda_winners=session.controller.borda_result.winners.inspect
+    result.errors=[]
+    unless qv
+      result.errors << "No quickvote with name #{shortname} found!"
+      return result
+    end
+    qv.results
+    result.plurality_winners=qv.plurality_result.winners
+    result.approval_winners=qv.approval_result.winners
+    result.condorcet_winners=qv.condorcet_result.winners
+    result.ssd_winners=qv.ssd_result.winners
+    result.borda_winners=qv.borda_result.winners

     result
   end
     result
   end

+  def get_quickvote_candidate_map(shortname)
+    qv=QuickVote.ident_to_quickvote(shortname)
+    result=CandidateMap.new
+    result.errors=[]
+    unless qv
+      result.errors << "No quickvote with name #{shortname} found!"
+      return result
+    end
+    candidates={}
+    qv.candidates.each {|c| candidates[c.id] = c.name}
+    result.candidate_ids=candidates.keys
+    result.candidate_names=candidates.values
+    result
+  end
+    

 end
 end