X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/22f84a3ea8bc39eb4cb91575d35dfca683336032..94f9b1405c2eefc97faf91ad14ec775584fca65a:/app/controllers/quickvote_controller.rb?ds=inline

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index 61a4c69..e327ed6 100644
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -1,5 +1,5 @@
 class QuickvoteController < ApplicationController
-  layout 'hc'
+  layout 'main'
   model :quick_voter
   model :quick_vote
   model :vote
@@ -10,13 +10,12 @@ class QuickvoteController < ApplicationController
   #############################################################
 
   def create
-    breakpoint
     if params[:quickvote] 
       @quickvote = QuickVote.new(params[:quickvote])
-
+     
       # 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
@@ -35,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'
@@ -50,7 +51,7 @@ class QuickvoteController < ApplicationController
   #############################################################
 
   def index
-    @election = QuickVote.find_all(["name = ?", params[:votename]])[0]
+    @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
@@ -64,7 +65,7 @@ class QuickvoteController < ApplicationController
       # if the voter has not voted we destroy them
       if @voter and not @voter.voted?
         @voter.destroy
-	@voter = nil
+      	@voter = nil
       end
 
       # if the voter does not exist or has has been destroyed, lets
@@ -72,14 +73,14 @@ class QuickvoteController < ApplicationController
       unless @voter
         # create a new voter and populate it
         @voter = QuickVoter.new
-        @voter.election = QuickVote.find_all( [ "name = ?", params[:votename] ] )[0]
+        @voter.election = @election
         @voter.session_id = session.session_id
-
-	# create new vote and make it the defaulted sorted list
+        
+	      # create new vote and make it the defaulted sorted list
         @voter.vote = Vote.new
-	@voter.save
-	@voter.vote.set_defaults!
-	@voter.reload
+	      @voter.save
+	      @voter.vote.set_defaults!
+	      @voter.reload
       end
     else
       redirect_to :controller => 'site'
@@ -88,29 +89,33 @@ class QuickvoteController < ApplicationController
 
   def confirm
     # we need the election to verify that we have the right voter
-    election = QuickVote.find_all( [ "name = ?", params[:votename] ] )[0]
+    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 = ?", 
-                                  session.session_id, election.id])[0]
-
+                                 session.session_id, election.id])[0]
+  
     if not @voter
       # we have not seen this  voter before. something is wrong, try
       # again
-      redirect_to quickvote_url( :votename => params[:votename] ) 
+      redirect_to quickvote_url( :ident => params[:ident] ) 
       
-    elsif @voter.voted?
+    elsif @voter.voted? 
       # this person has already voted, we try again
       flash[:notice] = "You have already voted!"
-      redirect_to quickvote_url( :votename => params[:votename] )
+      redirect_to quickvote_url( :ident => params[:ident] )
       
     else
       # record the ip address for posterity
-      @voter.ipaddress = request.env["HTTP_X_FORWARDED_FOR"]
+      @voter.ipaddress = request.env["REMOTE_ADDR"]
       @voter.save
       
-      # toggle the confirmation bit
+      # save the time the vote was made for statistical use
+      @voter.vote.time = Time.now
+      
+      # toggle the confirmation bit      
       @voter.vote.confirm!
+     
       @voter.reload
       render :action => 'thanks'
     end
@@ -119,7 +124,7 @@ class QuickvoteController < ApplicationController
   def change
     voter = QuickVoter.find_all(["session_id = ?", session.session_id])[0]
     voter.destroy
-    redirect_to quickvote_url( :votename => params[:votename] )
+    redirect_to quickvote_url( :ident => params[:ident] )
   end
 
   def sort_candidates
@@ -132,42 +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 = QuickVote.find_all( ["name = ?", params[:votename]] )[0]
-
-    # 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
-
 end