move method to helper

git-svn-id: https://dev.finn.de/svn/cockpit/branches/reporting_merge@1263 7926756e-e54e-46e6-9721-ed318f58905e
pull/6827/head
t.felgentreff 15 years ago
parent 8124c459fb
commit aaa3a23d2c
  1. 22
      app/helpers/reporting_helper.rb
  2. 25
      app/views/cost_reports/_cost_report_table.rhtml

@ -10,4 +10,26 @@ module ReportingHelper
{:name => :operators, :filter_name => filter.underscore_name, :operators => filter.available_operators}, {:name => :operators, :filter_name => filter.underscore_name, :operators => filter.available_operators},
{:name => :multi_values, :filter_name => filter.underscore_name, :values => filter.available_values}] {:name => :multi_values, :filter_name => filter.underscore_name, :values => filter.available_values}]
end end
##
# For a given row, determine how to render it's contents according to usability and
# localization rules
def show_row(row)
row.render do |key, value|
case key.to_sym
when :project_id then "Project ##{value}: #{Project.find(value.to_i).name}"
when :user_id then link_to_user User.find(value)
when :tyear then value
when :tweek then
if value.to_i == Date.today.cweek
l(:label_this_week)
elsif value.to_i == (Date.today.cweek - 1)
l(:label_last_week)
else
"#{l(:label_week)} ##{value}"
end
else "#{key}: #{value}"
end
end
end
end end

@ -1,27 +1,4 @@
<% # FIXME: Move this somewhere safe <%
##
# For a given row, determine how to render it's contents according to usability and
# localization rules
def show_row(row)
row.render do |key, value|
case key.to_sym
when :project_id then "Project ##{value}: #{Project.find(value.to_i).name}"
when :user_id then link_to_user User.find(value)
when :tyear then value
when :tweek then
if value.to_i == Date.today.cweek
l(:label_this_week).capitalize
elsif value.to_i == (Date.today.cweek - 1)
l(:label_last_week).capitalize
else
"#{l(:label_week)} ##{value}"
end
else "#{key}: #{value}"
end
end
end
walker.for_final_row do |row, cells| walker.for_final_row do |row, cells|
"<td>#{show_row row}</td>" << cells.join << "<td>#{row.real_costs} €</td>" "<td>#{show_row row}</td>" << cells.join << "<td>#{row.real_costs} €</td>"
end end

Loading…
Cancel
Save