From 9f3470f9dc4f570811ab8d205c8d21934335dacf Mon Sep 17 00:00:00 2001 From: Katrina Owen Date: Sun, 17 Mar 2013 19:47:35 -0600 Subject: [PATCH] Shave off slight redundancy --- app/controllers/stats_controller.rb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb index 26609e5c..afe189c5 100644 --- a/app/controllers/stats_controller.rb +++ b/app/controllers/stats_controller.rb @@ -347,26 +347,25 @@ class StatsController < ApplicationController def prep_context_data_for_view(all_actions_per_context) - sum = all_actions_per_context.inject(0){|sum, apc| sum += apc['total'].to_i } + sum = all_actions_per_context.inject(0){|sum, apc| sum + apc['total']} pie_cutoff=10 size = [all_actions_per_context.size, pie_cutoff].min - # explicitely copy contents of hash to avoid ending up with two arrays pointing to same hashes + # explicitly copy contents of hash to avoid ending up with two arrays pointing to same hashes actions_per_context = Array.new(size){|i| { 'name' => all_actions_per_context[i]['name'], - 'total' => all_actions_per_context[i]['total'].to_i, + 'total' => all_actions_per_context[i]['total'], 'id' => all_actions_per_context[i]['id'] } } if all_actions_per_context.size > pie_cutoff - actions_per_context[size-1]['name']=t('stats.other_actions_label') - actions_per_context[size-1]['total']=actions_per_context[size-1]['total'] - actions_per_context[size-1]['id']=-1 - size.upto(all_actions_per_context.size-1){ |i| actions_per_context[size-1]['total']+=(all_actions_per_context[i]['total'].to_i) } + actions_per_context[-1]['name']=t('stats.other_actions_label') + actions_per_context[-1]['id']=-1 + size.upto(all_actions_per_context.size-1){ |i| actions_per_context[-1]['total']+=(all_actions_per_context[i]['total']) } end - @pie_slices = Array.new(size){|i| actions_per_context[i]['total'].to_i*100/sum } + @pie_slices = Array.new(size){|i| actions_per_context[i]['total']*100/sum } @pie_labels = Array.new(size){|i| actions_per_context[i]['name'].truncate(15, :omission => '...') } @pie_links = Array.new(size){|i| context_path(actions_per_context[i]['id'])} end