taskjuggler 0.0.8 → 0.0.9

data/lib/reports/ReportTable.rb

@@ -3,7 +3,8 @@
 #
 # = ReportTable.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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/reports/ReportTableCell.rb

@@ -3,7 +3,8 @@
 #
 # = ReportTableCell.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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
@@ -52,6 +53,8 @@ class TaskJuggler
       @data = nil
       # Determines the background color of the cell.
       @category = nil
+      # True of the cell is hidden (because other cells span multiple rows or
+      # columns)
       @hidden = false
       # How to horizontally align the cell
       @alignment = :center
@@ -64,13 +67,22 @@ class TaskJuggler
       @icon = nil
       # A custom tooltip for the cell icon
       @iconTooltip = nil
+      # Font size of the cell text in pixels
       @fontSize = nil
+      # The background color of the cell. Overwrite the @category color.
       @cellColor = nil
+      # The color of the cell text font.
       @fontColor = nil
+      # True of a bold font is to be used for the cell text.
       @bold = false
+      # The width of the column in pixels
       @width = nil
+      # The number of rows the cell spans
       @rows = 1
+      # The number of columns the cell spans
       @columns = 1
+      # True of the resulting report should not contain any information from
+      # other files.
       @selfcontained = false
       # Ignore everything and use this reference to generate the output.
       @special = nil
@@ -85,6 +97,7 @@ class TaskJuggler
       @alignment == c.alignment &&
       @padding == c.padding &&
       @indent == c.indent &&
+      @cellColor == c.cellColor &&
       @category == c.category
     end
 
@@ -98,7 +111,9 @@ class TaskJuggler
       attribs['rowspan'] = "#{@rows}" if @rows > 1
       attribs['colspan'] = "#{@columns}" if @columns > 1
       attribs['class'] = @category ? @category : 'tabcell'
-      attribs['style'] = "background-color: #{@cellColor}; " if @cellColor
+      style = ''
+      style += "background-color: #{@cellColor}; " if @cellColor
+      attribs['style'] = style unless style.empty?
       cell = XMLElement.new('td', attribs)
 
       cell << (table = XMLElement.new('table',
@@ -109,9 +124,8 @@ class TaskJuggler
       calculateIndentation
 
       # Insert a padding cell for the left side indentation.
-      if @leftIndent
-        row << XMLElement.new('td', 'style' => "min-width:#{@leftIndent}px; " +
-                                               "width:#{@leftIndent}px; ")
+      if @leftIndent && @leftIndent > 0
+        row << XMLElement.new('td', 'style' => "width:#{@leftIndent}px; ")
       end
       row << cellIcon(cell)
 
@@ -132,9 +146,8 @@ class TaskJuggler
       end
 
       # Insert a padding cell for the right side indentation.
-      if @rightIndent
-        row << XMLElement.new('td', 'style' => "min-width:#{@rightIndent}px; " +
-                                               "width:#{@rightIndent}px; ")
+      if @rightIndent && @rightIndent > 0
+        row << XMLElement.new('td', 'style' => "width:#{@rightIndent}px; ")
       end
 
       cell
@@ -228,18 +241,13 @@ class TaskJuggler
       # None:            -      x      -     -
       fixedHeight = @line && @line.table.equiLines
       fixedWidth = !@width.nil?
-      style = "overflow:hidden; " if fixedHeight || fixedWidth
-      style = "white-space:#{fixedWidth && !fixedHeight ?
-                             'normal' : 'nowrap'}; "
+      style = ''
+      style += "overflow:hidden; " if fixedHeight || fixedWidth
+      style += "white-space:#{fixedWidth && !fixedHeight ?
+                              'normal' : 'nowrap'}; "
       if fixedHeight && !fixedWidth
         style += "height:#{@line.height - 3}px; "
       end
-      if fixedWidth && !fixedHeight
-        # @width does not really determine the column width. It only
-        # determines the with of the text label. Padding and icons can make
-        # the column significantly wider.
-        style += "max-width:#{@width}px; "
-      end
       style += 'font-weight:bold; ' if @bold
       style += "font-size: #{@fontSize}px; " if fontSize
       if @fontColor
@@ -248,8 +256,6 @@ class TaskJuggler
 
       return nil, nil if @text.nil? || @text.empty?
 
-      td = XMLElement.new('td', 'class' => 'tj_table_cell_label',
-                                'style' => style)
       tooltip = nil
 
       # @text can be a String or a RichText (with or without embedded
@@ -268,7 +274,20 @@ class TaskJuggler
 
       return nil, nil if textAsString.empty?
 
-      shortText, singleLine = shortVersion(textAsString)
+      if @width
+        # We have 4 pixels padding on each side of the cell.
+        labelWidth = @width - 8
+        labelWidth -= @leftIndent if @leftIndent
+        labelWidth -= @rightIndent if @rightIndent
+        if !@selfcontained
+          # The icons are 20 pixels width including padding.
+          labelWidth -= 20 if @icon
+          labelWidth -= 20 if tooltip || @tooltip
+        end
+      else
+        labelWidth = nil
+      end
+      shortText, singleLine = shortVersion(textAsString, labelWidth)
 
       if (@line && @line.table.equiLines && (!singleLine || @width )) &&
           !@headerCell
@@ -276,18 +295,26 @@ class TaskJuggler
         # in the cell and provide the full content via a tooltip.
         # Header cells are never shortened.
         tooltip = @text if shortText != textAsString
-        td << XMLText.new(shortText)
+        tl = XMLText.new(shortText)
       else
-        td << (@text.is_a?(RichTextIntermediate) ? @text.to_html :
-                                                   XMLText.new(@text))
+        tl = (@text.is_a?(RichTextIntermediate) ? @text.to_html :
+                                                  XMLText.new(@text))
+      end
+
+      if labelWidth
+        style += "min-width: #{labelWidth}px; max-width: #{labelWidth}px; "
       end
 
+      td = XMLElement.new('td', 'class' => 'tj_table_cell_label',
+                                'style' => style)
+      td << tl
+
       return td, tooltip
     end
 
     # Convert a RichText String into a small one-line plain text
     # version that fits the column.
-    def shortVersion(itext)
+    def shortVersion(itext, width)
       text = itext.to_s
       singleLine = true
       modified = false
@@ -296,10 +323,18 @@ class TaskJuggler
         singleLine = false
         modified = true
       end
-      # Assuming an average character width of 8 pixels
-      if @width && (text.length > (@width / 8))
-        text = text[0, @width / 8]
-        modified = true
+      if width
+        widthWithoutIcon = width - 20
+        # Assuming an average character width of 7 pixels
+        maxChars = widthWithoutIcon / 7
+        if text.length > maxChars
+          if maxChars > 0
+            text = text[0, maxChars]
+          else
+            text = ''
+          end
+          modified = true
+        end
       end
       # Add three dots to show that there is more info available.
       text += "..." if modified

data/lib/reports/ReportTableColumn.rb

@@ -3,7 +3,8 @@
 #
 # = ReportTableColumn.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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/reports/ReportTableLegend.rb

@@ -3,7 +3,8 @@
 #
 # = ReportTableLegend.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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
@@ -54,12 +55,11 @@ class TaskJuggler
       if @showGanttItems
         legend << (row = XMLElement.new('tr', 'class' => 'tj_legend_row'))
 
-        row << ganttItemToHTML(GanttContainer.new(nil, 0, 15, 10, 35, 0),
+        row << ganttItemToHTML(GanttContainer.new(15, 10, 35, 0),
                                'Container Task', 40)
-        row << ganttItemToHTML(GanttTaskBar.new(nil, 0, 15, 5, 35, 0),
+        row << ganttItemToHTML(GanttTaskBar.new(nil, 15, 5, 35, 0),
                                'Normal Task', 40)
-        row << ganttItemToHTML(GanttMilestone.new(nil, 15, 10, 0),
-                               'Milestone', 20)
+        row << ganttItemToHTML(GanttMilestone.new(15, 10, 0), 'Milestone', 20)
         row << XMLElement.new('td', 'class' => 'tj_legend_spacer')
       end
 

data/lib/reports/ReportTableLine.rb

@@ -3,7 +3,8 @@
 #
 # = ReportTableLine.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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/reports/ResourceListRE.rb

@@ -3,7 +3,8 @@
 #
 # = ResourceListRE.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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/reports/StatusSheetReport.rb

@@ -3,7 +3,8 @@
 #
 # = StatusSheetReport.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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
@@ -95,7 +96,8 @@ class TaskJuggler
       taskList = PropertyList.new(@project.tasks)
       taskList.setSorting(@report.get('sortTasks'))
       taskList = filterTaskList(taskList, nil, @report.get('hideTask'),
-                                @report.get('rollupTask'), @report.get('openNodes'))
+                                @report.get('rollupTask'),
+                                @report.get('openNodes'))
       taskList.sort!
 
       resourceList.each do |resource|

data/lib/reports/TableReport.rb

@@ -3,7 +3,8 @@
 #
 # = TableReport.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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
@@ -208,6 +209,7 @@ class TaskJuggler
           @end = date if @end.nil? || date > @end
         end
       end
+
       # We want to add at least 5% on both ends.
       margin = 0
       minWidth = @end - @start + 1
@@ -310,6 +312,7 @@ class TaskJuggler
         column = ReportTableColumn.new(@table, columnDef, columnDef.title)
         column.cell1.rows = 2
         column.cell2.hidden = true
+        column.cell1.width = columnDef.width if columnDef.width
       end
     end
 
@@ -598,6 +601,10 @@ 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.listMode = columnDef.listMode
+
       # Find out, what type of PropertyTreeNode we are dealing with.
       property = line.property
       if property.is_a?(Task)
@@ -627,24 +634,7 @@ class TaskJuggler
         cell.text = (rti = query.to_rti) ? rti : query.to_s
       end
 
-      # Replace the font color setting if the user has requested a custom
-      # color.
-      fontColor = columnDef.fontColor.getPattern(query)
-      cell.fontColor = fontColor if fontColor
-
-      # Replace the cell background color if the user has requested a custom
-      # color.
-      cellColor = columnDef.cellColor.getPattern(query)
-      cell.cellColor = cellColor if cellColor
-
-      # Replace the default cell alignment if the user has requested a custom
-      # alignment.
-      hAlign = columnDef.hAlign.getPattern(query)
-      cell.alignment = hAlign if hAlign
-
-      # If the user has requested a custom tooltip, add it to the cell.
-      cell.tooltip = columnDef.tooltip.getPattern(query) || nil
-
+      setCustomCellAttributes(cell, columnDef, query)
       checkCellText(cell)
 
       true
@@ -657,6 +647,10 @@ class TaskJuggler
     # 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.listMode = columnDef.listMode
+
       # Create a new cell
       cell = newCell(query, line)
 
@@ -713,25 +707,7 @@ class TaskJuggler
       cdText = columnDef.cellText.getPattern(query)
       cell.text = cdText if cdText
 
-      # Replace the cell background color if the user has requested a custom
-      # color.
-      cellColor = columnDef.cellColor.getPattern(query)
-      cell.cellColor = cellColor if cellColor
-
-      # Replace the font color setting if the user has requested a custom
-      # color.
-      fontColor = columnDef.fontColor.getPattern(query)
-      cell.fontColor = fontColor if fontColor
-
-      # Replace the default cell alignment if the user has requested a custom
-      # alignment.
-      hAlign = columnDef.hAlign.getPattern(query)
-      cell.alignment = hAlign if hAlign
-
-      # Register the custom tooltip if the user has requested one.
-      cdTooltip = columnDef.tooltip.getPattern(query)
-      cell.tooltip = cdTooltip if cdTooltip
-
+      setCustomCellAttributes(cell, columnDef, query)
       checkCellText(cell)
 
       true
@@ -789,6 +765,9 @@ class TaskJuggler
           raise "Unknown column content #{column.content}"
         end
 
+        cdText = columnDef.cellText.getPattern(query)
+        cell.text = cdText if cdText
+
         # Determine cell category (mostly the background color)
         if cellIv.overlaps?(taskIv)
           # The cell is either a container or leaf task
@@ -886,6 +865,9 @@ class TaskJuggler
           raise "Unknown column content #{column.content}"
         end
 
+        cdText = columnDef.cellText.getPattern(query)
+        cell.text = cdText if cdText
+
         # Set the tooltip for the cell. We might delete it again.
         cell.tooltip = columnDef.tooltip.getPattern(query) || nil
         cell.showTooltipHint = false
@@ -962,6 +944,28 @@ class TaskJuggler
       cell.width = columnDef.width if columnDef.width
     end
 
+    def setCustomCellAttributes(cell, columnDef, query)
+      # Replace the cell background color if the user has requested a custom
+      # color.
+      cellColor = columnDef.cellColor.getPattern(query)
+      cell.cellColor = cellColor if cellColor
+
+      # Replace the font color setting if the user has requested a custom
+      # color.
+      fontColor = columnDef.fontColor.getPattern(query)
+      cell.fontColor = fontColor if fontColor
+
+      # Replace the default cell alignment if the user has requested a custom
+      # alignment.
+      hAlign = columnDef.hAlign.getPattern(query)
+      cell.alignment = hAlign if hAlign
+
+      # Register the custom tooltip if the user has requested one.
+      cdTooltip = columnDef.tooltip.getPattern(query)
+      cell.tooltip = cdTooltip if cdTooltip
+    end
+
+
     def setScenarioSettings(cell, scenarioIdx, scenarioSpecific)
       # Check if we are dealing with multiple scenarios.
       if a('scenarios').length > 1

data/lib/reports/TaskListRE.rb

@@ -3,7 +3,8 @@
 #
 # = TaskListRE.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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,7 +39,8 @@ class TaskJuggler
       taskList = PropertyList.new(@project.tasks)
       taskList.setSorting(@report.get('sortTasks'))
       taskList = filterTaskList(taskList, nil, @report.get('hideTask'),
-                                @report.get('rollupTask'), @report.get('openNodes'))
+                                @report.get('rollupTask'),
+                                @report.get('openNodes'))
       taskList.query = @report.project.reportContexts.last.query
       taskList.sort!
 

data/lib/reports/TextReport.rb

@@ -3,7 +3,8 @@
 #
 # = TextReport.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               by Chris Schlaeger <chris@linux.com>
 #
 # 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