Turn Borda Bar graph on its side.

[selectricity] / app / models / election.rb

diff --git a/app/models/election.rb b/app/models/election.rb
index 7d8ad80d883ee45ab6bee1a875ed446478d68151..b48c9238c0bf39a2a79f1a044d0ec723626a4395 100644 (file)
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -2,19 +2,8 @@
 # Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
 # Copyright (C) 2007 Massachusetts Institute of Technology
 #
 # 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/>.
+# This program is free software. Please see the COPYING file for
+# details.

 
 class Election < ActiveRecord::Base
   has_many :candidates
 
 class Election < ActiveRecord::Base
   has_many :candidates


@@ -22,9 +11,12 @@ class Election < ActiveRecord::Base
   has_many :votes
   belongs_to :user
   validates_presence_of :name, :description
   has_many :votes
   belongs_to :user
   validates_presence_of :name, :description

-  
+
+  # enforce constraints associated with dependencies (i.e., a kiosk
+  # election can't also be unauthenticated)
+  before_save :enforce_constraints
+

   #validate that method is one of the listed election types
   #validate that method is one of the listed election types

-  

   attr_reader :plurality_result
   attr_reader :approval_result
   attr_reader :condorcet_result
   attr_reader :plurality_result
   attr_reader :approval_result
   attr_reader :condorcet_result


@@ -32,7 +24,7 @@ class Election < ActiveRecord::Base
   attr_reader :borda_result
   
   require 'date'
   attr_reader :borda_result
   
   require 'date'

-  
+ 

   def initialize(params={})
     super
     self.enddate = read_attribute( :enddate ) || \
   def initialize(params={})
     super
     self.enddate = read_attribute( :enddate ) || \


@@ -73,7 +65,7 @@ class Election < ActiveRecord::Base
       reasons << "You must have at least two candidates."
     end
     
       reasons << "You must have at least two candidates."
     end
     

-    if self.voters.length <= 1
+    if self.voters.length <= 1 and self.authenticated?

       reasons << "You must have at least two voters."
     end
 
       reasons << "You must have at least two voters."
     end
 


@@ -82,11 +74,11 @@ class Election < ActiveRecord::Base
 
   def activate!
     self.active = 1
 
   def activate!
     self.active = 1

-    self.save!
+    self.save

   end
   
   def quickvote?
   end
   
   def quickvote?

-    self.class == 'QuickVote'
+    self.class == QuickVote

   end
 
   def active?
   end
 
   def active?


@@ -97,6 +89,14 @@ class Election < ActiveRecord::Base
     active == 2
   end
 
     active == 2
   end
 

+  def authenticated?
+    authenticated
+  end
+
+  def kiosk?
+    kiosk
+  end
+  

   def shortdesc
     shortdesc = description.split(/\n/)[0]
   end
   def shortdesc
     shortdesc = description.split(/\n/)[0]
   end


@@ -137,11 +137,11 @@ class Election < ActiveRecord::Base
       # skip if the voter has not voted or has an unconfirmed vote
       next unless voter.voted?
 
       # 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
+      plurality_tally << voter.vote.rankings.sort[0].candidate_id

       approval_tally << voter.vote.rankings.sort[0..1].collect \
       approval_tally << voter.vote.rankings.sort[0..1].collect \

-        { |ranking| ranking.candidate.id }
+        { |ranking| ranking.candidate_id }

       preference_tally << voter.vote.rankings.sort.collect \
       preference_tally << voter.vote.rankings.sort.collect \

-        { |ranking| ranking.candidate.id }
+        { |ranking| ranking.candidate_id }

     end
     
     @plurality_result = PluralityVote.new(plurality_tally).result
     end
     
     @plurality_result = PluralityVote.new(plurality_tally).result


@@ -167,6 +167,30 @@ class Election < ActiveRecord::Base
     
     names
   end
     
     names
   end

+
+  def candidate_hash
+    hash = {}
+    self.candidates.each {|c| hash[c.id] = c}
+    return hash
+  end
+
+ 
+  # TODO now that this code is in here, we should go ahead and remove
+  # date checking from other places in the code
+  def after_find
+    if self.active < 2 and self.enddate < Time.now 
+      self.active = 2
+      self.save
+    end
+  end
+
+  private
+  def enforce_constraints
+    # kiosks can't be authenticated
+    self.authenticated = false if kiosk?
+    return true
+  end
+

 end
 
 
 end