jro_apps/redmine Commit - r4408:98c7c179ca3f

Gantt code cleanup....

Jean-Philippe Lang -

r4408:98c7c179ca3f

parent child

Context file:

r4408:98c7c179ca3f

Collapse all files

lib/redmine/helpers/gantt.rb +13 -58

@@ -435,65 +435,11 module Redmine
435		435
436	case options[:format]	436	case options[:format]
437	when :html	437	when :html
438	output = ''	438	coords = coordinates(version.fixed_issues.minimum('start_date'), version.due_date, version.completed_pourcent, options[:zoom])
439	i_left = ((version.start_date - self.date_from)*options[:zoom]).floor	439	label = "#{h version } #{h version.completed_pourcent.to_i.to_s}%"
440	# TODO: or version.fixed_issues.collect(&:start_date).min	440	label = h("#{version.project} -") + label unless @project && @project == version.project
441	start_date = version.fixed_issues.minimum('start_date') if version.fixed_issues.present?	441	output = html_task(options[:top], coords, :css => "version task", :label => label, :markers => true)
442	start_date \|\|= self.date_from
443	start_left = ((start_date - self.date_from)*options[:zoom]).floor
444
445	i_end_date = ((version.due_date <= self.date_to) ? version.due_date : self.date_to )
446	i_done_date = start_date + ((version.due_date - start_date+1)* version.completed_pourcent/100).floor
447	i_done_date = (i_done_date <= self.date_from ? self.date_from : i_done_date )
448	i_done_date = (i_done_date >= self.date_to ? self.date_to : i_done_date )
449		442
450	i_late_date = [i_end_date, Date.today].min if start_date < Date.today
451
452	i_width = (i_left - start_left + 1).floor - 2 # total width of the issue (- 2 for left and right borders)
453	d_width = ((i_done_date - start_date)*options[:zoom]).floor - 2 # done width
454	l_width = i_late_date ? ((i_late_date - start_date+1)*options[:zoom]).floor - 2 : 0 # delay width
455
456	i_end = ((i_end_date - self.date_from) * options[:zoom]).floor # Ending pixel
457
458	# Bar graphic
459
460	# Make sure that negative i_left and i_width don't
461	# overflow the subject
462	if i_width > 0 && i_left <= options[:g_width]
463	output << "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:#{ i_width }px;' class='task milestone_todo'> </div>"
464	end
465	if l_width > 0 && i_left <= options[:g_width]
466	output << "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:#{ l_width }px;' class='task milestone_late'> </div>"
467	end
468	if d_width > 0 && i_left <= options[:g_width]
469	output<< "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:#{ d_width }px;' class='task milestone_done'> </div>"
470	end
471
472
473	# Starting diamond
474	if start_left <= options[:g_width] && start_left > 0
475	output << "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:15px;' class='task milestone starting'> </div>"
476	output << "<div style='top:#{ options[:top] }px;left:#{ start_left + 12 }px;background:#fff;' class='task'>"
477	output << "</div>"
478	end
479
480	# Ending diamond
481	# Don't show items too far ahead
482	if i_left <= options[:g_width] && i_end > 0
483	output << "<div style='top:#{ options[:top] }px;left:#{ i_end }px;width:15px;' class='task milestone ending'> </div>"
484	end
485
486	# Display the Version name and %
487	if i_end <= options[:g_width]
488	# Display the status even if it's floated off to the left
489	status_px = i_end + 12 # 12px for the diamond
490	status_px = 0 if status_px <= 0
491
492	output << "<div style='top:#{ options[:top] }px;left:#{ status_px }px;' class='task label version-name'>"
493	output << h("#{version.project} -") unless @project && @project == version.project
494	output << "<strong>#{h version } #{h version.completed_pourcent.to_i.to_s}%</strong>"
495	output << "</div>"
496	end
497	@lines << output	443	@lines << output
498	output	444	output
499	when :image	445	when :image
@@ -1017,6 +963,15 module Redmine
1017	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>"	963	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>"
1018	end	964	end
1019	end	965	end
		966	# Renders the markers
		967	if options[:markers]
		968	if coords[:start]
		969	output << "<div style='top:#{ top }px;left:#{ coords[:start] }px;width:15px;' class='#{options[:css]} marker starting'> </div>"
		970	end
		971	if coords[:end]
		972	output << "<div style='top:#{ top }px;left:#{ coords[:end] }px;width:15px;' class='#{options[:css]} marker ending'> </div>"
		973	end
		974	end
1020	# Renders the label on the right	975	# Renders the label on the right
1021	if options[:label]	976	if options[:label]
1022	output << "<div style='top:#{ top }px;left:#{ (coords[:bar_end] \|\| 0) + 5 }px;' class='#{options[:css]} label'>"	977	output << "<div style='top:#{ top }px;left:#{ (coords[:bar_end] \|\| 0) + 5 }px;' class='#{options[:css]} label'>"

public/stylesheets/application.css +5 -4

             .task_todo.parent .left  { position: absolute; background: url(../images/task_parent_end.png) no-repeat 0 0; width: 8px; height: 16px; margin-left: -5px; left: 0px; top: -1px;}
             .task_todo.parent .right { position: absolute; background: url(../images/task_parent_end.png) no-repeat 0 0; width: 8px; height: 16px; margin-right: -5px; right: 0px; top: -1px;}
-            .milestone { background-image:url(../images/version_marker.png); background-repeat: no-repeat; border: 0; }
+            .version.task_late { background:#f66 url(../images/milestone_late.png); border: 1px solid #f66; height: 2px; margin-top: 3px;}
-            .milestone_late { background:#f66 url(../images/milestone_late.png); border: 1px solid #f66; height: 2px; margin-top: 3px;}
+            .version.task_done { background:#00c600 url(../images/milestone_done.png); border: 1px solid #00c600; height: 2px; margin-top: 3px;}
-            .milestone_done { background:#00c600 url(../images/milestone_done.png); border: 1px solid #00c600; height: 2px; margin-top: 3px;}
+            .version.task_todo { background:#fff url(../images/milestone_todo.png); border: 1px solid #fff; height: 2px; margin-top: 3px;}
-            .milestone_todo { background:#fff url(../images/milestone_todo.png); border: 1px solid #fff; height: 2px; margin-top: 3px;}
+            .version.marker { background-image:url(../images/version_marker.png); background-repeat: no-repeat; border: 0; }
             .project-line { background-image:url(../images/project_marker.png); background-repeat: no-repeat; border: 0; }
             .project_late { background:#f66 url(../images/milestone_late.png); border: 1px solid #f66; height: 2px; margin-top: 3px;}
             .project_done { background:#00c600 url(../images/milestone_done.png); border: 1px solid #00c600; height: 2px; margin-top: 3px;}

test/unit/lib/redmine/helpers/gantt_test.rb +18 -18

                 context "version" do
                   should "be rendered" do
-                    assert_select "div.milestone_todo"
+                    assert_select "div.version.task_todo"
-                    assert_select "div.milestone.starting"
+                    assert_select "div.version.starting"
-                    assert_select "div.milestone.ending"
+                    assert_select "div.version.ending"
-                    assert_select "div.label.version-name", /#{@version.name}/
+                    assert_select "div.label.version", /#{@version.name}/
                   end
                 end
                                                      :tracker => @tracker,
                                                      :project => @project,
                                                      :done_ratio => 30,
-                                                     :start_date => Date.yesterday,
+                                                     :start_date => 1.week.ago.to_date,
                                                      :due_date => 1.week.from_now.to_date)
                 end
                   context "todo line" do
                     should "start from the starting point on the left" do
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.milestone_todo[style*=left:52px]"
+                      assert_select "div.version.task_todo[style*=left:28px]", true, @response.body
                     end
                     should "be the total width of the version" do
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.milestone_todo[style*=width:31px]"
+                      assert_select "div.version.task_todo[style*=width:58px]", true, @response.body
                     end
                   end
                   context "late line" do
                     should "start from the starting point on the left" do
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.milestone_late[style*=left:52px]"
+                      assert_select "div.version.task_late[style*=left:28px]", true, @response.body
                     end
                     should "be the total delayed width of the version" do
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.milestone_late[style*=width:6px]"
+                      assert_select "div.version.task_late[style*=width:30px]", true, @response.body
                     end
                   end
                   context "done line" do
                     should "start from the starting point on the left" do
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.milestone_done[style*=left:52px]"
+                      assert_select "div.version.task_done[style*=left:28px]", true, @response.body
                     end
                     should "Be the total done width of the version"  do
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.milestone_done[style*=left:52px]"
+                      assert_select "div.version.task_done[style*=width:18px]", true, @response.body
                     end
                   end
                       @gantt.instance_variable_set('@date_from', Date.today)
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.milestone.starting", false
+                      assert_select "div.version.starting", false
                     end
                     should "appear at the starting point" do
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.milestone.starting[style*=left:52px]"
+                      assert_select "div.version.starting[style*=left:28px]", true, @response.body
                     end
                   end
                       @gantt.instance_variable_set('@date_to', 2.weeks.ago.to_date)
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.milestone.ending", false
+                      assert_select "div.version.ending", false
                     end
                     should "appear at the end of the date range" do
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.milestone.ending[style*=left:84px]"
+                      assert_select "div.version.ending[style*=left:84px]", true, @response.body
                     end
                   end
                       @gantt.instance_variable_set('@date_to', 2.weeks.ago.to_date)
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.version-name", /#{@version.name}/
+                      assert_select "div.version.label", /#{@version.name}/
                     end
                     should "show the version name" do
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.version-name", /#{@version.name}/
+                      assert_select "div.version.label", /#{@version.name}/
                     end
                     should "show the percent complete" do
                       @response.body = @gantt.line_for_version(@version, {:format => :html, :zoom => 4})
-                      assert_select "div.version-name", /30%/
+                      assert_select "div.version.label", /30%/
                     end
                   end
                 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