jro_apps/redmine Commit - r6791:dbc616c928bc

remove trailing white-spaces from app/helpers/timelog_helper.rb....

Toshi MARUYAMA -

r6791:dbc616c928bc

parent child

Context file:

r6791:dbc616c928bc

Collapse all files

app/helpers/timelog_helper.rb +18 -18

-             # redMine - project management software
-             # Copyright (C) 2006  Jean-Philippe Lang
+             # Redmine - project management software
+             # Copyright (C) 2006-2011  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
+             #
+             #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
+             #
+             #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              module TimelogHelper
                include ApplicationHelper
                def render_timelog_breadcrumb
                  links = []
                  links << link_to(l(:label_project_all), {:project_id => nil, :issue_id => nil})
                  activities.each { |a| collection << [a.name, a.id] }
                  collection
                end
                def select_hours(data, criteria, value)
                	if value.to_s.empty?
                		data.select {|row| row[criteria].blank? }
-                 else
+                 else
                  	data.select {|row| row[criteria].to_s == value.to_s}
                  end
                end
                def sum_hours(data)
                  sum = 0
                  data.each do |row|
                  end
                  sum
                end
                def options_for_period_select(value)
                  options_for_select([[l(:label_all_time), 'all'],
                                      [l(:label_today), 'today'],
                                      [l(:label_this_year), 'current_year']],
                                      value)
                end
                def entries_to_csv(entries)
-                 ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')
+                 ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')
                  decimal_separator = l(:general_csv_decimal_separator)
                  custom_fields = TimeEntryCustomField.find(:all)
                  export = FCSV.generate(:col_sep => l(:general_csv_separator)) do |csv|
                               ]
                    # Export custom fields
                    headers += custom_fields.collect(&:name)
                    csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
                    # csv lines
                    entries.each do |entry|
                                entry.comments
                                ]
                      fields += custom_fields.collect {|f| show_value(entry.custom_value_for(f)) }
                      csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
                    end
                  end
                  export
                end
                def format_criteria_value(criteria, value)
                  if value.blank?
                    l(:label_none)
                    format_value(value, @available_criterias[criteria][:format])
                  end
                end
                def report_to_csv(criterias, periods, hours)
                  export = FCSV.generate(:col_sep => l(:general_csv_separator)) do |csv|
                    # Column headers
                  end
                  export
                end
                def report_criteria_to_csv(csv, criterias, periods, hours, level=0)
                  hours.collect {|h| h[criterias[level]].to_s}.uniq.each do |value|
                    hours_for_value = select_hours(hours, criterias[level], value)
                    end
                    row << "%.2f" %total
                    csv << row
                    if criterias.length > level + 1
                      report_criteria_to_csv(csv, criterias, periods, hours_for_value, level + 1)
                    end
                  end
                end
                def to_utf8(s)
                  @ic ||= Iconv.new(l(:general_csv_encoding), 'UTF-8')
                  begin; @ic.iconv(s.to_s); rescue; s.to_s; end

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