whoops, committed some errant javascript last time, here removed

[selectricity] / app / controllers / election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index a418c49337682a523fc418d9a450395ddb0c1289..072d4397a10247c2bd3929f2224d06a1317e1152 100644 (file)
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -1,15 +1,41 @@
-class ElectionController < ApplicationController
-  model :raw_voter_list, :voter, :vote, :candidate
-  layout 'hc'
+# Selectricity: Voting Machinery for the Masses
+# Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
+# Copyright (C) 2007 Massachusetts Institute of Technology
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.

 
 

-  #before_filter :login_required
+class ElectionController < ApplicationController
+  require_dependency "raw_voter_list"
+  require_dependency "voter"
+  require_dependency "vote"
+  require_dependency "candidate"
+  layout 'main'

 
   ## methods for displaying, creating,
   ## and manipulating election overview data
   ####################################################################
 
   def new
 
   ## methods for displaying, creating,
   ## and manipulating election overview data
   ####################################################################
 
   def new

+    redirect_to :action => 'general_information'
+  end
+  
+  def general_information
+    @sidebar_content = render_to_string :partial => 'progress',
+                                        :locals => { :page => 'overview' }

     @election = Election.new
     @election = Election.new

+    render :action => 'general_information'

   end
   
   def create_election
   end
   
   def create_election


@@ -19,27 +45,39 @@ class ElectionController < ApplicationController
     @election.user = session[:user]
     @election.anonymous = 1
     @election.startdate = Time.now
     @election.user = session[:user]
     @election.anonymous = 1
     @election.startdate = Time.now

-
+    
+    unless params[:top_bar][:uploaded_data].to_s.empty?
+      token_generator = UniqueTokenGenerator.new( 16 )
+      @election.embed_custom_string = token_generator.token
+      add_theme(@election.embed_custom_string)
+    end
+    

     if @election.save
       flash[:notice] = 'Election was successfully created.'
       redirect_to :action => 'edit_candidates', :id => @election.id
     else
     if @election.save
       flash[:notice] = 'Election was successfully created.'
       redirect_to :action => 'edit_candidates', :id => @election.id
     else

-      render :action => 'new'
+      render :action => 'general_information'

     end
   end
   
     end
   end
   

-  # add filter to verify that the person working on or looking at
+  # TODO add filter to verify that the person working on or looking at

   # something is the owner
   # something is the owner

-  def edit
+  def edit_general_information

     @election = Election.find(params[:id])
   end
     @election = Election.find(params[:id])
   end

-
-  def show
-    @election = Election.find(params[:id])
-  end
-
-  def update
+  
+  def update_general_information

     @election = Election.find(params[:id])
     @election = Election.find(params[:id])

+    
+    unless (params[:top_bar][:uploaded_data].to_s.empty? and params[:default_image][:uploaded_data].to_s.empty? and params[:bg1][:uploaded_data].to_s.empty? and params[:bg2][:uploaded_data].to_s.empty? and params[:bottom_bar][:uploaded_data].to_s.empty?)
+      unless @election.embed_custom_string
+        token_generator = UniqueTokenGenerator.new( 16 )
+        @election.embed_custom_string = token_generator.token
+      end
+      
+      add_theme(@election.embed_custom_string)
+    end
+    

     if @election.update_attributes(params[:election])
       flash[:notice] = 'Election was successfully updated.'
       redirect_to :action => 'show', :id => @election
     if @election.update_attributes(params[:election])
       flash[:notice] = 'Election was successfully updated.'
       redirect_to :action => 'show', :id => @election


@@ -47,13 +85,53 @@ class ElectionController < ApplicationController
       render :action => 'edit'
     end
   end
       render :action => 'edit'
     end
   end

+  
+  def add_theme(prefix)
+    unless params[:top_bar][:uploaded_data].to_s.empty?
+      top_bar = SkinPicture.new(params[:top_bar])
+      top_bar.filename = prefix + "top_bar." + params[:top_bar][:uploaded_data].content_type[6..-2]
+      top_bar.save
+    end
+    unless params[:default_image][:uploaded_data].to_s.empty?
+      default_image = SkinPicture.new(params[:default_image])
+      default_image.filename = prefix + "default_image." + params[:default_image][:uploaded_data].content_type[6..-2]
+      default_image.save
+    end
+    unless params[:bg1][:uploaded_data].to_s.empty?
+      bg1 = SkinPicture.new(params[:bg1])  
+      bg1.filename = prefix + "bg1." + params[:bg1][:uploaded_data].content_type[6..-2]
+      bg1.save
+    end
+    unless params[:bg2][:uploaded_data].to_s.empty?
+      bg2 = SkinPicture.new(params[:bg2]) 
+      bg2.filename = prefix + "bg2." + params[:bg2][:uploaded_data].content_type[6..-2]
+      bg2.save
+    end
+    unless params[:bottom_bar][:uploaded_data].to_s.empty?
+      bottom_bar = SkinPicture.new(params[:bottom_bar])
+      bottom_bar.filename = prefix + "bottom_bar." + params[:bottom_bar][:uploaded_data].content_type[6..-2]
+      bottom_bar.save
+    end
+        
+  end
+  
+  def show
+    @sidebar_content = render_to_string :partial => 'progress',
+                                        :locals => { :page => 'review' }
+
+    @election = Election.find(params[:id])
+    if @election.type == QuickVote
+      redirect_to(:controller => 'quickvote', :action => 'index', :ident => @election.id)
+    end
+      
+  end

 
   def start_election
     @election = Election.find(params[:id])
     
     @election.voters.each do |voter|
 
   def start_election
     @election = Election.find(params[:id])
     
     @election.voters.each do |voter|

-      email = VoterNotify.deliver_votestart(voter)
-      #render(:text => "<pre>" + email.encoded + "</pre>")
+      voter.vote = Vote.new
+      email_voter voter unless voter.email.nil?

     end
 
     @election.activate!
     end
 
     @election.activate!


@@ -64,15 +142,23 @@ class ElectionController < ApplicationController
   # information for elections
   ####################################################################
   def edit_candidates
   # information for elections
   ####################################################################
   def edit_candidates

+    @sidebar_content = render_to_string :partial => 'progress',
+                                        :locals => { :page => 'candidates' }

     @election = Election.find( params[:id] )
   end
 
   def add_candidate
     @election = Election.find(params[:id])
     @candidate = Candidate.new(params[:candidate])
     @election = Election.find( params[:id] )
   end
 
   def add_candidate
     @election = Election.find(params[:id])
     @candidate = Candidate.new(params[:candidate])

-    
+    @election.candidates << @candidate
+

     if @candidate.save
     if @candidate.save

-      @election.candidates << @candidate
+      # check to see if they've uploaded a picture
+      if params[:picture][:uploaded_data]
+        picture = Picture.new(params[:picture])
+        @candidate.picture = picture if picture.save
+      end
+

       @candidate = Candidate.new
       redirect_to :action => 'edit_candidates', :id => @election.id
     else
       @candidate = Candidate.new
       redirect_to :action => 'edit_candidates', :id => @election.id
     else


@@ -85,39 +171,11 @@ class ElectionController < ApplicationController
     candidate.destroy
   end
 
     candidate.destroy
   end
 

-  def lessinfo_candidate
-    @show_details = false
-    @candidate = Candidate.find( params[:id] )
-    render :partial => 'candidate_line'
-  end
-
-  def moreinfo_candidate
-    @show_details = true
-    @candidate = Candidate.find( params[:id] )
-    render :partial => 'candidate_line'
-  end
-
-  def edit_candidate
-    @candidate = Candidate.find( params[:id] )
-    @election = @candidate.election
-  end
-
-  def update_candidate
-    @candidate = Candidate.find(params[:id])
-    @election = @candidate.election
-
-    if @candidate.update_attributes(params[:candidate])
-      redirect_to :action => 'edit_candidates', :id => @candidate.election.id
-    else
-      render :action => 'edit_candidate'
-    end
-  end
-

   def candidate_picture
     candidate = Candidate.find( params[:id] )
   def candidate_picture
     candidate = Candidate.find( params[:id] )

-    send_data( candidate.picture_data,
-               :filename => candidate.picture_filename,
-              :type => candidate.picture_type,
+    send_data( candidate.picture.data,
+               :filename => candidate.picture.filename,
+              :type => candidate.picture.filetype,

               :disposition => 'inline' )
   end
 
               :disposition => 'inline' )
   end
 


@@ -125,20 +183,17 @@ class ElectionController < ApplicationController
   ## for a particular election
   ####################################################################
   def new_voters
   ## for a particular election
   ####################################################################
   def new_voters

-    @election = Election.find( params[:id] )
-    if params.has_key?[:raw_voter_list]
-      process_incoming_voters( params[:raw_voter_list] )
-    end
-    @raw_voter_list = RawVoterList.new
-
+    redirect_to :action => 'edit_voters', :id => params[:id]

   end
   
   def edit_voters
   end
   
   def edit_voters

+    @sidebar_content = render_to_string :partial => 'progress',
+                                        :locals => { :page => 'voters' }
+

     @election = Election.find( params[:id] )
     if params.has_key?( :raw_voter_list )
       process_incoming_voters( params[:raw_voter_list] )
     end
     @election = Election.find( params[:id] )
     if params.has_key?( :raw_voter_list )
       process_incoming_voters( params[:raw_voter_list] )
     end

-

     @raw_voter_list = RawVoterList.new
   end
   
     @raw_voter_list = RawVoterList.new
   end
   


@@ -146,13 +201,23 @@ class ElectionController < ApplicationController
     voter = Voter.find( params[:id] )
     voter.destroy
   end
     voter = Voter.find( params[:id] )
     voter.destroy
   end

+
+  def toggle_authenticated
+    @election = Election.find(params[:id])
+    if params[:authenticated] == "1"
+      @election.authenticated = true
+    else
+      @election.authenticated = false
+    end
+    @election.save
+  end

   
   ## methods for computing and printing results
   ####################################################################
   def results
     @election = Election.find( params[:id] )
     votes = []
   
   ## methods for computing and printing results
   ####################################################################
   def results
     @election = Election.find( params[:id] )
     votes = []

-
+    

     @election.voters.each do |voter|
       if voter.vote and voter.vote.confirmed?
         votes << voter.vote.rankings.sort.collect {|vote| vote.candidate_id}
     @election.voters.each do |voter|
       if voter.vote and voter.vote.confirmed?
         votes << voter.vote.rankings.sort.collect {|vote| vote.candidate_id}


@@ -165,6 +230,7 @@ class ElectionController < ApplicationController
     
     @candidates_by_id = {}
     @election.candidates.each {|cand| @candidates_by_id[cand.id] = cand}
     
     @candidates_by_id = {}
     @election.candidates.each {|cand| @candidates_by_id[cand.id] = cand}

+    

   end
   
   def detailed_results
   end
   
   def detailed_results


@@ -173,10 +239,11 @@ class ElectionController < ApplicationController
 
     @voter_list = []
     @vote_list = []
 
     @voter_list = []
     @vote_list = []

-    @election.voters. each do |voter|
+    
+    @election.voters.each do |voter|

       if voter.vote and voter.vote.confirmed?
         @voter_list << voter.email
       if voter.vote and voter.vote.confirmed?
         @voter_list << voter.email

-       @vote_list << voter.vote
+             @vote_list << voter.vote

       end
     end
 
       end
     end
 


@@ -193,20 +260,16 @@ class ElectionController < ApplicationController
 
       unless incoming_voters.entries.empty?
         incoming_voters.each do |new_voter|
 
       unless incoming_voters.entries.empty?
         incoming_voters.each do |new_voter|

-
-          if incoming_voters.email == 0
-            new_voter.contacted = 1
-         elsif incoming_voters.email == 1
-           email_voter( new_voter )
-           new_voter.contacted = 1
-         else
-           new_voter.contacted = 0
-         end
-       
-          # the new voter should be in good shape. save add to the election
-         new_voter.save
-          @election.voters << new_voter
+          new_voter.email.strip! # There's a trailing \r on all but the last in
+                                 # the list!
+          if new_voter.valid?
+            # the new voter should be in good shape. save add to the election
+            @election.voters << new_voter
+                 new_voter.save
+          end
+          # TODO: Can we do some kind of AJAX error message for the voter being invalid?

         end
         end

+        @election.save

       end
  
       # reset the next time to have a the same default value for emailing
       end
  
       # reset the next time to have a the same default value for emailing


@@ -214,9 +277,11 @@ class ElectionController < ApplicationController
       @raw_voter_list.email = incoming_voters.email
     end
 
       @raw_voter_list.email = incoming_voters.email
     end
 

-    def email_voter(email=nil)
-      if email
-        
+    def email_voter(voter=nil)
+      if voter
+        VoterNotify.deliver_votestart(voter)
+        voter.contacted=1
+        voter.save

       end
     end
 
       end
     end