jro_apps/redmine Commit - r4409:edc35d4d5b04

Gantt code cleanup....

Jean-Philippe Lang -

r4409:edc35d4d5b04

parent child

Context file:

r4409:edc35d4d5b04

Collapse all files

lib/redmine/helpers/gantt.rb +3 -57

@@ -300,64 +300,10 module Redmine
300		300
301	case options[:format]	301	case options[:format]
302	when :html	302	when :html
303	output = ''	303	coords = coordinates(project.start_date, project.due_date, project.completed_percent(:include_subprojects => true), options[:zoom])
304	i_left = ((project.start_date - self.date_from)*options[:zoom]).floor	304	label = "#{h project } #{h project.completed_percent(:include_subprojects => true).to_i.to_s}%"
305		305	output = html_task(options[:top], coords, :css => "project task", :label => label, :markers => true)
306	start_date = project.start_date
307	start_date \|\|= self.date_from
308	start_left = ((start_date - self.date_from)*options[:zoom]).floor
309
310	i_end_date = ((project.due_date <= self.date_to) ? project.due_date : self.date_to )
311	i_done_date = start_date + ((project.due_date - start_date+1)* project.completed_percent(:include_subprojects => true)/100).floor
312	i_done_date = (i_done_date <= self.date_from ? self.date_from : i_done_date )
313	i_done_date = (i_done_date >= self.date_to ? self.date_to : i_done_date )
314
315	i_late_date = [i_end_date, Date.today].min if start_date < Date.today
316	i_end = ((i_end_date - self.date_from) * options[:zoom]).floor
317
318	i_width = (i_end - i_left + 1).floor - 2 # total width of the issue (- 2 for left and right borders)
319	d_width = ((i_done_date - start_date)*options[:zoom]).floor - 2 # done width
320	l_width = i_late_date ? ((i_late_date - start_date+1)*options[:zoom]).floor - 2 : 0 # delay width
321
322	# Bar graphic
323
324	# Make sure that negative i_left and i_width don't
325	# overflow the subject
326	if i_end > 0 && i_left <= options[:g_width]
327	output << "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:#{ i_width }px;' class='task project_todo'> </div>"
328	end
329		306
330	if l_width > 0 && i_left <= options[:g_width]
331	output << "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:#{ l_width }px;' class='task project_late'> </div>"
332	end
333	if d_width > 0 && i_left <= options[:g_width]
334	output<< "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:#{ d_width }px;' class='task project_done'> </div>"
335	end
336
337
338	# Starting diamond
339	if start_left <= options[:g_width] && start_left > 0
340	output << "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:15px;' class='task project-line starting'> </div>"
341	output << "<div style='top:#{ options[:top] }px;left:#{ start_left + 12 }px;' class='task label'>"
342	output << "</div>"
343	end
344
345	# Ending diamond
346	# Don't show items too far ahead
347	if i_end <= options[:g_width] && i_end > 0
348	output << "<div style='top:#{ options[:top] }px;left:#{ i_end }px;width:15px;' class='task project-line ending'> </div>"
349	end
350
351	# DIsplay the Project name and %
352	if i_end <= options[:g_width]
353	# Display the status even if it's floated off to the left
354	status_px = i_end + 12 # 12px for the diamond
355	status_px = 0 if status_px <= 0
356
357	output << "<div style='top:#{ options[:top] }px;left:#{ status_px }px;' class='task label project-name'>"
358	output << "<strong>#{h project } #{h project.completed_percent(:include_subprojects => true).to_i.to_s}%</strong>"
359	output << "</div>"
360	end
361	@lines << output	307	@lines << output
362	output	308	output
363	when :image	309	when :image

public/stylesheets/application.css +5 -4

             }
             .task.label {width:100%;}
+            .task.label.project, .task.label.version { font-weight: bold; }
             .task_late { background:#f66 url(../images/task_late.png); border: 1px solid #f66; }
             .task_done { background:#00c600 url(../images/task_done.png); border: 1px solid #00c600; }
             .version.task_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.task_late { background:#f66 url(../images/milestone_late.png); border: 1px solid #f66; height: 2px; margin-top: 3px;}
-            .project_late { background:#f66 url(../images/milestone_late.png); border: 1px solid #f66; height: 2px; margin-top: 3px;}
+            .project.task_done { background:#00c600 url(../images/milestone_done.png); border: 1px solid #00c600; height: 2px; margin-top: 3px;}
-            .project_done { background:#00c600 url(../images/milestone_done.png); border: 1px solid #00c600; height: 2px; margin-top: 3px;}
+            .project.task_todo { background:#fff url(../images/milestone_todo.png); border: 1px solid #fff; height: 2px; margin-top: 3px;}
-            .project_todo { background:#fff url(../images/milestone_todo.png); border: 1px solid #fff; height: 2px; margin-top: 3px;}
+            .project.marker { background-image:url(../images/project_marker.png); background-repeat: no-repeat; border: 0; }
             .version-behind-schedule a, .issue-behind-schedule a {color: #f66914;}
             .version-overdue a, .issue-overdue a, .project-overdue a {color: #f00;}

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

                 context "project" do
                   should "be rendered" do
-                    assert_select "div.project_todo"
+                    assert_select "div.project.task_todo"
-                    assert_select "div.project-line.starting"
+                    assert_select "div.project.starting"
-                    assert_select "div.project-line.ending"
+                    assert_select "div.project.ending"
-                    assert_select "div.label.project-name", /#{@project.name}/
+                    assert_select "div.label.project", /#{@project.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_project(@project, {:format => :html, :zoom => 4})
-                      assert_select "div.project_todo[style*=left:52px]"
+                      assert_select "div.project.task_todo[style*=left:28px]", true, @response.body
                     end
                     should "be the total width of the project" do
                       @response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
-                      assert_select "div.project_todo[style*=width:31px]"
+                      assert_select "div.project.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_project(@project, {:format => :html, :zoom => 4})
-                      assert_select "div.project_late[style*=left:52px]"
+                      assert_select "div.project.task_late[style*=left:28px]", true, @response.body
                     end
                     should "be the total delayed width of the project" do
                       @response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
-                      assert_select "div.project_late[style*=width:6px]"
+                      assert_select "div.project.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_project(@project, {:format => :html, :zoom => 4})
-                      assert_select "div.project_done[style*=left:52px]"
+                      assert_select "div.project.task_done[style*=left:28px]", true, @response.body
                     end
                     should "Be the total done width of the project"  do
                       @response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
-                      assert_select "div.project_done[style*=left:52px]"
+                      assert_select "div.project.task_done[style*=width:18px]", true, @response.body
                     end
                   end
                       @gantt.instance_variable_set('@date_from', Date.today)
                       @response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
-                      assert_select "div.project-line.starting", false
+                      assert_select "div.project.starting", false, @response.body
                     end
                     should "appear at the starting point" do
                       @response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
-                      assert_select "div.project-line.starting[style*=left:52px]"
+                      assert_select "div.project.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_project(@project, {:format => :html, :zoom => 4})
-                      assert_select "div.project-line.ending", false
+                      assert_select "div.project.ending", false, @response.body
                     end
                     should "appear at the end of the date range" do
                       @response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
-                      assert_select "div.project-line.ending[style*=left:84px]"
+                      assert_select "div.project.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_project(@project, {:format => :html, :zoom => 4})
-                      assert_select "div.project-name", /#{@project.name}/
+                      assert_select "div.project.label", /#{@project.name}/
                     end
                     should "show the project name" do
                       @response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
-                      assert_select "div.project-name", /#{@project.name}/
+                      assert_select "div.project.label", /#{@project.name}/
                     end
                     should "show the percent complete" do
                       @response.body = @gantt.line_for_project(@project, {:format => :html, :zoom => 4})
-                      assert_select "div.project-name", /0%/
+                      assert_select "div.project.label", /0%/
                     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