taskjuggler 3.4.0 → 3.5.0

data/lib/taskjuggler/Query.rb

@@ -3,7 +3,7 @@
 #
 # = Query.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
@@ -123,7 +123,7 @@ class TaskJuggler
       reset
       begin
         # Resolve property reference from property ID.
-        if @property.nil? && !@propertyId.nil?
+        if @propertyId && (@property.nil? || @propertyId[0] == '!')
           @property = resolvePropertyId(@propertyType, @propertyId)
           unless @property
             @errorMessage = "Unknown property #{@propertyId} queried"
@@ -297,15 +297,28 @@ class TaskJuggler
       unless @project
         raise "Need Project reference to process the query"
       end
-      case pType
-      when :Account
-        @project.account(pId)
-      when :Task
-        @project.task(pId)
-      when:Resource
-        @project.resource(pId)
+      if pId[0] == '!'
+        # This is the case where the property ID is just a sequence of
+        # exclamation marks. Each one moves the scope 1 level up from the
+        # current level.
+        pId.each_utf8_char do |c|
+          if c == '!'
+            @property = @property.parent
+          end
+          break unless @property
+        end
+        @property
       else
-        raise "Unknown property type #{pType}"
+        case pType
+        when :Account
+          @project.account(pId)
+        when :Task
+          @project.task(pId)
+        when:Resource
+          @project.resource(pId)
+        else
+          raise "Unknown property type #{pType}"
+        end
       end
     end
 

data/lib/taskjuggler/RealFormat.rb

@@ -3,7 +3,7 @@
 #
 # = RealFormat.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/Resource.rb

@@ -3,7 +3,7 @@
 #
 # = Resource.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/ResourceScenario.rb

@@ -3,7 +3,7 @@
 #
 # = ResourceScenario.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
@@ -199,6 +199,7 @@ class TaskJuggler
       # Track the total allocated slots for this resource.
       @effort += @efficiency
       @limits.inc(sbIdx) if @limits
+      task.incLimits(@scenarioIdx, sbIdx, @property)
 
       # Scoreboard iterations are fairly expensive but they are very frequent
       # operations in later processing. To limit the interations to the
@@ -742,11 +743,15 @@ class TaskJuggler
 
     # Get the first available slot of the resource.
     def getMinSlot
+      initScoreboard unless @minslot
+
       @minslot
     end
 
     # Get the last available slot of the resource.
     def getMaxSlot
+      initScoreboard unless @maxslot
+
       @maxslot
     end
 

data/lib/taskjuggler/RichText.rb

@@ -3,7 +3,7 @@
 #
 # = RichText.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/RichText/Document.rb

@@ -3,7 +3,7 @@
 #
 # = Document.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/RichText/Element.rb

@@ -3,7 +3,7 @@
 #
 # = Element.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/RichText/FunctionExample.rb

@@ -3,7 +3,7 @@
 #
 # = FunctionExample.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
@@ -40,8 +40,8 @@ class TaskJuggler
       tag = args['tag']
 
       example = TjpExample.new
-      fileName = AppConfig.dataDirs('test')[0] +
-                 "TestSuite/Syntax/Correct/#{file}.tjp"
+      fileName = File.join(AppConfig.dataDirs('test')[0], 'TestSuite',
+                           'Syntax', 'Correct', "#{file}.tjp")
       example.open(fileName)
       frame = XMLElement.new('div', 'class' => 'codeframe')
       frame << (pre = XMLElement.new('pre', 'class' => 'code'))

data/lib/taskjuggler/RichText/FunctionHandler.rb

@@ -3,7 +3,7 @@
 #
 # = FunctionHandler.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/RichText/Parser.rb

@@ -3,7 +3,7 @@
 #
 # = Parser.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/RichText/RTFHandlers.rb

@@ -3,7 +3,7 @@
 #
 # = RTFHandlers.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/RichText/RTFNavigator.rb

@@ -3,7 +3,7 @@
 #
 # = RTFNavigator.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/RichText/RTFQuery.rb

@@ -3,7 +3,7 @@
 #
 # = RTFQuery.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
@@ -86,7 +86,8 @@ class TaskJuggler
           SimpleQueryExpander.new(value, @query, @sourceFileInfo).expand
       end
 
-      if (expandedArgs['property'] || expandedArgs['scopeproperty']) &&
+      if ((expandedArgs['property'] && expandedArgs['property'][0] != '!') ||
+          expandedArgs['scopeproperty']) &&
           !(expandedArgs['family'] || @query.propertyType)
         error('missing_family',
               "If you provide a property or scope property you need to " +
@@ -99,7 +100,7 @@ class TaskJuggler
       # with the easy ones.
       if expandedArgs['property']
         query.propertyId = expandedArgs['property']
-        query.property = nil
+        query.property = nil unless query.propertyId[0] == '!'
       end
       if expandedArgs['scopeproperty']
         query.scopePropertyId = expandedArgs['scopeproperty']

data/lib/taskjuggler/RichText/RTFReport.rb

@@ -3,7 +3,7 @@
 #
 # = RTFReport.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/RichText/RTFReportLink.rb

@@ -3,7 +3,7 @@
 #
 # = RTFReportLink.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/RichText/RTFWithQuerySupport.rb

@@ -3,7 +3,7 @@
 #
 # = RTFWithQuerySupport.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/RichText/Scanner.rb

@@ -3,7 +3,7 @@
 #
 # = Scanner.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
@@ -145,6 +145,7 @@ class TaskJuggler
     end
 
     def fontColorStart(type, match)
+      self.mode = :inline
       # Extract color name from <fcol:colname>
       colName = match[6..-2]
       if colName =~ /#([0-9A-Fa-f]{3}|[0-9A-Fa-f]{6})/

data/lib/taskjuggler/RichText/Snip.rb

@@ -3,7 +3,7 @@
 #
 # = Snip.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/RichText/SyntaxRules.rb

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

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

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

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

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

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

@@ -3,7 +3,7 @@
 #
 # = Scoreboard.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,16 +144,18 @@ class TaskJuggler
       # index.
       duration = start = 0
 
-      startIdx.upto(endIdx) do |idx|
-        # Check whether the scoreboard slot matches any of the target values.
-        if yield(@sb[idx])
+      idx = startIdx
+      loop do
+        # Check whether the scoreboard slot matches any of the target values
+        # and we have not yet reached the last slot.
+        if yield(@sb[idx]) && idx < endIdx
           # If so, save the start position if this is the first slot and start
           # counting the matching slots.
           start = idx if start == 0
           duration += 1
         else
-          # If we don't have a match, check if we've just finished a matching
-          # interval.
+          # If we don't have a match or are at the end of the interval, check
+          # if we've just finished a matching interval.
           if duration > 0
             if duration >= minDuration
               # Make sure that all intervals are within the originally
@@ -166,7 +168,9 @@ class TaskJuggler
             duration = start = 0
           end
         end
+        break if (idx += 1) > endIdx
       end
+
       intervals
     end
 

data/lib/taskjuggler/SheetHandlerBase.rb

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

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

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

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

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

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

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