taskjuggler 3.4.0 → 3.5.0

data/lib/taskjuggler/StatusSheetReceiver.rb

@@ -3,7 +3,7 @@
 #
 # = StatusSheetReceiver.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/StatusSheetSender.rb

@@ -3,7 +3,7 @@
 #
 # = StatusSheetSender.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/StdIoWrapper.rb

@@ -3,7 +3,7 @@
 #
 # = StdIoWrapper.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/SyntaxReference.rb

@@ -3,7 +3,7 @@
 #
 # = SyntaxReference.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -176,7 +176,21 @@ class TaskJuggler
       head << XMLElement.new('base', 'target' => 'navigator')
       html.html << (body = XMLElement.new('body'))
 
+      body << (divf = XMLElement.new('div'))
+      divf << (form = XMLElement.new(
+        'form', 'action' => 'http://www.google.com/search',
+        'method' => "get", 'target' => '_blank', 'style' => 'margin:0'))
+      form << XMLElement.new('input', 'type' => 'text',
+                             'value' => '',
+                             'maxlength' => '255',
+                             'size' => '25',
+                             'name' => 'q')
+      form << XMLElement.new('input', 'type' => 'submit', 'value' => 'Search')
+      form << XMLElement.new('input', 'type' => 'hidden',
+                             'value' => 'taskjuggler.org/manual',
+                             'name' => 'sitesearch')
       body << (h3 = XMLElement.new('h3'))
+
       letters.each do |l|
         h3 << XMLNamedText.new(l.upcase, 'a',
                                'href' => "navbar.html##{l}")

data/lib/taskjuggler/TableColumnDefinition.rb

@@ -3,7 +3,7 @@
 #
 # = TableColumnDefinition.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/TableColumnSorter.rb

@@ -3,7 +3,7 @@
 #
 # = TableColumnSorter.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/Task.rb

@@ -3,7 +3,7 @@
 #
 # = Task.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/TaskDependency.rb

@@ -3,7 +3,7 @@
 #
 # = TaskDependency.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/TaskJuggler.rb

@@ -3,7 +3,7 @@
 #
 # = TaskJuggler.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -144,10 +144,13 @@ class TaskJuggler
   # Generate all specified reports. The project must have be scheduled before
   # this method can be called. It returns true if no error occured, false
   # otherwise.
-  def generateReports(outputDir = './')
+  def generateReports(outputDir = nil)
     @project.checkReports
-    outputDir += '/' unless outputDir.empty? || outputDir[-1] == '/'
-    @project.outputDir = outputDir
+    if outputDir
+      # Make sure the output directory path always ends with a '/' unless empty.
+      outputDir += '/' unless outputDir.empty? || outputDir[-1] == '/'
+      @project.outputDir = outputDir
+    end
     Log.enter('reports', 'Generating reports ...')
 
     begin

data/lib/taskjuggler/TaskScenario.rb

@@ -3,7 +3,7 @@
 #
 # = TaskScenario.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -119,6 +119,8 @@ class TaskJuggler
         task = task.parent
       end
 
+      @contendedResources = Hash.new { |hash, key| hash[key] = Hash.new(0) }
+
       # Collect the mandatory allocations.
       @mandatories = []
       @allocate.each do |allocation|
@@ -504,34 +506,21 @@ class TaskJuggler
         task = dependency.task
         limit = task[dependency.onEnd ? 'end' : 'start', @scenarioIdx]
         next if limit.nil?
-        if @start < limit
+        if @start < limit ||
+           (dependency.gapDuration > 0 &&
+            limit + dependency.gapDuration > @start) ||
+           (dependency.gapLength > 0 &&
+            calcLength(limit, @start) < dependency.gapLength)
           error('task_pred_before',
-                "Task #{@property.fullId} (#{@start}) must start after " +
+                "Task #{@property.fullId} (#{@start}) must start " +
+                (dependency.gapDuration > 0 ?
+                  "#{dependency.gapDuration / (60 * 60 * 24)} days " :
+                  (dependency.gapLength > 0 ?
+                    "#{@project.slotsToDays(dependency.gapLength)} " +
+                    "working days " : '')) +
+                "after " +
                 "#{dependency.onEnd ? 'end' : 'start'} (#{limit}) of task " +
-                "#{task.fullId}.")
-        end
-        if dependency.gapDuration > 0
-          if limit + dependency.gapDuration > @start
-            error('task_pred_before_gd',
-                  "Task #{@property.fullId} must start " +
-                  "#{dependency.gapDuration / (60 * 60 * 24)} days after " +
-                  "#{dependency.onEnd ? 'end' : 'start'} of task " +
-                  "#{task.fullId}. TaskJuggler cannot enforce this condition " +
-                  "because the task is scheduled ALAP (finish-to-start) or " +
-                  "has a fixed #{dependency.onEnd ? 'end' : 'start'} date.")
-          end
-        end
-        if dependency.gapLength > 0
-          if calcLength(limit, @start) < dependency.gapLength
-            error('task_pred_before_gl',
-                  "Task #{@property.fullId} must start " +
-                  "#{@project.slotsToDays(dependency.gapLength)} " +
-                  "working days after " +
-                  "#{dependency.onEnd ? 'end' : 'start'} of task " +
-                  "#{task.fullId}. TaskJuggler cannot enforce this condition " +
-                  "because the task is scheduled ALAP (finish-to-start) or " +
-                  "has a fixed #{dependency.onEnd ? 'end' : 'start'} date.")
-          end
+                "#{task.fullId}. This condition could not be met.")
         end
       end
 
@@ -540,34 +529,21 @@ class TaskJuggler
         task = dependency.task
         limit = task[dependency.onEnd ? 'end' : 'start', @scenarioIdx]
         next if limit.nil?
-        if limit < @end
+        if limit < @end ||
+           (dependency.gapDuration > 0 &&
+            limit - dependency.gapDuration < @end) ||
+           (dependency.gapLength > 0 &&
+            calcLength(@end, limit) < dependency.gapLength)
           error('task_succ_after',
-                "Task #{@property.fullId} (#{@end}) must end before " +
+                "Task #{@property.fullId} (#{@end}) must end " +
+                (dependency.gapDuration > 0 ?
+                   "#{dependency.gapDuration / (60 * 60 * 24)} days " :
+                   (dependency.gapLength > 0 ?
+                     "#{@project.slotsToDays(dependency.gapLength)} " +
+                     "working days " : '')) +
+                "before " +
                 "#{dependency.onEnd ? 'end' : 'start'} (#{limit}) of task " +
-                "#{task.fullId}.")
-        end
-        if dependency.gapDuration > 0
-          if limit - dependency.gapDuration < @end
-            error('task_succ_after_gd',
-                  "Task #{@property.fullId} must end " +
-                  "#{dependency.gapDuration / (60 * 60 * 24)} days before " +
-                  "#{dependency.onEnd ? 'end' : 'start'} of task " +
-                  "#{task.fullId}. TaskJuggler cannot enforce this condition " +
-                  "because the task is scheduled ASAP (start-to-finish) or " +
-                  "has a fixed #{dependency.onEnd ? 'end' : 'start'} date.")
-          end
-        end
-        if dependency.gapLength > 0
-          if calcLength(@end, limit) < dependency.gapLength
-            error('task_succ_after_gl',
-                  "Task #{@property.fullId} must end " +
-                  "#{@project.slotsToDays(dependency.gapLength)} " +
-                  "working days before " +
-                  "#{dependency.onEnd ? 'end' : 'start'} of task " +
-                  "#{task.fullId}. TaskJuggler cannot enforce this condition " +
-                  "because the task is scheduled ASAP (start-to-finish) or " +
-                  "has a fixed #{dependency.onEnd ? 'end' : 'start'} date.")
-          end
+                "#{task.fullId}. This condition could not be met.")
         end
       end
 
@@ -994,6 +970,15 @@ class TaskJuggler
       # For leaf tasks, propagate start may set the date. Container task dates
       # are only set in scheduleContainer().
       if @property.leaf?
+        # If we already have a date, we will only shrink the task period with
+        # the new date.
+        if (setDate = instance_variable_get('@' + thisEnd)) &&
+           atEnd ? date > setDate : date < setDate
+          Log.msg { "Preserving #{thisEnd} date of #{typename} " +
+                    "#{@property.fullId}: #{setDate}" }
+          return
+        end
+
         instance_variable_set(('@' + thisEnd).intern, date)
         typename = 'Task'
         if @durationType == :startEndTask
@@ -1203,10 +1188,10 @@ class TaskJuggler
       # task B depends on A and they are specified this way:
       # task A: | --> D-
       # task B: -D <-- |
-      if @end && startDate > @end
-        error('weak_start_dep',
-              "Task #{@property.fullId} has a too weak start dependencies " +
-              "to be scheduled properly.")
+      if @end && (startDate.nil? || startDate > @end)
+        error('impossible_start_dep',
+              "Task #{@property.fullId} has start date dependencies " +
+              "that conflict with the end date #{@end}.")
       end
 
       startDate
@@ -1260,10 +1245,10 @@ class TaskJuggler
       # task A precedes B and they are specified this way:
       # task A: | --> D-
       # task B: -D <-- |
-      if @start && (endDate.nil? || endDate > @start)
-        error('weak_end_dep',
-              "Task #{@property.fullId} has a too weak end dependencies " +
-              "to be scheduled properly.")
+      if @start && (endDate.nil? || endDate < @start)
+        error('impossible_end_dep',
+              "Task #{@property.fullId} has end date dependencies " +
+              "that conflict with the start date #{@start}.")
       end
 
       endDate
@@ -1341,7 +1326,6 @@ class TaskJuggler
       query.string = query.scaleLoad(effort)
     end
 
-
     # The remaining (as of 'now') effort allocated for the task in the
     # specified interval.  In case a Resource is given as scope property only
     # the effort allocated for this resource is taken into account.
@@ -1755,7 +1739,7 @@ class TaskJuggler
       when :lengthTask
         bookResources
         # The doneLength is only increased for global working time slots.
-        @doneLength += 1 if @project.isWorkingTime(@currentSlotIdx)
+        @doneLength += 1 if onShift?(@currentSlotIdx)
 
         # If we have reached the specified duration or lengths, we set the end
         # or start date and propagate the value to neighbouring tasks.
@@ -1931,11 +1915,6 @@ class TaskJuggler
           end
 
           @doneEffort += r['efficiency', @scenarioIdx]
-          # Limits do not take efficiency into account. Limits are usage limits,
-          # not effort limits.
-          @allLimits.each do |limit|
-            limit.inc(@currentSlotIdx, resource)
-          end
 
           unless @assignedresources.include?(r)
             @assignedresources << r
@@ -1946,12 +1925,21 @@ class TaskJuggler
           # the same resources and are potentially delaying the progress of
           # this Task.
           @competitors << competitor unless @competitors.include?(competitor)
+          @contendedResources[competitor][r] += 1
         end
       end
 
       booked
     end
 
+    def onShift?(sbIdx)
+      if @shifts && @shifts.assigned?(sbIdx)
+        return @shifts.onShift?(sbIdx)
+      else
+        return @project.isWorkingTime(sbIdx)
+      end
+    end
+
     # Check if all of the task limits are not exceded at the given _sbIdx_. If
     # a _resource_ is provided, the limit for that particular resource is
     # checked. If no resource is provided, only non-resource-specific limits
@@ -1963,6 +1951,15 @@ class TaskJuggler
       true
     end
 
+    # Limits do not take efficiency into account. Limits are usage limits, not
+    # effort limits.
+    def incLimits(sbIdx, resource = nil)
+      @allLimits.each do |limit|
+        limit.inc(sbIdx, resource)
+      end
+    end
+
+
     # Calculate the number of general working time slots between the TjTime
     # objects _d1_ and _d2_.
     def calcLength(d1, d2)
@@ -2041,7 +2038,7 @@ class TaskJuggler
           startIdx = @project.dateToIdx(date = @start)
           endIdx = @project.dateToIdx(@project['now'])
           startIdx.upto(endIdx) do |idx|
-            @doneLength += 1 if @project.isWorkingTime(idx)
+            @doneLength += 1 if onShift?(idx)
             date += slotDuration
             # Continue not only until the @length has been reached, but also
             # the tentativeEnd date. This allows us to detect overbookings.
@@ -2169,15 +2166,41 @@ class TaskJuggler
     end
 
     def markAsRunaway
-      warning('runaway', "Task #{@property.fullId} does not fit into " +
-                         "project time frame")
-
       @isRunAway = true
+      remainingEffort =
+        @project.convertToDailyLoad(@project['scheduleGranularity'] *
+            (@effort - @doneEffort))
+      warning('runaway', "#{remainingEffort}d of effort of task " +
+                         "#{@property.fullId} " +
+                         "does not fit into the project time frame. ")
+      unless @competitors.empty?
+        multi = @competitors.length > 1
+        info('runaway_tasks',
+             "The following task#{multi ? 's' : ''} " +
+             "compete#{multi ? '' : 's'} for the same resources that " +
+             "this task is requesting: ")
+        @competitors.each do |t|
+          res = @contendedResources[t].to_a
+          res.sort! { |i, j| j[1] <=> i[1] }
+          resList = res.map { |r| "#{r[0].id}(#{r[1]})" }.join(', ')
+          info('runaway_competitor',
+               "Task #{t.fullId} has conflicts for the following " +
+               "resource#{res.length > 1 ? 's' : ''}: #{resList}",
+               t.sourceFileInfo)
+        end
+      end
     end
 
     # This function determines if a task is a milestones and marks it
     # accordingly.
     def markAsMilestone
+      # Containers may not be milestones
+      if @milestone && @property.container?
+        error('container_milestone',
+              "Container task #{@property.fullId} may not be marked " +
+              "as a milestone.")
+      end
+
       return if @property.container? || @hasDurationSpec ||
         !@booking.empty? || !@allocate.empty?
 

data/lib/taskjuggler/TernarySearchTree.rb

@@ -3,7 +3,7 @@
 #
 # = TernarySearchTree.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/TextFormatter.rb

@@ -3,7 +3,7 @@
 #
 # = TextFormatter.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/TextParser.rb

@@ -3,7 +3,7 @@
 #
 # = TextParser.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/TextParser/MacroTable.rb

@@ -3,7 +3,7 @@
 #
 # = MacroTable.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/TextParser/Pattern.rb

@@ -3,7 +3,7 @@
 #
 # = Pattern.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify