Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-13 08:46:01 +01:00
Code Issues Packages Projects Releases Activity

Starting or ending marker is not displayed if they are on the leftmost or rightmost boundary of the gantt (#33175).

Browse Source 
Patch by Yuichi HARADA.


git-svn-id: http://svn.redmine.org/redmine/trunk@19976 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2020-08-12 04:21:32 +00:00
parent a7b9fa9996
commit 1712ff0785
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -615,13 +615,13 @@ module Redmine
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
coords[:start] = start_date - self.date_from coords[:start] = start_date - self.date_from
coords[:bar_start] = start_date - self.date_from coords[:bar_start] = start_date - self.date_from
else else
coords[:bar_start] = 0 coords[:bar_start] = 0
end end
if end_date < self.date_to if end_date <= self.date_to
coords[:end] = end_date - self.date_from + 1 coords[:end] = end_date - self.date_from + 1
coords[:bar_end] = end_date - self.date_from + 1 coords[:bar_end] = end_date - self.date_from + 1
else else

6
test/unit/lib/redmine/helpers/gantt_test.rb
View File

@@ -450,6 +450,9 @@ class Redmine::Helpers::GanttHelperTest < Redmine::HelperTest
@output_buffer = @gantt.line(today - 7, today + 7, 30, true, 'line', :format => :html, :zoom => 4) @output_buffer = @gantt.line(today - 7, today + 7, 30, true, 'line', :format => :html, :zoom => 4)
assert_select "div.starting", 1 assert_select "div.starting", 1
assert_select 'div.starting[style*="left:28px"]', 1 assert_select 'div.starting[style*="left:28px"]', 1
# starting marker on the leftmost boundary of the gantt
@output_buffer = @gantt.line(gantt_start, today + 7, 30, true, 'line', :format => :html, :zoom => 4)
assert_select 'div.starting[style*="left:0px"]', 1
end end
test "#line starting marker should not appear if the start date is before gantt start date" do test "#line starting marker should not appear if the start date is before gantt start date" do
@@ -463,6 +466,9 @@ class Redmine::Helpers::GanttHelperTest < Redmine::HelperTest
@output_buffer = @gantt.line(today - 7, today + 7, 30, true, 'line', :format => :html, :zoom => 4) @output_buffer = @gantt.line(today - 7, today + 7, 30, true, 'line', :format => :html, :zoom => 4)
assert_select "div.ending", 1 assert_select "div.ending", 1
assert_select 'div.ending[style*="left:88px"]', 1 assert_select 'div.ending[style*="left:88px"]', 1
# ending marker on the rightmost boundary of the gantt
@output_buffer = @gantt.line(today - 7, gantt_end, 30, true, 'line', :format => :html, :zoom => 4)
assert_select 'div.ending[style*="left:116px"]', 1
end end
test "#line ending marker should not appear if the end date is before gantt start date" do test "#line ending marker should not appear if the end date is before gantt start date" do