Defect #35726 » timelog_helper.patch
| app/helpers/timelog_helper.rb | ||
|---|---|---|
| 109 | 109 |
report.periods.each do |period| |
| 110 | 110 |
sum = sum_hours(select_hours(report.hours, report.columns, period.to_s)) |
| 111 | 111 |
total += sum |
| 112 |
row << (sum > 0 ? sum : '')
|
|
| 112 |
row << (sum > 0 ? format_hours(sum) : '')
|
|
| 113 | 113 |
end |
| 114 |
row << total
|
|
| 114 |
row << format_hours(total)
|
|
| 115 | 115 |
csv << row |
| 116 | 116 |
end |
| 117 | 117 |
end |
| app/helpers/timelog_helper.rb → app/helpers/timelog_helper.rb (date 1628525671015) | ||
|---|---|---|
| 128 | 128 |
periods.each do |period| |
| 129 | 129 |
sum = sum_hours(select_hours(hours_for_value, columns, period.to_s)) |
| 130 | 130 |
total += sum |
| 131 |
row << (sum > 0 ? sum : '')
|
|
| 131 |
row << (sum > 0 ? format_hours(sum) : '')
|
|
| 132 | 132 |
end |
| 133 |
row << total
|
|
| 133 |
row << format_hours(total)
|
|
| 134 | 134 |
csv << row |
| 135 | 135 |
if criteria.length > level + 1 |
| 136 | 136 |
report_criteria_to_csv(csv, available_criteria, columns, criteria, periods, hours_for_value, level + 1) |
| 137 | 137 |
|
| 138 | 138 |
|