taskjuggler 3.5.0 → 3.6.0

data/lib/taskjuggler/reports/CSVFile.rb

@@ -3,8 +3,8 @@
 #
 # = CSVFile.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/ChartPlotter.rb

@@ -3,8 +3,8 @@
 #
 # = ChartPlotter.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/CollisionDetector.rb

@@ -3,8 +3,8 @@
 #
 # = CollisionDetector.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/ColumnTable.rb

@@ -3,8 +3,8 @@
 #
 # = ColumnTable.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/ExportRE.rb

@@ -3,8 +3,8 @@
 #
 # = ExportRE.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/GanttChart.rb

@@ -3,8 +3,8 @@
 #
 # = GanttChart.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/GanttContainer.rb

@@ -3,8 +3,8 @@
 #
 # = GanttContainer.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/GanttHeader.rb

@@ -3,8 +3,8 @@
 #
 # = GanttHeader.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/GanttHeaderScaleItem.rb

@@ -3,8 +3,8 @@
 #
 # = GanttHeaderScaleItem.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/GanttLine.rb

@@ -3,8 +3,8 @@
 #
 # = GanttLine.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -32,7 +32,7 @@ class TaskJuggler
     attr_reader :y, :height, :query
 
     # Create a GanttLine object and generate the abstract representation.
-    def initialize(chart, query, y, height, tooltip)
+    def initialize(chart, query, y, height, lineIndex, tooltip)
       # A reference to the chart that the line belongs to.
       @chart = chart
       # Register the line with the chart.
@@ -49,6 +49,9 @@ class TaskJuggler
       @y = y + chart.header.height + 1
       # The height of the line in screen pixels.
       @height = height
+      # The index of the line in the chart. It starts with 0 and is
+      # incremented for each line by one.
+      @lineIndex = lineIndex
       # The x coordinates of the time-off zones. It's an Array of [ startX, endX
       # ] touples.
       @timeOffZones = []
@@ -133,7 +136,7 @@ class TaskJuggler
     # appear in the scope of a resource.
     def generateTask
       # Set the background color
-      @category = "taskcell#{(@query.property.get('index') + 1) % 2 + 1}"
+      @category = "taskcell#{(@lineIndex + 1) % 2 + 1}"
 
       project = @query.project
       property = @query.property
@@ -228,7 +231,7 @@ class TaskJuggler
     # line or appear in the scope of a task.
     def generateResource
       # Set the alternating background color
-      @category = "resourcecell#{(@query.property.get('index') + 1) % 2 + 1}"
+      @category = "resourcecell#{(@lineIndex + 1) % 2 + 1}"
 
       # The cellStartDate Array contains the end of the final cell as last
       # element. We need to use a shift mechanism to start and end

data/lib/taskjuggler/reports/GanttLoadStack.rb

@@ -3,8 +3,8 @@
 #
 # = GanttLoadStack.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/GanttMilestone.rb

@@ -3,8 +3,8 @@
 #
 # = GanttMilestone.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/GanttRouter.rb

@@ -3,8 +3,8 @@
 #
 # = GanttRouter.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/GanttTaskBar.rb

@@ -3,8 +3,8 @@
 #
 # = GanttTaskBar.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/HTMLGraphics.rb

@@ -3,8 +3,8 @@
 #
 # = HTMLGraphics.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/ICalReport.rb

@@ -3,8 +3,8 @@
 #
 # = ICalReport.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/MspXmlRE.rb

@@ -3,8 +3,8 @@
 #
 # = MspXmlRE.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -53,7 +53,10 @@ class TaskJuggler
       # Prepare the task list.
       @taskList = PropertyList.new(@project.tasks)
       @taskList.includeAdopted
-      @taskList.setSorting(a('sortTasks'))
+      # The MSP XML format requires that the tasks are listed in 'tree' order.
+      # We purposely ignore the user provided sorting criteria.
+      @taskList.setSorting([ [ 'tree', true, -1 ],
+                             [ 'seqno', true, -1 ] ])
       @taskList = filterTaskList(@taskList, nil, a('hideTask'), a('rollupTask'),
                                  a('openNodes'))
       @taskList.sort!

data/lib/taskjuggler/reports/Navigator.rb

@@ -3,8 +3,8 @@
 #
 # = Navigator.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/NikuReport.rb

@@ -3,8 +3,8 @@
 #
 # = NikuReport.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/Report.rb

@@ -3,8 +3,8 @@
 #
 # = Report.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -187,7 +187,7 @@ class TaskJuggler
         auxSrcDir = AppConfig.dataDirs('data/css')[0]
         cssFileName = (auxSrcDir ? auxSrcDir + '/tjreport.css' : '')
         # Raise an error if we haven't found the data directory
-        if auxSrcDir.nil? || !File.exists?(cssFileName)
+        if auxSrcDir.nil? || !File.exist?(cssFileName)
           dataDirError(cssFileName, AppConfig.dataSearchDirs('data/css'))
         end
         cssFile = IO.read(cssFileName)
@@ -403,7 +403,7 @@ EOT
       # Find the data directory that came with the TaskJuggler installation.
       auxSrcDir = AppConfig.dataDirs("data/#{dirName}")[0].untaint
       # Raise an error if we haven't found the data directory
-      if auxSrcDir.nil? || !File.exists?(auxSrcDir)
+      if auxSrcDir.nil? || !File.exist?(auxSrcDir)
         dataDirError(dirName, AppConfig.dataSearchDirs("data/#{dirName}"))
       end
       # Don't copy directory if all files are up-to-date.
@@ -419,7 +419,7 @@ EOT
     end
 
     def directoryUpToDate?(auxSrcDir, auxDstDir)
-      return false unless File.exists?(auxDstDir.untaint)
+      return false unless File.exist?(auxDstDir.untaint)
 
       Dir.entries(auxSrcDir).each do |file|
         next if file == '.' || file == '..'
@@ -466,7 +466,7 @@ EOT
 
     def absoluteFileName?(name)
       if windowsOS?
-        name[0] =~ /a-zA-Z/ && name[1] == ?:
+        name[0] =~ /[a-zA-Z]/ && name[1] == ?:
       else
         name[0] == ?/
       end

data/lib/taskjuggler/reports/ReportBase.rb

@@ -3,8 +3,8 @@
 #
 # = ReportBase.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/ReportContext.rb

@@ -3,8 +3,8 @@
 #
 # = ReportContext.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/ReportTable.rb

@@ -3,8 +3,8 @@
 #
 # = ReportTable.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/ReportTableCell.rb

@@ -3,8 +3,8 @@
 #
 # = ReportTableCell.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/ReportTableColumn.rb

@@ -3,8 +3,8 @@
 #
 # = ReportTableColumn.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/ReportTableLegend.rb

@@ -3,8 +3,8 @@
 #
 # = ReportTableLegend.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/ReportTableLine.rb

@@ -3,8 +3,8 @@
 #
 # = ReportTableLine.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/ResourceListRE.rb

@@ -3,8 +3,8 @@
 #
 # = ResourceListRE.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/StatusSheetReport.rb

@@ -3,8 +3,8 @@
 #
 # = StatusSheetReport.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/reports/TableReport.rb

@@ -3,8 +3,8 @@
 #
 # = TableReport.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -38,6 +38,7 @@ class TaskJuggler
       'alerttrend'        => [ 'Alert Trend',          false,  :left,  false ],
       'balance'           => [ 'Balance',              true,   :right, true ],
       'bsi'               => [ 'BSI',                  false,  :left,  false ],
+      'children'          => [ 'Children'    ,         false,  :left,  false ],
       'closedtasks'       => [ 'Closed Tasks',         true,   :right, true ],
       'competitorcount'   => [ 'Competitor count',     true,   :right, true ],
       'competitors'       => [ 'Competitors',          true,   :left,  true ],
@@ -162,7 +163,7 @@ class TaskJuggler
 
     # Return if the column values should be indented based on the _colId_ or the
     # _propertyType_.
-    def indent(colId, propertyType)
+    def TableReport::indent(colId, propertyType)
       if @@propertiesById.has_key?(colId)
         return @@propertiesById[colId][1]
       elsif @@propertiesByType.has_key?(propertyType)
@@ -174,7 +175,7 @@ class TaskJuggler
 
     # Return the alignment of the column based on the _colId_ or the
     # _attributeType_.
-    def alignment(colId, attributeType)
+    def TableReport::alignment(colId, attributeType)
       if @@propertiesById.has_key?(colId)
         return @@propertiesById[colId][2]
       elsif @@propertiesByType.has_key?(attributeType)
@@ -186,22 +187,22 @@ class TaskJuggler
 
     # This function returns true if the values for the _colId_ column need to be
     # calculated.
-    def calculated?(colId)
+    def TableReport::calculated?(colId)
       return @@propertiesById.has_key?(colId)
     end
 
     # This functions returns true if the values for the _col_id_ column are
     # scenario specific.
-    def scenarioSpecific?(colId)
+    def TableReport::scenarioSpecific?(colId)
       if @@propertiesById.has_key?(colId)
         return @@propertiesById[colId][3]
       end
       return false
     end
 
-    def supportedColumns
-      @@propertiesById.keys
-    end
+    #def TableReport::supportedColumns
+    #  @@propertiesById.keys
+    #end
 
   protected
 
@@ -650,7 +651,8 @@ class TaskJuggler
         # header.
         chart = columnDef.column.cell1.special
         GanttLine.new(chart, query, (line.subLineNo - 1) * (line.height + 1),
-                      line.height, a('selfcontained') ? nil : columnDef.tooltip)
+                      line.height, line.subLineNo,
+                      a('selfcontained') ? nil : columnDef.tooltip)
         return true
       # The calendar cells can be all generated by the same function. But we
       # need to use different parameters.
@@ -673,7 +675,7 @@ class TaskJuggler
         start = query.start.beginOfYear
         sameTimeNextFunc = :sameTimeNextYear
       else
-        if calculated?(columnDef.id)
+        if TableReport.calculated?(columnDef.id)
           return genCalculatedCell(query, line, columnDef)
         else
           return genStandardCell(query, line, columnDef)
@@ -687,6 +689,7 @@ class TaskJuggler
                                    line.property, line.scopeLine)
 
       PlaceHolderCell.new(line, tcLine)
+      tcLine.subLineNo = line.subLineNo
       # Depending on the property type we use different generator functions.
       if query.property.is_a?(Task)
         genCalChartTaskCell(query, tcLine, columnDef, start, sameTimeNextFunc)
@@ -753,7 +756,7 @@ class TaskJuggler
       cell = newCell(query, line)
 
       unless setScenarioSettings(cell, query.scenarioIdx,
-                                 scenarioSpecific?(columnDef.id))
+                                 TableReport.scenarioSpecific?(columnDef.id))
         return false
       end
 
@@ -924,7 +927,7 @@ class TaskJuggler
           # The cell is just filled with the background color.
           cell.category = 'taskcell'
         end
-        cell.category += line.property.get('index') % 2  == 1 ? '1' : '2'
+        cell.category += line.subLineNo % 2  == 1 ? '1' : '2'
 
         setCustomCellAttributes(cell, columnDef, query)
         tryCellMerging(cell, line, firstCell)
@@ -1052,7 +1055,7 @@ class TaskJuggler
                             'offduty'
                           end
                         end
-        cell.category += line.property.get('index') % 2 == 1 ? '1' : '2'
+        cell.category += line.subLineNo % 2 == 1 ? '1' : '2'
 
         setCustomCellAttributes(cell, columnDef, query)
 
@@ -1072,20 +1075,20 @@ class TaskJuggler
     # alignment and background color.
     def setStandardCellAttributes(query, cell, columnDef, attributeType, line)
       # Determine whether it should be indented
-      if indent(columnDef.id, attributeType)
+      if TableReport.indent(columnDef.id, attributeType)
         cell.indent = line.indentation
       end
 
       # Determine the cell alignment
-      cell.alignment = alignment(columnDef.id, attributeType)
+      cell.alignment = TableReport.alignment(columnDef.id, attributeType)
 
       # Set background color
       if line.property.is_a?(Task)
         cell.category = 'taskcell'
-        cell.category += line.property.get('index') % 2 == 1 ? '1' : '2'
+        cell.category += line.subLineNo % 2 == 1 ? '1' : '2'
       elsif line.property.is_a?(Resource)
         cell.category = 'resourcecell'
-        cell.category += line.property.get('index') % 2 == 1 ? '1' : '2'
+        cell.category += line.subLineNo % 2 == 1 ? '1' : '2'
       elsif line.property.is_a?(Account)
         setAccountCellBgColor(query, line, cell)
       end
@@ -1173,7 +1176,7 @@ class TaskJuggler
       end
 
       cell.category = prefix + 'accountcell' +
-                      (line.property.get('index') % 2 == 1 ? '1' : '2')
+                      (line.subLineNo % 2 == 1 ? '1' : '2')
     end
 
     # Make sure we have a valid cell text. If not, this is the result of an