taskjuggler 0.0.8 → 0.0.9

data/lib/RichTextElement.rb

@@ -3,7 +3,8 @@
 #
 # = RichTextElement.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/RichTextFunctionExample.rb

@@ -3,7 +3,8 @@
 #
 # = RichTextFunctionExample.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/RichTextFunctionHandler.rb

@@ -3,7 +3,8 @@
 #
 # = RichTextFunctionHandler.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/RichTextParser.rb

@@ -3,7 +3,8 @@
 #
 # = RichTextParser.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/RichTextScanner.rb

@@ -3,7 +3,8 @@
 #
 # = RichTextScanner.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/RichTextSnip.rb

@@ -3,7 +3,8 @@
 #
 # = RichTextSnip.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/RichTextSyntaxRules.rb

@@ -3,7 +3,8 @@
 #
 # = RichTextSyntaxRules.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/RuntimeConfig.rb

@@ -3,7 +3,8 @@
 #
 # = RuntimeConfig.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/Scenario.rb

@@ -3,7 +3,8 @@
 #
 # = Scenario.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/ScenarioData.rb

@@ -3,7 +3,8 @@
 #
 # = ScenarioData.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/Scoreboard.rb

@@ -3,13 +3,16 @@
 #
 # = Scoreboard.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
 # published by the Free Software Foundation.
 #
 
+require 'IntervalList'
+
 class TaskJuggler
 
   # Scoreboard objects are instrumental during the scheduling process. The
@@ -106,19 +109,30 @@ class TaskJuggler
     # Return a list of intervals that describe a contiguous part of the
     # scoreboard that contains only the values that yield true for the passed
     # block.  The intervals must be within the interval described by _iv_ and
-    # must be at least _minDuration_ long. The return value is an Array of [
-    # start, end ] TjTime values.
+    # must be at least _minDuration_ long. The return value is an
+    # IntervalList.
     def collectIntervals(iv, minDuration)
-      # Determine the start and stop index for the scoreboard search.
-      startIdx = dateToIdx(iv.start, true)
-      endIdx = dateToIdx(iv.end, true)
+      # Determine the start and stop index for the scoreboard search. We save
+      # the original values for later use as well.
+      startIdx = sIdx = dateToIdx(iv.start, true)
+      endIdx = eIdx = dateToIdx(iv.end, true)
 
       # Convert the minDuration into number of slots.
       minDuration /= @resolution
       minDuration = 1 if minDuration <= 0
 
+      # Expand the interval with the minDuration to both sides. This will
+      # reduce the failure to detect intervals at the iv boundary. However,
+      # this will not prevent undetected intervals at the project time frame
+      # boundaries.
+      startIdx -= minDuration
+      startIdx = 0 if startIdx < 0
+      endIdx += minDuration
+      endIdx = @size - 1 if endIdx > @size - 1
+
       # This is collects the resulting intervals.
-      intervals = []
+      intervals = IntervalList.new
+
       # The duration counter for the currently analyzed interval and the start
       # index.
       duration = start = 0
@@ -135,7 +149,12 @@ class TaskJuggler
           # interval.
           if duration > 0
             if duration >= minDuration
-              intervals << [ idxToDate(start), idxToDate(idx) ]
+              # Make sure that all intervals are within the originally
+              # requested Interval.
+              start = sIdx if start < sIdx
+              idx = eIdx if idx > eIdx
+
+              intervals << Interval.new(idxToDate(start), idxToDate(idx))
             end
             duration = start = 0
           end

data/lib/SheetHandlerBase.rb

@@ -3,7 +3,8 @@
 #
 # = SheetHandlerBase.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/SheetReceiver.rb

@@ -3,7 +3,8 @@
 #
 # = SheetReceiver.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/SheetSender.rb

@@ -3,7 +3,8 @@
 #
 # = SheetSender.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/Shift.rb

@@ -3,7 +3,8 @@
 #
 # = Shift.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/ShiftAssignments.rb

@@ -3,7 +3,8 @@
 #
 # = ShiftAssignments.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/ShiftScenario.rb

@@ -3,7 +3,8 @@
 #
 # = ShiftScenario.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/SimpleQueryExpander.rb

@@ -3,7 +3,8 @@
 #
 # = SimpleQueryExpander.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/SourceFileInfo.rb

@@ -3,7 +3,8 @@
 #
 # = SourceFileInfo.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/StatusSheetReceiver.rb

@@ -3,7 +3,8 @@
 #
 # = StatusSheetReceiver.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/StatusSheetSender.rb

@@ -3,7 +3,8 @@
 #
 # = StatusSheetSender.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/SyntaxReference.rb

@@ -3,7 +3,8 @@
 #
 # = SyntaxReference.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/TOCEntry.rb

@@ -3,7 +3,8 @@
 #
 # = TOCEntry.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/TableColumnDefinition.rb

@@ -3,7 +3,8 @@
 #
 # = TableColumnDefinition.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
@@ -58,7 +59,8 @@ class TaskJuggler
   class TableColumnDefinition
 
     attr_reader :id, :cellText, :tooltip, :hAlign, :cellColor, :fontColor
-    attr_accessor :title, :start, :end, :scale, :width, :content, :column
+    attr_accessor :title, :start, :end, :scale, :listType, :listMode,
+                  :width, :content, :column
 
     def initialize(id, title)
       # The column ID. It must be unique within the report.
@@ -86,6 +88,11 @@ class TaskJuggler
       # An alternative font color for the cell. The format is equivalent to
       # the @cellColor setting.
       @fontColor = CellSettingPatternList.new
+      # Specifies whether list items are comma separated, bullet or numbered
+      # list.
+      @listType = nil
+      # Specifies how the list entries look like.
+      @listMode = nil
       # The scale attribute is only used for Gantt chart columns. It specifies
       # the minimum resolution of the chart.
       @scale = 'week'

data/lib/TableOfContents.rb

@@ -3,7 +3,8 @@
 #
 # = TableOfContents.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/Task.rb

@@ -3,7 +3,8 @@
 #
 # = Task.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/TaskDependency.rb

@@ -3,7 +3,8 @@
 #
 # = TaskDependency.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/TaskJuggler.rb

@@ -3,7 +3,8 @@
 #
 # = TaskJuggler.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
@@ -166,13 +167,14 @@ class TaskJuggler
 
   # Generate the report with the ID _reportId_. If _regExpMode_ is true,
   # _reportId_ is interpreted as a Regular Expression and all reports with
-  # matching IDs are generated. _dynamicAtributes_ is a String that may
-  # contain attributes to supplement the report definition. The String must be
-  # in TJP format and may be nil if no additional attributes are provided.
-  def generateReport(reportId, regExpMode, dynamicAttributes = nil)
+  # matching IDs are generated. _formats_ is a list of formats (e. g. :html,
+  # :csv, etc.). _dynamicAtributes_ is a String that may contain attributes to
+  # supplement the report definition. The String must be in TJP format and may
+  # be nil if no additional attributes are provided.
+  def generateReport(reportId, regExpMode, formats, dynamicAttributes = nil)
     begin
       Log.enter('generateReport', 'Generating report #{reportId} ...')
-      @project.generateReport(reportId, regExpMode, dynamicAttributes)
+      @project.generateReport(reportId, regExpMode, formats, dynamicAttributes)
     rescue TjException => msg
       if msg.message && !msg.message.empty?
         @messageHandler.critical('generate_report', msg.message)

data/lib/TaskScenario.rb

@@ -3,7 +3,8 @@
 #
 # = TaskScenario.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
@@ -187,7 +188,8 @@ class TaskJuggler
       # If an effort has been specified resources must be allocated as well.
       if a('effort') > 0 && a('allocate').empty?
         error('effort_no_allocations',
-              "Task #{@property.fullId} has an effort but no allocations.")
+              "Task #{@property.fullId} has an effort but no resource " +
+              "allocations.")
       end
 
       durationSpecs = 0
@@ -320,6 +322,19 @@ class TaskJuggler
               'certain attributes like \'end\' or \'precedes\' automatically ' +
               'switch the task to ALAP mode.')
       end
+
+      a('startsuccs').each do |task, onEnd|
+        unless task['forward', @scenarioIdx]
+          task.error(@scenarioIdx, 'onstart_wrong_direction',
+                     'Tasks with on-start dependencies must be ASAP scheduled')
+        end
+      end
+      a('endpreds').each do |task, onEnd|
+        if task['forward', @scenarioIdx]
+          task.error(@scenarioIdx, 'onend_wrong_direction',
+                     'Tasks with on-end dependencies must be ALAP scheduled')
+        end
+      end
     end
 
     # When the actual scheduling process has been completed, this function must
@@ -521,7 +536,7 @@ class TaskJuggler
               "end date.")
       end
 
-      if a('fail') || a('warn')
+      if !a('fail').empty? || !a('warn').empty?
         queryAttrs = { 'project' => @project,
                        'scenarioIdx' => @scenarioIdx,
                        'property' => @property,
@@ -533,18 +548,22 @@ class TaskJuggler
                        'timeFormat' => @project['timeFormat'],
                        'currencyFormat' => @project['currencyFormat'] }
         query = Query.new(queryAttrs)
-        if a('fail') && a('fail').eval(query)
-          error('task_fail_check',
-                "User defined check failed for task #{@property.fullId} \n" +
-                "Condition: #{a('fail').to_s}\n" +
-                "Result:    #{a('fail').to_s(query)}")
+        a('fail').each do |expr|
+          if expr.eval(query)
+            error('task_fail_check',
+                  "User defined check failed for task #{@property.fullId} \n" +
+                  "Condition: #{expr.to_s}\n" +
+                  "Result:    #{expr.to_s(query)}")
+          end
         end
-        if a('warn') && a('warn').eval(query)
-          warning('task_warn_check',
-                  "User defined warning triggered for task " +
-                  "#{@property.fullId} \n" +
-                  "Condition: #{a('warn').to_s}\n" +
-                  "Result:    #{a('warn').to_s(query)}")
+        a('warn').each do |expr|
+          if expr.eval(query)
+            warning('task_warn_check',
+                    "User defined warning triggered for task " +
+                    "#{@property.fullId} \n" +
+                    "Condition: #{expr.to_s}\n" +
+                    "Result:    #{expr.to_s(query)}")
+          end
         end
       end
 
@@ -555,7 +574,18 @@ class TaskJuggler
       @deadEndFlags = Array.new(4, false)
     end
 
-    def checkForLoops(path, atEnd, fromOutside)
+    # To ensure that we can properly schedule the project, we need to make
+    # sure that it does not contain any circular dependencies. This method
+    # recursively checks for such loops by remembering the _path_. Each entry
+    # is marks the start or end of a task. _atEnd_ specifies whether we are
+    # currently at the start or end of the task. _fromOutside_ specifies
+    # whether we are coming from a inside or outside that tasks. See
+    # specification below. _forward_ specifies whether we are checking the
+    # dependencies from start to end or in the opposite direction. If we are
+    # moving forward, we only move from start to end of ASAP tasks, not ALAP
+    # tasks and vice versa. For milestones, we ignore the scheduling
+    # direction.
+    def checkForLoops(path, atEnd, fromOutside, forward)
       # Check if we have been here before on this path.
       if path.include?([ @property, atEnd ])
         warning('loop_detected',
@@ -618,7 +648,7 @@ class TaskJuggler
             #            V
             #
             @property.children.each do |child|
-              child.checkForLoops(@scenarioIdx, path, false, true)
+              child.checkForLoops(@scenarioIdx, path, false, true, forward)
             end
           else
             #         |
@@ -627,7 +657,9 @@ class TaskJuggler
             #    -->| o---->
             #       +--------
             #
-            checkForLoops(path, true, false) # if a('forward')
+            if (forward && a('forward')) || a('milestone')
+              checkForLoops(path, true, false, true)
+            end
           end
         else
           if a('startpreds').empty?
@@ -641,7 +673,8 @@ class TaskJuggler
             #         |
             #
             if @property.parent
-              @property.parent.checkForLoops(@scenarioIdx, path, false, false)
+              @property.parent.checkForLoops(@scenarioIdx, path, false, false,
+                                             forward)
             end
           else
 
@@ -652,7 +685,7 @@ class TaskJuggler
             #          |
             #
             a('startpreds').each do |task, targetEnd|
-              task.checkForLoops(@scenarioIdx, path, targetEnd, true)
+              task.checkForLoops(@scenarioIdx, path, targetEnd, true, forward)
             end
           end
         end
@@ -669,7 +702,7 @@ class TaskJuggler
             #       v
             #
             @property.children.each do |child|
-              child.checkForLoops(@scenarioIdx, path, true, true)
+              child.checkForLoops(@scenarioIdx, path, true, true, forward)
             end
           else
             #          |
@@ -678,7 +711,9 @@ class TaskJuggler
             #     <----o |<--
             #    --------+
             #
-            checkForLoops(path, false, false) # unless a('forward')
+            if (!forward && !a('forward')) || a('milestone')
+              checkForLoops(path, false, false, false)
+            end
           end
         else
           if a('endsuccs').empty?
@@ -692,7 +727,8 @@ class TaskJuggler
             #          |
             #
             if @property.parent
-              @property.parent.checkForLoops(@scenarioIdx, path, true, false)
+              @property.parent.checkForLoops(@scenarioIdx, path, true, false,
+                                             forward)
             end
           else
             #    --------+
@@ -702,7 +738,7 @@ class TaskJuggler
             #          |
             #
             a('endsuccs').each do |task, targetEnd|
-              task.checkForLoops(@scenarioIdx, path, targetEnd, true)
+              task.checkForLoops(@scenarioIdx, path, targetEnd, true, forward)
             end
           end
         end
@@ -896,7 +932,10 @@ class TaskJuggler
 
       # For leaf tasks, propagate start may set the date. Container task dates
       # are only set in scheduleContainer().
-      @property[thisEnd, @scenarioIdx] = date if @property.leaf?
+      if @property.leaf?
+        @property[thisEnd, @scenarioIdx] = date
+        Log << "Task #{@property.fullId}: #{a('start')} -> #{a('end')}"
+      end
 
       if a('milestone')
         # Start and end date of a milestone are identical.
@@ -911,12 +950,20 @@ class TaskJuggler
         @property['scheduled', @scenarioIdx] = true
       end
 
-      # Propagate date to all dependent tasks.
-      a(thisEnd + 'preds').each do |task, onEnd|
-        propagateDateToDep(task, onEnd)
+      # Propagate date to all dependent tasks. Don't do this for start
+      # successors or end predecessors if this task is effort based. In this
+      # case, the date might still change to align with the first/last
+      # allocation. In these cases, bookResoruce() has to propagate the final
+      # date.
+      unless atEnd && a('effort') > 0
+        a(thisEnd + 'preds').each do |task, onEnd|
+          propagateDateToDep(task, onEnd)
+        end
       end
-      a(thisEnd + 'succs').each do |task, onEnd|
-        propagateDateToDep(task, onEnd)
+      unless !atEnd && a('effort') > 0
+        a(thisEnd + 'succs').each do |task, onEnd|
+          propagateDateToDep(task, onEnd)
+        end
       end
 
       # Propagate date to sub tasks which have only an implicit
@@ -939,52 +986,42 @@ class TaskJuggler
     def canInheritDate?(atEnd)
       # Inheriting a start or end date from the enclosing task or the project
       # is allowed for the following scenarios:
-      #   -  --> -   inherit start and end when no bookings but allocations
-      #              present
-      #   -  <-- -   dito
+      #   -  --> -   inhS*1  -  <-- -   inhE*1
+      #   -  --> |   inhS    |  <-- -   inhE
+      #   -  x-> -   inhS    -  <-x -   inhE
+      #   -  x-> |   inhS    |  <-x -   inhE
+      #   -  x-> -D  inhS    -D <-x -   inhE
+      #   -  x-> |D  inhS    |D <-x -   inhE
+      #   -  --> -D  inhS    -D <-- -   inhE
+      #   -  --> |D  inhS    |D <-- -   inhE
+      #   -  <-- |   inhS    |  --> -   inhE
       #
-      #   -  x-> -   inhS
-      #   -  x-> |   inhS
-      #   -  x-> -D  inhS
-      #   -  x-> |D  inhS
-      #   -  --> |   inhS
-      #   -  --> -D  inhS
-      #   -  --> |D  inhS
-      #   -  <-- |   inhS
-      #   |  --> -   inhE
-      #   |  <-x -   inhE
-      #   |D <-x -   inhE
-      #   -  <-x -   inhE
-      #   -D <-x -   inhE
-      #   |  <-- -   inhE
-      #   |D <-- -   inhE
-      #   -D <-- -   inhE
-      # Return false if we already have a date or if we have a dependency for
-      # this end.
-      thisEnd = atEnd ? 'end' : 'start'
-      hasThisDeps = !a(thisEnd + 'preds').empty? || !a(thisEnd + 'succs').empty?
-      hasThisSpec = a(thisEnd) || hasThisDeps
-      return false if hasThisSpec
+      #   *1 when no bookings but allocations are present
+
+      thisEnd, thatEnd = atEnd ? [ 'end', 'start' ] : [ 'start', 'end' ]
+      # Return false if we already have a date for this end or if we have a
+      # strong dependency for this end.
+      return false if a(thisEnd) || hasStrongDeps(thisEnd)
 
-      # Containter task can inherit the date if they have no dependencies.
+      # Containter task can inherit the date if they have no dependencies at
+      # this end.
       return true if @property.container?
 
-      thatEnd = atEnd ? 'start' : 'end'
-      hasThatDeps = !a(thatEnd + 'preds').empty? || !a(thatEnd + 'succs').empty?
-      hasThatSpec = a(thatEnd) || hasThatDeps
+      hasThatSpec = a(thatEnd) || hasStrongDeps(thatEnd)
+      hasDurationSpec = hasDurationSpec?
 
       # Check for tasks that have no start and end spec, no duration spec but
       # allocates. They can inherit the start and end date.
-      return true if hasThatSpec && !hasDurationSpec? && !a('allocate').empty?
+      return true if hasThatSpec && !hasDurationSpec && !a('allocate').empty?
 
       if a('forward') ^ atEnd
         # the scheduling direction is pointing away from this end
-        return true if hasDurationSpec? || !a('booking').empty?
+        return true if hasDurationSpec || !a('booking').empty?
 
         return hasThatSpec
       else
         # the scheduling direction is pointing towards this end
-        return a(thatEnd) && !hasDurationSpec? &&
+        return a(thatEnd) && !hasDurationSpec &&
                a('booking').empty? #&& a('allocate').empty?
       end
     end
@@ -1231,88 +1268,89 @@ class TaskJuggler
     end
 
     def query_followers(query)
-      str = ''
+      list = []
 
       # First gather the task that depend on the start of this task.
       a('startsuccs').each do |task, onEnd|
-        str += "* <nowiki>#{task.name}</nowiki> (#{task.fullId}) "
         if onEnd
-          taskEnd = task['end', query.scenarioIdx].to_s(query.timeFormat)
-          str += "<nowiki>[->]</nowiki> #{taskEnd}"
+          date = task['end', query.scenarioIdx].to_s(query.timeFormat)
+          dep "[->]"
         else
-          taskStart = task['start', query.scenarioIdx].to_s(query.timeFormat)
-          str += "<nowiki>[->[</nowiki> #{taskStart}"
+          date = task['start', query.scenarioIdx].to_s(query.timeFormat)
+          dep "[->["
         end
-        str += "\n"
+        list << generateDepencyListItem(query.listMode, task, dep, date)
       end
       # Than add the tasks that depend on the end of this task.
       a('endsuccs').each do |task, onEnd|
-        str += "* <nowiki>#{task.name}</nowiki> (#{task.fullId}) "
         if onEnd
-          taskEnd = task['end', query.scenarioIdx].to_s(query.timeFormat)
-          str += "<nowiki>]->]</nowiki> #{taskEnd}"
+          date = task['end', query.scenarioIdx].to_s(query.timeFormat)
+          dep = "]->]"
         else
-          taskStart = task['start', query.scenarioIdx].to_s(query.timeFormat)
-          str += "<nowiki>]->[</nowiki> #{taskStart}"
+          date = task['start', query.scenarioIdx].to_s(query.timeFormat)
+          dep = "]->["
         end
-        str += "\n"
+        list << generateDepencyListItem(query.listMode, task, dep, date)
       end
 
-      rText = RichText.new(str, [], @property.project.messageHandler)
-      unless (query.rti = rText.generateIntermediateFormat)
-        @property.project.messageHandler.warning(
-          'task_sc_followers', 'Syntax error in followers')
-      end
+      query.assignList(list)
     end
 
     def query_precursors(query)
-      str = ''
+      list = []
 
       # First gather the task that depend on the start of this task.
       a('startpreds').each do |task, onEnd|
-        str += "* <nowiki>#{task.name}</nowiki> (#{task.fullId}) "
         if onEnd
-          taskEnd = task['end', query.scenarioIdx].to_s(query.timeFormat)
-          str += "<nowiki>]->]</nowiki> #{taskEnd}"
+          date = task['end', query.scenarioIdx].to_s(query.timeFormat)
+          dep = "]->["
         else
-          taskStart = task['start', query.scenarioIdx].to_s(query.timeFormat)
-          str += "<nowiki>[->[</nowiki> #{taskStart}"
+          date = task['start', query.scenarioIdx].to_s(query.timeFormat)
+          dep = "[->["
         end
-        str += "\n"
+        list << generateDepencyListItem(query.listMode, task, dep, date)
       end
       # Than add the tasks that depend on the end of this task.
       a('endpreds').each do |task, onEnd|
-        str += "* <nowiki>#{task.name}</nowiki> (#{task.fullId}) "
         if onEnd
-          taskEnd = task['end', query.scenarioIdx].to_s(query.timeFormat)
-          str += "<nowiki>[->]</nowiki> #{taskEnd}"
+          date = task['end', query.scenarioIdx].to_s(query.timeFormat)
+          dep = "]->]"
         else
-          taskStart = task['start', query.scenarioIdx].to_s(query.timeFormat)
-          str += "<nowiki>]->[</nowiki> #{taskStart}"
+          date = task['start', query.scenarioIdx].to_s(query.timeFormat)
+          dep = "[->]"
         end
-        str += "\n"
+        list << generateDepencyListItem(query.listMode, task, dep, date)
       end
 
-      rText = RichText.new(str)
-      query.rti = rText.generateIntermediateFormat
+      query.assignList(list)
     end
 
     # A list of the resources that have been allocated to work on the task in
     # the report time frame.
     def query_resources(query)
-      list = ''
-      return list unless @property.leaf?
+      return '' unless @property.leaf?
 
+      list = []
       a('assignedresources').each do |resource|
         if resource.allocated?(@scenarioIdx,
                                Interval.new(query.start, query.end), @property)
-          list += ', ' unless list.empty?
-          list += "#{resource.name} (#{resource.fullId})"
+          case query.listMode
+          when 1
+            list << "#{resource.fullId}"
+          when 2
+            list << "#{resource.name}"
+          when 3, nil
+            list << "#{resource.name} (#{resource.fullId})"
+          when 4
+            list << "#{resource.fullId}: #{resource.name}"
+          else
+            error('bad_listmode_qr',
+                  "Unsupported list mode #{query.listMode} used for " +
+                  "resources column.")
+          end
         end
       end
-      query.sortable = query.string = list
-      rText = RichText.new(list)
-      query.rti = rText.generateIntermediateFormat
+      query.assignList(list)
     end
 
     # Compute the revenue generated by this Task for a given Account during a
@@ -1347,13 +1385,32 @@ class TaskJuggler
                              ['seqno', true, -1 ]])
       targetList.sort!
 
-      res = ''
+      list = []
       targetList.each do |task|
         date = task['start', @scenarioIdx].to_s(@property.project['timeFormat'])
-        res += "# #{task.name} (#{task.fullId}) #{date}\n"
+        case query.listMode
+        when 1
+          list << "#{task.fullId}"
+        when 2
+          list << "#{task.name}"
+        when 3
+          list << "#{task.name} (#{task.fullId})"
+        when 4
+          list << "#{task.fullId}: #{task.name}"
+        when 5
+          list << "#{task.fullId} (#{date})"
+        when 6
+          list << "#{task.name} (#{date})"
+        when 7, nil
+          list << "#{task.name} (#{task.fullId}) #{date}"
+        when 8
+          list << "#{task.fullId}: #{task.name} #{date}"
+        else
+          error('bad_listmode_qt',
+                "Bad listmode #{query.listMode}. Use 1 - 8.")
+        end
       end
-      rText = RichText.new(res)
-      query.rti = rText.generateIntermediateFormat
+      query.assignList(list)
     end
 
 
@@ -1364,28 +1421,27 @@ class TaskJuggler
                     (resource && !a('assignedresources').include?(resource))
 
       key = [ self, :TaskScenarioAllocatedTime, startIdx, endIdx, resource ].hash
-      allocatedTime = @dCache.load(key)
-      return allocatedTime if allocatedTime
-
-      allocatedTime = 0.0
-      if @property.container?
-        @property.children.each do |task|
-          allocatedTime += task.getAllocatedTime(@scenarioIdx, startIdx, endIdx,
-                                                 resource)
-        end
-      else
-        if resource
-          allocatedTime += resource.getAllocatedTime(@scenarioIdx,
-                                                     startIdx, endIdx,
-                                                     @property)
+      @dCache.cached(key) do
+        allocatedTime = 0.0
+        if @property.container?
+          @property.children.each do |task|
+            allocatedTime += task.getAllocatedTime(@scenarioIdx,
+                                                   startIdx, endIdx, resource)
+          end
         else
-          a('assignedresources').each do |r|
-            allocatedTime += r.getAllocatedTime(@scenarioIdx, startIdx, endIdx,
-                                                @property)
+          if resource
+            allocatedTime += resource.getAllocatedTime(@scenarioIdx,
+                                                       startIdx, endIdx,
+                                                       @property)
+          else
+            a('assignedresources').each do |r|
+              allocatedTime += r.getAllocatedTime(@scenarioIdx, startIdx, endIdx,
+                                                  @property)
+            end
           end
         end
+        allocatedTime
       end
-      @dCache.store(allocatedTime, key)
     end
 
     # Compute the effective work a _resource_ or all resources do during the
@@ -1396,36 +1452,59 @@ class TaskJuggler
                     (resource && !a('assignedresources').include?(resource))
 
       key = [ self, :TaskScenarioEffectiveWork, startIdx, endIdx, resource ].hash
-      workLoad = @dCache.load(key)
-      return workLoad if workLoad
-
-      workLoad = 0.0
-      if @property.container?
-        @property.children.each do |task|
-          workLoad += task.getEffectiveWork(@scenarioIdx, startIdx, endIdx,
-                                            resource)
-        end
-      else
-        if resource
-          workLoad += resource.getEffectiveWork(@scenarioIdx, startIdx, endIdx,
-                                                @property)
+      @dCache.cached(key) do
+        workLoad = 0.0
+        if @property.container?
+          @property.children.each do |task|
+            workLoad += task.getEffectiveWork(@scenarioIdx, startIdx, endIdx,
+                                              resource)
+          end
         else
-          a('assignedresources').each do |r|
-            workLoad += r.getEffectiveWork(@scenarioIdx, startIdx, endIdx,
-                                           @property)
+          if resource
+            workLoad += resource.getEffectiveWork(@scenarioIdx, startIdx, endIdx,
+                                                  @property)
+          else
+            a('assignedresources').each do |r|
+              workLoad += r.getEffectiveWork(@scenarioIdx, startIdx, endIdx,
+                                             @property)
+            end
           end
         end
+        workLoad
       end
-      @dCache.store(workLoad, key)
     end
 
     # Return a list of intervals that lay within _iv_ and are at least
     # minDuration long and contain no working time.
     def collectTimeOffIntervals(iv, minDuration)
-      if a('shifts')
-        a('shifts').collectTimeOffIntervals(iv, minDuration)
-      else
-        []
+      # This function is often called recursively for the same parameters. We
+      # store the results in the cache to avoid repeated computations of the
+      # same results.
+      key = [ self, :TaskScenarioCollectTimeOffIntervals, iv, minDuration ].hash
+      @dCache.cached(key) do
+        workLoad = @dCache.load(key)
+        il = IntervalList.new
+        il << Interval.new(@project['start'], @project['end'])
+        if @property.leaf?
+          unless (resources = a('assignedresources')).empty?
+            # The task has assigned resources, so we can use their common time
+            # off intervals.
+            resources.each do |resource|
+              il &= resource.collectTimeOffIntervals(@scenarioIdx, iv,
+                                                     minDuration)
+            end
+          else
+            # The task has no assigned resources. We simply use the global time
+            # off intervals.
+            il &= @project.collectTimeOffIntervals(iv, minDuration)
+          end
+        else
+          @property.children.each do |task|
+            il &= task.collectTimeOffIntervals(@scenarioIdx, iv, minDuration)
+          end
+        end
+
+        il
       end
     end
 
@@ -1547,8 +1626,8 @@ class TaskJuggler
       elsif a('effort') > 0
         bookResources(slot, slotDuration) if @doneEffort < a('effort')
         if @doneEffort >= a('effort')
-          # The specified effort has been reached. The has been fully scheduled
-          # now.
+          # The specified effort has been reached. The task has been fully
+          # scheduled now.
           if a('forward')
             propagateDate(@tentativeEnd, true)
           else
@@ -1694,11 +1773,17 @@ class TaskJuggler
 
         if r.book(@scenarioIdx, sbIdx, @property)
 
-          if a('assignedresources').empty?
+          if a('effort') > 0 && a('assignedresources').empty?
             if a('forward')
               @property['start', @scenarioIdx] = @project.idxToDate(sbIdx)
+              a('startsuccs').each do |task, onEnd|
+                task.propagateDate(@scenarioIdx, a('start'), false)
+              end
             else
               @property['end', @scenarioIdx] = @project.idxToDate(sbIdx + 1)
+              a('endpreds').each do |task, onEnd|
+                task.propagateDate(@scenarioIdx, a('end'), true)
+              end
             end
           end
 
@@ -1827,6 +1912,69 @@ class TaskJuggler
       false
     end
 
+    def hasStrongDeps(thisEnd)
+      # A dependency that could determine the date on this side of the
+      # dependency is a strong dependency. If the scheduling direction of the
+      # task on the other side leads away from the dependency point, then the
+      # dependency is weak. This date will influence the other date for weak
+      # dependencies.
+      #
+      # +---          SS -> SP> : Weak
+      # |-+           SS -> SP< : Illegal
+      # +-|-          SP -> SS> : Strong
+      #   | +---      SP -> SS< : Illegal
+      #   +-|
+      #     +---
+      #
+      #
+      # ---+          ES -> SP> : Weak
+      #    |-+        ES -> SP< : Strong
+      # ---+ |        SP -> ES> : Strong
+      #      | +---   SP -> ES< : Weak
+      #      +-|
+      #        +---
+      #
+      #
+      # ---+          ES -> EP> : Illegal
+      #    |-+        ES -> EP< : Strong
+      # ---+ |        EP -> ES> : Illegal
+      #     -|-+      EP -> ES< : Weak
+      #      +-|
+      #     ---+
+      #
+      # All other combinations are illegal and should be caught earlier. So,
+      # illegal values can be considered don't care values.
+      #
+      # f/t SP> SP< SS> SS< EP> EP< ES> ES<
+      # SP  x   x   S   x   x   x   S   W     Row 1
+      # SS  W   x   x   x   x   x   x   x     Row 2
+      # EP  x   x   x   x   x   x   x   W     Row 3
+      # ES  W   S   x   x   x   S   x   x     Row 4
+      if thisEnd == 'start'
+        # Row 1
+        a('startpreds').each do |task, onEnd|
+          if (onEnd && (task['forward', @scenarioIdx] ||
+                        task['end', @scenarioIdx])) ||
+             (!onEnd && (task['forward', @scenarioIdx] ||
+                         task['start']))
+            return true
+          end
+        end
+      else
+        # Row 4
+        a('endsuccs').each do |task, onEnd|
+          if (onEnd && (!task['forward', @scenarioIdx] ||
+                        task['end', @scenarioIdx])) ||
+             (!onEnd && (!task['forward', @scenarioIdx] ||
+                         task['start', @scenarioIdx]))
+            return true
+          end
+        end
+      end
+
+      false
+    end
+
     def markAsRunaway
       warning('runaway', "Task #{@property.fullId} does not fit into " +
                          "project time frame")
@@ -1944,19 +2092,19 @@ class TaskJuggler
       maxCriticalness = 0.0
       # Gather a list of all end-successors of this task and its parent task.
       tList = []
+      depStruct = Struct.new(:task, :onEnd)
       p = @property
       while (p)
         p['endsuccs', @scenarioIdx].each do |task, onEnd|
-          tList << [ task, onEnd ] unless tList.include?([ task, onEnd ])
+          dep = depStruct.new(task, onEnd)
+          tList << dep unless tList.include?(dep)
         end
         p = p.parent
       end
 
-      tList.each do |task, onEnd|
-        if (criticalness = task.calcPathCriticalness(@scenarioIdx, onEnd)) >
-          maxCriticalness
-          maxCriticalness = criticalness
-        end
+      tList.each do |dep|
+        criticalness = dep.task.calcPathCriticalness(@scenarioIdx, dep.onEnd)
+        maxCriticalness = criticalness if criticalness > maxCriticalness
       end
 
       maxCriticalness
@@ -2126,6 +2274,42 @@ class TaskJuggler
       amount
     end
 
+    def generateDepencyListItem(mode, task, dep, date)
+      str =
+        case mode
+        when 1
+          "#{task.fullId} #{dep} #{date}"
+        when 2
+          "#{task.name} #{dep} #{date}"
+        when 3, nil
+          "#{task.name} (#{task.fullId}) #{dep} #{date}"
+        when 4
+          "#{task.fullId}: #{task.name} #{dep} #{date}"
+        when 5
+          "#{task.fullId} #{dep}"
+        when 6
+          "#{task.name} #{dep}"
+        when 7
+          "#{task.name} (#{task.fullId}) #{dep}"
+        when 8
+          "#{task.fullId}: #{task.name} #{dep}"
+        when 9
+          "#{task.fullId}"
+        when 10
+          "#{task.name}"
+        when 11
+          "#{task.name} (#{task.fullId})"
+        when 12
+          "#{task.fullId}: #{task.name}"
+        else
+          error('bad_listmode_deps',
+                "Unsupported list mode #{query.listMode} used for " +
+                "dependency column. Use 1 - 12.")
+        end
+
+      "* <nowiki>#{str}</nowiki>"
+    end
+
   end
 
 end