Rewrite the Gantt chart. #6276

This version of the Gantt chart supports nested charts. So Projects,
Versions, and Issues will be nested underneath their parents correctly.

Additional features:

* Move all Gantt code to Redmine::Helpers::Gantt class instead of having it in
  the Gantt class, controller, and view
* Recursive and nest sub-projects
* Recursive and nest versions
* Recursive and nest issues
* Draw a line showing when a Project is active and it's progress
* Draw a line showing when a Version is active and it's progress
* Show a version's % complete
* Change the color of Projects, Versions, and Issues if they are late or
  behind schedule
* Added Project#start_date and #due_date
* Added Project#completed_percent
* Use a mini-gravatar on the Gantt chart
* Added tests for the Gantt rendering

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4072 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 791 insertions, 100 deletions

diff --git a/lib/redmine/helpers/gantt.rb b/lib/redmine/helpers/gantt.rb
index 96ba4db7c..33a4e1c2c 100644
--- a/lib/redmine/helpers/gantt.rb
+++ b/lib/redmine/helpers/gantt.rb
@@ -19,11 +19,28 @@ module Redmine
   module Helpers
     # Simple class to handle gantt chart data
     class Gantt
-      attr_reader :year_from, :month_from, :date_from, :date_to, :zoom, :months, :events
-    
+      include ERB::Util
+      include Redmine::I18n
+
+      # :nodoc:
+      # Some utility methods for the PDF export
+      class PDF
+        MaxCharactorsForSubject = 45
+        TotalWidth = 280
+        LeftPaneWidth = 100
+
+        def self.right_pane_width
+          TotalWidth - LeftPaneWidth
+        end
+      end
+
+      attr_reader :year_from, :month_from, :date_from, :date_to, :zoom, :months
+      attr_accessor :query
+      attr_accessor :project
+      attr_accessor :view
+      
       def initialize(options={})
         options = options.dup
-        @events = []
         
         if options[:year] && options[:year].to_i >0
           @year_from = options[:year].to_i
@@ -52,31 +69,6 @@ module Redmine
         @date_to = (@date_from >> @months) - 1
       end
       
-      
-      def events=(e)
-        @events = e
-        # Adds all ancestors
-        root_ids = e.select {|i| i.is_a?(Issue) && i.parent_id? }.collect(&:root_id).uniq
-        if root_ids.any?
-          # Retrieves all nodes
-          parents = Issue.find_all_by_root_id(root_ids, :conditions => ["rgt - lft > 1"])
-          # Only add ancestors
-          @events += parents.select {|p| @events.detect {|i| i.is_a?(Issue) && p.is_ancestor_of?(i)}}
-        end
-        @events.uniq!
-        # Sort issues by hierarchy and start dates
-        @events.sort! {|x,y| 
-          if x.is_a?(Issue) && y.is_a?(Issue)
-            gantt_issue_compare(x, y, @events)
-          else
-            gantt_start_compare(x, y)
-          end
-        }
-        # Removes issues that have no start or end date
-        @events.reject! {|i| i.is_a?(Issue) && (i.start_date.nil? || i.due_before.nil?) }
-        @events
-      end
-      
       def params
         { :zoom => zoom, :year => year_from, :month => month_from, :months => months }
       end
@@ -88,10 +80,652 @@ module Redmine
       def params_next
         { :year => (date_from >> months).year, :month => (date_from >> months).month, :zoom => zoom, :months => months }
       end
-      
+
+            ### Extracted from the HTML view/helpers
+      # Returns the number of rows that will be rendered on the Gantt chart
+      def number_of_rows
+        if @project
+          return number_of_rows_on_project(@project)
+        else
+          Project.roots.inject(0) do |total, project|
+            total += number_of_rows_on_project(project)
+          end
+        end
+      end
+
+      # Returns the number of rows that will be used to list a project on
+      # the Gantt chart.  This will recurse for each subproject.
+      def number_of_rows_on_project(project)
+        # Remove the project requirement for Versions because it will
+        # restrict issues to only be on the current project.  This
+        # ends up missing issues which are assigned to shared versions.
+        @query.project = nil if @query.project
+
+        # One Root project
+        count = 1
+        # Issues without a Version
+        count += project.issues.for_gantt.without_version.with_query(@query).count
+
+        # Versions
+        count += project.versions.count
+
+        # Issues on the Versions
+        project.versions.each do |version|
+          count += version.fixed_issues.for_gantt.with_query(@query).count
+        end
+
+        # Subprojects
+        project.children.each do |subproject|
+          count += number_of_rows_on_project(subproject)
+        end
+
+        count
+      end
+
+      # Renders the subjects of the Gantt chart, the left side.
+      def subjects(options={})
+        options = {:indent => 4, :render => :subject, :format => :html}.merge(options)
+
+        output = ''
+        if @project
+          output << render_project(@project, options)
+        else
+          Project.roots.each do |project|
+            output << render_project(project, options)
+          end
+        end
+
+        output
+      end
+
+      # Renders the lines of the Gantt chart, the right side
+      def lines(options={})
+        options = {:indent => 4, :render => :line, :format => :html}.merge(options)
+        output = ''
+
+        if @project
+          output << render_project(@project, options)
+        else
+          Project.roots.each do |project|
+            output << render_project(project, options)
+          end
+        end
+        
+        output
+      end
+
+      def render_project(project, options={})
+        options[:top] = 0 unless options.key? :top
+        options[:indent_increment] = 20 unless options.key? :indent_increment
+        options[:top_increment] = 20 unless options.key? :top_increment
+
+        output = ''
+        # Project Header
+        project_header = if options[:render] == :subject
+                           subject_for_project(project, options)
+                         else
+                           # :line
+                           line_for_project(project, options)
+                         end
+        output << project_header if options[:format] == :html
+        
+        options[:top] += options[:top_increment]
+        options[:indent] += options[:indent_increment]
+        
+        # Second, Issues without a version
+        issues = project.issues.for_gantt.without_version.with_query(@query)
+        if issues
+          issue_rendering = render_issues(issues, options)
+          output << issue_rendering if options[:format] == :html
+        end
+
+        # Third, Versions
+        project.versions.sort.each do |version|
+          version_rendering = render_version(version, options)
+          output << version_rendering if options[:format] == :html
+        end
+
+        # Fourth, subprojects
+        project.children.each do |project|
+          subproject_rendering = render_project(project, options)
+          output << subproject_rendering if options[:format] == :html
+        end
+
+        # Remove indent to hit the next sibling
+        options[:indent] -= options[:indent_increment]
+        
+        output
+      end
+
+      def render_issues(issues, options={})
+        output = ''
+        issues.each do |i|
+          issue_rendering = if options[:render] == :subject
+                              subject_for_issue(i, options)
+                            else
+                              # :line
+                              line_for_issue(i, options)
+                            end
+          output << issue_rendering if options[:format] == :html
+          options[:top] += options[:top_increment]
+        end
+        output
+      end
+
+      def render_version(version, options={})
+        output = ''
+        # Version header
+        version_rendering = if options[:render] == :subject
+                              subject_for_version(version, options)
+                            else
+                              # :line
+                              line_for_version(version, options)
+                            end
+
+        output << version_rendering if options[:format] == :html
+        
+        options[:top] += options[:top_increment]
+
+        # Remove the project requirement for Versions because it will
+        # restrict issues to only be on the current project.  This
+        # ends up missing issues which are assigned to shared versions.
+        @query.project = nil if @query.project
+        
+        issues = version.fixed_issues.for_gantt.with_query(@query)
+        if issues
+          # Indent issues
+          options[:indent] += options[:indent_increment]
+          output << render_issues(issues, options)
+          options[:indent] -= options[:indent_increment]
+        end
+
+        output
+      end
+
+      def subject_for_project(project, options)
+        case options[:format]
+        when :html
+          output = ''
+
+          output << "<div class='project-name' style='position: absolute;line-height:1.2em;height:16px;top:#{options[:top]}px;left:#{options[:indent]}px;overflow:hidden;'><small>    "
+          if project.is_a? Project
+            output << "<span class='icon icon-projects #{project.overdue? ? 'project-overdue' : ''}'>"
+            output << view.link_to_project(project)
+            output << '</span>'
+          else
+            ActiveRecord::Base.logger.debug "Gantt#subject_for_project was not given a project"
+            ''
+          end
+          output << "</small></div>"
+
+          output
+        when :image
+          
+          options[:image].fill('black')
+          options[:image].stroke('transparent')
+          options[:image].stroke_width(1)
+          options[:image].text(options[:indent], options[:top] + 2, project.name)
+        when :pdf
+          options[:pdf].SetY(options[:top])
+          options[:pdf].SetX(15)
+          
+          char_limit = PDF::MaxCharactorsForSubject - options[:indent]
+          options[:pdf].Cell(options[:subject_width]-15, 5, (" " * options[:indent]) +"#{project.name}".sub(/^(.{#{char_limit}}[^\s]*\s).*$/, '\1 (...)'), "LR")
+        
+          options[:pdf].SetY(options[:top])
+          options[:pdf].SetX(options[:subject_width])
+          options[:pdf].Cell(options[:g_width], 5, "", "LR")
+        end
+      end
+
+      def line_for_project(project, options)
+        # Skip versions that don't have a start_date
+        if project.is_a?(Project) && project.start_date
+          options[:zoom] ||= 1
+          options[:g_width] ||= (self.date_to - self.date_from + 1) * options[:zoom]
+
+          
+          case options[:format]
+          when :html
+            output = ''
+            i_left = ((project.start_date - self.date_from)*options[:zoom]).floor
+
+            start_date = project.start_date
+            start_date ||= self.date_from
+            start_left = ((start_date - self.date_from)*options[:zoom]).floor
+
+            i_end_date = ((project.due_date <= self.date_to) ? project.due_date : self.date_to )
+            i_done_date = start_date + ((project.due_date - start_date+1)* project.completed_percent(:include_subprojects => true)/100).floor
+            i_done_date = (i_done_date <= self.date_from ? self.date_from : i_done_date )
+            i_done_date = (i_done_date >= self.date_to ? self.date_to : i_done_date )
+            
+            i_late_date = [i_end_date, Date.today].min if start_date < Date.today
+            i_end = ((i_end_date - self.date_from) * options[:zoom]).floor
+
+            i_width = (i_end - i_left + 1).floor - 2                  # total width of the issue (- 2 for left and right borders)
+            d_width = ((i_done_date - start_date)*options[:zoom]).floor - 2                     # done width
+            l_width = i_late_date ? ((i_late_date - start_date+1)*options[:zoom]).floor - 2 : 0 # delay width
+
+            # Bar graphic
+
+            # Make sure that negative i_left and i_width don't
+            # overflow the subject
+            if i_end > 0 && i_left <= options[:g_width]
+              output << "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:#{ i_width }px;' class='task project_todo'>&nbsp;</div>"
+            end
+            
+            if l_width > 0 && i_left <= options[:g_width]
+              output << "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:#{ l_width }px;' class='task project_late'>&nbsp;</div>"
+            end
+            if d_width > 0 && i_left <= options[:g_width]
+              output<< "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:#{ d_width }px;' class='task project_done'>&nbsp;</div>"
+            end
+
+            
+            # Starting diamond
+            if start_left <= options[:g_width] && start_left > 0
+              output << "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:15px;' class='task project-line starting'>&nbsp;</div>"
+              output << "<div style='top:#{ options[:top] }px;left:#{ start_left + 12 }px;' class='task label'>"
+              output << "</div>"
+            end
+
+            # Ending diamond
+            # Don't show items too far ahead
+            if i_end <= options[:g_width] && i_end > 0
+              output << "<div style='top:#{ options[:top] }px;left:#{ i_end }px;width:15px;' class='task project-line ending'>&nbsp;</div>"
+            end
+
+            # DIsplay the Project name and %
+            if i_end <= options[:g_width]
+              # Display the status even if it's floated off to the left
+              status_px = i_end + 12 # 12px for the diamond
+              status_px = 0 if status_px <= 0
+
+              output << "<div style='top:#{ options[:top] }px;left:#{ status_px }px;' class='task label project-name'>"
+              output << "<strong>#{h project } #{h project.completed_percent(:include_subprojects => true).to_i.to_s}%</strong>"
+              output << "</div>"
+            end
+
+            output
+          when :image
+            options[:image].stroke('transparent')
+            i_left = options[:subject_width] + ((project.due_date - self.date_from)*options[:zoom]).floor
+
+            # Make sure negative i_left doesn't overflow the subject
+            if i_left > options[:subject_width]
+              options[:image].fill('blue')
+              options[:image].rectangle(i_left, options[:top], i_left + 6, options[:top] - 6)        
+              options[:image].fill('black')
+              options[:image].text(i_left + 11, options[:top] + 1, project.name)
+            end
+          when :pdf
+            options[:pdf].SetY(options[:top]+1.5)
+            i_left = ((project.due_date - @date_from)*options[:zoom])
+
+            # Make sure negative i_left doesn't overflow the subject
+            if i_left > 0
+              options[:pdf].SetX(options[:subject_width] + i_left)
+              options[:pdf].SetFillColor(50,50,200)
+              options[:pdf].Cell(2, 2, "", 0, 0, "", 1) 
+        
+              options[:pdf].SetY(options[:top]+1.5)
+              options[:pdf].SetX(options[:subject_width] + i_left + 3)
+              options[:pdf].Cell(30, 2, "#{project.name}")
+            end
+          end
+        else
+          ActiveRecord::Base.logger.debug "Gantt#line_for_project was not given a project with a start_date"
+          ''
+        end
+      end
+
+      def subject_for_version(version, options)
+        case options[:format]
+        when :html
+          output = ''
+          output << "<div class='version-name' style='position: absolute;line-height:1.2em;height:16px;top:#{options[:top]}px;left:#{options[:indent]}px;overflow:hidden;'><small>    "
+          if version.is_a? Version
+            output << "<span class='icon icon-package #{version.behind_schedule? ? 'version-behind-schedule' : ''} #{version.overdue? ? 'version-overdue' : ''}'>"
+            output << view.link_to_version(version)
+            output << '</span>'
+          else
+            ActiveRecord::Base.logger.debug "Gantt#subject_for_version was not given a version"
+            ''
+          end
+          output << "</small></div>"
+
+          output
+        when :image
+          options[:image].fill('black')
+          options[:image].stroke('transparent')
+          options[:image].stroke_width(1)
+          options[:image].text(options[:indent], options[:top] + 2, version.name)
+        when :pdf
+          options[:pdf].SetY(options[:top])
+          options[:pdf].SetX(15)
+          
+          char_limit = PDF::MaxCharactorsForSubject - options[:indent]
+          options[:pdf].Cell(options[:subject_width]-15, 5, (" " * options[:indent]) +"#{version.name}".sub(/^(.{#{char_limit}}[^\s]*\s).*$/, '\1 (...)'), "LR")
+        
+          options[:pdf].SetY(options[:top])
+          options[:pdf].SetX(options[:subject_width])
+          options[:pdf].Cell(options[:g_width], 5, "", "LR")
+        end
+      end
+
+      def line_for_version(version, options)
+        # Skip versions that don't have a start_date
+        if version.is_a?(Version) && version.start_date
+          options[:zoom] ||= 1
+          options[:g_width] ||= (self.date_to - self.date_from + 1) * options[:zoom]
+
+          case options[:format]
+          when :html
+            output = ''
+            i_left = ((version.start_date - self.date_from)*options[:zoom]).floor
+            # TODO: or version.fixed_issues.collect(&:start_date).min
+            start_date = version.fixed_issues.minimum('start_date') if version.fixed_issues.present?
+            start_date ||= self.date_from
+            start_left = ((start_date - self.date_from)*options[:zoom]).floor
+
+            i_end_date = ((version.due_date <= self.date_to) ? version.due_date : self.date_to )
+            i_done_date = start_date + ((version.due_date - start_date+1)* version.completed_pourcent/100).floor
+            i_done_date = (i_done_date <= self.date_from ? self.date_from : i_done_date )
+            i_done_date = (i_done_date >= self.date_to ? self.date_to : i_done_date )
+            
+            i_late_date = [i_end_date, Date.today].min if start_date < Date.today
+
+            i_width = (i_left - start_left + 1).floor - 2                  # total width of the issue (- 2 for left and right borders)
+            d_width = ((i_done_date - start_date)*options[:zoom]).floor - 2                     # done width
+            l_width = i_late_date ? ((i_late_date - start_date+1)*options[:zoom]).floor - 2 : 0 # delay width
+
+            i_end = ((i_end_date - self.date_from) * options[:zoom]).floor # Ending pixel
+
+            # Bar graphic
+
+            # Make sure that negative i_left and i_width don't
+            # overflow the subject
+            if i_width > 0 && i_left <= options[:g_width]
+              output << "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:#{ i_width }px;' class='task milestone_todo'>&nbsp;</div>"
+            end
+            if l_width > 0 && i_left <= options[:g_width]
+              output << "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:#{ l_width }px;' class='task milestone_late'>&nbsp;</div>"
+            end
+            if d_width > 0 && i_left <= options[:g_width]
+              output<< "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:#{ d_width }px;' class='task milestone_done'>&nbsp;</div>"
+            end
+
+            
+            # Starting diamond
+            if start_left <= options[:g_width] && start_left > 0
+              output << "<div style='top:#{ options[:top] }px;left:#{ start_left }px;width:15px;' class='task milestone starting'>&nbsp;</div>"
+              output << "<div style='top:#{ options[:top] }px;left:#{ start_left + 12 }px;background:#fff;' class='task'>"
+              output << "</div>"
+            end
+
+            # Ending diamond
+            # Don't show items too far ahead
+            if i_left <= options[:g_width] && i_end > 0
+              output << "<div style='top:#{ options[:top] }px;left:#{ i_end }px;width:15px;' class='task milestone ending'>&nbsp;</div>"
+            end
+
+            # Display the Version name and %
+            if i_end <= options[:g_width]
+              # Display the status even if it's floated off to the left
+              status_px = i_end + 12 # 12px for the diamond
+              status_px = 0 if status_px <= 0
+              
+              output << "<div style='top:#{ options[:top] }px;left:#{ status_px }px;' class='task label version-name'>"
+              output << h("#{version.project} -") unless @project && @project == version.project
+              output << "<strong>#{h version } #{h version.completed_pourcent.to_i.to_s}%</strong>"
+              output << "</div>"
+            end
+
+            output
+          when :image
+            options[:image].stroke('transparent')
+            i_left = options[:subject_width] + ((version.start_date - @date_from)*options[:zoom]).floor
+
+            # Make sure negative i_left doesn't overflow the subject
+            if i_left > options[:subject_width]
+              options[:image].fill('green')
+              options[:image].rectangle(i_left, options[:top], i_left + 6, options[:top] - 6)        
+              options[:image].fill('black')
+              options[:image].text(i_left + 11, options[:top] + 1, version.name)
+            end
+          when :pdf
+            options[:pdf].SetY(options[:top]+1.5)
+            i_left = ((version.start_date - @date_from)*options[:zoom]) 
+
+            # Make sure negative i_left doesn't overflow the subject
+            if i_left > 0
+              options[:pdf].SetX(options[:subject_width] + i_left)
+              options[:pdf].SetFillColor(50,200,50)
+              options[:pdf].Cell(2, 2, "", 0, 0, "", 1) 
+        
+              options[:pdf].SetY(options[:top]+1.5)
+              options[:pdf].SetX(options[:subject_width] + i_left + 3)
+              options[:pdf].Cell(30, 2, "#{version.name}")
+            end
+          end
+        else
+          ActiveRecord::Base.logger.debug "Gantt#line_for_version was not given a version with a start_date"
+          ''
+        end
+      end
+
+      def subject_for_issue(issue, options)
+        case options[:format]
+        when :html
+          output = ''
+          output << "<div class='tooltip'>"
+          output << "<div class='issue-subject' style='position: absolute;line-height:1.2em;height:16px;top:#{options[:top]}px;left:#{options[:indent]}px;overflow:hidden;'><small>    "
+          if issue.is_a? Issue
+            css_classes = []
+            css_classes << 'issue-overdue' if issue.overdue?
+            css_classes << 'issue-behind-schedule' if issue.behind_schedule?
+            css_classes << 'icon icon-issue' unless Setting.gravatar_enabled? && issue.assigned_to
+
+            if issue.assigned_to.present?
+              assigned_string = l(:field_assigned_to) + ": " + issue.assigned_to.name
+              output << view.avatar(issue.assigned_to, :class => 'gravatar icon-gravatar', :size => 10, :title => assigned_string)
+            end
+            output << "<span class='#{css_classes.join(' ')}'>"
+            output << view.link_to_issue(issue)
+            output << ":"
+            output << h(issue.subject)
+            output << '</span>'
+          else
+            ActiveRecord::Base.logger.debug "Gantt#subject_for_issue was not given an issue"
+            ''
+          end
+          output << "</small></div>"
+
+          # Tooltip
+          if issue.is_a? Issue
+            output << "<span class='tip' style='position: absolute;top:#{ options[:top].to_i + 16 }px;left:#{ options[:indent].to_i + 20 }px;'>"
+            output << view.render_issue_tooltip(issue)
+            output << "</span>"
+          end
+
+          output << "</div>"
+          output
+        when :image
+          options[:image].fill('black')
+          options[:image].stroke('transparent')
+          options[:image].stroke_width(1)
+          options[:image].text(options[:indent], options[:top] + 2, issue.subject)
+        when :pdf
+          options[:pdf].SetY(options[:top])
+          options[:pdf].SetX(15)
+          
+          char_limit = PDF::MaxCharactorsForSubject - options[:indent]
+          options[:pdf].Cell(options[:subject_width]-15, 5, (" " * options[:indent]) +"#{issue.tracker} #{issue.id}: #{issue.subject}".sub(/^(.{#{char_limit}}[^\s]*\s).*$/, '\1 (...)'), "LR")
+        
+          options[:pdf].SetY(options[:top])
+          options[:pdf].SetX(options[:subject_width])
+          options[:pdf].Cell(options[:g_width], 5, "", "LR")
+        end
+      end
+
+      def line_for_issue(issue, options)
+        # Skip issues that don't have a due_before (due_date or version's due_date)
+        if issue.is_a?(Issue) && issue.due_before
+          case options[:format]
+          when :html
+            output = ''
+            # Handle nil start_dates, rare but can happen.
+            i_start_date =  if issue.start_date && issue.start_date >= self.date_from
+                              issue.start_date
+                            else
+                              self.date_from
+                            end
+
+            i_end_date = ((issue.due_before && issue.due_before <= self.date_to) ? issue.due_before : self.date_to )
+            i_done_date = i_start_date + ((issue.due_before - i_start_date+1)*issue.done_ratio/100).floor
+            i_done_date = (i_done_date <= self.date_from ? self.date_from : i_done_date )
+            i_done_date = (i_done_date >= self.date_to ? self.date_to : i_done_date )
+            
+            i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
+            
+            i_left = ((i_start_date - self.date_from)*options[:zoom]).floor 	
+            i_width = ((i_end_date - i_start_date + 1)*options[:zoom]).floor - 2                  # total width of the issue (- 2 for left and right borders)
+            d_width = ((i_done_date - i_start_date)*options[:zoom]).floor - 2                     # done width
+            l_width = i_late_date ? ((i_late_date - i_start_date+1)*options[:zoom]).floor - 2 : 0 # delay width
+            css = "task " + (issue.leaf? ? 'leaf' : 'parent')
+            
+            # Make sure that negative i_left and i_width don't
+            # overflow the subject
+            if i_width > 0
+              output << "<div style='top:#{ options[:top] }px;left:#{ i_left }px;width:#{ i_width }px;' class='#{css} task_todo'>&nbsp;</div>"
+            end
+            if l_width > 0
+              output << "<div style='top:#{ options[:top] }px;left:#{ i_left }px;width:#{ l_width }px;' class='#{css} task_late'>&nbsp;</div>"
+            end
+            if d_width > 0
+              output<< "<div style='top:#{ options[:top] }px;left:#{ i_left }px;width:#{ d_width }px;' class='#{css} task_done'>&nbsp;</div>"
+            end
+
+            # Display the status even if it's floated off to the left
+            status_px = i_left + i_width + 5
+            status_px = 5 if status_px <= 0
+            
+            output << "<div style='top:#{ options[:top] }px;left:#{ status_px }px;' class='#{css} label issue-name'>"
+            output << issue.status.name
+            output << ' '
+            output << (issue.done_ratio).to_i.to_s
+            output << "%"
+            output << "</div>"
+
+            output << "<div class='tooltip' style='position: absolute;top:#{ options[:top] }px;left:#{ i_left }px;width:#{ i_width }px;height:12px;'>"
+            output << '<span class="tip">'
+            output << view.render_issue_tooltip(issue)
+            output << "</span></div>"
+            output
+          
+          when :image
+            # Handle nil start_dates, rare but can happen.
+            i_start_date =  if issue.start_date && issue.start_date >= @date_from
+                              issue.start_date
+                            else
+                              @date_from
+                            end
+
+            i_end_date = (issue.due_before <= date_to ? issue.due_before : date_to )        
+            i_done_date = i_start_date + ((issue.due_before - i_start_date+1)*issue.done_ratio/100).floor
+            i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
+            i_done_date = (i_done_date >= date_to ? date_to : i_done_date )        
+            i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
+            
+            i_left = options[:subject_width] + ((i_start_date - @date_from)*options[:zoom]).floor 	
+            i_width = ((i_end_date - i_start_date + 1)*options[:zoom]).floor                  # total width of the issue
+            d_width = ((i_done_date - i_start_date)*options[:zoom]).floor                     # done width
+            l_width = i_late_date ? ((i_late_date - i_start_date+1)*options[:zoom]).floor : 0 # delay width
+
+            
+            # Make sure that negative i_left and i_width don't
+            # overflow the subject
+            if i_width > 0
+              options[:image].fill('grey')
+              options[:image].rectangle(i_left, options[:top], i_left + i_width, options[:top] - 6)
+              options[:image].fill('red')
+              options[:image].rectangle(i_left, options[:top], i_left + l_width, options[:top] - 6) if l_width > 0
+              options[:image].fill('blue')
+              options[:image].rectangle(i_left, options[:top], i_left + d_width, options[:top] - 6) if d_width > 0
+            end
+
+            # Show the status and % done next to the subject if it overflows
+            options[:image].fill('black')
+            if i_width > 0
+              options[:image].text(i_left + i_width + 5,options[:top] + 1, "#{issue.status.name} #{issue.done_ratio}%")
+            else
+              options[:image].text(options[:subject_width] + 5,options[:top] + 1, "#{issue.status.name} #{issue.done_ratio}%")            
+            end
+
+          when :pdf
+            options[:pdf].SetY(options[:top]+1.5)
+            # Handle nil start_dates, rare but can happen.
+            i_start_date =  if issue.start_date && issue.start_date >= @date_from
+                          issue.start_date
+                        else
+                          @date_from
+                        end
+
+            i_end_date = (issue.due_before <= @date_to ? issue.due_before : @date_to )
+            
+            i_done_date = i_start_date + ((issue.due_before - i_start_date+1)*issue.done_ratio/100).floor
+            i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
+            i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date )
+            
+            i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
+            
+            i_left = ((i_start_date - @date_from)*options[:zoom]) 
+            i_width = ((i_end_date - i_start_date + 1)*options[:zoom])
+            d_width = ((i_done_date - i_start_date)*options[:zoom])
+            l_width = ((i_late_date - i_start_date+1)*options[:zoom]) if i_late_date
+            l_width ||= 0
+
+            # Make sure that negative i_left and i_width don't
+            # overflow the subject
+            if i_width > 0
+              options[:pdf].SetX(options[:subject_width] + i_left)
+              options[:pdf].SetFillColor(200,200,200)
+              options[:pdf].Cell(i_width, 2, "", 0, 0, "", 1)
+            end
+          
+            if l_width > 0
+              options[:pdf].SetY(options[:top]+1.5)
+              options[:pdf].SetX(options[:subject_width] + i_left)
+              options[:pdf].SetFillColor(255,100,100)
+              options[:pdf].Cell(l_width, 2, "", 0, 0, "", 1)
+            end 
+            if d_width > 0
+              options[:pdf].SetY(options[:top]+1.5)
+              options[:pdf].SetX(options[:subject_width] + i_left)
+              options[:pdf].SetFillColor(100,100,255)
+              options[:pdf].Cell(d_width, 2, "", 0, 0, "", 1)
+            end
+
+            options[:pdf].SetY(options[:top]+1.5)
+
+            # Make sure that negative i_left and i_width don't
+            # overflow the subject
+            if (i_left + i_width) >= 0
+              options[:pdf].SetX(options[:subject_width] + i_left + i_width)
+            else
+              options[:pdf].SetX(options[:subject_width])
+            end
+            options[:pdf].Cell(30, 2, "#{issue.status} #{issue.done_ratio}%")
+          end
+        else
+          ActiveRecord::Base.logger.debug "GanttHelper#line_for_issue was not given an issue with a due_before"
+          ''
+        end
+      end
+
       # Generates a gantt image
       # Only defined if RMagick is avalaible
-      def to_image(project, format='PNG')
+      def to_image(format='PNG')
         date_to = (@date_from >> @months)-1    
         show_weeks = @zoom > 1
         show_days = @zoom > 2
@@ -101,7 +735,7 @@ module Redmine
         # width of one day in pixels
         zoom = @zoom*2
         g_width = (@date_to - @date_from + 1)*zoom
-        g_height = 20 * events.length + 20
+        g_height = 20 * number_of_rows + 30
         headers_heigth = (show_weeks ? 2*header_heigth : header_heigth)
         height = g_height + headers_heigth
             
@@ -110,21 +744,7 @@ module Redmine
         gc = Magick::Draw.new
         
         # Subjects
-        top = headers_heigth + 20
-        gc.fill('black')
-        gc.stroke('transparent')
-        gc.stroke_width(1)
-        events.each do |i|
-          text = ""
-          if i.is_a? Issue
-            text = "#{i.tracker} #{i.id}: #{i.subject}"
-          else
-            text = i.name
-          end
-          text = "#{i.project} - #{text}" unless project && project == i.project
-          gc.text(4, top + 2, text)
-          top = top + 20
-        end
+        subjects(:image => gc, :top => (headers_heigth + 20), :indent => 4, :format => :image)
     
         # Months headers
         month_f = @date_from
@@ -202,38 +822,8 @@ module Redmine
             
         # content
         top = headers_heigth + 20
-        gc.stroke('transparent')
-        events.each do |i|      
-          if i.is_a?(Issue)       
-            i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )
-            i_end_date = (i.due_before <= date_to ? i.due_before : date_to )        
-            i_done_date = i.start_date + ((i.due_before - i.start_date+1)*i.done_ratio/100).floor
-            i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
-            i_done_date = (i_done_date >= date_to ? date_to : i_done_date )        
-            i_late_date = [i_end_date, Date.today].min if i_start_date < Date.today
-            
-            i_left = subject_width + ((i_start_date - @date_from)*zoom).floor 	
-            i_width = ((i_end_date - i_start_date + 1)*zoom).floor                  # total width of the issue
-            d_width = ((i_done_date - i_start_date)*zoom).floor                     # done width
-            l_width = i_late_date ? ((i_late_date - i_start_date+1)*zoom).floor : 0 # delay width
-      
-            gc.fill('grey')
-            gc.rectangle(i_left, top, i_left + i_width, top - 6)
-            gc.fill('red')
-            gc.rectangle(i_left, top, i_left + l_width, top - 6) if l_width > 0
-            gc.fill('blue')
-            gc.rectangle(i_left, top, i_left + d_width, top - 6) if d_width > 0
-            gc.fill('black')
-            gc.text(i_left + i_width + 5,top + 1, "#{i.status.name} #{i.done_ratio}%")
-          else
-            i_left = subject_width + ((i.start_date - @date_from)*zoom).floor
-            gc.fill('green')
-            gc.rectangle(i_left, top, i_left + 6, top - 6)        
-            gc.fill('black')
-            gc.text(i_left + 11, top + 1, i.name)
-          end
-          top = top + 20
-        end
+        
+        lines(:image => gc, :top => top, :zoom => zoom, :subject_width => subject_width, :format => :image)
         
         # today red line
         if Date.today >= @date_from and Date.today <= date_to
@@ -246,36 +836,137 @@ module Redmine
         imgl.format = format
         imgl.to_blob
       end if Object.const_defined?(:Magick)
-      
-      private
-      
-      def gantt_issue_compare(x, y, issues)
-        if x.parent_id == y.parent_id
-          gantt_start_compare(x, y)
-        elsif x.is_ancestor_of?(y)
-          -1
-        elsif y.is_ancestor_of?(x)
-          1
-        else
-          ax = issues.select {|i| i.is_a?(Issue) && i.is_ancestor_of?(x) && !i.is_ancestor_of?(y) }.sort_by(&:lft).first
-          ay = issues.select {|i| i.is_a?(Issue) && i.is_ancestor_of?(y) && !i.is_ancestor_of?(x) }.sort_by(&:lft).first
-          if ax.nil? && ay.nil?
-            gantt_start_compare(x, y)
+
+      def to_pdf
+        pdf = ::Redmine::Export::PDF::IFPDF.new(current_language)
+        pdf.SetTitle("#{l(:label_gantt)} #{project}")
+        pdf.AliasNbPages
+        pdf.footer_date = format_date(Date.today)
+        pdf.AddPage("L")
+        pdf.SetFontStyle('B',12)
+        pdf.SetX(15)
+        pdf.Cell(PDF::LeftPaneWidth, 20, project.to_s)
+        pdf.Ln
+        pdf.SetFontStyle('B',9)
+        
+        subject_width = PDF::LeftPaneWidth
+        header_heigth = 5
+        
+        headers_heigth = header_heigth
+        show_weeks = false
+        show_days = false
+        
+        if self.months < 7
+          show_weeks = true
+          headers_heigth = 2*header_heigth
+          if self.months < 3
+            show_days = true
+            headers_heigth = 3*header_heigth
+          end
+        end
+        
+        g_width = PDF.right_pane_width
+        zoom = (g_width) / (self.date_to - self.date_from + 1)
+        g_height = 120
+        t_height = g_height + headers_heigth
+        
+        y_start = pdf.GetY
+        
+        # Months headers
+        month_f = self.date_from
+        left = subject_width
+        height = header_heigth
+        self.months.times do 
+          width = ((month_f >> 1) - month_f) * zoom 
+          pdf.SetY(y_start)
+          pdf.SetX(left)
+          pdf.Cell(width, height, "#{month_f.year}-#{month_f.month}", "LTR", 0, "C")
+          left = left + width
+          month_f = month_f >> 1
+        end  
+        
+        # Weeks headers
+        if show_weeks
+          left = subject_width
+          height = header_heigth
+          if self.date_from.cwday == 1
+            # self.date_from is monday
+            week_f = self.date_from
           else
-            gantt_issue_compare(ax || x, ay || y, issues)
+            # find next monday after self.date_from
+            week_f = self.date_from + (7 - self.date_from.cwday + 1)
+            width = (7 - self.date_from.cwday + 1) * zoom-1
+            pdf.SetY(y_start + header_heigth)
+            pdf.SetX(left)
+            pdf.Cell(width + 1, height, "", "LTR")
+            left = left + width+1
+          end
+          while week_f <= self.date_to
+            width = (week_f + 6 <= self.date_to) ? 7 * zoom : (self.date_to - week_f + 1) * zoom
+            pdf.SetY(y_start + header_heigth)
+            pdf.SetX(left)
+            pdf.Cell(width, height, (width >= 5 ? week_f.cweek.to_s : ""), "LTR", 0, "C")
+            left = left + width
+            week_f = week_f+7
+          end
+        end
+        
+        # Days headers
+        if show_days
+          left = subject_width
+          height = header_heigth
+          wday = self.date_from.cwday
+          pdf.SetFontStyle('B',7)
+          (self.date_to - self.date_from + 1).to_i.times do 
+            width = zoom
+            pdf.SetY(y_start + 2 * header_heigth)
+            pdf.SetX(left)
+            pdf.Cell(width, height, day_name(wday).first, "LTR", 0, "C")
+            left = left + width
+            wday = wday + 1
+            wday = 1 if wday > 7
           end
         end
+        
+        pdf.SetY(y_start)
+        pdf.SetX(15)
+        pdf.Cell(subject_width+g_width-15, headers_heigth, "", 1)
+        
+        # Tasks
+        top = headers_heigth + y_start
+        pdf_subjects_and_lines(pdf, {
+                                 :top => top,
+                                 :zoom => zoom,
+                                 :subject_width => subject_width,
+                                 :g_width => g_width
+                               })
+
+        
+        pdf.Line(15, top, subject_width+g_width, top)
+        pdf.Output
+
+        
       end
       
-      def gantt_start_compare(x, y)
-        if x.start_date.nil?
-          -1
-        elsif y.start_date.nil?
-          1
+      private
+
+      # Renders both the subjects and lines of the Gantt chart for the
+      # PDF format
+      def pdf_subjects_and_lines(pdf, options = {})
+        subject_options = {:indent => 0, :indent_increment => 5, :top_increment => 3, :render => :subject, :format => :pdf, :pdf => pdf}.merge(options)
+        line_options = {:indent => 0, :indent_increment => 5, :top_increment => 3, :render => :line, :format => :pdf, :pdf => pdf}.merge(options)
+
+        if @project
+          render_project(@project, subject_options)
+          render_project(@project, line_options)
         else
-          x.start_date <=> y.start_date
+          Project.roots.each do |project|
+            render_project(project, subject_options)
+            render_project(project, line_options)
+          end
         end
       end
+
     end
   end
 end