Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: data export should fill missing dates with zero value

This commit is contained in:
Arpit Jalan 2018-02-18 23:52:09 +05:30
parent c8cf034092
commit 33df2d6a02
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/jobs/regular/export_csv_file.rb
View File

@ -146,8 +146,14 @@ module Jobs
@extra[:end_date] = @extra[:end_date].to_date if @extra[:end_date].is_a?(String) @extra[:end_date] = @extra[:end_date].to_date if @extra[:end_date].is_a?(String)
@extra[:category_id] = @extra[:category_id].present? ? @extra[:category_id].to_i : nil @extra[:category_id] = @extra[:category_id].present? ? @extra[:category_id].to_i : nil
@extra[:group_id] = @extra[:group_id].present? ? @extra[:group_id].to_i : nil @extra[:group_id] = @extra[:group_id].present? ? @extra[:group_id].to_i : nil
report_hash = {}
Report.find(@extra[:name], @extra).data.each do |row| Report.find(@extra[:name], @extra).data.each do |row|
yield [row[:x].to_s(:db), row[:y].to_s(:db)] report_hash[row[:x].to_s(:db)] = row[:y].to_s(:db)
end
(@extra[:start_date]..@extra[:end_date]).each do |date|
yield [date.to_s(:db), report_hash.fetch(date.to_s(:db), 0)]
end end
end end