add-column-timelog

.gitignore

 /.project
+/vendor
 /.idea
 /.loadpath
 /.powrc

app/controllers/timelog_controller.rb

@@ -66,7 +66,7 @@ class TimelogController < ApplicationController
       format.csv {
         # Export all entries
         @entries = scope.to_a
-        send_data(query_to_csv(@entries, @query, params), :type => 'text/csv; header=present', :filename => 'timelog.csv')
+        send_data(query_to_csv_timelog(@entries, @query, params), :type => 'text/csv; header=present', :filename => 'timelog.csv')
       }
     end
   end

app/helpers/queries_helper.rb

@@ -297,6 +297,22 @@ module QueriesHelper
     end
   end
 
+  def query_to_csv_timelog(items, query, options={})
+    time_entry = TimeEntry.includes(:project).find(1)
+    project = time_entry.project
+    parent_project_name = project.parent.name
+
+    columns = query.columns
+    Redmine::Export::CSV.generate(:encoding => params[:encoding]) do |csv|
+      # csv header fields
+      csv << ['Projet principal'] + columns.map {|c| c.caption.to_s}
+      # csv lines
+      items.each do |item|
+        csv << [parent_project_name] + columns.map {|c| csv_content(c, item)}
+      end
+    end
+  end
+
   # Retrieve query from session or build a new query
   def retrieve_query(klass=IssueQuery, use_session=true, options={})
     session_key = klass.name.underscore.to_sym