Allowed for the results page of quickvotes to be hidden while the quickvote is go

[selectricity] / app / controllers / quickvote_controller.rb

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index 5b3acab79f21998d5897e90cc331b71745c37b8c..7ad1722cb59cf69f2021b22021647ef0a26f452f 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -4,44 +4,50 @@ class QuickvoteController < ApplicationController
   require_dependency "quick_vote"
   require_dependency "vote"
   require_dependency "election"
   require_dependency "quick_vote"
   require_dependency "vote"
   require_dependency "election"

-
+  

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

-    if params[:quickvote] 
+    if params[:quickvote]

       @quickvote = QuickVote.new(params[:quickvote])
       # store the candidate grabbed through ajax and stored in flash
       @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)
+      @quickvote.candidate_names = flash[:candidate_names]
+      @quickvote.description=@quickvote.description
+      #record who created the quickvote so that person can monitor it easily
+      @quickvote.quickuser = session.session_id

       # try to save, if it fails, show the page again (the flash should
       # still be intact
       if @quickvote.save
         @quickvote = @quickvote.reload
         render :action => 'success'
       else
       # try to save, if it fails, show the page again (the flash should
       # still be intact
       if @quickvote.save
         @quickvote = @quickvote.reload
         render :action => 'success'
       else

-        flash.keep(:candlist)
+        flash.keep(:candidate_names)

       end 
 
     else
       # if we don't have a quickvote param, it means that the person
       # here has not been hitting this page and we can clear any
       end 
 
     else
       # if we don't have a quickvote param, it means that the person
       # here has not been hitting this page and we can clear any

-      # candlist in the flash
-      flash.delete(:candlist) if flash.has_key?(:candlist)
+      # candidate_names list in the flash
+      flash.delete(:candidate_names) if flash.has_key?(:candidate_names)
+      @quickvote = QuickVote.new

     end
   end
 
   def add_candidate
     end
   end
 
   def add_candidate

-    candidate_name = CGI.escapeHTML(params[:ajax][:newcandidate])
+    candidate_name = params[:ajax][:newcandidate]

     unless candidate_name.strip.empty?
     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)
+      if flash.has_key?(:candidate_names) \
+        and flash[:candidate_names].instance_of?(Array) 
+        unless flash[:candidate_names].index(candidate_name)
+          flash[:candidate_names] << candidate_name
+        end

      else
      else

-       flash[:candlist] = [ candidate_name ]
+       flash[:candidate_names] = [ candidate_name ]

       end
     end
       end
     end

-    flash.keep(:candlist)
+    flash.keep(:candidate_names)

     render_partial 'candidate_list'
   end
  
     render_partial 'candidate_list'
   end
  


@@ -56,8 +62,9 @@ class QuickvoteController < ApplicationController
     if @election
       # look to see that the voter has been created and has voted in
       # this election, and has confirmed their vote
     if @election
       # look to see that the voter has been created and has voted in
       # this election, and has confirmed their vote

-      @voter = QuickVoter.find(:all, :conditions => ["session_id = ? and election_id = ?",
-                                  session.session_id, @election.id])[0]
+      @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
       if @voter and not @voter.voted?
 
       # if the voter has not voted we destroy them
       if @voter and not @voter.voted?


@@ -89,8 +96,9 @@ class QuickvoteController < ApplicationController
     election = QuickVote.ident_to_quickvote(params[:ident])
 
     # find out who the voter is for this election
     election = QuickVote.ident_to_quickvote(params[:ident])
 
     # find out who the voter is for this election

-    @voter = QuickVoter.find(:all, :conditions => ["session_id = ? and election_id = ?", 
-                                 session.session_id, election.id])[0]
+    @voter = QuickVoter.find(:all,
+      :conditions => ["session_id = ? and election_id = ?", 
+                      session.session_id, election.id])[0]

   
     if not @voter
       # we have not seen this  voter before. something is wrong, try
   
     if not @voter
       # we have not seen this  voter before. something is wrong, try


@@ -119,7 +127,8 @@ class QuickvoteController < ApplicationController
   end
  
   def change
   end
  
   def change

-    voter = QuickVoter.find(:all, :conditions => ["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


@@ -137,19 +146,27 @@ class QuickvoteController < ApplicationController
   def mapvoters
     @map = GMap.new("map_div_id") 
     @map.control_init(:large_map => true, :map_type => true) 
   def mapvoters
     @map = GMap.new("map_div_id") 
     @map.control_init(:large_map => true, :map_type => true) 

-    center=nil
+    center = nil
+

     QuickVote.ident_to_quickvote(params[:id]).voters.each do |voter|
       next unless voter.ipaddress
     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
       location = GeoKit::Geocoders::IpGeocoder.geocode(voter.ipaddress)
       next unless location.lng and location.lat

+

       unless center
       unless center

-        center=[location.lat,location.lng]
-        @map.center_zoom_init(center,4)
+        center = [location.lat, location.lng]
+        @map.center_zoom_init(center, 4)

       end
       end

-      marker = GMarker.new([location.lat,location.lng], :title => "Voter", :info_window => (voter.ipaddress or "unknown")+"   "+voter.vote.votestring)
+
+      marker = GMarker.new([location.lat,location.lng],
+                           :title => "Voter",
+                           :info_window => (voter.ipaddress or "unknown") \
+                                           + "   " + voter.vote.votestring)

       @map.overlay_init(marker)
     end
   end
       @map.overlay_init(marker)
     end
   end

+

   ###############################################################
   # the following method pertains to displaying the results of a
   # quickvote
   ###############################################################
   # the following method pertains to displaying the results of a
   # quickvote


@@ -161,8 +178,18 @@ class QuickvoteController < ApplicationController
       redirect_to :controller => 'site'
       return
     end
       redirect_to :controller => 'site'
       return
     end

-    @election.results
+    if @election.viewable == 0 && @election.active == 1
+      render :action => 'not_viewable' and return
+    end
+    @results = @election.results

     @candidates = {}
     @election.candidates.each {|c| @candidates[c.id] = c}
   end
     @candidates = {}
     @election.candidates.each {|c| @candidates[c.id] = c}
   end

+  
+  def my_quickvotes
+    @myqvs = QuickVote.find(:all, :conditions => ["quickuser = ?",
+                                session.session_id])
+  end
+  

 end
 end

+