@@ -4,6 +4,7 @@ <td align="center"><%= format_date(time_entry.spent_on) %></td> <td align="center"><%= time_entry.user.name %></td> <td align="center"><%= time_entry.activity.name %></td> + <td align="center"><%= time_entry.project.name %></td> <td align="center"> <% if time_entry.issue %> <div class="tooltip"> app/views/timesheet/_time_entry.rhtml @@ -7,6 +7,7 @@ <th width="8%"><%= l(:label_date) %></th> <th width="10%"><%= l(:label_member) %></th> <th width="15%"><%= l(:label_activity) %></th> + <th width="15%"><%= l(:label_project) %></th> <th width="10%"><%= l(:label_issue) %></th> <th width="25%"><%= l(:field_comments) %></th> <th width="10%"><%= l(:field_hours) %> app/views/timesheet/_timesheet_group.rhtml @@ -20,8 +20,9 @@ <% when :issue %> <h3><%= h entryname -%> (<%= h number_with_precision(@total[entryname], @precision) %> <%= h(l(:field_hours)) -%>)</h3> <%= render :partial => 'by_issue', :locals => {:entry => entry, :name => entryname, :total => 0 } %> -<% else # Default to :project %> - <%= '<h3>' + h(entryname) -%> (<%= h number_with_precision(@total[entryname], @precision) %> <%= h(l(:field_hours)) -%>) <%= showing_users(entry[:users]) + '</h3>'%> +<% else %> +<%# Default to :project %> + <h3><%= h entryname -%> (<%= h number_with_precision(@total[entryname], @precision) %> <%= h(l(:field_hours)) -%>) <%= showing_users(entry[:users]) %></h3> <%= render :partial => 'timesheet_group', :locals => {:entry => entry, :name => entryname, :total => @total[entryname] } %> <% end @@ -35,12 +36,12 @@ end # form_tag <% end %> <% content_for(:header_tags) do %> - <%= javascript_include_tag 'context_menu' %> - <%= stylesheet_link_tag 'context_menu' %> +<%= javascript_include_tag 'context_menu' %> +<%= stylesheet_link_tag 'context_menu' %> <%= stylesheet_link_tag "timesheet", :plugin => "timesheet_plugin", :media => 'all' %> - <%# TODO: Typo on hook %> - <%= call_hook(:plugin_timesheet_view_timesheets_report_header_tags, { :timesheet => @timesheet }) %> - <%= call_hook(:plugin_timesheet_views_timesheets_report_header_tags, { :timesheet => @timesheet }) %> +<%# TODO: Typo on hook %> +<%= call_hook(:plugin_timesheet_view_timesheets_report_header_tags, { :timesheet => @timesheet }) %> +<%= call_hook(:plugin_timesheet_views_timesheets_report_header_tags, { :timesheet => @timesheet }) %> <% end %> <div id="context-menu" style="display: none;"></div> app/views/timesheet/report.rhtml f5635e2f51f991391f24a8630c11f91167726de9 4966c0ed886e0192c1fa76fdb8b0a65e7422090e Michele Franzin michele.franzin@gmail.com http://github.com/michelefranzin/redmine-timesheet-plugin/commit/6dd0e533559a0258f2aecec759c72845600f9f4b 6dd0e533559a0258f2aecec759c72845600f9f4b 2009-09-06T02:25:08-07:00 2009-09-06T02:25:08-07:00 merged edavis10 / redmine-timesheet-plugin @ 4966c0ed886e0192c1fa76fdb8b0a65e7422090e b6f102e8b4c32fb40c7f80d7a9846f08afd35df8 Michele Franzin michele.franzin@gmail.com