Removed the Gruff plugin from vendor/plugins. It seems to be working from the gem...

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

diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb
index 4f33ac3a3f7b02d212a7362ca9b26f10d0e22f3a..e7668ff38ed27e036d9710ae5784a19569304985 100644 (file)
--- a/app/controllers/graph_controller.rb
+++ b/app/controllers/graph_controller.rb
@@ -11,20 +11,20 @@ class GraphController < ApplicationController
     line.font = File.expand_path('/usr/X11R6/lib/X11/fonts/TTF/Vera.ttf',
                                  RAILS_ROOT)
 
     line.font = File.expand_path('/usr/X11R6/lib/X11/fonts/TTF/Vera.ttf',
                                  RAILS_ROOT)
 

-    line.data("#{@election.name}", data )
+    line.data( "#{@election.name}", data )

     line.labels = labels
 
     line.x_axis_label = "Date"
     line.y_axis_label = "Number of Votes"
     line.minimum_value = 0.0
 
     line.labels = labels
 
     line.x_axis_label = "Date"
     line.y_axis_label = "Number of Votes"
     line.minimum_value = 0.0
 

-    line.draw

     send_data(line.to_blob, :disposition => 'inline', :type => 'image/png')
   end
     send_data(line.to_blob, :disposition => 'inline', :type => 'image/png')
   end

- 
+  
+  #will place votes in a fixed number of intervals, and shows votes over time

   def votes_per_interval
     @election = Election.find(params[:id])
   def votes_per_interval
     @election = Election.find(params[:id])

-    data, labels = get_votes_per_interval_data(@election)
+    data, labels, scale = get_votes_per_interval_data(@election)

     
     line = Gruff::Line.new("700x400")
     line.theme = { :background_colors => ['#73BF26', '#ffffff'] }
     
     line = Gruff::Line.new("700x400")
     line.theme = { :background_colors => ['#73BF26', '#ffffff'] }


@@ -35,16 +35,41 @@ class GraphController < ApplicationController
     line.data("#{@election.name}", data )
     line.labels = labels
     
     line.data("#{@election.name}", data )
     line.labels = labels
     

-    line.x_axis_label = "Intervals"
+    line.x_axis_label = scale

     line.y_axis_label = "Number of Votes"
     line.minimum_value = 0.0
                                
     line.y_axis_label = "Number of Votes"
     line.minimum_value = 0.0
                                

-    line.draw

     send_data(line.to_blob, :disposition => 'inline', :type => 'image/png')  
   end
  
     send_data(line.to_blob, :disposition => 'inline', :type => 'image/png')  
   end
  

- private 
+  def quickvote_bar
+    @election = Election.find(params[:id])
+  end
+  
+  def borda_bar
+    @election = Election.find(params[:id])
+    pref_tally = make_preference_tally(@election)
+    
+    @borda_result = BordaVote.new(pref_tally).result
+    data, labels = get_borda_points(@borda_result)
+    
+    bar = Gruff::Bar.new("700x400")
+    bar.theme = { :background_colors => ['#73BF26', '#ffffff'] }
+    bar.title = "Points Per Candidate"
+    bar.font = File.expand_path('/usr/X11R6/lib/X11/fonts/TTF/Vera.ttf',
+                               RAILS_ROOT)
+                      
+    bar.data("#{@election.name}", data)
+    bar.labels = labels
+    
+    bar.y_axis_label = "Points"
+    bar.x_axis_label = "Candidate"
+    bar.minimum_value = 0.0
+    send_data(bar.to_blob, :disposition => 'inline', :type => 'image/png')
+  end

  
  

+ private 
+   

   # generate the data and labels for each graph
   def get_votes_per_day_data(election)
     voter_days = Array.new
   # generate the data and labels for each graph
   def get_votes_per_day_data(election)
     voter_days = Array.new


@@ -93,6 +118,7 @@ class GraphController < ApplicationController
     labels_hash = Hash.new
     buckets = Hash.new
     total_per_interval = Array.new
     labels_hash = Hash.new
     buckets = Hash.new
     total_per_interval = Array.new

+    interval_type = ""

     
     starttime = election.startdate
     timedelta = Time.now - starttime
     
     starttime = election.startdate
     timedelta = Time.now - starttime


@@ -124,18 +150,52 @@ class GraphController < ApplicationController
       labels_hash[0] = starttime.min.to_s
       labels_hash[(numcols/2)-1] = (starttime + (timedelta/2)).min.to_s
       labels_hash[numcols-1] = Time.now.min.to_s
       labels_hash[0] = starttime.min.to_s
       labels_hash[(numcols/2)-1] = (starttime + (timedelta/2)).min.to_s
       labels_hash[numcols-1] = Time.now.min.to_s

+      interval_type = "Minute of the Hour"

     elsif timedelta < 2.days #more than 2 hours means use hours for labels
       labels_hash[0] = starttime.hour.to_s
       labels_hash[(numcols/2)-1] = (starttime + (timedelta/2)).hour.to_s
       labels_hash[numcols-1] = Time.now.hour.to_s
     elsif timedelta < 2.days #more than 2 hours means use hours for labels
       labels_hash[0] = starttime.hour.to_s
       labels_hash[(numcols/2)-1] = (starttime + (timedelta/2)).hour.to_s
       labels_hash[numcols-1] = Time.now.hour.to_s

+      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-1] = (Date.today).to_s
     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-1] = (Date.today).to_s

+      interval_type = "The Date"

     end
     
     # Make sure to return an array for data and hash for labels
     end
     
     # Make sure to return an array for data and hash for labels

-    return total_per_interval, labels_hash   
+    return total_per_interval, labels_hash, interval_type   
+  end
+  
+  def get_borda_points(result)
+    #points holds how mnay points each candidate has received in array form
+    #becasue Gruff::Bar#data takes only an array
+    points = Array.new
+    labels = Hash.new
+
+    #Populate points with an sorted array from election.votes hash
+    #biggest to smallest will go from left to right
+    points = result.election.votes.sort do |a, b|
+      b[1] <=> a[1]
+    end.collect {|i| i[1]}
+
+    #make the labels  
+    result.ranked_candidates.each_with_index do |candidate, index|
+      labels[index] = Candidate.find(candidate).name
+    end
+
+    return points, labels
+  end
+
+  #most vote result objects require an array of vote arrays, which this will make
+  def make_preference_tally(election)
+    preference_tally = Array.new
+    @election.voters.each do |voter|
+      next unless voter.voted?
+      preference_tally << voter.vote.rankings.sort.collect \
+        { |ranking| ranking.candidate.id }
+    end
+  return preference_tally

   end
 
 end
   end
 
 end