taskjuggler 3.0.0 → 3.1.0

data/lib/taskjuggler/reports/StatusSheetReport.rb

@@ -3,7 +3,7 @@
 #
 # = StatusSheetReport.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -164,7 +164,7 @@ class TaskJuggler
             responsibility.journalEntries.each do |entry|
               task = entry.property
               @file << "  task #{task.fullId} {\n"
-              alertLevel = @project['alertLevels'][entry.alertLevel][0]
+              alertLevel = @project['alertLevels'][entry.alertLevel].id
               @file << "    # status #{alertLevel} \"#{entry.headline}\" {\n"
               @file << "    #   # Date: #{entry.date}\n"
               if (tsRecord = entry.timeSheetRecord)

data/lib/taskjuggler/reports/TableReport.rb

@@ -3,7 +3,7 @@
 #
 # = TableReport.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -15,6 +15,7 @@ require 'taskjuggler/reports/ReportBase'
 require 'taskjuggler/reports/GanttChart'
 require 'taskjuggler/reports/ReportTableLegend'
 require 'taskjuggler/reports/ColumnTable'
+require 'taskjuggler/reports/TableReportColumn'
 require 'taskjuggler/Query'
 
 class TaskJuggler
@@ -27,38 +28,46 @@ class TaskJuggler
     attr_reader :legend
 
     @@propertiesById = {
-      # ID                  Header                 Indent  Align   Scen Spec.
-      'alert'            => [ 'Alert',             true,   :left,  false ],
-      'alertmessages'    => [ 'Alert Messages',    false,  :left,  false ],
-      'alertsummaries'   => [ 'Alert Summaries',   false,  :left,  false ],
-      'alerttrend'       => [ 'Alert Trend',       false,  :left,  false ],
-      'complete'         => [ 'Completion',        false,  :right, true ],
-      'cost'             => [ 'Cost',              true,   :right, true ],
-      'duration'         => [ 'Duration',          true,   :right, true ],
-      'effort'           => [ 'Effort',            true,   :right, true ],
-      'effortdone'       => [ 'Effort Done',       true,   :right, true ],
-      'effortleft'       => [ 'Effort Left',       true,   :right, true ],
-      'freetime'         => [ 'Free Time',         true,   :right, true ],
-      'freework'         => [ 'Free Work',         true,   :right, true ],
-      'followers'        => [ 'Followers',         false,  :left,  true ],
-      'id'               => [ 'Id',                false,  :left,  false ],
-      'inputs'           => [ 'Inputs',            false,  :left,  true ],
-      'journal'          => [ 'Journal',           false,  :left,  false ],
-      'journal_sub'      => [ 'Journal',           false,  :left,  false ],
-      'journalmessages'  => [ 'Journal Messages',  false,  :left,  false ],
-      'journalsummaries' => [ 'Journal Summaries', false,  :left,  false ],
-      'line'             => [ 'Line No.',          false,  :right, false ],
-      'name'             => [ 'Name',              true,   :left,  false ],
-      'no'               => [ 'No.',               false,  :right, false ],
-      'precursors'       => [ 'Precursors',        false,  :left,  true ],
-      'rate'             => [ 'Rate',              true,   :right, true ],
-      'resources'        => [ 'Resources',         false,  :left,  true ],
-      'responsible'      => [ 'Responsible',       false,  :left,  true ],
-      'revenue'          => [ 'Revenue',           true,   :right, true ],
-      'scenario'         => [ 'Scenario',          false,  :left,  true ],
-      'status'           => [ 'Status',            false,  :left,  true ],
-      'targets'          => [ 'Targets',           false,  :left,  true ],
-      'bsi'              => [ 'BSI',               false,  :left,  false ]
+      # ID                   Header                   Indent  Align   Scen Spec.
+      'annualleave'       => [ 'Annual Leave',         true,   :right, true ],
+      'annualleavebalance'=> [ 'Annual Leave Balance', false,   :right, true ],
+      'alert'             => [ 'Alert',                true,   :left,  false ],
+      'alertmessages'     => [ 'Alert Messages',       false,  :left,  false ],
+      'alertsummaries'    => [ 'Alert Summaries',      false,  :left,  false ],
+      'alerttrend'        => [ 'Alert Trend',          false,  :left,  false ],
+      'balance'           => [ 'Balance',              true,   :right, true ],
+      'bsi'               => [ 'BSI',                  false,  :left,  false ],
+      'complete'          => [ 'Completion',           false,  :right, true ],
+      'cost'              => [ 'Cost',                 true,   :right, true ],
+      'duration'          => [ 'Duration',             true,   :right, true ],
+      'effort'            => [ 'Effort',               true,   :right, true ],
+      'effortdone'        => [ 'Effort Done',          true,   :right, true ],
+      'effortleft'        => [ 'Effort Left',          true,   :right, true ],
+      'freetime'          => [ 'Free Time',            true,   :right, true ],
+      'freework'          => [ 'Free Work',            true,   :right, true ],
+      'followers'         => [ 'Followers',            false,  :left,  true ],
+      'fte'               => [ 'FTE',                  true,   :right, true ],
+      'headcount'         => [ 'Headcount',            true,   :right, true ],
+      'id'                => [ 'Id',                   false,  :left,  false ],
+      'inputs'            => [ 'Inputs',               false,  :left,  true ],
+      'journal'           => [ 'Journal',              false,  :left,  false ],
+      'journal_sub'       => [ 'Journal',              false,  :left,  false ],
+      'journalmessages'   => [ 'Journal Messages',     false,  :left,  false ],
+      'journalsummaries'  => [ 'Journal Summaries',    false,  :left,  false ],
+      'line'              => [ 'Line No.',             false,  :right, false ],
+      'name'              => [ 'Name',                 true,   :left,  false ],
+      'no'                => [ 'No.',                  false,  :right, false ],
+      'precursors'        => [ 'Precursors',           false,  :left,  true ],
+      'rate'              => [ 'Rate',                 true,   :right, true ],
+      'resources'         => [ 'Resources',            false,  :left,  true ],
+      'responsible'       => [ 'Responsible',          false,  :left,  true ],
+      'revenue'           => [ 'Revenue',              true,   :right, true ],
+      'scenario'          => [ 'Scenario',             false,  :left,  true ],
+      'sickleave'         => [ 'Sick Leave',           true,   :right, true ],
+      'specialleave'      => [ 'Special Leave',        true,   :right, true ],
+      'status'            => [ 'Status',               false,  :left,  true ],
+      'targets'           => [ 'Targets',              false,  :left,  true ],
+      'unpaidleave'       => [ 'Unpaid Leave',         true,   :right, true ]
     }
     @@propertiesByType = {
       # Type                     Indent  Align
@@ -76,7 +85,10 @@ class TaskJuggler
 
       # Reference to the intermediate representation.
       @table = nil
-      @start = @end = nil
+      # The table is generated row after row. We need to hold some computed
+      # values that are specific to certain columns. For that we use a Hash of
+      # ReportTableColumn objects.
+      @columns = { }
 
       @legend = ReportTableLegend.new
 
@@ -155,12 +167,12 @@ class TaskJuggler
     end
 
     # Return the alignment of the column based on the _colId_ or the
-    # _propertyType_.
-    def alignment(colId, propertyType)
+    # _attributeType_.
+    def alignment(colId, attributeType)
       if @@propertiesById.has_key?(colId)
         return @@propertiesById[colId][2]
-      elsif @@propertiesByType.has_key?(propertyType)
-        return @@propertiesByType[propertyType][1]
+      elsif @@propertiesByType.has_key?(attributeType)
+        return @@propertiesByType[attributeType][1]
       else
         :center
       end
@@ -187,87 +199,119 @@ class TaskJuggler
 
   protected
 
-    # These can't be determined during initialization as they have have been
-    # changed afterwards.
-    def setReportPeriod
-      @start = a('start')
-      @end = a('end')
-    end
-
     # In case the user has not specified the report period, we try to fit all
-    # the _tasks_ in and add an extra 5% time at both ends. _scenarios_ is a
-    # list of scenario indexes.
-    def adjustReportPeriod(tasks, scenarios, columns)
-      return if tasks.empty? ||
-        a('start') != @project['start'] || a('end') != @project['end']
+    # the _tasks_ in and add an extra 5% time at both ends for some specific
+    # type of columns. _scenarios_ is a list of scenario indexes. _columnDef_
+    # is a reference to the TableColumnDefinition object describing the
+    # current column.
+    def adjustColumnPeriod(columnDef, tasks = [], scenarios = [])
+      # If we have user specified dates for the report period or the column
+      # period, we don't adjust the period. This flag is used to mark if we
+      # have user-provided values.
+      doNotAdjust = false
+
+      # Determine the start date for the column.
+      if columnDef.start
+        # We have a user-specified, column specific start date.
+        rStart = columnDef.start
+        doNotAdjust = true
+      else
+        # Use the report start date.
+        rStart = a('start')
+        doNotAdjust = true if rStart != @project['start']
+      end
 
-      @start = @end = nil
+      if columnDef.end
+        rEnd = columnDef.end
+        doNotAdjust = true
+      else
+        rEnd = a('end')
+        doNotAdjust = true if rEnd != @project['end']
+      end
+
+      # Save the unadjusted dates to the columns Hash.
+      @columns[columnDef] = TableReportColumn.new(rStart, rEnd)
+
+      # If the task list is empty or the user has provided a custom start or
+      # end date, we don't touch the report period.
+      return if tasks.empty? || scenarios.empty? || doNotAdjust
+
+      # Find the start date of the earliest tasks included in the report and
+      # the end date of the last included tasks.
+      rStart = rEnd = nil
       scenarios.each do |scenarioIdx|
         tasks.each do |task|
           date = task['start', scenarioIdx] || @project['start']
-          @start = date if @start.nil? || date < @start
+          rStart = date if rStart.nil? || date < rStart
           date = task['end', scenarioIdx] || @project['end']
-          @end = date if @end.nil? || date > @end
+          rEnd = date if rEnd.nil? || date > rEnd
         end
       end
 
       # We want to add at least 5% on both ends.
       margin = 0
-      minWidth = @end - @start + 1
-      columns.each do |column|
-        case column.id
-        when 'chart'
-          # In case we have a 'chart' column, we enforce certain minimum width
-          # The following table contains an entry for each scale. The entry
-          # consists of the triple 'seconds per unit', 'minimum width units'
-          # and 'margin units'. The minimum with does not include the margins
-          # since they are always added.
-          mwMap = {
-            'hour' =>    [ 60 * 60,            18, 2 ],
-            'day' =>     [ 60 * 60 * 24,       18, 2 ],
-            'week' =>    [ 60 * 60 * 24 * 7,    6, 1 ],
-            'month' =>   [ 60 * 60 * 24 * 31,  10, 1 ],
-            'quarter' => [ 60 * 60 * 24 * 90,   6, 1 ],
-            'year' =>    [ 60 * 60 * 24 * 365,  4, 1 ]
-          }
-          entry = mwMap[column.scale]
-          raise "Unknown scale #{column.scale}" unless entry
-          margin = entry[0] * entry[2]
-          # If the with determined by start and end dates of the task is below
-          # the minimum width, we increase the width to the value provided by
-          # the table.
-          minWidth = entry[0] * entry[1] if minWidth < entry[0] * entry[1]
-          break
-        when 'hourly', 'daily', 'weekly', 'monthly', 'quarterly', 'yearly'
-          # For the calendar columns we use a similar approach as we use for
-          # the 'chart' column.
-          mwMap = {
-            'hourly' =>    [ 60 * 60,            18, 2 ],
-            'daily' =>     [ 60 * 60 * 24,       18, 2 ],
-            'weekly' =>    [ 60 * 60 * 24 * 7,    6, 1 ],
-            'monthly' =>   [ 60 * 60 * 24 * 31,  10, 1 ],
-            'quarterly' => [ 60 * 60 * 24 * 90,   6, 1 ],
-            'yearly' =>    [ 60 * 60 * 24 * 365,  4, 1 ]
-          }
-          entry = mwMap[column.id]
-          raise "Unknown scale #{column.id}" unless entry
-          margin = entry[0] * entry[2]
-          minWidth = entry[0] * entry[1] if minWidth < entry[0] * entry[1]
-          break
-        end
+      minWidth = rEnd - rStart + 1
+      case columnDef.id
+      when 'chart'
+        # In case we have a 'chart' column, we enforce certain minimum width
+        # The following table contains an entry for each scale. The entry
+        # consists of the triple 'seconds per unit', 'minimum width units'
+        # and 'margin units'. The minimum with does not include the margins
+        # since they are always added.
+        mwMap = {
+          'hour' =>    [ 60 * 60,            18, 2 ],
+          'day' =>     [ 60 * 60 * 24,       18, 2 ],
+          'week' =>    [ 60 * 60 * 24 * 7,    6, 1 ],
+          'month' =>   [ 60 * 60 * 24 * 31,  10, 1 ],
+          'quarter' => [ 60 * 60 * 24 * 90,   6, 1 ],
+          'year' =>    [ 60 * 60 * 24 * 365,  4, 1 ]
+        }
+        entry = mwMap[columnDef.scale]
+        raise "Unknown scale #{columnDef.scale}" unless entry
+        margin = entry[0] * entry[2]
+        # If the with determined by start and end dates of the task is below
+        # the minimum width, we increase the width to the value provided by
+        # the table.
+        minWidth = entry[0] * entry[1] if minWidth < entry[0] * entry[1]
+      when 'hourly', 'daily', 'weekly', 'monthly', 'quarterly', 'yearly'
+        # For the calendar columns we use a similar approach as we use for
+        # the 'chart' column.
+        mwMap = {
+          'hourly' =>    [ 60 * 60,            18, 2 ],
+          'daily' =>     [ 60 * 60 * 24,       18, 2 ],
+          'weekly' =>    [ 60 * 60 * 24 * 7,    6, 1 ],
+          'monthly' =>   [ 60 * 60 * 24 * 31,  10, 1 ],
+          'quarterly' => [ 60 * 60 * 24 * 90,   6, 1 ],
+          'yearly' =>    [ 60 * 60 * 24 * 365,  4, 1 ]
+        }
+        entry = mwMap[columnDef.id]
+        raise "Unknown scale #{columnDef.id}" unless entry
+        margin = entry[0] * entry[2]
+        minWidth = entry[0] * entry[1] if minWidth < entry[0] * entry[1]
+      else
+        doNotAdjust = true
       end
 
-      if minWidth > (@end - @start + 1)
-        margin += (minWidth - (@end - @start + 1)) / 2
+      unless doNotAdjust
+        if minWidth > (rEnd - rStart + 1)
+          margin += (minWidth - (rEnd - rStart + 1)) / 2
+        end
+
+        rStart -= margin
+        rEnd += margin
+
+        # Save the adjusted dates to the columns Hash.
+        @columns[columnDef] = TableReportColumn.new(rStart, rEnd)
       end
-      @start -= margin
-      @end += margin
     end
 
     # Generates cells for the table header. _columnDef_ is the
     # TableColumnDefinition object that describes the column. Based on the id of
     # the column different actions need to be taken to generate the header text.
     def generateHeaderCell(columnDef)
+      rStart = @columns[columnDef].start
+      rEnd = @columns[columnDef].end
+
       case columnDef.id
       when 'chart'
         # For the 'chart' column we generate a GanttChart object. The sizes are
@@ -275,7 +319,7 @@ class TaskJuggler
         # table.
         gantt = GanttChart.new(a('now'),
                                a('weekStartsMonday'), self)
-        gantt.generateByScale(@start, @end, columnDef.scale)
+        gantt.generateByScale(rStart, rEnd, columnDef.scale)
         # The header consists of 2 lines separated by a 1 pixel boundary.
         gantt.header.height = @table.headerLineHeight * 2 + 1
         # The maximum width of the chart. In case it needs more space, a
@@ -288,23 +332,23 @@ class TaskJuggler
         column.scrollbar = gantt.hasScrollbar?
         @table.equiLines = true
       when 'hourly'
-        genCalChartHeader(columnDef, @start.midnight, :sameTimeNextHour,
+        genCalChartHeader(columnDef, rStart.midnight, rEnd, :sameTimeNextHour,
                           :weekdayAndDate, :hour)
       when 'daily'
-        genCalChartHeader(columnDef, @start.midnight, :sameTimeNextDay,
+        genCalChartHeader(columnDef, rStart.midnight, rEnd, :sameTimeNextDay,
                           :monthAndYear, :day)
       when 'weekly'
         genCalChartHeader(columnDef,
-                          @start.beginOfWeek(a('weekStartsMonday')),
+                          rStart.beginOfWeek(a('weekStartsMonday')), rEnd,
                           :sameTimeNextWeek, :monthAndYear, :day)
       when 'monthly'
-        genCalChartHeader(columnDef, @start.beginOfMonth, :sameTimeNextMonth,
-                          :year, :shortMonthName)
+        genCalChartHeader(columnDef, rStart.beginOfMonth, rEnd,
+                          :sameTimeNextMonth, :year, :shortMonthName)
       when 'quarterly'
-        genCalChartHeader(columnDef, @start.beginOfQuarter,
+        genCalChartHeader(columnDef, rStart.beginOfQuarter, rEnd,
                           :sameTimeNextQuarter, :year, :quarterName)
       when 'yearly'
-        genCalChartHeader(columnDef, @start.beginOfYear, :sameTimeNextYear,
+        genCalChartHeader(columnDef, rStart.beginOfYear, rEnd, :sameTimeNextYear,
                           nil, :year)
       else
         # This is the most common case. It does not need any special treatment.
@@ -317,26 +361,57 @@ class TaskJuggler
       end
     end
 
+    # Generate a ReportTableLine for each of the accounts in _accountList_. If
+    # _scopeLine_ is defined, the generated account lines will be within the
+    # scope this resource line.
+    def generateAccountList(accountList, lineOffset, mode)
+      # Get the current Query from the report context and create a copy. We
+      # are going to modify it.
+      accountList.query = query = @project.reportContexts.last.query.dup
+      accountList.sort!
+
+      # The primary line counter. Is not used for enclosed lines.
+      no = lineOffset
+      # The scope line counter. It's reset for each new scope.
+      lineNo = lineOffset
+      # Init the variable to get a larger scope
+      line = nil
+      accountList.each do |account|
+        query.property = account
+
+        no += 1
+        Log.activity if lineNo % 10 == 0
+        lineNo += 1
+        a('scenarios').each do |scenarioIdx|
+          query.scenarioIdx = scenarioIdx
+          # Generate line for each account.
+          line = ReportTableLine.new(@table, account, nil)
+
+          line.no = no
+          line.lineNo = lineNo
+          line.subLineNo = @table.lines
+          setIndent(line, a('accountRoot'), accountList.treeMode?)
+
+          # Generate a cell for each column in this line.
+          a('columns').each do |columnDef|
+            query.attributeId = columnDef.id
+            next unless generateTableCell(line, columnDef, query)
+          end
+        end
+      end
+      lineNo
+    end
+
     # Generate a ReportTableLine for each of the tasks in _taskList_. In case
     # _resourceList_ is not nil, it also generates the nested resource lines for
     # each resource that is assigned to the particular task. If _scopeLine_
-    # is defined, the generated task lines will be within the scope this resource
-    # line.
+    # is defined, the generated task lines will be within the scope this
+    # resource line.
     def generateTaskList(taskList, resourceList, scopeLine)
-      queryAttrs = { 'project' => @project,
-                     'scopeProperty' => scopeLine ? scopeLine.property : nil,
-                     'loadUnit' => a('loadUnit'),
-                     'numberFormat' => a('numberFormat'),
-                     'timeFormat' => a('timeFormat'),
-                     'currencyFormat' => a('currencyFormat'),
-                     'start' => @start, 'end' => @end,
-                     'hideJournalEntry' => a('hideJournalEntry'),
-                     'journalMode' => a('journalMode'),
-                     'journalAttributes' => a('journalAttributes'),
-                     'sortJournalEntries' => a('sortJournalEntries'),
-                     'costAccount' => a('costAccount'),
-                     'revenueAccount' => a('revenueAccount') }
-      taskList.query = Query.new(queryAttrs)
+      # Get the current Query from the report context and create a copy. We
+      # are going to modify it.
+      taskList.query = query = @project.reportContexts.last.query.dup
+      query.scopeProperty = scopeLine ? scopeLine.property : nil
       taskList.sort!
 
       # The primary line counter. Is not used for enclosed lines.
@@ -348,7 +423,6 @@ class TaskJuggler
       taskList.each do |task|
         # Get the current Query from the report context and create a copy. We
         # are going to modify it.
-        query = @project.reportContexts.last.query.dup
         query.property = task
         query.scopeProperty = scopeLine ? scopeLine.property : nil
 
@@ -368,7 +442,7 @@ class TaskJuggler
           # Generate a cell for each column in this line.
           a('columns').each do |columnDef|
             query.attributeId = columnDef.id
-            next unless generateTableCell(line, task, columnDef, query)
+            next unless generateTableCell(line, columnDef, query)
           end
         end
 
@@ -391,20 +465,10 @@ class TaskJuggler
     # each task that the resource is assigned to. If _scopeLine_ is defined, the
     # generated resource lines will be within the scope this task line.
     def generateResourceList(resourceList, taskList, scopeLine)
-      queryAttrs = { 'project' => @project,
-                     'scopeProperty' => scopeLine ? scopeLine.property : nil,
-                     'loadUnit' => a('loadUnit'),
-                     'numberFormat' => a('numberFormat'),
-                     'timeFormat' => a('timeFormat'),
-                     'currencyFormat' => a('currencyFormat'),
-                     'start' => @start, 'end' => @end,
-                     'hideJournalEntry' => a('hideJournalEntry'),
-                     'journalMode' => a('journalMode'),
-                     'journalAttributes' => a('journalAttributes'),
-                     'sortJournalEntries' => a('sortJournalEntries'),
-                     'costAccount' => a('costAccount'),
-                     'revenueAccount' => a('revenueAccount') }
-      resourceList.query = Query.new(queryAttrs)
+      # Get the current Query from the report context and create a copy. We
+      # are going to modify it.
+      resourceList.query = query = @project.reportContexts.last.query.dup
+      query.scopeProperty = scopeLine ? scopeLine.property : nil
       resourceList.sort!
 
       # The primary line counter. Is not used for enclosed lines.
@@ -416,7 +480,6 @@ class TaskJuggler
       resourceList.each do |resource|
         # Get the current Query from the report context and create a copy. We
         # are going to modify it.
-        query = @project.reportContexts.last.query.dup
         query.property = resource
         query.scopeProperty = scopeLine ? scopeLine.property : nil
 
@@ -436,7 +499,7 @@ class TaskJuggler
           # Generate a cell for each column in this line.
           a('columns').each do |column|
             query.attributeId = column.id
-            next unless generateTableCell(line, resource, column, query)
+            next unless generateTableCell(line, column, query)
           end
         end
 
@@ -463,7 +526,8 @@ class TaskJuggler
     # that is called to advance _t_ to the next table column interval.
     # _name1Func_ and _name2Func_ are functions that return the upper and lower
     # title of the particular column.
-    def genCalChartHeader(columnDef, t, sameTimeNextFunc, name1Func, name2Func)
+    def genCalChartHeader(columnDef, t, rEnd, sameTimeNextFunc,
+                          name1Func, name2Func)
       tableColumn = ReportTableColumn.new(@table, columnDef, '')
 
       # Calendar chars only work when all lines have same height.
@@ -483,14 +547,14 @@ class TaskJuggler
       # iteration is done with 2 nested loops. The outer loops generates the
       # intervals for the upper (larger) scale. The inner loop generates the
       # lower (smaller) scale.
-      while t < @end
+      while t < rEnd
         cellsInInterval = 0
         # Label for upper scale. The yearly calendar only has a lower scale.
         currentInterval = t.send(name1Func) if name1Func
         firstColumn = nil
         # The innter loops terminates when the label for the upper scale has
         # changed to the next scale cell.
-        while t < @end && (name1Func.nil? ||
+        while t < rEnd && (name1Func.nil? ||
                            t.send(name1Func) == currentInterval)
           # call TjTime::sameTimeNext... function to get the end of the column.
           nextT = t.send(sameTimeNextFunc)
@@ -508,8 +572,11 @@ class TaskJuggler
             column.cell1.hidden = true
           end
           column.cell2.text = t.send(name2Func).to_s
-          # TODO: The width should be taken from some data structure.
-          column.cell2.width = 28
+          # We assume an average of 7 pixel per character
+          width = 8 + 7 * column.cell2.text.length
+          # Ensure a minimum with of 28 to have good looking tables even with
+          # small column headers (like day of months numbers).
+          column.cell2.width = width <= 28 ? 28 : width
           # Off-duty cells will have a different color than working time cells.
           unless @project.hasWorkingTime(iv)
             column.cell2.category = 'tabhead_offduty'
@@ -537,14 +604,15 @@ class TaskJuggler
     # columns. In such a case many cells are generated with a single call of
     # this method. The last kind of cell is actually not a cell. It just
     # generates the chart objects that belong to the property in this line.
-    def generateTableCell(line, property, columnDef, query)
-      if columnDef.start || columnDef.end
-        # If the user has specified a new start or end time for this column,
-        # we have to duplicate the query before we modify it.
-        query = query.dup
-        query.start = columnDef.start if columnDef.start
-        query.end = columnDef.end if columnDef.end
-      end
+    def generateTableCell(line, columnDef, query)
+      # Adjust the Query to use column specific settings. We create a copy of
+      # the Query to avoid spoiling the original query with column specific
+      # settings.
+      query = query.dup
+      query.start = @columns[columnDef].start
+      query.end = @columns[columnDef].end
+      query.listType = columnDef.listType
+      query.listItem = columnDef.listItem
 
       case columnDef.id
       when 'chart'
@@ -562,26 +630,26 @@ class TaskJuggler
       # The calendar cells can be all generated by the same function. But we
       # need to use different parameters.
       when 'hourly'
-        start = @start.midnight
+        start = query.start.midnight
         sameTimeNextFunc = :sameTimeNextHour
       when 'daily'
-        start = @start.midnight
+        start = query.start.midnight
         sameTimeNextFunc = :sameTimeNextDay
       when 'weekly'
-        start = @start.beginOfWeek(a('weekStartsMonday'))
+        start = query.start.beginOfWeek(a('weekStartsMonday'))
         sameTimeNextFunc = :sameTimeNextWeek
       when 'monthly'
-        start = @start.beginOfMonth
+        start = query.start.beginOfMonth
         sameTimeNextFunc = :sameTimeNextMonth
       when 'quarterly'
-        start = @start.beginOfQuarter
+        start = query.start.beginOfQuarter
         sameTimeNextFunc = :sameTimeNextQuarter
       when 'yearly'
-        start = @start.beginOfYear
+        start = query.start.beginOfYear
         sameTimeNextFunc = :sameTimeNextYear
       else
         if calculated?(columnDef.id)
-          return genCalculatedCell(query, line, columnDef, property)
+          return genCalculatedCell(query, line, columnDef)
         else
           return genStandardCell(query, line, columnDef)
         end
@@ -595,13 +663,15 @@ class TaskJuggler
 
       PlaceHolderCell.new(line, tcLine)
       # Depending on the property type we use different generator functions.
-      if property.is_a?(Task)
+      if query.property.is_a?(Task)
         genCalChartTaskCell(query, tcLine, columnDef, start, sameTimeNextFunc)
-      elsif property.is_a?(Resource)
+      elsif query.property.is_a?(Resource)
         genCalChartResourceCell(query, tcLine, columnDef, start,
                                 sameTimeNextFunc)
+      elsif query.property.is_a?(Account)
+        genCalChartAccountCell(query, tcLine, columnDef, start, sameTimeNextFunc)
       else
-        raise "Unknown property type #{property.class}"
+        raise "Unknown property type #{query.property.class}"
       end
       true
     end
@@ -610,16 +680,14 @@ class TaskJuggler
     # property that line is for. It returns true if the cell exists, false for a
     # hidden cell.
     def genStandardCell(query, line, columnDef)
-      query = query.dup
-      query.listType = columnDef.listType
-      query.listItem = columnDef.listItem
-
       # Find out, what type of PropertyTreeNode we are dealing with.
       property = line.property
       if property.is_a?(Task)
         propertyList = @project.tasks
       elsif property.is_a?(Resource)
         propertyList = @project.resources
+      elsif property.is_a?(Account)
+        propertyList = @project.accounts
       else
         raise "Unknown property type #{property.class}"
       end
@@ -632,7 +700,7 @@ class TaskJuggler
         return false
       end
 
-      setStandardCellAttributes(cell, columnDef,
+      setStandardCellAttributes(query, cell, columnDef,
                                 propertyList.attributeType(columnDef.id), line)
 
       # If the user has requested a custom cell text, this will be used
@@ -653,13 +721,8 @@ class TaskJuggler
     # or other sources of information. It returns true if the cell exists, false
     # for a hidden cell. _query_ is the Query to get the cell value.  _line_
     # is the ReportTableLine of the cell. _columnDef_ is the
-    # TableColumnDefinition of the column. _property_ is the PropertyTreeNode
-    # that is reported in this cell.
-    def genCalculatedCell(query, line, columnDef, property)
-      query = query.dup
-      query.listType = columnDef.listType
-      query.listItem = columnDef.listItem
-
+    # TableColumnDefinition of the column.
+    def genCalculatedCell(query, line, columnDef)
       # Create a new cell
       cell = newCell(query, line)
 
@@ -668,7 +731,7 @@ class TaskJuggler
         return false
       end
 
-      setStandardCellAttributes(cell, columnDef, nil, line)
+      setStandardCellAttributes(query, cell, columnDef, nil, line)
 
       if query.process
         cell.text = (rti = query.to_rti) ? rti : query.to_s
@@ -677,15 +740,16 @@ class TaskJuggler
       # Some columns need some extra care.
       case columnDef.id
       when 'alert'
-        id = @project.alertLevelId(query.to_num)
+        id = @project['alertLevels'][query.to_sort].id
         cell.icon = "flag-#{id}"
-        cell.fontColor = @project.alertLevelColor(query.to_sort)
+        cell.fontColor = @project['alertLevels'][query.to_sort].color
       when 'alerttrend'
         icons = %w( up flat down )
         cell.icon = "trend-#{icons[query.to_sort]}"
       when 'line'
         cell.text = line.lineNo.to_s
       when 'name'
+        property = query.property
         cell.icon =
           if property.is_a?(Task)
             if property.container?
@@ -722,6 +786,49 @@ class TaskJuggler
       true
     end
 
+    # Generate the cells for the account lines of a calendar column. These
+    # lines do not directly belong to the @table object but to an embedded
+    # ColumnTable object. Therefor a single @table column usually has many
+    # cells on each single line. _scenarioIdx_ is the index of the scenario
+    # that is reported in this line. _line_ is the @table line. _t_ is the
+    # start date for the calendar. _sameTimeNextFunc_ is the function that
+    # will move the date to the next cell.
+    def genCalChartAccountCell(query, line, columnDef, t, sameTimeNextFunc)
+      # We modify the start and end dates to match the cell boundaries. So
+      # we need to make sure we don't modify the original Query but our own
+      # copies.
+      query = query.dup
+
+      firstCell = nil
+      endDate = query.end
+      while t < endDate
+        # call TjTime::sameTimeNext... function
+        nextT = t.send(sameTimeNextFunc)
+        query.attributeId = 'balance'
+        query.start = t
+        query.end = nextT
+        query.process
+
+        # Create a new cell
+        cell = newCell(query, line)
+
+        cell.text = query.to_s
+
+        cdText = columnDef.cellText.getPattern(query)
+        cell.text = cdText if cdText
+        cell.showTooltipHint = false
+
+        setAccountCellBgColor(query, line, cell)
+
+        setCustomCellAttributes(cell, columnDef, query)
+
+        tryCellMerging(cell, line, firstCell)
+
+        t = nextT
+        firstCell = cell unless firstCell
+      end
+    end
+
     # Generate the cells for the task lines of a calendar column. These lines do
     # not directly belong to the @table object but to an embedded ColumnTable
     # object. Therefor a single @table column usually has many cells on each
@@ -729,7 +836,7 @@ class TaskJuggler
     # in this line. _line_ is the @table line. _t_ is the start date for the
     # calendar. _sameTimeNextFunc_ is the function that will move the date to
     # the next cell.
-    def genCalChartTaskCell(origQuery, line, columnDef, t, sameTimeNextFunc)
+    def genCalChartTaskCell(query, line, columnDef, t, sameTimeNextFunc)
       task = line.property
       # Find out if we have an enclosing resource scope.
       if line.scopeLine && line.scopeLine.property.is_a?(Resource)
@@ -740,17 +847,19 @@ class TaskJuggler
 
       # Get the interval of the task. In case a date is invalid due to a
       # scheduling problem, we use the full project interval.
-      taskStart = task['start', origQuery.scenarioIdx]
-      taskEnd = task['end', origQuery.scenarioIdx]
+      taskStart = task['start', query.scenarioIdx]
+      taskEnd = task['end', query.scenarioIdx]
       taskIv = TimeInterval.new(taskStart.nil? ?  @project['start'] : taskStart,
                                 taskEnd.nil? ?  @project['end'] : taskEnd)
 
+      # We modify the start and end dates to match the cell boundaries. So
+      # we need to make sure we don't modify the original Query but our own
+      # copies.
+      query = query.dup
+
       firstCell = nil
-      while t < @end
-        # We modify the start and end dates to match the cell boundaries. So
-        # we need to make sure we don't modify the original Query but our own
-        # copies.
-        query = origQuery.dup
+      endDate = query.end
+      while t < endDate
         # call TjTime::sameTimeNext... function
         nextT = t.send(sameTimeNextFunc)
         cellIv = TimeInterval.new(t, nextT)
@@ -768,7 +877,7 @@ class TaskJuggler
           # Create a new cell
           cell = newCell(query, line)
 
-          # To increase readability, we don't show 0.0 values.
+          # To increase readability show empty cells instead of 0.0 values.
           cell.text = query.to_s if query.to_num != 0.0
         else
           raise "Unknown column content #{column.content}"
@@ -782,7 +891,6 @@ class TaskJuggler
         if cellIv.overlaps?(taskIv)
           # The cell is either a container or leaf task
           cell.category = task.container? ? 'calconttask' : 'caltask'
-          setCustomCellAttributes(cell, columnDef, query)
         elsif !@project.isWorkingTime(cellIv)
           # The cell is a vacation cell.
           cell.category = 'offduty'
@@ -792,6 +900,7 @@ class TaskJuggler
         end
         cell.category += line.property.get('index') % 2  == 1 ? '1' : '2'
 
+        setCustomCellAttributes(cell, columnDef, query)
         tryCellMerging(cell, line, firstCell)
 
         t = nextT
@@ -810,15 +919,15 @@ class TaskJuggler
     # reported in this line. _line_ is the @table line. _t_ is the start date
     # for the calendar. _sameTimeNextFunc_ is the function that will move the
     # date to the next cell.
-    def genCalChartResourceCell(origQuery, line, columnDef, t,
+    def genCalChartResourceCell(query, line, columnDef, t,
                                 sameTimeNextFunc)
       # Find out if we have an enclosing task scope.
       if line.scopeLine && line.scopeLine.property.is_a?(Task)
         task = line.scopeLine.property
         # Get the interval of the task. In case a date is invalid due to a
         # scheduling problem, we use the full project interval.
-        taskStart = task['start', origQuery.scenarioIdx]
-        taskEnd = task['end', origQuery.scenarioIdx]
+        taskStart = task['start', query.scenarioIdx]
+        taskEnd = task['end', query.scenarioIdx]
         taskIv = TimeInterval.new(taskStart.nil? ? @project['start'] :
                                                    taskStart,
                                   taskEnd.nil? ?  @project['end'] : taskEnd)
@@ -826,13 +935,14 @@ class TaskJuggler
         task = nil
       end
 
-      firstCell = nil
-      while t < @end
-        # We modify the start and end dates to match the cell boundaries. So
-        # we need to make sure we don't modify the original Query but our own
-        # copies.
-        query = origQuery.dup
+      # We modify the start and end dates to match the cell boundaries. So
+      # we need to make sure we don't modify the original Query but our own
+      # copies.
+      query = query.dup
 
+      firstCell = nil
+      endDate = query.end
+      while t < endDate
         # Create a new cell
         cell = newCell(query, line)
 
@@ -847,6 +957,7 @@ class TaskJuggler
         query.process
         workLoad = query.to_num
         scaledWorkLoad = query.to_s
+
         if task
           # Get work load for the particular task.
           query.scopeProperty = task
@@ -917,6 +1028,8 @@ class TaskJuggler
                         end
         cell.category += line.property.get('index') % 2 == 1 ? '1' : '2'
 
+        setCustomCellAttributes(cell, columnDef, query)
+
         tryCellMerging(cell, line, firstCell)
 
         t = nextT
@@ -931,7 +1044,7 @@ class TaskJuggler
 
     # This method takes care of often used cell attributes like indentation,
     # alignment and background color.
-    def setStandardCellAttributes(cell, columnDef, attributeType, line)
+    def setStandardCellAttributes(query, cell, columnDef, attributeType, line)
       # Determine whether it should be indented
       if indent(columnDef.id, attributeType)
         cell.indent = line.indentation
@@ -942,11 +1055,13 @@ class TaskJuggler
 
       # Set background color
       if line.property.is_a?(Task)
-        cell.category = line.property.get('index') % 2 == 1 ?
-          'taskcell1' : 'taskcell2'
-      else
-        cell.category = line.property.get('index') % 2 == 1 ?
-          'resourcecell1' : 'resourcecell2'
+        cell.category = 'taskcell'
+        cell.category += line.property.get('index') % 2 == 1 ? '1' : '2'
+      elsif line.property.is_a?(Resource)
+        cell.category = 'resourcecell'
+        cell.category += line.property.get('index') % 2 == 1 ? '1' : '2'
+      elsif line.property.is_a?(Account)
+        setAccountCellBgColor(query, line, cell)
       end
 
       # Set column width
@@ -1019,6 +1134,23 @@ class TaskJuggler
       end
     end
 
+    def setAccountCellBgColor(query, line, cell)
+      if query.costAccount &&
+         (query.property.isChildOf?(query.costAccount) ||
+          query.costAccount == query.property)
+        prefix = 'cost'
+      elsif query.revenueAccount &&
+            (query.property.isChildOf?(query.revenueAccount) ||
+             query.revenueAccount == query.property)
+        prefix = 'revenue'
+      else
+        prefix = ''
+      end
+
+      cell.category = prefix + 'accountcell' +
+                      (line.property.get('index') % 2 == 1 ? '1' : '2')
+    end
+
     # Make sure we have a valid cell text. If not, this is the result of an
     # error. This could happen after scheduling errors.
     def checkCellText(cell)