taskjuggler 3.5.0 → 3.6.0

data/lib/taskjuggler/Task.rb

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

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

@@ -3,8 +3,8 @@
 #
 # = TaskJuggler.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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
@@ -232,7 +232,7 @@ class TaskJuggler
       bookingsFileBase = masterFileBase + '-bookings'
       bookingsFile = bookingsFileBase + '.tji'
 
-      if !File.exists?(bookingsFile) || !File.exists?(headerFile)
+      if !File.exist?(bookingsFile) || !File.exist?(headerFile)
         info('incl_freeze_files',
              "Please make sure you include #{headerFile} at " +
              "the end of the project header and " +
@@ -350,7 +350,6 @@ class TaskJuggler
                      'property' => ss[0],
                      'scopeProperty' => nil,
                      'scenarioIdx' => @project['trackingScenarioIdx'],
-                     'timeFormat' => '%Y-%m-%d',
                      'start' => ss[1],
                      'end' => ss[2],
                      'timeFormat' => '%Y-%m-%d',

data/lib/taskjuggler/TaskScenario.rb

@@ -3,8 +3,8 @@
 #
 # = TaskScenario.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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
@@ -28,11 +28,25 @@ class TaskJuggler
       # have to check for existance each time we access them.
       %w( allocate assignedresources booking charge chargeset complete
           competitors criticalness depends duration
-          effort end forward gauge length
+          effort effortdone effortleft end forward gauge length
           maxend maxstart minend minstart milestone pathcriticalness
-          precedes priority scheduled shifts start status ).each do |attr|
+          precedes priority projectionmode responsible
+          scheduled shifts start status ).each do |attr|
         @property[attr, @scenarioIdx]
       end
+      unless @property.parent
+        # The projectionmode attributes is a scenario specific attribute that
+        # can be inherited from the project. The normal inherit-from-project
+        # mechanism does not support scenario specific inheritance. We have to
+        # deal with this separately here. To make it look like a regularly
+        # inherted value, we need to switch the AttributeBase mode and restore
+        # it afterwards.
+          mode = AttributeBase.mode
+          AttributeBase.setMode(1)
+          @property['projectionmode', @scenarioIdx] =
+            @project.scenario(@scenarioIdx).get('projection')
+          AttributeBase.setMode(mode)
+      end
 
       # A list of all allocated leaf resources.
       @candidates = []
@@ -42,15 +56,17 @@ class TaskJuggler
     def markAsScheduled
       return if @scheduled
       @scheduled = true
-      if @milestone
-        typename = 'Milestone'
-      elsif @property.leaf?
-        typename = 'Task'
-      else
-        typename = 'Container'
-      end
 
-      Log.msg { "#{typename} #{@property.fullId} has been scheduled." }
+      Log.msg do
+        if @milestone
+          typename = 'Milestone'
+        elsif @property.leaf?
+          typename = 'Task'
+        else
+          typename = 'Container'
+        end
+        "#{typename} #{@property.fullId} has been scheduled."
+      end
     end
 
     # Call this function to reset all scheduling related data prior to
@@ -71,7 +87,6 @@ class TaskJuggler
       # Due to the 'efficiency' factor the effort slots must be a float.
       @doneEffort = 0.0
 
-      @projectionMode = @project.scenario(@scenarioIdx).get('projection')
       @nowIdx = @project.dateToIdx(@project['now'])
 
       @startIsDetermed = nil
@@ -203,6 +218,17 @@ class TaskJuggler
         end
       end
 
+      @responsible.map! do |resourceId|
+        # 'resource' is still just an ID and needs to be converted into a
+        # Resource.
+        if (resource = @project.resource(resourceId)).nil?
+          error('resource_id_expected', "#{resourceId} is not a defined " +
+                'resource.', @sourceFileInfo)
+        end
+        resource
+      end
+      @responsible.uniq!
+
       # Leaf tasks can be turned into containers after bookings have been added.
       # We need to check for this.
       unless @property.leaf? || @booking.empty?
@@ -918,7 +944,7 @@ class TaskJuggler
         # the tasks has allocations.
         if @currentSlotIdx.nil?
           @currentSlotIdx = @project.dateToIdx(
-            @projectionMode && (@project['now'] > @start) && !@allocate.empty? ?
+            @projectionmode && (@project['now'] > @start) && !@allocate.empty? ?
             @project['now'] : @start)
         end
       else
@@ -956,7 +982,7 @@ class TaskJuggler
                         "to task #{@property.id}")
       thisEnd = atEnd ? 'end' : 'start'
       otherEnd = atEnd ? 'start' : 'end'
-      #puts "Propagating #{thisEnd} date #{date} of #{@property.fullId} " +
+      #puts "Propagating #{thisEnd} date #{date} to #{@property.fullId} " +
       #     "#{ignoreEffort ? "ignoring effort" : "" }"
 
       # These flags are just used to avoid duplicate calls of this function
@@ -1318,11 +1344,16 @@ class TaskJuggler
     # specified interval.  In case a Resource is given as scope property only
     # the effort allocated for this resource is taken into account.
     def query_effortdone(query)
-      # For this query, we always override the query period.
-      query.sortable = query.numerical = effort =
-        getEffectiveWork(@project.dateToIdx(@project['start'], false),
-                         @project.dateToIdx(@project['now']),
-                         query.scopeProperty)
+      if @effortdone
+        effort = @project.convertToDailyLoad(@effortdone *
+                                             @project['scheduleGranularity'])
+      else
+        # For this query, we always override the query period.
+        effort = getEffectiveWork(@project.dateToIdx(@project['start'], false),
+                                  @project.dateToIdx(@project['now']),
+                                  query.scopeProperty)
+      end
+      query.sortable = query.numerical = effort
       query.string = query.scaleLoad(effort)
     end
 
@@ -1773,7 +1804,7 @@ class TaskJuggler
 
         # Depending on the scheduling direction we can mark the task as
         # scheduled once we have reached the other end.
-        if (@forward && @currentSlotIdx >= @endIdx) |
+        if (@forward && @currentSlotIdx >= @endIdx) ||
            (!@forward && @currentSlotIdx <= @startIdx)
           markAsScheduled
           @property.parents.each do |parent|
@@ -1791,7 +1822,7 @@ class TaskJuggler
     def bookResources
       # First check if there is any resource at all for this slot.
       return if !@project.anyResourceAvailable?(@currentSlotIdx) ||
-                (@projectionMode && (@nowIdx > @currentSlotIdx))
+                (@projectionmode && (@nowIdx > @currentSlotIdx))
 
 
       # If the task has resource independent allocation limits we need to make
@@ -1896,21 +1927,15 @@ class TaskJuggler
           # For effort based task we adjust the the start end (as defined by
           # the scheduling direction) to align with the first booked time
           # slot.
-          if @effort > 0 && @assignedresources.empty?
+          if @effort > 0 && @doneEffort == 0
             if @forward
-              @start = @project.idxToDate(@currentSlotIdx)
+              propagateDate(@project.idxToDate(@currentSlotIdx), false, true)
               Log.msg { "Task #{@property.fullId} first assignment: " +
                         "#{period_to_s}" }
-              @startsuccs.each do |task, onEnd|
-                task.propagateDate(@scenarioIdx, @start, false, true)
-              end
             else
-              @end = @project.idxToDate(@currentSlotIdx + 1)
+              propagateDate(@project.idxToDate(@currentSlotIdx + 1), true, true)
               Log.msg { "Task #{@property.fullId} last assignment: " +
                         "#{period_to_s}" }
-              @endpreds.each do |task, onEnd|
-                task.propagateDate(@scenarioIdx, @end, true, true)
-              end
             end
           end
 
@@ -1977,35 +2002,78 @@ class TaskJuggler
     def bookBookings
       firstSlotIdx = nil
       lastSlotIdx = nil
-      findBookings.each do |booking|
-        unless booking.resource.leaf?
-          error('booking_resource_not_leaf',
-                "Booked resources may not be group resources",
-                booking.sourceFileInfo)
-        end
-        unless @forward || @scheduled
-          error('booking_forward_only',
-                "Only forward scheduled tasks may have booking statements.")
-        end
-        booked = false
-        booking.intervals.each do |interval|
-          startIdx = @project.dateToIdx(interval.start, false)
-          endIdx = @project.dateToIdx(interval.end, false)
-          startIdx.upto(endIdx - 1) do |idx|
-            if booking.resource.bookBooking(@scenarioIdx, idx, booking)
-              # Booking was successful for this time slot.
-              @doneEffort += booking.resource['efficiency', @scenarioIdx]
-              booked = true
-
-              # Store the indexes of the first slot and the slot after the
-              # last slot.
-              firstSlotIdx = idx if !firstSlotIdx || firstSlotIdx > idx
-              lastSlotIdx = idx if !lastSlotIdx || lastSlotIdx < idx
+      if @effortdone || @effortleft
+        # Force task to be scheduled in ASAP mode.
+        @forward = true
+        unless @start
+          error('effort_done_left_start_missing',
+                "Task #{@property.fullId} has 'effortdone' or 'effortleft' " +
+                "attribute but no start date specified.")
+        end
+        unless @effort > 0
+          error('effort_missing',
+                "Task #{@property.fullId} has 'effortdone' or " +
+                "'effortleft' attribute but no 'effort'.")
+        end
+        if @effortdone
+          if @effortdone > @effort
+            error('effort_done_larger_effort',
+                  "Task #{@property.fullId} has larger 'effortdone' " +
+                  "than 'effort'.")
+          end
+          @doneEffort = @effortdone
+          if @effortleft
+            error('effort_done_and_left',
+                  "A task cannot have the 'effortdone' and 'effortleft' " +
+                  "attribute.")
+          end
+        else
+          if @effortleft > @effort
+            error('effort_left_larger_effort',
+                  "Task #{@property.fullId} has larger 'effortleft' " +
+                  "than 'effort'.")
+          end
+          @doneEffort = @effort - @effortleft
+        end
+        firstSlotIdx = @project.dateToIdx(@start)
+        lastSlotIdx = @project.dateToIdx(@project['now'])
+      end
+      unless (bookings = findBookings).empty?
+        if @effortdone || @effortleft
+          error('bookings_and_effort',
+                "Bookings cannot be used together with 'effortdone' or " +
+                "'effortleft' attributes.")
+        end
+        bookings.each do |booking|
+          unless booking.resource.leaf?
+            error('booking_resource_not_leaf',
+                  "Booked resources may not be group resources",
+                  booking.sourceFileInfo)
+          end
+          unless @forward || @scheduled
+            error('booking_forward_only',
+                  "Only forward scheduled tasks may have booking statements.")
+          end
+          booked = false
+          booking.intervals.each do |interval|
+            startIdx = @project.dateToIdx(interval.start, false)
+            endIdx = @project.dateToIdx(interval.end, false)
+            startIdx.upto(endIdx - 1) do |idx|
+              if booking.resource.bookBooking(@scenarioIdx, idx, booking)
+                # Booking was successful for this time slot.
+                @doneEffort += booking.resource['efficiency', @scenarioIdx]
+                booked = true
+
+                # Store the indexes of the first slot and the slot after the
+                # last slot.
+                firstSlotIdx = idx if !firstSlotIdx || firstSlotIdx > idx
+                lastSlotIdx = idx if !lastSlotIdx || lastSlotIdx < idx
+              end
             end
           end
-        end
-        if booked && !@assignedresources.include?(booking.resource)
-          @assignedresources << booking.resource
+          if booked && !@assignedresources.include?(booking.resource)
+            @assignedresources << booking.resource
+          end
         end
       end
 
@@ -2091,8 +2159,8 @@ class TaskJuggler
         requestedLength = @project.slotsToDays(@length)
         warning('overbooked_length',
                 "The total length (#{length}d) of the provided bookings " +
-                "for task #{@property.fullId} exceeds the specified length of " +
-                "#{requestedLength}d.")
+                "for task #{@property.fullId} exceeds the specified length " +
+                "of #{requestedLength}d.")
       end
       if @duration > 0 && @doneDuration > @duration
         duration = @doneDuration * @project['scheduleGranularity'] /
@@ -2104,6 +2172,16 @@ class TaskJuggler
                 "for task #{@property.fullId} exceeds the specified duration " +
                 "of #{requestedDuration}d.")
       end
+
+      # If a task has only bookings but no effort, length or duration and is
+      # not a milestone but marked as being scheduled, we set the start and
+      # end date according to the first/last booking date unless the date has
+      # been set already.
+      if @scheduled && @effort == 0 && @length == 0 && @duration == 0 &&
+         !@milestone
+        @start = @project.idxToDate(firstSlotIdx) unless @start
+        @end = @project.idxToDate(lastSlotIdx + 1) unless @end
+      end
     end
 
     def rollbackBookings

data/lib/taskjuggler/TernarySearchTree.rb

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

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

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

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

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

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

@@ -3,8 +3,8 @@
 #
 # = Scanner.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # 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
@@ -193,7 +193,7 @@ class TaskJuggler::TextParser
       def initialize(buffer, log, textScanner)
         super(log, textScanner)
         begin
-          @stream = StringIO.new(buffer.forceUTF8Encoding)
+          @stream = StringIO.new(buffer)
         rescue
           error('bufferEncoding', $!.message)
         end

data/lib/taskjuggler/TextParser/SourceFileInfo.rb

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