kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Gantt code cleanup. 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4526 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2010-12-17 14:59:32 +00:00
parent 74a94ed4ad
commit 084e9e2e57
1 changed files with 16 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
lib/redmine/helpers/gantt.rb
View File

@ -297,22 +297,15 @@ module Redmine
options[:zoom] ||= 1 options[:zoom] ||= 1
options[:g_width] ||= (self.date_to - self.date_from + 1) * options[:zoom] options[:g_width] ||= (self.date_to - self.date_from + 1) * options[:zoom]
coords = coordinates(project.start_date, project.due_date, project.completed_percent(:include_subprojects => true), options[:zoom])
label = "#{h project } #{h project.completed_percent(:include_subprojects => true).to_i.to_s}%"
case options[:format] case options[:format]
when :html when :html
coords = coordinates(project.start_date, project.due_date, project.completed_percent(:include_subprojects => true), options[:zoom]) html_task(options, coords, :css => "project task", :label => label, :markers => true)
label = "#{h project } #{h project.completed_percent(:include_subprojects => true).to_i.to_s}%"
output = html_task(options, coords, :css => "project task", :label => label, :markers => true)
@lines << output
output
when :image when :image
coords = coordinates(project.start_date, project.due_date, project.completed_percent(:include_subprojects => true), options[:zoom])
label = "#{h project } #{h project.completed_percent(:include_subprojects => true).to_i.to_s}%"
image_task(options, coords, :label => label, :markers => true, :height => 3) image_task(options, coords, :label => label, :markers => true, :height => 3)
when :pdf when :pdf
coords = coordinates(project.start_date, project.due_date, project.completed_percent(:include_subprojects => true), options[:zoom])
label = "#{h project } #{h project.completed_percent(:include_subprojects => true).to_i.to_s}%"
pdf_task(options, coords, :label => label, :markers => true, :height => 0.8) pdf_task(options, coords, :label => label, :markers => true, :height => 0.8)
end end
else else
@ -362,24 +355,16 @@ module Redmine
options[:zoom] ||= 1 options[:zoom] ||= 1
options[:g_width] ||= (self.date_to - self.date_from + 1) * options[:zoom] options[:g_width] ||= (self.date_to - self.date_from + 1) * options[:zoom]
coords = coordinates(version.fixed_issues.minimum('start_date'), version.due_date, version.completed_pourcent, options[:zoom])
label = "#{h version } #{h version.completed_pourcent.to_i.to_s}%"
label = h("#{version.project} -") + label unless @project && @project == version.project
case options[:format] case options[:format]
when :html when :html
coords = coordinates(version.fixed_issues.minimum('start_date'), version.due_date, version.completed_pourcent, options[:zoom]) html_task(options, coords, :css => "version task", :label => label, :markers => true)
label = "#{h version } #{h version.completed_pourcent.to_i.to_s}%"
label = h("#{version.project} -") + label unless @project && @project == version.project
output = html_task(options, coords, :css => "version task", :label => label, :markers => true)
@lines << output
output
when :image when :image
coords = coordinates(version.fixed_issues.minimum('start_date'), version.due_date, version.completed_pourcent, options[:zoom])
label = "#{h version } #{h version.completed_pourcent.to_i.to_s}%"
label = h("#{version.project} -") + label unless @project && @project == version.project
image_task(options, coords, :label => label, :markers => true, :height => 3) image_task(options, coords, :label => label, :markers => true, :height => 3)
when :pdf when :pdf
coords = coordinates(version.fixed_issues.minimum('start_date'), version.due_date, version.completed_pourcent, options[:zoom])
label = "#{h version } #{h version.completed_pourcent.to_i.to_s}%"
label = h("#{version.project} -") + label unless @project && @project == version.project
pdf_task(options, coords, :label => label, :markers => true, :height => 0.8) pdf_task(options, coords, :label => label, :markers => true, :height => 0.8)
end end
else else
@ -445,22 +430,16 @@ module Redmine
def line_for_issue(issue, options) def line_for_issue(issue, options)
# Skip issues that don't have a due_before (due_date or version's due_date) # Skip issues that don't have a due_before (due_date or version's due_date)
if issue.is_a?(Issue) && issue.due_before if issue.is_a?(Issue) && issue.due_before
coords = coordinates(issue.start_date, issue.due_before, issue.done_ratio, options[:zoom])
label = "#{ issue.status.name } #{ issue.done_ratio }%"
case options[:format] case options[:format]
when :html when :html
coords = coordinates(issue.start_date, issue.due_before, issue.done_ratio, options[:zoom]) html_task(options, coords, :css => "task " + (issue.leaf? ? 'leaf' : 'parent'), :label => label, :issue => issue)
css = "task " + (issue.leaf? ? 'leaf' : 'parent')
output = html_task(options, coords, :css => css, :label => "#{ issue.status.name } #{ issue.done_ratio }%", :issue => issue)
@lines << output
output
when :image when :image
coords = coordinates(issue.start_date, issue.due_before, issue.done_ratio, options[:zoom]) image_task(options, coords, :label => label)
image_task(options, coords, :label => "#{ issue.status.name } #{ issue.done_ratio }%")
when :pdf when :pdf
coords = coordinates(issue.start_date, issue.due_before, issue.done_ratio, options[:zoom]) pdf_task(options, coords, :label => label)
pdf_task(options, coords, :label => "#{ issue.status.name } #{ issue.done_ratio }%")
end end
else else
ActiveRecord::Base.logger.debug "GanttHelper#line_for_issue was not given an issue with a due_before" ActiveRecord::Base.logger.debug "GanttHelper#line_for_issue was not given an issue with a due_before"
@ -815,7 +794,7 @@ module Redmine
output << view.render_issue_tooltip(options[:issue]) output << view.render_issue_tooltip(options[:issue])
output << "</span></div>" output << "</span></div>"
end end
@lines << output
output output
end end