taskjuggler 3.0.0 → 3.1.0

data/lib/taskjuggler/reports/CSVFile.rb

@@ -3,7 +3,7 @@
 #
 # = CSVFile.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

data/lib/taskjuggler/reports/CollisionDetector.rb

@@ -3,7 +3,7 @@
 #
 # = CollisionDetector.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

data/lib/taskjuggler/reports/ColumnTable.rb

@@ -3,7 +3,7 @@
 #
 # = ColumnTable.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

data/lib/taskjuggler/reports/GanttChart.rb

@@ -3,7 +3,7 @@
 #
 # = GanttChart.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

data/lib/taskjuggler/reports/GanttContainer.rb

@@ -3,7 +3,7 @@
 #
 # = GanttContainer.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
@@ -83,8 +83,6 @@ class TaskJuggler
       # Invisible trigger frame for tooltips.
       html << rectToHTML(xStart - @@size, 0, width + 2 * @@size, @lineHeight,
                          'tj_gantt_frame')
-      # If the container is too small we make it wider so it is recognizeable.
-      xStart -= (@@size + 1) - (width / 2) if width < 2
 
       # The bar
       html << rectToHTML(xStart - @@size, yCenter - @@size,

data/lib/taskjuggler/reports/GanttHeader.rb

@@ -3,7 +3,7 @@
 #
 # = GanttHeader.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

data/lib/taskjuggler/reports/GanttHeaderScaleItem.rb

@@ -3,7 +3,7 @@
 #
 # = GanttHeaderScaleItem.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

data/lib/taskjuggler/reports/GanttLine.rb

@@ -3,7 +3,7 @@
 #
 # = GanttLine.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
@@ -173,14 +173,15 @@ class TaskJuggler
               endDate = taskEnd
               w = @chart.dateToX(endDate) - x
             end
+            startIdx = project.dateToIdx(startDate)
+            endIdx = project.dateToIdx(endDate)
 
             overallWork = scopeProperty.getEffectiveWork(@query.scenarioIdx,
-                                                         startDate, endDate) +
+                                                         startIdx, endIdx) +
                           scopeProperty.getEffectiveFreeWork(@query.scenarioIdx,
-                                                             startDate,
-                                                             endDate)
+                                                             startIdx, endIdx)
             workThisTask = property.getEffectiveWork(@query.scenarioIdx,
-                                                      startDate, endDate,
+                                                      startIdx, endIdx,
                                                       scopeProperty)
             # If all values are 0 we make sure we show an empty frame.
             if overallWork == 0 && workThisTask == 0
@@ -207,7 +208,10 @@ class TaskJuggler
         @content <<
           if property['milestone', @query.scenarioIdx]
             GanttMilestone.new(@height, xStart, @y)
-          elsif property.container?
+          elsif property.container? &&
+                ((rollupExpr = @query.project.reportContexts.
+                              last.report.get('rollupTask')).nil? ||
+                 !rollupExpr.eval(@query))
             GanttContainer.new(@height, xStart, xEnd, @y)
           else
             GanttTaskBar.new(@query, @height, xStart, xEnd, @y)
@@ -232,6 +236,7 @@ class TaskJuggler
       x = nil
       startDate = endDate = nil
 
+      project = @query.project
       property = @query.property
       scopeProperty = @query.scopeProperty
 
@@ -242,7 +247,6 @@ class TaskJuggler
       if scopeProperty
         categories = [ 'assigned', 'busy', 'free' ]
 
-        project = @query.project
         taskStart = scopeProperty['start', @query.scenarioIdx] ||
                     project['start']
         taskEnd = scopeProperty['end', @query.scenarioIdx] ||
@@ -290,20 +294,27 @@ class TaskJuggler
             # of the scope task.
             endDate = taskEnd
           end
+
+          startIdx = project.dateToIdx(startDate)
+          endIdx = project.dateToIdx(endDate)
+
           taskWork = property.getEffectiveWork(@query.scenarioIdx,
-                                               startDate, endDate,
+                                               startIdx, endIdx,
                                                scopeProperty)
           overallWork = property.getEffectiveWork(@query.scenarioIdx,
-                                                  startDate, endDate)
+                                                  startIdx, endIdx)
           freeWork = property.getEffectiveFreeWork(@query.scenarioIdx,
-                                                   startDate, endDate)
+                                                   startIdx, endIdx)
           values = [ taskWork, overallWork - taskWork, freeWork ]
         else
+          startIdx = project.dateToIdx(startDate)
+          endIdx = project.dateToIdx(endDate)
+
           values = []
           values << property.getEffectiveWork(@query.scenarioIdx,
-                                              startDate, endDate)
+                                              startIdx, endIdx)
           values << property.getEffectiveFreeWork(@query.scenarioIdx,
-                                                  startDate, endDate)
+                                                  startIdx, endIdx)
         end
 
         x = @chart.dateToX(startDate)

data/lib/taskjuggler/reports/GanttLoadStack.rb

@@ -3,7 +3,7 @@
 #
 # = GanttLoadStack.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

data/lib/taskjuggler/reports/GanttMilestone.rb

@@ -3,7 +3,7 @@
 #
 # = GanttMilestone.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

data/lib/taskjuggler/reports/GanttRouter.rb

@@ -3,7 +3,7 @@
 #
 # = GanttRouter.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

data/lib/taskjuggler/reports/GanttTaskBar.rb

@@ -3,7 +3,7 @@
 #
 # = GanttTaskBar.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

data/lib/taskjuggler/reports/HTMLGraphics.rb

@@ -3,7 +3,7 @@
 #
 # = HTMLGraphics.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

data/lib/taskjuggler/reports/ICalReport.rb

@@ -3,7 +3,7 @@
 #
 # = ICalReport.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
@@ -101,7 +101,10 @@ class TaskJuggler
             @ical, "#{task['projectid', scenarioIdx]}-#{task.fullId}",
             task.name, task['start', scenarioIdx], task['end', scenarioIdx])
           event.description = note if note
-          event.setOrganizer(organizer.name, organizer.email) if organizer
+          if organizer
+            event.setOrganizer(organizer.name, organizer.get('email'))
+          end
+
           attendees.each do |attendee|
             event.addAttendee(attendee.name, attendee.get('email'))
           end

data/lib/taskjuggler/reports/Navigator.rb

@@ -3,7 +3,7 @@
 #
 # = Navigator.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

data/lib/taskjuggler/reports/NikuReport.rb

@@ -3,7 +3,7 @@
 #
 # = NikuReport.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

data/lib/taskjuggler/reports/Report.rb

@@ -3,7 +3,7 @@
 #
 # = Report.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
@@ -14,6 +14,7 @@
 require 'fileutils'
 
 require 'taskjuggler/PropertyTreeNode'
+require 'taskjuggler/reports/AccountListRE'
 require 'taskjuggler/reports/TextReport'
 require 'taskjuggler/reports/TaskListRE'
 require 'taskjuggler/reports/ResourceListRE'
@@ -104,8 +105,16 @@ class TaskJuggler
     # Generate an output format agnostic version that can later be turned into
     # the respective output formats.
     def generateIntermediateFormat
+      if get('scenarios').empty?
+        warning('all_scenarios_disabled',
+                "The report #{fullId} has only disabled scenarios. The " +
+                "report will possibly be empty.")
+      end
+
       @content = nil
       case @typeSpec
+      when :accountreport
+        @content = AccountListRE.new(self)
       when :export
         @content = TjpExportRE.new(self)
       when :iCal
@@ -250,7 +259,11 @@ EOT
           ((@name[0] == '/' ? '' : @project.outputDir) +
            @name + '.html').untaint
         end
-      html.write(fileName)
+      begin
+        html.write(fileName)
+      rescue IOError, SystemCallError
+        error('write_html', "Cannot write to file #{fileName}.\n#{$!}")
+      end
     end
 
     # Generate a CSV version of the report.
@@ -281,6 +294,13 @@ EOT
 
     # Generate time sheet drafts.
     def generateTJP
+      unless @content.respond_to?('to_tjp')
+        warning('tjp_not_supported',
+                "TJP format is not supported for report #{@id} of " +
+                "type #{@typeSpec}.")
+        return nil
+      end
+
       begin
         fileName = '.'
         if @name == '.'
@@ -375,8 +395,13 @@ EOT
       # Don't copy directory if all files are up-to-date.
       return if directoryUpToDate?(auxSrcDir, auxDstDir + dirName)
 
-      # Recursively copy the directory and all content.
-      FileUtils.cp_r(auxSrcDir, auxDstDir)
+      begin
+        # Recursively copy the directory and all content.
+        FileUtils.cp_r(auxSrcDir, auxDstDir)
+      rescue IOError, SystemCallError
+        error('copy_dir', "Cannot copy directory #{auxSrcDir} to " +
+                          "#{auxDstDir}.\n#{$!}")
+      end
     end
 
     def directoryUpToDate?(auxSrcDir, auxDstDir)

data/lib/taskjuggler/reports/ReportBase.rb

@@ -3,7 +3,7 @@
 #
 # = ReportBase.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
@@ -46,6 +46,20 @@ class TaskJuggler
       raise 'This function must be overriden by derived classes.'
     end
 
+    # Take the complete account list and remove all accounts that are matching
+    # the hide expression, the rollup Expression or are not a descendent of
+    # accountRoot.
+    def filterAccountList(list_, hideExpr, rollupExpr, openNodes)
+      list = PropertyList.new(list_)
+      if (accountRoot = a('accountRoot'))
+        # Remove all accounts that are not descendents of the accountRoot.
+        list.delete_if { |account| !account.isChildOf?(accountRoot) }
+      end
+
+      standardFilterOps(list, hideExpr, rollupExpr, openNodes, nil,
+                        accountRoot)
+    end
+
     # Take the complete task list and remove all tasks that are matching the
     # hide expression, the rollup Expression or are not a descendent of
     # taskRoot. In case resource is not nil, a task is only included if

data/lib/taskjuggler/reports/ReportContext.rb

@@ -3,7 +3,7 @@
 #
 # = ReportContext.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

data/lib/taskjuggler/reports/ReportTable.rb

@@ -3,7 +3,7 @@
 #
 # = ReportTable.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

data/lib/taskjuggler/reports/ReportTableCell.rb

@@ -3,7 +3,7 @@
 #
 # = ReportTableCell.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

data/lib/taskjuggler/reports/ReportTableColumn.rb

@@ -3,7 +3,7 @@
 #
 # = ReportTableColumn.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

data/lib/taskjuggler/reports/ReportTableLegend.rb

@@ -3,7 +3,7 @@
 #
 # = ReportTableLegend.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

data/lib/taskjuggler/reports/ReportTableLine.rb

@@ -3,7 +3,7 @@
 #
 # = ReportTableLine.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

data/lib/taskjuggler/reports/ResourceListRE.rb

@@ -3,7 +3,7 @@
 #
 # = ResourceListRE.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
@@ -33,8 +33,6 @@ class TaskJuggler
     def generateIntermediateFormat
       super
 
-      setReportPeriod
-
       # Prepare the resource list.
       resourceList = PropertyList.new(@project.resources)
       resourceList.setSorting(@report.get('sortResources'))
@@ -61,11 +59,11 @@ class TaskJuggler
         assignedTaskList.uniq!
       end
 
-      adjustReportPeriod(assignedTaskList, @report.get('scenarios'),
-                         @report.get('columns'))
 
       # Generate the table header.
       @report.get('columns').each do |columnDescr|
+        adjustColumnPeriod(columnDescr, assignedTaskList,
+                           @report.get('scenarios'))
         generateHeaderCell(columnDescr)
       end