jro_apps/redmine Commit - r13920:49914f010dfb

Adds a class for handling CSV generation (#7037)....

Jean-Philippe Lang -

r13920:49914f010dfb

parent child

Context file:

r13920:49914f010dfb

Collapse all files

lib/redmine/export/csv.rb created 644 +59 0

@@ -0,0 +1,59
	1	# encoding: utf-8
	2	#
	3	# Redmine - project management software
	4	# Copyright (C) 2006-2015 Jean-Philippe Lang
	5	#
	6	# This program is free software; you can redistribute it and/or
	7	# modify it under the terms of the GNU General Public License
	8	# as published by the Free Software Foundation; either version 2
	9	# of the License, or (at your option) any later version.
	10	#
	11	# This program is distributed in the hope that it will be useful,
	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	14	# GNU General Public License for more details.
	15	#
	16	# You should have received a copy of the GNU General Public License
	17	# along with this program; if not, write to the Free Software
	18	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	19
	20	require 'csv'
	21
	22	module Redmine
	23	module Export
	24	module CSV
	25	def self.generate(*args, &block)
	26	Base.generate(*args, &block)
	27	end
	28
	29	class Base < ::CSV
	30	include Redmine::I18n
	31
	32	class << self
	33
	34	def generate(&block)
	35	col_sep = l(:general_csv_separator)
	36	encoding = l(:general_csv_encoding)
	37
	38	super(:col_sep => col_sep, :encoding => encoding, &block)
	39	end
	40	end
	41
	42	def <<(row)
	43	row = row.map do \|field\|
	44	case field
	45	when String
	46	Redmine::CodesetUtil.from_utf8(field, self.encoding.name)
	47	when Float
	48	@decimal_separator \|\|= l(:general_csv_decimal_separator)
	49	("%.2f" % field).gsub('.', @decimal_separator)
	50	else
	51	field
	52	end
	53	end
	54	super row
	55	end
	56	end
	57	end
	58	end
	59	end

app/helpers/application_helper.rb +5 0

                 end
               end
+              def generate_csv(&block)
+                decimal_separator = l(:general_csv_decimal_separator)
+                encoding = l(:general_csv_encoding)
+              end
               private
               def wiki_helper

app/helpers/queries_helper.rb +3 -5

               end
               def query_to_csv(items, query, options={})
-                encoding = l(:general_csv_encoding)
                 columns = (options[:columns] == 'all' ? query.available_inline_columns : query.inline_columns)
                 query.available_block_columns.each do |column|
                   if options[column.name].present?
                   end
                 end
-                export = CSV.generate(:col_sep => l(:general_csv_separator)) do |csv|
+                Redmine::Export::CSV.generate do |csv|
                   # csv header fields
-                  csv << columns.collect {|c| Redmine::CodesetUtil.from_utf8(c.caption.to_s, encoding) }
+                  csv << columns.map {|c| c.caption.to_s}
                   # csv lines
                   items.each do |item|
-                    csv << columns.collect {|c| Redmine::CodesetUtil.from_utf8(csv_content(c, item), encoding) }
+                    csv << columns.map {|c| csv_content(c, item)}
                   end
                 end
-                export
               end
               # Retrieve query from session or build a new query

app/helpers/timelog_helper.rb +8 -15

               end
               def report_to_csv(report)
-                decimal_separator = l(:general_csv_decimal_separator)
+                Redmine::Export::CSV.generate do |csv|
-                export = CSV.generate(:col_sep => l(:general_csv_separator)) do |csv|
                   # Column headers
                   headers = report.criteria.collect {|criteria| l(report.available_criteria[criteria][:label]) }
                   headers += report.periods
                   headers << l(:label_total_time)
-                  csv << headers.collect {|c| Redmine::CodesetUtil.from_utf8(
+                  csv << headers
-                                                c.to_s,
-                                                l(:general_csv_encoding) ) }
                   # Content
                   report_criteria_to_csv(csv, report.available_criteria, report.columns, report.criteria, report.periods, report.hours)
                   # Total row
-                  str_total = Redmine::CodesetUtil.from_utf8(l(:label_total_time), l(:general_csv_encoding))
+                  str_total = l(:label_total_time)
                   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))
                     total += sum
-                    row << (sum > 0 ? ("%.2f" % sum).gsub('.',decimal_separator) : '')
+                    row << (sum > 0 ? sum : '')
                   end
-                  row << ("%.2f" % total).gsub('.',decimal_separator)
+                  row << total
                   csv << row
                 end
-                export
               end
               def report_criteria_to_csv(csv, available_criteria, columns, criteria, periods, hours, level=0)
-                decimal_separator = l(:general_csv_decimal_separator)
                 hours.collect {|h| h[criteria[level]].to_s}.uniq.each do |value|
                   hours_for_value = select_hours(hours, criteria[level], value)
                   next if hours_for_value.empty?
                   row = [''] * level
-                  row << Redmine::CodesetUtil.from_utf8(
+                  row << format_criteria_value(available_criteria[criteria[level]], value).to_s
-                                    format_criteria_value(available_criteria[criteria[level]], value).to_s,
-                                    l(:general_csv_encoding) )
                   row += [''] * (criteria.length - level - 1)
                   total = 0
                   periods.each do |period|
                     sum = sum_hours(select_hours(hours_for_value, columns, period.to_s))
                     total += sum
-                    row << (sum > 0 ? ("%.2f" % sum).gsub('.',decimal_separator) : '')
+                    row << (sum > 0 ? sum : '')
                   end
-                  row << ("%.2f" % total).gsub('.',decimal_separator)
+                  row << total
                   csv << row
                   if criteria.length > level + 1
                     report_criteria_to_csv(csv, available_criteria, columns, criteria, periods, hours_for_value, level + 1)

lib/redmine.rb 0 -2

             require 'redmine/hook'
             require 'redmine/plugin'
-            require 'csv'
             Redmine::Scm::Base.add "Subversion"
             Redmine::Scm::Base.add "Darcs"
             Redmine::Scm::Base.add "Mercurial"

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages