Skip to content

Commit e76e3fd

Browse files
committed
道場数の推移グラフと推移テーブルの値を一致させた #341
推移テーブルが間違いとみなし、推移テーブルの方を修正した。 (Dojo#annual_count に寄せた。もしかしたら Dojo#annual_sum_total_of_aggregatable_dojo かもしれない)
1 parent 875f9c3 commit e76e3fd

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

app/models/stat.rb

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ def initialize(period)
66
def annual_sum_total_of_aggregatable_dojo
77
return @annual_sum_total_of_aggregatable_dojo if defined?(@annual_sum_total_of_aggregatable_dojo)
88

9-
hash = Dojo.aggregatable_annual_count(@period)
10-
@annual_sum_total_of_aggregatable_dojo = year_hash_template.merge!(hash).each.with_object({}) {|(k, v), h| h[k] = (h.values.last || 0) + v }
9+
@annual_sum_total_of_aggregatable_dojo = year_hash_template.merge!(dojo_annual_count).each.with_object({}) do |(k, v), h|
10+
h[k] = (h.values.last || 0) + v
11+
end
1112
end
1213

1314
def annual_count_of_event_histories
@@ -25,7 +26,7 @@ def annual_sum_of_participants
2526
end
2627

2728
def annual_dojos_chart
28-
HighChartsBuilder.build_annual_dojos(Dojo.annual_count(@period))
29+
HighChartsBuilder.build_annual_dojos(dojo_annual_count)
2930
end
3031

3132
def annual_event_histories_chart
@@ -38,6 +39,10 @@ def annual_participants_chart
3839

3940
private
4041

42+
def dojo_annual_count
43+
Dojo.annual_count(@period)
44+
end
45+
4146
def year_hash_template
4247
initialized_year_hash.dup
4348
end

0 commit comments

Comments
 (0)