Project

General

Profile

Defect #35726 » #35726.patch

Patch against trunk @ r21131 - Mischa The Evil, 2021-08-09 21:33

View differences:

app/helpers/queries_helper.rb
case column.name
when :attachments
value.to_a.map {|a| a.filename}.join("\n")
when :hours, :estimated_hours, :total_estimated_hours, :spent_hours, :total_spent_hours
format_hours(value)
else
format_object(value, false) do |value|
case value.class.name
app/helpers/timelog_helper.rb
report.periods.each do |period|
sum = sum_hours(select_hours(report.hours, report.columns, period.to_s))
total += sum
row << (sum > 0 ? sum : '')
row << (sum > 0 ? format_hours(sum) : '')
end
row << total
row << format_hours(total)
csv << row
end
end
......
periods.each do |period|
sum = sum_hours(select_hours(hours_for_value, columns, period.to_s))
total += sum
row << (sum > 0 ? sum : '')
row << (sum > 0 ? format_hours(sum) : '')
end
row << total
row << format_hours(total)
csv << row
if criteria.length > level + 1
report_criteria_to_csv(csv, available_criteria, columns, criteria, periods, hours_for_value, level + 1)
(2-2/2)