X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/9abed97635edbac7fb1a687298fff5c5434cdff4..c5fda1e5174238779afd496014379d6446d1e3c1:/app/controllers/elections_controller.rb

diff --git a/app/controllers/elections_controller.rb b/app/controllers/elections_controller.rb
index b3406a8..339c77b 100644
--- a/app/controllers/elections_controller.rb
+++ b/app/controllers/elections_controller.rb
@@ -1,5 +1,3 @@
-require 'uniq_token'
-
 class ElectionsController < ApplicationController
   model :raw_voter_list, :voter, :vote, :candidate
 
@@ -102,21 +100,29 @@ class ElectionsController < ApplicationController
     voter.destroy
   end
   
+  def summary_results 
+  end
+  
+  def detailed_results
+    @election = Election.find( params[:id] )
+    @voting_rolls = []
+    @election.voters.each do |voter|
+      if voter.vote and voter.vote.confirmed?
+        @voting_rolls << voter
+      end
+    end
+  end
+  
   private
+    def randomize_order
+    end
 
     def process_incoming_voters(raw_voter_list)
       incoming_voters = RawVoterList.new( raw_voter_list )
-      token_generator = UniqueTokenGenerator.new( 16 )
 
       unless incoming_voters.entries.empty?
         incoming_voters.each do |new_voter|
 
-	  until new_voter.password and \
-	        Voter.find_all( [ "password = ?", new_voter.password ]).empty?
-	    new_voter.password = token_generator.token
-	  end
-	 
-	  breakpoint
           if incoming_voters.email == 0
             new_voter.contacted = 1
 	  elsif incoming_voters.email == 1