meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Test broken, display hours like in other tables (#23996).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@15967 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2016-11-18 13:47:16 +00:00
parent 05a160e372
commit 8c9f9ba38b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/timelog/_report_criteria.html.erb
View File

@ -8,9 +8,9 @@
<% total = 0 -%> <% total = 0 -%>
<% @report.periods.each do |period| -%> <% @report.periods.each do |period| -%>
<% sum = sum_hours(select_hours(hours_for_value, @report.columns, period.to_s)); total += sum -%> <% sum = sum_hours(select_hours(hours_for_value, @report.columns, period.to_s)); total += sum -%>
<td class="hours"><%= html_hours(l_hours_short(sum)) if sum > 0 %></td> <td class="hours"><%= html_hours(format_hours(sum)) if sum > 0 %></td>
<% end -%> <% end -%>
<td class="hours"><%= html_hours(l_hours_short(total)) if total > 0 %></td> <td class="hours"><%= html_hours(format_hours(total)) if total > 0 %></td>
</tr> </tr>
<% if criterias.length > level+1 -%> <% if criterias.length > level+1 -%>
<%= render(:partial => 'report_criteria', :locals => {:criterias => criterias, :hours => hours_for_value, :level => (level + 1)}) %> <%= render(:partial => 'report_criteria', :locals => {:criterias => criterias, :hours => hours_for_value, :level => (level + 1)}) %>

4
app/views/timelog/report.html.erb
View File

@ -52,9 +52,9 @@
<% total = 0 -%> <% total = 0 -%>
<% @report.periods.each do |period| -%> <% @report.periods.each do |period| -%>
<% sum = sum_hours(select_hours(@report.hours, @report.columns, period.to_s)); total += sum -%> <% sum = sum_hours(select_hours(@report.hours, @report.columns, period.to_s)); total += sum -%>
<td class="hours"><%= html_hours(l_hours_short(sum)) if sum > 0 %></td> <td class="hours"><%= html_hours(format_hours(sum)) if sum > 0 %></td>
<% end -%> <% end -%>
<td class="hours"><%= html_hours(l_hours_short(total)) if total > 0 %></td> <td class="hours"><%= html_hours(format_hours(total)) if total > 0 %></td>
</tr> </tr>
</tbody> </tbody>
</table> </table>