meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-10-17 17:01:01 +00:00
Code Issues Releases Wiki Activity

shorten long line of TimelogHelper

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20614 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2020-12-10 13:34:38 +00:00
parent 43b245acdc
commit c03cb9e135
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/helpers/timelog_helper.rb
View File

@ -34,9 +34,11 @@ module TimelogHelper
collection = []
if time_entry && time_entry.activity && !time_entry.activity.active?
collection << [ "--- #{l(:actionview_instancetag_blank_option)} ---", '' ]
collection << ["--- #{l(:actionview_instancetag_blank_option)} ---", '']
else
collection << [ "--- #{l(:actionview_instancetag_blank_option)} ---", '' ] unless activities.detect(&:is_default)
unless activities.detect(&:is_default)
collection << ["--- #{l(:actionview_instancetag_blank_option)} ---", '']
end
end
activities.each {|a| collection << [a.name, a.id]}
collection
@ -44,7 +46,9 @@ module TimelogHelper
def user_collection_for_select_options(time_entry)
collection = time_entry.assignable_users
collection << time_entry.user if time_entry.user && !collection.include?(time_entry.user)
if time_entry.user && !collection.include?(time_entry.user)
collection << time_entry.user
end
principals_options_for_select(collection, time_entry.user_id.to_s)
end
@ -88,15 +92,19 @@ module TimelogHelper
def report_to_csv(report)
Redmine::Export::CSV.generate(:encoding => params[:encoding]) do |csv|
# Column headers
headers = report.criteria.collect {|criteria| l_or_humanize(report.available_criteria[criteria][:label])}
headers =
report.criteria.collect do |criteria|
l_or_humanize(report.available_criteria[criteria][:label])
end
headers += report.periods
headers << l(:label_total_time)
csv << headers
# Content
report_criteria_to_csv(csv, report.available_criteria, report.columns, report.criteria, report.periods, report.hours)
report_criteria_to_csv(csv, report.available_criteria, report.columns,
report.criteria, report.periods, report.hours)
# Total row
str_total = l(:label_total_time)
row = [ str_total ] + [''] * (report.criteria.size - 1)
row = [str_total] + [''] * (report.criteria.size - 1)
total = 0
report.periods.each do |period|
sum = sum_hours(select_hours(report.hours, report.columns, period.to_s))