X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/0bcced90721389c27eb815ca8dcab85533417697..037ba376cadff08bca7185d7bc66410e10cf2975:/app/controllers/graph_controller.rb diff --git a/app/controllers/graph_controller.rb b/app/controllers/graph_controller.rb index bbd5cd7..8b617da 100644 --- a/app/controllers/graph_controller.rb +++ b/app/controllers/graph_controller.rb @@ -82,6 +82,7 @@ class GraphController < ApplicationController #pref_tally = make_preference_tally(@election) #@borda_result = BordaVote.new(pref_tally).result + @election.results unless @election.borda_result data, labels = get_borda_points(@election.borda_result) graph = GruffGraff.new( :graph_type => Gruff::Bar, @@ -169,7 +170,8 @@ class GraphController < ApplicationController # Now I need to create an array with all the times votes were made election.votes.each do |vote| - voter_days << Date.parse(vote.time.to_s) + next unless vote.time + voter_days << Date.parse(vote.time.to_s) end voter_days.sort! @@ -215,6 +217,7 @@ class GraphController < ApplicationController # Will build a graph over time, as each successive interval will have more # vote objects election.votes.each do |vote| + next unless vote.time buckets.keys.sort.each do |inter| if vote.time < inter buckets[inter] << vote