From: <jlsharps@mit.edu>
Date: Thu, 30 Aug 2007 23:07:41 +0000 (-0400)
Subject: Started modifying the results page for final appearnces.
X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/e7df11018ea1e15f8671f948126632be3ac86e84?ds=sidebyside

Started modifying the results page for final appearnces.
---

diff --git a/app/models/election.rb b/app/models/election.rb
index 9c6337f..7fa138e 100644
--- a/app/models/election.rb
+++ b/app/models/election.rb
@@ -23,7 +23,7 @@ class Election < ActiveRecord::Base
 
   def other_methods
     if election_method
-      @other_methods = ELECTION_TYPES.reject {|i| i == election_method}
+      @other_methods = ELECTION_TYPES.keys.reject {|i| i == election_method}
     else
       @other_methods = nil
     end
diff --git a/app/views/quickvote/results.rhtml b/app/views/quickvote/results.rhtml
index eb149f6..a51ca1d 100644
--- a/app/views/quickvote/results.rhtml
+++ b/app/views/quickvote/results.rhtml
@@ -30,8 +30,8 @@
 
 <div class="normal-header">
   <span class="header">Winner</span>
-  <span class="subheader">The chosen method is: 
-  <%= @election.election_method.capitalize %></span>
+  <span class="subheader">Computed with
+  <%= ELECTION_TYPES[@election.election_method] %></span>
 </div>
 
 <div class="mainresultbox">
diff --git a/config/environment.rb b/config/environment.rb
index 49b0c48..5ea9f10 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -67,7 +67,11 @@ require 'gruff-0.2.8/lib/gruff'
 require 'sparklines'
 
 require 'rubyvote'
-ELECTION_TYPES = %w(ssd plurality approval condorcet borda)
+ELECTION_TYPES = {'ssd' => "Schulze Sequential Dropping",
+                  'plurality' => "Plurality/First Past the Post",
+                  'approval' => "Approval (Top Two)",
+                  'condorcet' => "Simple Condorcet",
+                  'borda' => "Borda Count"}
 
 class String
   # alternate capitalization method that does not lowercase the rest of