X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/b82260b129b48f9da19e73e81e1e26b89c1f53e5..7ea8b24f8b002feba79f92e5333f1ec5c6e9f929:/app/controllers/quickvote_controller.rb diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb index f5ab581..e327ed6 100644 --- a/app/controllers/quickvote_controller.rb +++ b/app/controllers/quickvote_controller.rb @@ -15,7 +15,7 @@ class QuickvoteController < ApplicationController # store the candidate grabbed through ajax and stored in flash @quickvote.candidatelist = flash[:candlist] - + @quickvote.description=CGI.escapeHTML(@quickvote.description) # try to save, if it fails, show the page again (the flash should # still be intact if @quickvote.save @@ -34,11 +34,13 @@ class QuickvoteController < ApplicationController end def add_candidate - candidate_name = params[:ajax][:newcandidate] - if flash.has_key?(:candlist) and flash[:candlist].instance_of?(Array) - flash[:candlist] << candidate_name - else - flash[:candlist] = [ candidate_name ] + candidate_name = CGI.escapeHTML(params[:ajax][:newcandidate]) + unless candidate_name.strip.empty? + if flash.has_key?(:candlist) and flash[:candlist].instance_of?(Array) + flash[:candlist] << candidate_name unless flash[:candlist].index(candidate_name) + else + flash[:candlist] = [ candidate_name ] + end end flash.keep(:candlist) render_partial 'candidate_list' @@ -49,7 +51,7 @@ class QuickvoteController < ApplicationController ############################################################# def index - @election = ident_to_quickvote(params[:ident]) + @election = QuickVote.ident_to_quickvote(params[:ident]) # if the person has specified an election, we show them the voting # page. otherwise, we redirect back to main the page @@ -87,7 +89,7 @@ class QuickvoteController < ApplicationController def confirm # we need the election to verify that we have the right voter - election = ident_to_quickvote(params[:ident]) + election = QuickVote.ident_to_quickvote(params[:ident]) # find out who the voter is for this election @voter = QuickVoter.find_all(["session_id = ? and election_id = ?", @@ -135,53 +137,31 @@ class QuickvoteController < ApplicationController render :nothing => true end - + def mapvoters + @map = GMap.new("map_div_id") + @map.control_init(:large_map => true, :map_type => true) + center=nil + QuickVote.ident_to_quickvote(params[:id]).voters.each do |voter| + next unless voter.ipaddress + location = GeoKit::Geocoders::IpGeocoder.geocode(voter.ipaddress) + next unless location.lng and location.lat + unless center + center=[location.lat,location.lng] + @map.center_zoom_init(center,4) + end + marker = GMarker.new([location.lat,location.lng], :title => "Voter", :info_window => (voter.ipaddress or "unknown")+" "+voter.vote.votestring) + @map.overlay_init(marker) + end + end ############################################################### # the following method pertains to displaying the results of a # quickvote ############################################################### def results - @election = ident_to_quickvote(params[:ident]) - - # initalize the tallies to empty arrays - preference_tally = Array.new - plurality_tally = Array.new - approval_tally = Array.new - - @election.voters.each do |voter| - # skip if the voter has not voted or has an unconfirmed vote - next unless voter.voted? - - plurality_tally << voter.vote.rankings.sort[0].candidate.id - approval_tally << voter.vote.rankings.sort[0..1].collect \ - { |ranking| ranking.candidate.id } - preference_tally << voter.vote.rankings.sort.collect \ - { |ranking| ranking.candidate.id } - end - - @plurality_result = PluralityVote.new(plurality_tally).result - @approval_result = ApprovalVote.new(approval_tally).result - @condorcet_result = PureCondorcetVote.new(preference_tally).result - @ssd_result = CloneproofSSDVote.new(preference_tally).result - @borda_result = BordaVote.new(preference_tally).result - #@runoff_result = InstantRunoffVote.new(preference_tally).result - #@runoff_results = PluralityVote.new(preference_tally).result - - - @candidates = {} + @election = QuickVote.ident_to_quickvote(params[:ident]) + @election.results + @candidates = {} @election.candidates.each {|c| @candidates[c.id] = c} end - - private - def ident_to_quickvote(ident) - if ident.match(/^\d+$/) - quickvote = QuickVote.find(ident) - else - quickvote = QuickVote.find_all(["name = ?", ident])[0] - end - - return quickvote - end - end