summaryrefslogtreecommitdiffstats
path: root/app/helpers/timelog_helper.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2013-02-19 20:41:54 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2013-02-19 20:41:54 +0000
commitf8c649320f849dec288407a771d446108dc40931 (patch)
treec8dfd1900c26ade2c57a63fccb8c5a88b2aa5b40 /app/helpers/timelog_helper.rb
parentaf92686c62c33d5566241d619b06b03f82ecb269 (diff)
downloadredmine-f8c649320f849dec288407a771d446108dc40931.tar.gz
redmine-f8c649320f849dec288407a771d446108dc40931.zip
Makes all time entry columns available in the CSV export.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11442 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/helpers/timelog_helper.rb')
-rw-r--r--app/helpers/timelog_helper.rb40
1 files changed, 6 insertions, 34 deletions
diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb
index cc4fbff47..380c4721c 100644
--- a/app/helpers/timelog_helper.rb
+++ b/app/helpers/timelog_helper.rb
@@ -86,44 +86,16 @@ module TimelogHelper
value)
end
- def entries_to_csv(entries)
- decimal_separator = l(:general_csv_decimal_separator)
- custom_fields = TimeEntryCustomField.all
+ def entries_to_csv(entries, query, options={})
+ encoding = l(:general_csv_encoding)
+ columns = (options[:columns] == 'all' ? query.available_inline_columns : query.inline_columns)
+
export = FCSV.generate(:col_sep => l(:general_csv_separator)) do |csv|
# csv header fields
- headers = [l(:field_spent_on),
- l(:field_user),
- l(:field_activity),
- l(:field_project),
- l(:field_issue),
- l(:field_tracker),
- l(:field_subject),
- l(:field_hours),
- l(:field_comments)
- ]
- # Export custom fields
- headers += custom_fields.collect(&:name)
-
- csv << headers.collect {|c| Redmine::CodesetUtil.from_utf8(
- c.to_s,
- l(:general_csv_encoding) ) }
+ csv << columns.collect {|c| Redmine::CodesetUtil.from_utf8(c.caption.to_s, encoding) }
# csv lines
entries.each do |entry|
- fields = [format_date(entry.spent_on),
- entry.user,
- entry.activity,
- entry.project,
- (entry.issue ? entry.issue.id : nil),
- (entry.issue ? entry.issue.tracker : nil),
- (entry.issue ? entry.issue.subject : nil),
- entry.hours.to_s.gsub('.', decimal_separator),
- entry.comments
- ]
- fields += custom_fields.collect {|f| show_value(entry.custom_field_values.detect {|v| v.custom_field_id == f.id}) }
-
- csv << fields.collect {|c| Redmine::CodesetUtil.from_utf8(
- c.to_s,
- l(:general_csv_encoding) ) }
+ csv << columns.collect {|c| Redmine::CodesetUtil.from_utf8(csv_content(c, entry), encoding) }
end
end
export