comparison lib/redmine/helpers/.svn/text-base/gantt.rb.svn-base @ 1:cca12e1c1fd4

* Update to Redmine trunk (SVN revisions 3860-3892)

         { :year => (date_from >> months).year, :month => (date_from >> months).month, :zoom => zoom, :months => months }
       end
       
       # Generates a gantt image
       # Only defined if RMagick is avalaible
-      def to_image(format='PNG')
+      def to_image(project, format='PNG')
         date_to = (@date_from >> @months)-1    
         show_weeks = @zoom > 1
         show_days = @zoom > 2
         
-        subject_width = 320
+        subject_width = 400
         header_heigth = 18
         # width of one day in pixels
         zoom = @zoom*2
         g_width = (@date_to - @date_from + 1)*zoom
         g_height = 20 * events.length + 20

         top = headers_heigth + 20
         gc.fill('black')
         gc.stroke('transparent')
         gc.stroke_width(1)
         events.each do |i|
-          gc.text(4, top + 2, (i.is_a?(Issue) ? i.subject : i.name))
+          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
     
         # Months headers
         month_f = @date_from