##// END OF EJS Templates
Option for long text custom fields to be displayed under the description field (#21705)....
Option for long text custom fields to be displayed under the description field (#21705). Based on patch by Marius BALTEANU. git-svn-id: http://svn.redmine.org/redmine/trunk@16251 e93f8b46-1217-0410-a6f0-8f06a7374b81

File last commit:

r15675:c9e197ed5558
r15869:b40d66f39fa8
Show More
report.html.erb
74 lines | 3.3 KiB | text/plain | TextLexer
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162 <div class="contextual">
Jean-Philippe Lang
Removes routes for time entries nested under project/issues....
r13060 <%= link_to l(:button_log_time),
_new_time_entry_path(@project, @issue),
:class => 'icon icon-time-add' if User.current.allowed_to?(:log_time, @project, :global => true) %>
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162 </div>
Jean-Philippe Lang
Makes spent time queries savable (#14790)....
r15257 <h2><%= @query.new_record? ? l(:label_spent_time) : @query.name %></h2>
Jean-Philippe Lang
Added time report....
r569
Jean-Philippe Lang
Remove special behaviour for listing issue time entries, use a filter for that....
r15262 <%= form_tag(_report_time_entries_path(@project, nil), :method => :get, :id => 'query_form') do %>
Jean-Philippe Lang
Extracted time report logic from the controller....
r7906 <% @report.criteria.each do |criterion| %>
<%= hidden_field_tag 'criteria[]', criterion, :id => nil %>
Jean-Philippe Lang
Added time report....
r569 <% end %>
Eric Davis
Refactor: extract TimelogController#report to a new controller class...
r4118 <%= render :partial => 'timelog/date_range' %>
Jean-Philippe Lang
Time report can be done at issue level (closes #970) + timelog views xhtml validation....
r1304
Toshi MARUYAMA
[#9489] linked labels to their elements...
r7571 <p><label for='columns'><%= l(:label_details) %></label>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],
Jean-Philippe Lang
Add predefined date ranges to the time report in the same way as the details view (closes #972). It nows defaults to 'All time'....
r1303 [l(:label_month), 'month'],
Jean-Philippe Lang
Various timelog report enhancements:...
r1311 [l(:label_week), 'week'],
Jean-Philippe Lang
Extracted time report logic from the controller....
r7906 [l(:label_day_plural).titleize, 'day']], @report.columns),
Jean-Philippe Lang
Fixed javascript error when changing time period on time report....
r8581 :onchange => "this.form.submit();" %>
Jean-Philippe Lang
Added time report....
r569
Jean-Philippe Lang
Extracted time report logic from the controller....
r7906 <label for='criterias'><%= l(:button_add) %></label>: <%= select_tag('criteria[]', options_for_select([[]] + (@report.available_criteria.keys - @report.criteria).collect{|k| [l_or_humanize(@report.available_criteria[k][:label]), k]}),
Jean-Philippe Lang
Changed timelogs filters to use non-AJAX requests (#1965)....
r5177 :onchange => "this.form.submit();",
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162 :style => 'width: 200px',
Toshi MARUYAMA
remove duplicated :id key from app/views/timelog/report.html.erb...
r13453 :disabled => (@report.criteria.length >= 3),
:id => "criterias") %>
Jean-Philippe Lang
"Clear" button in Spent Time Report tab also clears global filters (#13622)....
r15675 <%= link_to l(:button_clear), {:params => request.query_parameters.merge(:criteria => nil)}, :class => 'icon icon-reload' %></p>
Jean-Philippe Lang
Add predefined date ranges to the time report in the same way as the details view (closes #972). It nows defaults to 'All time'....
r1303 <% end %>
Jean-Philippe Lang
Extracted time report logic from the controller....
r7906 <% unless @report.criteria.empty? %>
Jean-Philippe Lang
Changes required by functional tests updates....
r15344 <% if @report.hours.empty? %>
<p class="nodata"><%= l(:label_no_data) %></p>
<% else %>
Jean-Philippe Lang
Adds an autoscroll div around time entry list and report (#8809)....
r7862 <div class="autoscroll">
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162 <table class="list" id="time-report">
Jean-Philippe Lang
Added time report....
r569 <thead>
<tr>
Jean-Philippe Lang
Extracted time report logic from the controller....
r7906 <% @report.criteria.each do |criteria| %>
<th><%= l_or_humanize(@report.available_criteria[criteria][:label]) %></th>
Jean-Philippe Lang
Added time report....
r569 <% end %>
Jean-Philippe Lang
Extracted time report logic from the controller....
r7906 <% columns_width = (40 / (@report.periods.length+1)).to_i %>
<% @report.periods.each do |period| %>
Jean-Philippe Lang
Removed deprecated align and width html attributes (#15307)....
r12038 <th class="period" style="width:<%= columns_width %>%;"><%= period %></th>
Jean-Philippe Lang
Added time report....
r569 <% end %>
Jean-Philippe Lang
Removed deprecated align and width html attributes (#15307)....
r12038 <th class="total" style="width:<%= columns_width %>%;"><%= l(:label_total_time) %></th>
Jean-Philippe Lang
Added time report....
r569 </tr>
</thead>
<tbody>
Jean-Philippe Lang
Extracted time report logic from the controller....
r7906 <%= render :partial => 'report_criteria', :locals => {:criterias => @report.criteria, :hours => @report.hours, :level => 0} %>
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162 <tr class="total">
Jean-Philippe Lang
Adds label_total_time string (#13337)....
r11352 <td><%= l(:label_total_time) %></td>
Toshi MARUYAMA
Rails3: view: html_safe for timelog/report.html.erb...
r8330 <%= ('<td></td>' * (@report.criteria.size - 1)).html_safe %>
Jean-Philippe Lang
Various timelog report enhancements:...
r1311 <% total = 0 -%>
Jean-Philippe Lang
Extracted time report logic from the controller....
r7906 <% @report.periods.each do |period| -%>
<% sum = sum_hours(select_hours(@report.hours, @report.columns, period.to_s)); total += sum -%>
Jean-Philippe Lang
Test broken, display hours like in other tables (#23996)....
r15585 <td class="hours"><%= html_hours(format_hours(sum)) if sum > 0 %></td>
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162 <% end -%>
Jean-Philippe Lang
Test broken, display hours like in other tables (#23996)....
r15585 <td class="hours"><%= html_hours(format_hours(total)) if total > 0 %></td>
Jean-Philippe Lang
Propagates time tracking to the parent project (closes #433). Time report enhancements....
r1162 </tr>
Jean-Philippe Lang
Added time report....
r569 </tbody>
</table>
Jean-Philippe Lang
Adds an autoscroll div around time entry list and report (#8809)....
r7862 </div>
Jean-Philippe Lang
CSV export added to timelog report (#1009)....
r1323
Jean-Philippe Lang
Adds an helper to render other formats download links....
r2331 <% other_formats_links do |f| %>
Toshi MARUYAMA
replace tabs to spaces at app/views/time_entry_reports/report.html.erb...
r7247 <%= f.link_to 'CSV', :url => params %>
Jean-Philippe Lang
Adds an helper to render other formats download links....
r2331 <% end %>
Jean-Philippe Lang
Added time report....
r569 <% end %>
<% end %>
Jean-Philippe Lang
Time report can be done at issue level (closes #970) + timelog views xhtml validation....
r1304
Jean-Philippe Lang
Display the list of saved queries in the sidebar (#14790)....
r15260 <% content_for :sidebar do %>
<%= render_sidebar_queries(TimeEntryQuery, @project) %>
<% end %>
Jean-Philippe Lang
Makes spent time queries savable (#14790)....
r15257 <% html_title(@query.new_record? ? l(:label_spent_time) : @query.name, l(:label_report)) %>
Jean-Philippe Lang
Time report can be done at issue level (closes #970) + timelog views xhtml validation....
r1304