Redmine 4.1.1
This commit is contained in:
parent
33e7b881a5
commit
3d976f1b3b
1593 changed files with 36180 additions and 19489 deletions
5
app/views/my/blocks/_activity.html.erb
Normal file
5
app/views/my/blocks/_activity.html.erb
Normal file
|
@ -0,0 +1,5 @@
|
|||
<h3><%= link_to l(:label_activity), :controller => 'activities',
|
||||
:action => 'index', :id => nil, :user_id => User.current,
|
||||
:from => events_by_day.keys.first %></h3>
|
||||
|
||||
<%= render :partial => 'activities/activities', :locals => {:events_by_day => events_by_day} %>
|
|
@ -35,13 +35,15 @@
|
|||
<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| %>
|
||||
<% 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(format_hours(entries_by_day[day].sum(&:hours))) %></em></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<% entries_by_day[day].each do |entry| -%>
|
||||
<tr id="time-entry-<%= entry.id %>" class="time-entry hascontextmenu">
|
||||
|
@ -52,6 +54,7 @@
|
|||
<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(format_hours(entry.hours)) %></td>
|
||||
<td class="buttons"><%= link_to_context_menu %></td>
|
||||
</tr>
|
||||
<% end -%>
|
||||
<% end -%>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue