mirror of
https://github.com/meineerde/redmine.git
synced 2026-01-06 15:41:33 +00:00
ed50d42210
Depending on the offset between a user's configured timezone and the server timezone, Date.today may be more or less often wrong from the user's perspective, leading to things like issues marked as overdue too early or too late, or yesterday / tomorrow being displayed / selected where 'today' is intended. A test case illustrating the problem with Issue#overdue? is included Patch by Jens Kraemer. git-svn-id: http://svn.redmine.org/redmine/trunk@15379 e93f8b46-1217-0410-a6f0-8f06a7374b81
60 lines
2.1 KiB
Plaintext
60 lines
2.1 KiB
Plaintext
<h3>
|
|
<%= link_to l(:label_spent_time), time_entries_path(:user_id => 'me') %>
|
|
(<%= l(:label_last_n_days, 7) %>)
|
|
</h3>
|
|
<%
|
|
entries = timelog_items
|
|
entries_by_day = entries.group_by(&:spent_on)
|
|
%>
|
|
|
|
<% if User.current.allowed_to?(:log_time, nil, :global => true) %>
|
|
<div class="contextual">
|
|
<%= link_to l(:button_log_time), new_time_entry_path, :class => "icon icon-add" %>
|
|
</div>
|
|
<% end %>
|
|
|
|
<div class="total-hours">
|
|
<p><%= l(:label_total_time) %>: <%= html_hours("%.2f" % entries.sum(&:hours).to_f) %></p>
|
|
</div>
|
|
|
|
<% if entries.any? %>
|
|
<table class="list time-entries">
|
|
<thead><tr>
|
|
<th><%= l(:label_activity) %></th>
|
|
<th><%= l(:label_project) %></th>
|
|
<th><%= l(:field_comments) %></th>
|
|
<th><%= l(:field_hours) %></th>
|
|
<th></th>
|
|
</tr></thead>
|
|
<tbody>
|
|
<% entries_by_day.keys.sort.reverse.each do |day| %>
|
|
<tr class="odd">
|
|
<td><strong><%= day == User.current.today ? l(:label_today).titleize : format_date(day) %></strong></td>
|
|
<td colspan="2"></td>
|
|
<td class="hours"><em><%= html_hours("%.2f" % entries_by_day[day].sum(&:hours).to_f) %></em></td>
|
|
<td></td>
|
|
</tr>
|
|
<% entries_by_day[day].each do |entry| -%>
|
|
<tr class="time-entry" style="border-bottom: 1px solid #f5f5f5;">
|
|
<td class="activity"><%= entry.activity %></td>
|
|
<td class="subject"><%= entry.project %> <%= h(' - ') + link_to_issue(entry.issue, :truncate => 50) if entry.issue %></td>
|
|
<td class="comments"><%= entry.comments %></td>
|
|
<td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
|
|
<td class="buttons">
|
|
<% if entry.editable_by?(@user) -%>
|
|
<%= link_to l(:button_edit), {:controller => 'timelog', :action => 'edit', :id => entry},
|
|
:title => l(:button_edit),
|
|
:class => 'icon-only icon-edit' %>
|
|
<%= link_to l(:button_delete), {:controller => 'timelog', :action => 'destroy', :id => entry},
|
|
:data => {:confirm => l(:text_are_you_sure)}, :method => :delete,
|
|
:title => l(:button_delete),
|
|
:class => 'icon-only icon-del' %>
|
|
<% end -%>
|
|
</td>
|
|
</tr>
|
|
<% end -%>
|
|
<% end -%>
|
|
</tbody>
|
|
</table>
|
|
<% end %>
|