X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/46f924b34b305d2474b09ce204a7a9187e8d8622..9086b07aefc0560832373bb4ba30888d8d43f0d6:/app/controllers/quickvote_controller.rb diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb index acbf012..8b853eb 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 @@ -57,7 +59,7 @@ class QuickvoteController < ApplicationController # look to see that the voter has been created and has voted in # this election, and has confirmed their vote - @voter = QuickVoter.find_all(["session_id = ? and election_id = ?", + @voter = QuickVoter.find(:all, :conditions => ["session_id = ? and election_id = ?", session.session_id, @election.id])[0] # if the voter has not voted we destroy them @@ -87,10 +89,10 @@ 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 = ?", + @voter = QuickVoter.find(:all, :conditions => ["session_id = ? and election_id = ?", session.session_id, election.id])[0] if not @voter @@ -120,7 +122,7 @@ class QuickvoteController < ApplicationController end def change - voter = QuickVoter.find_all(["session_id = ?", session.session_id])[0] + voter = QuickVoter.find(:all, :conditions => ["session_id = ?", session.session_id])[0] voter.destroy redirect_to quickvote_url( :ident => params[:ident] ) end @@ -135,28 +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]) + @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