comparison lib/redmine/export/.svn/text-base/pdf.rb.svn-base @ 1:cca12e1c1fd4

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

         pdf.SetX(15)
         pdf.Cell(70, 20, project.to_s)
         pdf.Ln
         pdf.SetFontStyle('B',9)
         
-        subject_width = 70
+        subject_width = 100
         header_heigth = 5
         
         headers_heigth = header_heigth
         show_weeks = false
         show_days = false

             show_days = true
             headers_heigth = 3*header_heigth
           end
         end
         
-        g_width = 210
+        g_width = 280 - subject_width
         zoom = (g_width) / (gantt.date_to - gantt.date_from + 1)
         g_height = 120
         t_height = g_height + headers_heigth
         
         y_start = pdf.GetY

         pdf.SetFontStyle('B',7)
         gantt.events.each do |i|
           pdf.SetY(top)
           pdf.SetX(15)
           
+          text = ""
           if i.is_a? Issue
-            pdf.Cell(subject_width-15, 5, "#{i.tracker} #{i.id}: #{i.subject}".sub(/^(.{30}[^\s]*\s).*$/, '\1 (...)'), "LR")
+            text = "#{i.tracker} #{i.id}: #{i.subject}"
           else
-            pdf.Cell(subject_width-15, 5, "#{l(:label_version)}: #{i.name}", "LR")
-          end
-        
-          pdf.SetY(top)
+            text = i.name
+          end
+          text = "#{i.project} - #{text}" unless project && project == i.project
+          pdf.Cell(subject_width-15, 5, text, "LR")
+        
+          pdf.SetY(top + 0.2)
           pdf.SetX(subject_width)
-          pdf.Cell(g_width, 5, "", "LR")
-        
+          pdf.SetFillColor(255, 255, 255)
+          pdf.Cell(g_width, 4.6, "", "LR", 0, "", 1)
           pdf.SetY(top+1.5)
           
           if i.is_a? Issue
             i_start_date = (i.start_date >= gantt.date_from ? i.start_date : gantt.date_from )
             i_end_date = (i.due_before <= gantt.date_to ? i.due_before : gantt.date_to )