diff options
| -rw-r--r-- | lib/redmine/helpers/gantt.rb | 48 | ||||
| -rw-r--r-- | test/unit/lib/redmine/helpers/gantt_test.rb | 8 |
2 files changed, 30 insertions, 26 deletions
diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb index d84202b5e..ea0140c4d 100644 --- a/lib/redmine/helpers/gantt.rb +++ b/lib/redmine/helpers/gantt.rb @@ -587,22 +587,9 @@ module Redmine if issue.is_a?(Issue) && issue.due_before case options[:format] when :html - output = '' - css = "task " + (issue.leaf? ? 'leaf' : 'parent') - coords = coordinates(issue.start_date, issue.due_before, issue.done_ratio, options[:zoom]) - if coords[:bar_start] && coords[:bar_end] - output << html_task(options[:top], coords, css) - - output << "<div class='tooltip' style='position: absolute;top:#{ options[:top] }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_end] - coords[:bar_start] }px;height:12px;'>" - output << '<span class="tip">' - output << view.render_issue_tooltip(issue) - output << "</span></div>" - end - - output << "<div style='top:#{ options[:top] }px;left:#{ (coords[:bar_end] || 0) + 5 }px;' class='#{css} label issue-name'>" - output << "#{ issue.status.name } #{ issue.done_ratio }%" - output << "</div>" + css = "task " + (issue.leaf? ? 'leaf' : 'parent') + output = html_task(options[:top], coords, :css => css, :label => "#{ issue.status.name } #{ issue.done_ratio }%", :issue => issue) @lines << output output @@ -1017,14 +1004,31 @@ module Redmine end end - def html_task(top, coords, css) - output = "<div style='top:#{ top }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_end] - coords[:bar_start] - 2}px;' class='#{css} task_todo'> </div>" - - if coords[:bar_late_end] - output << "<div style='top:#{ top }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_late_end] - coords[:bar_start] - 2}px;' class='#{css} task_late'> </div>" + def html_task(top, coords, options={}) + output = '' + # Renders the task bar, with progress and late + if coords[:bar_start] && coords[:bar_end] + output << "<div style='top:#{ top }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_end] - coords[:bar_start] - 2}px;' class='#{options[:css]} task_todo'> </div>" + + if coords[:bar_late_end] + output << "<div style='top:#{ top }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_late_end] - coords[:bar_start] - 2}px;' class='#{options[:css]} task_late'> </div>" + end + if coords[:bar_progress_end] + output << "<div style='top:#{ top }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_progress_end] - coords[:bar_start] - 2}px;' class='#{options[:css]} task_done'> </div>" + end + end + # Renders the label on the right + if options[:label] + output << "<div style='top:#{ top }px;left:#{ (coords[:bar_end] || 0) + 5 }px;' class='#{options[:css]} label'>" + output << options[:label] + output << "</div>" end - if coords[:bar_progress_end] - output << "<div style='top:#{ top }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_progress_end] - coords[:bar_start] - 2}px;' class='#{css} task_done'> </div>" + # Renders the tooltip + if options[:issue] && coords[:bar_start] && coords[:bar_end] + output << "<div class='tooltip' style='position: absolute;top:#{ top }px;left:#{ coords[:bar_start] }px;width:#{ coords[:bar_end] - coords[:bar_start] }px;height:12px;'>" + output << '<span class="tip">' + output << view.render_issue_tooltip(options[:issue]) + output << "</span></div>" end output diff --git a/test/unit/lib/redmine/helpers/gantt_test.rb b/test/unit/lib/redmine/helpers/gantt_test.rb index d3b65c340..9578b6b43 100644 --- a/test/unit/lib/redmine/helpers/gantt_test.rb +++ b/test/unit/lib/redmine/helpers/gantt_test.rb @@ -235,7 +235,7 @@ class Redmine::Helpers::GanttTest < ActiveSupport::TestCase context "issue" do should "be rendered" do assert_select "div.task_todo" - assert_select "div.label.issue-name", /#{@issue.done_ratio}/ + assert_select "div.task.label", /#{@issue.done_ratio}/ assert_select "div.tooltip", /#{@issue.subject}/ end end @@ -692,17 +692,17 @@ class Redmine::Helpers::GanttTest < ActiveSupport::TestCase @gantt.instance_variable_set('@date_to', 2.weeks.ago.to_date) @response.body = @gantt.line_for_issue(@issue, {:format => :html, :zoom => 4}) - assert_select "div.issue-name", true, @response.body + assert_select "div.task.label", true, @response.body end should "show the issue status" do @response.body = @gantt.line_for_issue(@issue, {:format => :html, :zoom => 4}) - assert_select "div.issue-name", /#{@issue.status.name}/ + assert_select "div.task.label", /#{@issue.status.name}/ end should "show the percent complete" do @response.body = @gantt.line_for_issue(@issue, {:format => :html, :zoom => 4}) - assert_select "div.issue-name", /30%/ + assert_select "div.task.label", /30%/ end end end |