Merge from my devel branch

[selectricity-live] / app / controllers / graph_controller.rb

diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index 0d024468eaebe8ccef25938b4fc3e57404a6bc2f..825688476485d114f1583cdb6774c6962e40528d 100644 (file)
--- a/app/controllers/graph_controller.rb
+++ b/app/controllers/graph_controller.rb
@@ -1,6 +1,6 @@
 require 'date'
 class GraphController < ApplicationController
-
+  
   class GruffGraff
   
     def initialize(options)
@@ -12,11 +12,19 @@ class GraphController < ApplicationController
                                    RAILS_ROOT)
       
       # fill in the data with the optional data name
-      @graph.data( options.fetch(:data_name, nil), options[:data] )
-
+      #Check to see if multiple datasets, if so, fill them all!     
+      if options[:data].size > 1 && options[:data].all?  {|i| i.is_a?(Array)}
+        options[:data].each do |array|
+          @graph.data( options.fetch(:data_name, "Data"), array)
+        end
+      else #one dimensional array, just pass it in
+      @graph.data( options.fetch(:data_name, "Data"), options[:data] )
+      end
+      
       # set the labels or create an empty hash
       @graph.labels = options[:interval_labels] \
-        if options.has_key?(:labels) and options[:labels].class = Hash
+        if options.has_key?(:interval_labels) and \
+           options[:interval_labels].class == Hash
       @graph.x_axis_label = options[:x_axis_label] \
         if options.has_key?(:x_axis_label)
       @graph.y_axis_label = options[:y_axis_label] \
@@ -62,11 +70,7 @@ class GraphController < ApplicationController
                             :y_axis_label => "Number of Votes")
     send_data(*graph.output)
   end
- 
-  def quickvote_bar
-    @election = Election.find(params[:id])
-  end
-  
+
   def borda_bar
     @election = Election.find(params[:id])
     pref_tally = make_preference_tally(@election)
@@ -84,7 +88,55 @@ class GraphController < ApplicationController
     send_data(*graph.output)
   end
  
+  def choices_positions
+    @election = Election.find(params[:id])
+    pref_tally = make_preference_tally(@election)
+    
+    fulldata, labels = get_positions_info(@election)
+    labels = @candidates
+    graph = GruffGraff.new( :graph_type => Gruff::Bar,
+                            :data_name => @election.name,
+                            :data => fulldata,
+                            :interval_labels => labels,
+                            :title => "Times Voted in Each Position",
+                            :y_axis_label => "Number of Times Ranked",
+                            :x_axis_label => "Rank")
+    send_data(*graph.output) 
+  end
+  
  private 
+ 
+  def get_positions_info(election)
+    buckets = Hash.new
+    buckets2= Hash.new
+    rank_labels = Hash.new
+  
+    election.candidates.each do |candidate|
+      buckets[candidate.id] = []
+      buckets2[candidate.id] = []
+    end
+     
+    election.votes.each do |vote|
+      vote.rankings.each do |ranking|
+        buckets[ranking.candidate_id] << ranking.rank
+      end
+    end
+       
+    buckets.each_pair do |id, array|
+      (1..election.candidates.size).each do |i|
+        buckets2[id] << (array.find_all {|rank| rank == i}).size
+      end
+    end
+    
+    election.votes.each do |vote|
+      vote.rankings.size.times do |i|
+        rank_labels[i] = (i+1).to_s
+      end
+    end
+   
+    return buckets2.values, rank_labels
+    
+  end
    
   # generate the data and labels for each graph
   def get_votes_per_day_data(election)
@@ -143,12 +195,12 @@ class GraphController < ApplicationController
     
     # Make a hash, buckets, indexed by time intervals and containing empty arrays
     # The time object must come first in addition! 
-    # i would start at 0, i+1 goes from 0 up till numcols
+    # i would start at 0, i+1 goes from 1 up till numcols
     numcols.times {|i| buckets[starttime + ((i+1)*interval_length)] = []}
      
     # Put votes into bucket according to the time interval to which they belong,
     # referenced by their key
-    # Will build a graph over time, as each successive interval wil lhave more
+    # Will build a graph over time, as each successive interval will have more
     # vote objects  
     election.votes.each do |vote|
       buckets.keys.sort.each do |inter|
@@ -174,7 +226,7 @@ class GraphController < ApplicationController
       interval_type = "Hour of the Day on 24 hour scale"
     else #more than 2 days means use dates for labels
       labels_hash[0] = (Date.parse(starttime.to_s)).to_s
-      labels_hash[(numcols/2)-1] = (Date.parse(starttime + (timedelta/2))).to_s
+      labels_hash[(numcols/2)-1] = (Date.parse((starttime + (timedelta/2)).to_s)).to_s
       labels_hash[numcols-1] = (Date.today).to_s
       interval_type = "The Date"
     end