Merge from head -- breakage

[selectricity] / app / controllers / quickvote_controller.rb

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index f5ab58128caa2d0a8ae03a67fa9994ab0119a2ed..54784ef46e735749238ea4fc8617bd261cb72d80 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -1,9 +1,9 @@
 class QuickvoteController < ApplicationController
   layout 'main'
 class QuickvoteController < ApplicationController
   layout 'main'

-  model :quick_voter
-  model :quick_vote
-  model :vote
-  model :election
+  require_dependency "quick_voter"
+  require_dependency "quick_vote"
+  require_dependency "vote"
+  require_dependency "election"

 
   #############################################################
   # the following methods pertain to creating quickvotes
 
   #############################################################
   # the following methods pertain to creating quickvotes


@@ -12,10 +12,9 @@ class QuickvoteController < ApplicationController
   def create
     if params[:quickvote] 
       @quickvote = QuickVote.new(params[:quickvote])
   def create
     if params[:quickvote] 
       @quickvote = QuickVote.new(params[:quickvote])

-     

       # store the candidate grabbed through ajax and stored in flash
       @quickvote.candidatelist = flash[:candlist]
       # store the candidate grabbed through ajax and stored in flash
       @quickvote.candidatelist = flash[:candlist]

-
+      @quickvote.description=@quickvote.description

       # try to save, if it fails, show the page again (the flash should
       # still be intact
       if @quickvote.save
       # try to save, if it fails, show the page again (the flash should
       # still be intact
       if @quickvote.save


@@ -35,10 +34,12 @@ class QuickvoteController < ApplicationController
 
   def add_candidate
     candidate_name = params[:ajax][:newcandidate]
 
   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 ]
+    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'
     end
     flash.keep(:candlist)
     render_partial 'candidate_list'


@@ -49,15 +50,13 @@ class QuickvoteController < ApplicationController
   #############################################################
 
   def index
   #############################################################
 
   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
     if @election
     # if the person has specified an election, we show them the voting
     # page. otherwise, we redirect back to main the page
     if @election

-

       # look to see that the voter has been created and has voted in
       # this election, and has confirmed their vote
       # 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
                                   session.session_id, @election.id])[0]
 
       # if the voter has not voted we destroy them


@@ -73,8 +72,8 @@ class QuickvoteController < ApplicationController
         @voter = QuickVoter.new
         @voter.election = @election
         @voter.session_id = session.session_id
         @voter = QuickVoter.new
         @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.vote = Vote.new
              @voter.save
              @voter.vote.set_defaults!


@@ -87,10 +86,10 @@ class QuickvoteController < ApplicationController
 
   def confirm
     # we need the election to verify that we have the right voter
 
   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
 
     # 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
                                  session.session_id, election.id])[0]
   
     if not @voter


@@ -120,7 +119,7 @@ class QuickvoteController < ApplicationController
   end
  
   def change
   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
     voter.destroy
     redirect_to quickvote_url( :ident => params[:ident] )
   end


@@ -135,53 +134,35 @@ class QuickvoteController < ApplicationController
     render :nothing => true
   end
                
     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
   ###############################################################
   # 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 }
+    unless @election = QuickVote.ident_to_quickvote(params[:ident])
+      flash[:notice] = "Cannot find quickvote #{params[:ident]}."
+      redirect_to :controller => 'site'
+      return

     end
     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 = {} 
+    @results = @election.results
+    @candidates = {}

     @election.candidates.each {|c| @candidates[c.id] = c}
   end
     @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
 end