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

code layout cleanup lib/redmine/helpers/gantt.rb 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10066 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2012-07-21 13:03:29 +00:00
parent dc393cc480
commit 1f84a8d83e
1 changed files with 0 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,6 @@ module Redmine
def initialize(options={}) def initialize(options={})
options = options.dup options = options.dup
if options[:year] && options[:year].to_i >0 if options[:year] && options[:year].to_i >0
@year_from = options[:year].to_i @year_from = options[:year].to_i
if options[:month] && options[:month].to_i >=1 && options[:month].to_i <= 12 if options[:month] && options[:month].to_i >=1 && options[:month].to_i <= 12
@ -53,27 +52,21 @@ module Redmine
@month_from ||= Date.today.month @month_from ||= Date.today.month
@year_from ||= Date.today.year @year_from ||= Date.today.year
end end
zoom = (options[:zoom] || User.current.pref[:gantt_zoom]).to_i zoom = (options[:zoom] || User.current.pref[:gantt_zoom]).to_i
@zoom = (zoom > 0 && zoom < 5) ? zoom : 2 @zoom = (zoom > 0 && zoom < 5) ? zoom : 2
months = (options[:months] || User.current.pref[:gantt_months]).to_i months = (options[:months] || User.current.pref[:gantt_months]).to_i
@months = (months > 0 && months < 25) ? months : 6 @months = (months > 0 && months < 25) ? months : 6
# Save gantt parameters as user preference (zoom and months count) # Save gantt parameters as user preference (zoom and months count)
if (User.current.logged? && (@zoom != User.current.pref[:gantt_zoom] || @months != User.current.pref[:gantt_months])) if (User.current.logged? && (@zoom != User.current.pref[:gantt_zoom] || @months != User.current.pref[:gantt_months]))
User.current.pref[:gantt_zoom], User.current.pref[:gantt_months] = @zoom, @months User.current.pref[:gantt_zoom], User.current.pref[:gantt_months] = @zoom, @months
User.current.preference.save User.current.preference.save
end end
@date_from = Date.civil(@year_from, @month_from, 1) @date_from = Date.civil(@year_from, @month_from, 1)
@date_to = (@date_from >> @months) - 1 @date_to = (@date_from >> @months) - 1
@subjects = '' @subjects = ''
@lines = '' @lines = ''
@number_of_rows = nil @number_of_rows = nil
@issue_ancestors = [] @issue_ancestors = []
@truncated = false @truncated = false
if options.has_key?(:max_rows) if options.has_key?(:max_rows)
@max_rows = options[:max_rows] @max_rows = options[:max_rows]
@ -110,7 +103,6 @@ module Redmine
# the Gantt chart. This will recurse for each subproject. # the Gantt chart. This will recurse for each subproject.
def number_of_rows_on_project(project) def number_of_rows_on_project(project)
return 0 unless projects.include?(project) return 0 unless projects.include?(project)
count = 1 count = 1
count += project_issues(project).size count += project_issues(project).size
count += project_versions(project).size count += project_versions(project).size
@ -141,7 +133,6 @@ module Redmine
# Return all the project nodes that will be displayed # Return all the project nodes that will be displayed
def projects def projects
return @projects if @projects return @projects if @projects
ids = issues.collect(&:project).uniq.collect(&:id) ids = issues.collect(&:project).uniq.collect(&:id)
if ids.any? if ids.any?
# All issues projects and their visible ancestors # All issues projects and their visible ancestors
@ -174,60 +165,49 @@ module Redmine
def render(options={}) def render(options={})
options = {:top => 0, :top_increment => 20, :indent_increment => 20, :render => :subject, :format => :html}.merge(options) options = {:top => 0, :top_increment => 20, :indent_increment => 20, :render => :subject, :format => :html}.merge(options)
indent = options[:indent] || 4 indent = options[:indent] || 4
@subjects = '' unless options[:only] == :lines @subjects = '' unless options[:only] == :lines
@lines = '' unless options[:only] == :subjects @lines = '' unless options[:only] == :subjects
@number_of_rows = 0 @number_of_rows = 0
Project.project_tree(projects) do |project, level| Project.project_tree(projects) do |project, level|
options[:indent] = indent + level * options[:indent_increment] options[:indent] = indent + level * options[:indent_increment]
render_project(project, options) render_project(project, options)
break if abort? break if abort?
end end
@subjects_rendered = true unless options[:only] == :lines @subjects_rendered = true unless options[:only] == :lines
@lines_rendered = true unless options[:only] == :subjects @lines_rendered = true unless options[:only] == :subjects
render_end(options) render_end(options)
end end
def render_project(project, options={}) def render_project(project, options={})
subject_for_project(project, options) unless options[:only] == :lines subject_for_project(project, options) unless options[:only] == :lines
line_for_project(project, options) unless options[:only] == :subjects line_for_project(project, options) unless options[:only] == :subjects
options[:top] += options[:top_increment] options[:top] += options[:top_increment]
options[:indent] += options[:indent_increment] options[:indent] += options[:indent_increment]
@number_of_rows += 1 @number_of_rows += 1
return if abort? return if abort?
issues = project_issues(project).select {|i| i.fixed_version.nil?} issues = project_issues(project).select {|i| i.fixed_version.nil?}
sort_issues!(issues) sort_issues!(issues)
if issues if issues
render_issues(issues, options) render_issues(issues, options)
return if abort? return if abort?
end end
versions = project_versions(project) versions = project_versions(project)
versions.each do |version| versions.each do |version|
render_version(project, version, options) render_version(project, version, options)
end end
# Remove indent to hit the next sibling # Remove indent to hit the next sibling
options[:indent] -= options[:indent_increment] options[:indent] -= options[:indent_increment]
end end
def render_issues(issues, options={}) def render_issues(issues, options={})
@issue_ancestors = [] @issue_ancestors = []
issues.each do |i| issues.each do |i|
subject_for_issue(i, options) unless options[:only] == :lines subject_for_issue(i, options) unless options[:only] == :lines
line_for_issue(i, options) unless options[:only] == :subjects line_for_issue(i, options) unless options[:only] == :subjects
options[:top] += options[:top_increment] options[:top] += options[:top_increment]
@number_of_rows += 1 @number_of_rows += 1
break if abort? break if abort?
end end
options[:indent] -= (options[:indent_increment] * @issue_ancestors.size) options[:indent] -= (options[:indent_increment] * @issue_ancestors.size)
end end
@ -235,11 +215,9 @@ module Redmine
# Version header # Version header
subject_for_version(version, options) unless options[:only] == :lines subject_for_version(version, options) unless options[:only] == :lines
line_for_version(version, options) unless options[:only] == :subjects line_for_version(version, options) unless options[:only] == :subjects
options[:top] += options[:top_increment] options[:top] += options[:top_increment]
@number_of_rows += 1 @number_of_rows += 1
return if abort? return if abort?
issues = version_issues(project, version) issues = version_issues(project, version)
if issues if issues
sort_issues!(issues) sort_issues!(issues)
@ -277,10 +255,8 @@ module Redmine
if project.is_a?(Project) && project.start_date && project.due_date if project.is_a?(Project) && project.start_date && project.due_date
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, nil, options[:zoom]) coords = coordinates(project.start_date, project.due_date, nil, options[:zoom])
label = h(project) label = h(project)
case options[:format] case options[:format]
when :html when :html
html_task(options, coords, :css => "project task", :label => label, :markers => true) html_task(options, coords, :css => "project task", :label => label, :markers => true)
@ -315,11 +291,9 @@ module Redmine
if version.is_a?(Version) && version.start_date && version.due_date if version.is_a?(Version) && version.start_date && version.due_date
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.start_date, version.due_date, version.completed_pourcent, options[:zoom]) coords = coordinates(version.start_date, version.due_date, version.completed_pourcent, options[:zoom])
label = "#{h version } #{h version.completed_pourcent.to_i.to_s}%" label = "#{h version } #{h version.completed_pourcent.to_i.to_s}%"
label = h("#{version.project} -") + label unless @project && @project == version.project label = h("#{version.project} -") + label unless @project && @project == version.project
case options[:format] case options[:format]
when :html when :html
html_task(options, coords, :css => "version task", :label => label, :markers => true) html_task(options, coords, :css => "version task", :label => label, :markers => true)
@ -346,7 +320,6 @@ module Redmine
css_classes << ' issue-overdue' if issue.overdue? css_classes << ' issue-overdue' if issue.overdue?
css_classes << ' issue-behind-schedule' if issue.behind_schedule? css_classes << ' issue-behind-schedule' if issue.behind_schedule?
css_classes << ' icon icon-issue' unless Setting.gravatar_enabled? && issue.assigned_to css_classes << ' icon icon-issue' unless Setting.gravatar_enabled? && issue.assigned_to
subject = "<span class='#{css_classes}'>".html_safe subject = "<span class='#{css_classes}'>".html_safe
if issue.assigned_to.present? if issue.assigned_to.present?
assigned_string = l(:field_assigned_to) + ": " + issue.assigned_to.name assigned_string = l(:field_assigned_to) + ": " + issue.assigned_to.name
@ -361,12 +334,10 @@ module Redmine
pdf_new_page?(options) pdf_new_page?(options)
pdf_subject(options, issue.subject) pdf_subject(options, issue.subject)
end end
unless issue.leaf? unless issue.leaf?
@issue_ancestors << issue @issue_ancestors << issue
options[:indent] += options[:indent_increment] options[:indent] += options[:indent_increment]
end end
output output
end end
@ -375,7 +346,6 @@ module Redmine
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]) coords = coordinates(issue.start_date, issue.due_before, issue.done_ratio, options[:zoom])
label = "#{ issue.status.name } #{ issue.done_ratio }%" label = "#{ issue.status.name } #{ issue.done_ratio }%"
case options[:format] case options[:format]
when :html when :html
html_task(options, coords, :css => "task " + (issue.leaf? ? 'leaf' : 'parent'), :label => label, :issue => issue, :markers => !issue.leaf?) html_task(options, coords, :css => "task " + (issue.leaf? ? 'leaf' : 'parent'), :label => label, :issue => issue, :markers => !issue.leaf?)
@ -405,15 +375,12 @@ module Redmine
g_height = 20 * number_of_rows + 30 g_height = 20 * number_of_rows + 30
headers_height = (show_weeks ? 2*header_height : header_height) headers_height = (show_weeks ? 2*header_height : header_height)
height = g_height + headers_height height = g_height + headers_height
imgl = Magick::ImageList.new imgl = Magick::ImageList.new
imgl.new_image(subject_width+g_width+1, height) imgl.new_image(subject_width+g_width+1, height)
gc = Magick::Draw.new gc = Magick::Draw.new
# Subjects # Subjects
gc.stroke('transparent') gc.stroke('transparent')
subjects(:image => gc, :top => (headers_height + 20), :indent => 4, :format => :image) subjects(:image => gc, :top => (headers_height + 20), :indent => 4, :format => :image)
# Months headers # Months headers
month_f = @date_from month_f = @date_from
left = subject_width left = subject_width
@ -430,7 +397,6 @@ module Redmine
left = left + width left = left + width
month_f = month_f >> 1 month_f = month_f >> 1
end end
# Weeks headers # Weeks headers
if show_weeks if show_weeks
left = subject_width left = subject_width
@ -462,7 +428,6 @@ module Redmine
week_f = week_f+7 week_f = week_f+7
end end
end end
# Days details (week-end in grey) # Days details (week-end in grey)
if show_days if show_days
left = subject_width left = subject_width
@ -479,7 +444,6 @@ module Redmine
wday = 1 if wday > 7 wday = 1 if wday > 7
end end
end end
# border # border
gc.fill('transparent') gc.fill('transparent')
gc.stroke('grey') gc.stroke('grey')
@ -487,20 +451,16 @@ module Redmine
gc.rectangle(0, 0, subject_width+g_width, headers_height) gc.rectangle(0, 0, subject_width+g_width, headers_height)
gc.stroke('black') gc.stroke('black')
gc.rectangle(0, 0, subject_width+g_width, g_height+ headers_height-1) gc.rectangle(0, 0, subject_width+g_width, g_height+ headers_height-1)
# content # content
top = headers_height + 20 top = headers_height + 20
gc.stroke('transparent') gc.stroke('transparent')
lines(:image => gc, :top => top, :zoom => zoom, :subject_width => subject_width, :format => :image) lines(:image => gc, :top => top, :zoom => zoom, :subject_width => subject_width, :format => :image)
# today red line # today red line
if Date.today >= @date_from and Date.today <= date_to if Date.today >= @date_from and Date.today <= date_to
gc.stroke('red') gc.stroke('red')
x = (Date.today-@date_from+1)*zoom + subject_width x = (Date.today-@date_from+1)*zoom + subject_width
gc.line(x, headers_height, x, headers_height + g_height-1) gc.line(x, headers_height, x, headers_height + g_height-1)
end end
gc.draw(imgl) gc.draw(imgl)
imgl.format = format imgl.format = format
imgl.to_blob imgl.to_blob
@ -517,14 +477,11 @@ module Redmine
pdf.RDMCell(PDF::LeftPaneWidth, 20, project.to_s) pdf.RDMCell(PDF::LeftPaneWidth, 20, project.to_s)
pdf.Ln pdf.Ln
pdf.SetFontStyle('B',9) pdf.SetFontStyle('B',9)
subject_width = PDF::LeftPaneWidth subject_width = PDF::LeftPaneWidth
header_height = 5 header_height = 5
headers_height = header_height headers_height = header_height
show_weeks = false show_weeks = false
show_days = false show_days = false
if self.months < 7 if self.months < 7
show_weeks = true show_weeks = true
headers_height = 2*header_height headers_height = 2*header_height
@ -533,14 +490,11 @@ module Redmine
headers_height = 3*header_height headers_height = 3*header_height
end end
end end
g_width = PDF.right_pane_width g_width = PDF.right_pane_width
zoom = (g_width) / (self.date_to - self.date_from + 1) zoom = (g_width) / (self.date_to - self.date_from + 1)
g_height = 120 g_height = 120
t_height = g_height + headers_height t_height = g_height + headers_height
y_start = pdf.GetY y_start = pdf.GetY
# Months headers # Months headers
month_f = self.date_from month_f = self.date_from
left = subject_width left = subject_width
@ -553,7 +507,6 @@ module Redmine
left = left + width left = left + width
month_f = month_f >> 1 month_f = month_f >> 1
end end
# Weeks headers # Weeks headers
if show_weeks if show_weeks
left = subject_width left = subject_width
@ -579,7 +532,6 @@ module Redmine
week_f = week_f+7 week_f = week_f+7
end end
end end
# Days headers # Days headers
if show_days if show_days
left = subject_width left = subject_width
@ -596,11 +548,9 @@ module Redmine
wday = 1 if wday > 7 wday = 1 if wday > 7
end end
end end
pdf.SetY(y_start) pdf.SetY(y_start)
pdf.SetX(15) pdf.SetX(15)
pdf.RDMCell(subject_width+g_width-15, headers_height, "", 1) pdf.RDMCell(subject_width+g_width-15, headers_height, "", 1)
# Tasks # Tasks
top = headers_height + y_start top = headers_height + y_start
options = { options = {
@ -622,7 +572,6 @@ module Redmine
def coordinates(start_date, end_date, progress, zoom=nil) def coordinates(start_date, end_date, progress, zoom=nil)
zoom ||= @zoom zoom ||= @zoom
coords = {} coords = {}
if start_date && end_date && start_date < self.date_to && end_date > self.date_from if start_date && end_date && start_date < self.date_to && end_date > self.date_from
if start_date > self.date_from if start_date > self.date_from
@ -637,7 +586,6 @@ module Redmine
else else
coords[:bar_end] = self.date_to - self.date_from + 1 coords[:bar_end] = self.date_to - self.date_from + 1
end end
if progress if progress
progress_date = start_date + (end_date - start_date + 1) * (progress / 100.0) progress_date = start_date + (end_date - start_date + 1) * (progress / 100.0)
if progress_date > self.date_from && progress_date > start_date if progress_date > self.date_from && progress_date > start_date
@ -647,7 +595,6 @@ module Redmine
coords[:bar_progress_end] = self.date_to - self.date_from + 1 coords[:bar_progress_end] = self.date_to - self.date_from + 1
end end
end end
if progress_date < Date.today if progress_date < Date.today
late_date = [Date.today, end_date].min late_date = [Date.today, end_date].min
if late_date > self.date_from && late_date > start_date if late_date > self.date_from && late_date > start_date
@ -660,7 +607,6 @@ module Redmine
end end
end end
end end
# Transforms dates into pixels witdh # Transforms dates into pixels witdh
coords.keys.each do |key| coords.keys.each do |key|
coords[key] = (coords[key] * zoom).floor coords[key] = (coords[key] * zoom).floor
@ -708,7 +654,6 @@ module Redmine
def html_subject(params, subject, options={}) def html_subject(params, subject, options={})
style = "position: absolute;top:#{params[:top]}px;left:#{params[:indent]}px;" style = "position: absolute;top:#{params[:top]}px;left:#{params[:indent]}px;"
style << "width:#{params[:subject_width] - params[:indent]}px;" if params[:subject_width] style << "width:#{params[:subject_width] - params[:indent]}px;" if params[:subject_width]
output = view.content_tag 'div', subject, :class => options[:css], :style => style, :title => options[:title] output = view.content_tag 'div', subject, :class => options[:css], :style => style, :title => options[:title]
@subjects << output @subjects << output
output output
@ -717,7 +662,6 @@ module Redmine
def pdf_subject(params, subject, options={}) def pdf_subject(params, subject, options={})
params[:pdf].SetY(params[:top]) params[:pdf].SetY(params[:top])
params[:pdf].SetX(15) params[:pdf].SetX(15)
char_limit = PDF::MaxCharactorsForSubject - params[:indent] char_limit = PDF::MaxCharactorsForSubject - params[:indent]
params[:pdf].RDMCell(params[:subject_width]-15, 5, (" " * params[:indent]) + subject.to_s.sub(/^(.{#{char_limit}}[^\s]*\s).*$/, '\1 (...)'), "LR") params[:pdf].RDMCell(params[:subject_width]-15, 5, (" " * params[:indent]) + subject.to_s.sub(/^(.{#{char_limit}}[^\s]*\s).*$/, '\1 (...)'), "LR")
@ -738,7 +682,6 @@ module Redmine
# Renders the task bar, with progress and late # Renders the task bar, with progress and late
if coords[:bar_start] && coords[:bar_end] if coords[:bar_start] && coords[:bar_end]
output << "<div style='top:#{ params[:top] }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_end] - coords[:bar_start] - 2}px;' class='#{options[:css]} task_todo'>&nbsp;</div>".html_safe output << "<div style='top:#{ params[:top] }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_end] - coords[:bar_start] - 2}px;' class='#{options[:css]} task_todo'>&nbsp;</div>".html_safe
if coords[:bar_late_end] if coords[:bar_late_end]
output << "<div style='top:#{ params[:top] }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_late_end] - coords[:bar_start] - 2}px;' class='#{options[:css]} task_late'>&nbsp;</div>".html_safe output << "<div style='top:#{ params[:top] }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_late_end] - coords[:bar_start] - 2}px;' class='#{options[:css]} task_late'>&nbsp;</div>".html_safe
end end
@ -774,14 +717,12 @@ module Redmine
def pdf_task(params, coords, options={}) def pdf_task(params, coords, options={})
height = options[:height] || 2 height = options[:height] || 2
# Renders the task bar, with progress and late # Renders the task bar, with progress and late
if coords[:bar_start] && coords[:bar_end] if coords[:bar_start] && coords[:bar_end]
params[:pdf].SetY(params[:top]+1.5) params[:pdf].SetY(params[:top]+1.5)
params[:pdf].SetX(params[:subject_width] + coords[:bar_start]) params[:pdf].SetX(params[:subject_width] + coords[:bar_start])
params[:pdf].SetFillColor(200,200,200) params[:pdf].SetFillColor(200,200,200)
params[:pdf].RDMCell(coords[:bar_end] - coords[:bar_start], height, "", 0, 0, "", 1) params[:pdf].RDMCell(coords[:bar_end] - coords[:bar_start], height, "", 0, 0, "", 1)
if coords[:bar_late_end] if coords[:bar_late_end]
params[:pdf].SetY(params[:top]+1.5) params[:pdf].SetY(params[:top]+1.5)
params[:pdf].SetX(params[:subject_width] + coords[:bar_start]) params[:pdf].SetX(params[:subject_width] + coords[:bar_start])
@ -819,12 +760,10 @@ module Redmine
def image_task(params, coords, options={}) def image_task(params, coords, options={})
height = options[:height] || 6 height = options[:height] || 6
# Renders the task bar, with progress and late # Renders the task bar, with progress and late
if coords[:bar_start] && coords[:bar_end] if coords[:bar_start] && coords[:bar_end]
params[:image].fill('#aaa') params[:image].fill('#aaa')
params[:image].rectangle(params[:subject_width] + coords[:bar_start], params[:top], params[:subject_width] + coords[:bar_end], params[:top] - height) params[:image].rectangle(params[:subject_width] + coords[:bar_start], params[:top], params[:subject_width] + coords[:bar_end], params[:top] - height)
if coords[:bar_late_end] if coords[:bar_late_end]
params[:image].fill('#f66') params[:image].fill('#f66')
params[:image].rectangle(params[:subject_width] + coords[:bar_start], params[:top], params[:subject_width] + coords[:bar_late_end], params[:top] - height) params[:image].rectangle(params[:subject_width] + coords[:bar_start], params[:top], params[:subject_width] + coords[:bar_late_end], params[:top] - height)