Made the results page 'modular,' and all the necessary adaptations.

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index bb60b4552b029efff74be54bba9282c7599a671f..54784ef46e735749238ea4fc8617bd261cb72d80 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -161,7 +161,7 @@ class QuickvoteController < ApplicationController
       redirect_to :controller => 'site'
       return
     end
       redirect_to :controller => 'site'
       return
     end

-    @election.results
+    @results = @election.results

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

diff --git a/app/models/election.rb b/app/models/election.rb
index d76c13f633cd7ddb7b48ca560deb60d54f266d4a..59a10bfbe601387eac1b72de2c9fcec03c99560c 100644 (file)
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -5,13 +5,24 @@ class Election < ActiveRecord::Base
   belongs_to :user
   validates_presence_of :name, :description
   
   belongs_to :user
   validates_presence_of :name, :description
   

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

   attr_reader :plurality_result
   attr_reader :approval_result
   attr_reader :condorcet_result
   attr_reader :ssd_result
   attr_reader :borda_result
   attr_reader :plurality_result
   attr_reader :approval_result
   attr_reader :condorcet_result
   attr_reader :ssd_result
   attr_reader :borda_result

-
+  

   require 'date'
   require 'date'

+  
+  def other_methods
+    if election_method
+      @other_methods = ELECTION_TYPES.reject {|i| i == election_method}
+    else
+      @other_methods = nil
+    end
+    @other_methods
+  end

 
   def startdate
     read_attribute( :startdate ) || Time.now
 
   def startdate
     read_attribute( :startdate ) || Time.now


@@ -100,15 +111,19 @@ class Election < ActiveRecord::Base
       preference_tally << voter.vote.rankings.sort.collect \
         { |ranking| ranking.candidate.id }
     end
       preference_tally << voter.vote.rankings.sort.collect \
         { |ranking| ranking.candidate.id }
     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
     @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

     
     

-    nil # to stay consistent
-  end
+    { 'plurality' => @plurality_result,
+      'approval' => @approval_result,
+      'condorcet' => @condorcet_result,
+      'ssd' => @ssd_result,
+      'borda' => @borda_result }
+    end

   
   def names_by_id
     names = Hash.new
   
   def names_by_id
     names = Hash.new

diff --git a/app/views/quickvote/_result_approval.rhtml b/app/views/quickvote/_result_approval.rhtml
new file mode 100644 (file)
index 0000000..12c7958
--- /dev/null
+++ b/app/views/quickvote/_result_approval.rhtml
@@ -0,0 +1,17 @@
+<div class="resultbox">
+<h3>Approval Result</h3>
+<p><font size="-1">(This algorithm assumes that top two choices are "approved.")</font></p>
+
+<div class="rbmoreinfo">
+<h4>About Approval Voting</h4>
+
+<p><%= link_to "Approval voting",
+"http://en.wikipedia.org/wiki/Approval_voting" %> is a voting system in
+which each voter can vote for as many or as few candidates as the voter
+chooses.  Approval voting is a limited form of range voting, where the
+range that voters are allowed to express is extremely constrained:
+accept or not.</p>
+
+</div>
+
+</div>
\ No newline at end of file

diff --git a/app/views/quickvote/_result_borda.rhtml b/app/views/quickvote/_result_borda.rhtml
new file mode 100644 (file)
index 0000000..97d82e5
--- /dev/null
+++ b/app/views/quickvote/_result_borda.rhtml
@@ -0,0 +1,16 @@
+<div class="resultbox">
+<h3>Borda Count Results</h3>
+
+<div class="rbmoreinfo">
+<h4>About Borda Count</h4>
+
+<p><%= link_to "Borda count",
+"http://en.wikipedia.org/wiki/Borda_count" %> 
+is an election method in which voters rank
+candidates in order of preference. The Borda count determines the winner
+of an election by giving each candidate a certain number of points
+corresponding to the position in which he or she is ranked by each
+voter. Once all votes have been counted the candidate with the most
+points is the winner.</p>
+</div>
+</div>
\ No newline at end of file

diff --git a/app/views/quickvote/_result_condorcet.rhtml b/app/views/quickvote/_result_condorcet.rhtml
new file mode 100644 (file)
index 0000000..4279bbd
--- /dev/null
+++ b/app/views/quickvote/_result_condorcet.rhtml
@@ -0,0 +1,18 @@
+<div class="resultbox">
+<h3>Simple Condorcet Results</h3>
+
+<div class="rbmoreinfo">
+<h4>About Simple Cordorcet Voting</h4>
+
+<p><%= link_to "Condorcet",
+"http://en.wikipedia.org/wiki/Condorcet_method" %> allows voters to rank
+candidates in order of preference.  If there is a choice whom voters
+prefer to each other choice when compared to one at a time, that choice
+will be the winner.</p>
+
+<p>There is a family of Condorcet methods. This method is referred to as
+"Simple Condorcet" to distinguish it from the Schulze method which is
+another Condorcet system.</p>
+
+</div>
+</div>
\ No newline at end of file

diff --git a/app/views/quickvote/_result_plurality.rhtml b/app/views/quickvote/_result_plurality.rhtml
new file mode 100644 (file)
index 0000000..121c1dc
--- /dev/null
+++ b/app/views/quickvote/_result_plurality.rhtml
@@ -0,0 +1,17 @@
+<div class="resultbox">
+<h3>Plurality Results</h3>
+
+<div class="rbmoreinfo">
+<h4>About Plurality Voting</h4>
+
+<p><%= link_to "Plurality voting",
+"http://en.wikipedia.org/wiki/Plurality_electoral_system" %> selects the
+winner who has received the most "number one" votes, regardless of
+whether or not he or she has a majority of votes.</p>
+
+<p>Plurality voting is also variously referred to as, "first past the
+post," "winner-take-all," "majoritarian" or "simple majority"
+voting.</p>
+
+</div>
+</div>
\ No newline at end of file

diff --git a/app/views/quickvote/_result_runoff.rhtml b/app/views/quickvote/_result_runoff.rhtml
new file mode 100644 (file)
index 0000000..f242290
--- /dev/null
+++ b/app/views/quickvote/_result_runoff.rhtml
@@ -0,0 +1,20 @@
+<div class="resultbox">
+<h3>Instant Runoff (IRV) Results</h3>
+
+<div class="rbmoreinfo">
+<h4>About Instant Runoff Voting</h4>
+
+<p><%= link_to "Instant runoff voting",
+"http://en.wikipedia.org/wiki/Instant_Runoff_Voting" %> is an electoral
+system in which voters rank candidates in order of preference. In an IRV
+election, if no candidate receives an overall majority of first
+preferences the candidates with fewest votes are eliminated one by one,
+and their votes transferred according to their second and third
+preferences (and so on), until one candidate achieves a majority.</p>
+
+<p>Instant-runoff voting (IRV) is also known as the Alternative Vote (AV) and
+by several other names.</p>
+
+</div>
+
+</div>
\ No newline at end of file

diff --git a/app/views/quickvote/_result_ssd.rhtml b/app/views/quickvote/_result_ssd.rhtml
new file mode 100644 (file)
index 0000000..436dd67
--- /dev/null
+++ b/app/views/quickvote/_result_ssd.rhtml
@@ -0,0 +1,17 @@
+<div class="mainresultbox">
+<h3>Schulze Method Results</h3>
+
+<div class="rbmoreinfo">
+<h4>About the Schulze Method</h4>
+
+<p>The <%= link_to "Schulze method",
+"http://en.wikipedia.org/wiki/Schulze_method" %> is a preferential
+voting system. It is based on the Condorcet method but includes a set of
+methods for resolving "circular" defeats.</p>
+
+<p>The Schulze method is also known as Schwartz Sequential Dropping
+(SSD), Cloneproof Schwartz Sequential Dropping (CSSD), Beatpath Method,
+Beatpath Winner, Path Voting, and Path Winner.</p>
+</div>
+
+</div>

diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index 3d5468ce7782bd2d9095033fcde95a545abde31d..7ab73efc23926bfc73db059bb5421d4b30e31be0 100644 (file)
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -27,121 +27,16 @@
 
 <h2>Winners</h2>
 
 
 <h2>Winners</h2>
 

-<div class="mainresultbox">
-<h3>Schulze Method Results</h3>
-<%= render :partial => 'result', :object => @election.ssd_result %>
+<%= render :partial => 'result_' + @election.election_method,
+           :object => @results[@election.election_method] %>

 
 

-<div class="rbmoreinfo">
-<h4>About the Schulze Method</h4>

 
 

-<p>The <%= link_to "Schulze method",
-"http://en.wikipedia.org/wiki/Schulze_method" %> is a preferential
-voting system. It is based on the Condorcet method but includes a set of
-methods for resolving "circular" defeats.</p>
-
-<p>The Schulze method is also known as Schwartz Sequential Dropping
-(SSD), Cloneproof Schwartz Sequential Dropping (CSSD), Beatpath Method,
-Beatpath Winner, Path Voting, and Path Winner.</p>
-</div>
-
-</div>
-
-<div class="resultbox">
-<h3>Plurality Results</h3>
-<%= render :partial => 'result', :object => @election.plurality_result %>
-
-<div class="rbmoreinfo">
-<h4>About Plurality Voting</h4>
-
-<p><%= link_to "Plurality voting",
-"http://en.wikipedia.org/wiki/Plurality_electoral_system" %> selects the
-winner who has received the most "number one" votes, regardless of
-whether or not he or she has a majority of votes.</p>
-
-<p>Plurality voting is also variously referred to as, "first past the
-post," "winner-take-all," "majoritarian" or "simple majority"
-voting.</p>
-
-</div>
-</div>
-
-<div class="resultbox">
-<h3>Approval Result</h3>
-<p><font size="-1">(This algorithm assumes that top two choices are "approved.")</font></p>
-<%= render :partial => 'result', :object => @election.approval_result %>
-
-<div class="rbmoreinfo">
-<h4>About Approval Voting</h4>
-
-<p><%= link_to "Approval voting",
-"http://en.wikipedia.org/wiki/Approval_voting" %> is a voting system in
-which each voter can vote for as many or as few candidates as the voter
-chooses.  Approval voting is a limited form of range voting, where the
-range that voters are allowed to express is extremely constrained:
-accept or not.</p>
-
-</div>
-
-</div>
-
-<div class="resultbox">
-<h3>Simple Condorcet Results</h3>
-<%= render :partial => 'result', :object => @election.condorcet_result %>
-
-<div class="rbmoreinfo">
-<h4>About Simple Cordorcet Voting</h4>
-
-<p><%= link_to "Condorcet",
-"http://en.wikipedia.org/wiki/Condorcet_method" %> allows voters to rank
-candidates in order of preference.  If there is a choice whom voters
-prefer to each other choice when compared to one at a time, that choice
-will be the winner.</p>
-
-<p>There is a family of Condorcet methods. This method is referred to as
-"Simple Condorcet" to distinguish it from the Schulze method which is
-another Condorcet system.</p>
-
-</div>
-</div>
-
-<div class="resultbox">
-<h3>Borda Count Results</h3>
-<%= render :partial => 'result', :object => @election.borda_result %>
-
-<div class="rbmoreinfo">
-<h4>About Borda Count</h4>
-
-<p><%= link_to "Borda count",
-"http://en.wikipedia.org/wiki/Borda_count" %> 
-is an election method in which voters rank
-candidates in order of preference. The Borda count determines the winner
-of an election by giving each candidate a certain number of points
-corresponding to the position in which he or she is ranked by each
-voter. Once all votes have been counted the candidate with the most
-points is the winner.</p>
-</div>
-</div>
-
-<div class="resultbox">
-<h3>Instant Runoff (IRV) Results</h3>
-
-<div class="rbmoreinfo">
-<h4>About Instant Runoff Voting</h4>
-
-<p><%= link_to "Instant runoff voting",
-"http://en.wikipedia.org/wiki/Instant_Runoff_Voting" %> is an electoral
-system in which voters rank candidates in order of preference. In an IRV
-election, if no candidate receives an overall majority of first
-preferences the candidates with fewest votes are eliminated one by one,
-and their votes transferred according to their second and third
-preferences (and so on), until one candidate achieves a majority.</p>
-
-<p>Instant-runoff voting (IRV) is also known as the Alternative Vote (AV) and
-by several other names.</p>
-
-</div>
+<h3> Other Voting Methods </h3>
+<% for result_type in @election.other_methods %>
+<%= render :partial => 'result_' + result_type, 
+           :object => @results[result_type] %>
+<% end %>

 
 

-</div>

 
 <div class="clearbox"></div>
 
 
 <div class="clearbox"></div>
 

diff --git a/config/environment.rb b/config/environment.rb
index e071a1437bf25b6c24074331c4f9d0a9efe09cc0..571638d14a3fc1a0ccefbce34442f8cbc1fa8fc0 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -63,10 +63,12 @@ MAIL_CONFIG = { :from => 'Selectricity <info@selectricity.media.mit.edu>'}
 
 require 'uniq_token'
 require 'randarray'
 
 require 'uniq_token'
 require 'randarray'

-require 'rubyvote'

 require 'gruff'
 require 'sparklines'
 
 require 'gruff'
 require 'sparklines'
 

+require 'rubyvote'
+ELECTION_TYPES = %w(ssd plurality approval condorcet borda)
+

 class String
   # alternate capitalization method that does not lowercase the rest of
   # the string -- which is almost never what I want
 class String
   # alternate capitalization method that does not lowercase the rest of
   # the string -- which is almost never what I want

diff --git a/db/create.sql b/db/create.sql
index 0a2f4b5b9dc3bca3ae9dd5d60ab57590e310014e..7b3fef5600b061a043c5c3972abe066aa75df79f 100644 (file)
--- a/db/create.sql
+++ b/db/create.sql
@@ -11,6 +11,7 @@ create table elections (
  enddate datetime NOT NULL, 
  active tinyint NOT NULL DEFAULT 0,
  user_id int NULL,
  enddate datetime NOT NULL, 
  active tinyint NOT NULL DEFAULT 0,
  user_id int NULL,

+ election_method varchar(100) DEFAULT 'ssd',

  `type` varchar(100) NOT NULL,
  primary key (id),
  constraint fk_user_election foreign key (user_id) references users(id)
  `type` varchar(100) NOT NULL,
  primary key (id),
  constraint fk_user_election foreign key (user_id) references users(id)

diff --git a/db/schema.rb b/db/schema.rb
index 45d7b416a2eb0a25c752c23b3ddfe74920236c8f..cc61ca37c0b9abdbf9a6e19760d4749bd2ea6f66 100644 (file)
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -14,14 +14,15 @@ ActiveRecord::Schema.define() do
   end
 
   create_table "elections", :force => true do |t|
   end
 
   create_table "elections", :force => true do |t|

-    t.column "name",        :string,   :limit => 100, :default => "", :null => false
-    t.column "description", :text,                    :default => "", :null => false
-    t.column "anonymous",   :integer,  :limit => 4,   :default => 1,  :null => false
-    t.column "startdate",   :datetime
-    t.column "enddate",     :datetime,                                :null => false
-    t.column "active",      :integer,  :limit => 4,   :default => 0,  :null => false
-    t.column "user_id",     :integer
-    t.column "type",        :string,   :limit => 100, :default => "", :null => false
+    t.column "name",            :string,   :limit => 100, :default => "",    :null => false
+    t.column "description",     :text,                    :default => "",    :null => false
+    t.column "anonymous",       :integer,  :limit => 4,   :default => 1,     :null => false
+    t.column "startdate",       :datetime
+    t.column "enddate",         :datetime,                                   :null => false
+    t.column "active",          :integer,  :limit => 4,   :default => 0,     :null => false
+    t.column "user_id",         :integer
+    t.column "election_method", :string,   :limit => 100, :default => "ssd"
+    t.column "type",            :string,   :limit => 100, :default => "",    :null => false

   end
 
   add_index "elections", ["user_id"], :name => "fk_user_election"
   end
 
   add_index "elections", ["user_id"], :name => "fk_user_election"