taskjuggler 3.5.0 → 3.6.0

data/lib/taskjuggler/LeaveList.rb

@@ -3,8 +3,8 @@
 #
 # = LeaveList.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,7 +28,8 @@ class TaskJuggler
       :special => 3,
       :sick => 4,
       :unpaid => 5,
-      :holiday => 6
+      :holiday => 6,
+      :unemployed => 7
     }
 
     # Create a new Leave object. _interval_ should be an Interval describing

data/lib/taskjuggler/Limits.rb

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

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

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

@@ -3,8 +3,8 @@
 #
 # = LogicalFunction.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
@@ -250,7 +250,19 @@ class TaskJuggler
         expr.error("Unknown attribute '#{attr}' used for function " +
                    "isvalid()")
       end
-      !property[attr, scenarioIdx].nil?
+      if scenario
+        unless property.attributeDefinition(attr).scenarioSpecific
+          expr.error("Attribute '#{attr}' of property '#{property.fullId}' " +
+                     "is not scenario specific. Don't provide a scenario ID!")
+        end
+        !property[attr, scenarioIdx].nil?
+      else
+        if property.attributeDefinition(attr).scenarioSpecific
+          expr.error("Attribute '#{attr}' of property '#{property.fullId}' " +
+                     "is scenario specific. Please provide a scenario ID!")
+        end
+        !property.get(attr).nil?
+      end
     end
 
     def treelevel(expr, args)

data/lib/taskjuggler/LogicalOperation.rb

@@ -3,8 +3,8 @@
 #
 # = LogicalOperation.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
@@ -195,12 +195,17 @@ class TaskJuggler
       query.scenarioIdx = @scenario.sequenceNo - 1
       query.attributeId = @operand1
       query.process
-      # The logical expressions are mostly about comparing values. So we use
-      # the sortableResult of the Query. This creates some challenges for load
-      # values, as the user is not accustomed to the internal representation
-      # of those.
-      # Convert nil results into empty Strings if necessary
-      query.result || ''
+      if query.ok
+        # The logical expressions are mostly about comparing values. So we use
+        # the sortableResult of the Query. This creates some challenges for load
+        # values, as the user is not accustomed to the internal representation
+        # of those.
+        # Convert nil results into empty Strings if necessary
+        query.result || ''
+      else
+        expr.error(query.errorMessage)
+        query.errorMessage
+      end
     end
 
     # Dumps the LogicalOperation as String. If _query_ is nil, the variable
@@ -241,9 +246,9 @@ class TaskJuggler
     def to_s(query)
       if query
         if query.is_a?(Query)
-          query.property['flags', 0].include(@operand1) ? 'true' : 'false'
+          query.property['flags', 0].include?(@operand1) ? 'true' : 'false'
         else
-          query.flags.include(@operand1) ? 'true' : 'false'
+          query.flags.include?(@operand1) ? 'true' : 'false'
         end
       else
         @operand1

data/lib/taskjuggler/MessageHandler.rb

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

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

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

@@ -3,8 +3,8 @@
 #
 # = Project.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
@@ -264,6 +264,10 @@ class TaskJuggler
               false, false,   true,  0 ],
         [ 'effort',    'Effort',       DurationAttribute,
               false, false,   true,  0 ],
+        [ 'effortdone', 'Completed Effort', FixnumAttribute,
+              false, false,   true,  nil ],
+        [ 'effortleft', 'Remaining Effort', FixnumAttribute,
+              false, false,   true,  nil ],
         [ 'end',       'End',          DateAttribute,
               false, false,   true,  nil ],
         [ 'endpreds',  'End Preds.',   TaskDepListAttribute,
@@ -312,6 +316,8 @@ class TaskJuggler
               true,  false,   true,  [] ],
         [ 'scheduled', 'Scheduled',    BooleanAttribute,
               true,  false,   true,  false ],
+        [ 'projectionmode', 'Projection Mode', BooleanAttribute,
+              true,  false,   true,  false ],
         [ 'seqno',    'No',          FixnumAttribute,
               false, false,   false, nil ],
         [ 'shifts',     'Shifts',      ShiftAssignmentsAttribute,

data/lib/taskjuggler/ProjectFileParser.rb

@@ -3,8 +3,8 @@
 #
 # = ProjectFileParser.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
@@ -105,7 +105,7 @@ class TaskJuggler
       open(attributes, false, true)
       @property = report
       @project = report.project
-      parse(:reportAttributes)
+      parse(:dynamicAttributes)
     end
 
   private

data/lib/taskjuggler/ProjectFileScanner.rb

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

@@ -3,8 +3,8 @@
 #
 # = PropertyList.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
@@ -226,21 +226,14 @@ class TaskJuggler
       unless @propertySet.knownAttribute?(criteria) ||
              @propertySet.hasQuery?(criteria, scIdx)
         raise TjException.new,
-              "Unknown attribute #{criteria} used for sorting criterium"
+              "Unknown attribute '#{criteria}' used for sorting criterium"
       end
-      if scIdx == -1
-        if @propertySet.scenarioSpecific?(criteria)
-          raise TjException.new,
-                "Attribute #{criteria} is scenario specific." +
-                "You must specify a scenario id."
-        end
-      else
+      if @propertySet.scenarioSpecific?(criteria)
         if @propertySet.project.scenario(scIdx).nil?
-          raise TjException.new, "Unknown scenario index #{scIdx} used."
-        end
-        if !@propertySet.scenarioSpecific?(criteria)
-          raise TjException.new, "Attribute #{criteria} is not scenario specific"
+          raise TjException.new, "Unknown scenario index '#{scIdx}' used."
         end
+      else
+        scIdx == -1
       end
       @sortingCriteria.push(criteria)
       @sortingUp.push(up)
@@ -262,7 +255,7 @@ class TaskJuggler
           # real-world projects.
           tree += idx.to_s.rjust(6, '0')
         end
-        property.set('tree', tree)
+        property.force('tree', tree)
       end
     end
 

data/lib/taskjuggler/PropertySet.rb

@@ -3,8 +3,8 @@
 #
 # = PropertySet.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
@@ -139,6 +139,10 @@ class TaskJuggler
       @attributeDefinitions[attrId].userDefined
     end
 
+    def listAttribute?(attrId)
+      (ad = @attributeDefinitions[attrId]) && ad.objClass.isList?
+    end
+
     # Return the default value of the attribute.
     def defaultValue(attrId)
       return nil if @attributeDefinitions[attrId].nil?

data/lib/taskjuggler/PropertyTreeNode.rb

@@ -3,8 +3,8 @@
 #
 # = PropertyTreeNode.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
@@ -590,6 +590,24 @@ class TaskJuggler
       end
     end
 
+    def query_children(query)
+      list = []
+      kids.each do |property|
+        if query.listItem
+          rti = RichText.new(query.listItem, RTFHandlers.create(@project)).
+            generateIntermediateFormat
+          q = query.dup
+          q.property = property
+          rti.setQuery(q)
+          list << "<nowiki>#{rti.to_s}</nowiki>"
+        else
+          list << "<nowiki>#{property.name} (#{property.fullId})</nowiki>"
+        end
+      end
+
+      query.assignList(list)
+    end
+
     def query_journal(query)
       @project['journal'].to_rti(query)
     end

data/lib/taskjuggler/Query.rb

@@ -3,8 +3,8 @@
 #
 # = Query.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
@@ -126,7 +126,7 @@ class TaskJuggler
         if @propertyId && (@property.nil? || @propertyId[0] == '!')
           @property = resolvePropertyId(@propertyType, @propertyId)
           unless @property
-            @errorMessage = "Unknown property #{@propertyId} queried"
+            @errorMessage = "Unknown property '#{@propertyId}' queried"
             return @ok = false
           end
         end
@@ -197,8 +197,13 @@ class TaskJuggler
             raise ArgumentError unless aType
             scIdx = aType.scenarioSpecific ? @scenarioIdx : nil
             @attr = @property.getAttribute(@attributeId, scIdx)
+            if @attr.nil? && @attr.is_a?(DateAttribute)
+              @errorMessage = "Attribute '#{@attributeId}' of property " +
+                "'#{@property.fullId}' has undefined value."
+              return @ok = false
+            end
           rescue ArgumentError
-            @errorMessage = "Unknown attribute #{@attributeId} queried"
+            @errorMessage = "Unknown attribute '#{@attributeId}' queried"
             return @ok = false
           end
         end

data/lib/taskjuggler/RealFormat.rb

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

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

@@ -3,8 +3,8 @@
 #
 # = ResourceScenario.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
@@ -26,14 +26,7 @@ class TaskJuggler
       # Bit 0:      Reserved
       # Bit 1:      0: Work time (as defined by working hours)
       #             1: No work time (as defined by working hours)
-      # Bit 2 - 5:  0: No holiday or leave time
-      #             1: Public holiday (holiday)
-      #             2: Annual leave
-      #             3: Special leave
-      #             4: Sick leave
-      #             5: unpaid leave
-      #             6: blocked for other projects
-      #             7 - 15: Reserved
+      # Bit 2 - 5:  See Leave class for acutal values.
       # Bit 6 - 7:  Reserved
       # Bit 8:      0: No global override
       #             1: Override global setting
@@ -73,8 +66,6 @@ class TaskJuggler
     def prepareScheduling
       @effort = 0
       initScoreboard if @property.leaf?
-
-      setDirectReports
     end
 
     # The criticalness of a resource is a measure for the probabilty that all
@@ -97,17 +88,35 @@ class TaskJuggler
     end
 
     def setDirectReports
-      # Only leaf resources have reporting lines.
-      return unless @property.leaf?
-
-      # The 'directreports' attribute is the reverse link for the 'managers'
-      # attribute. In contrast to the 'managers' attribute, the
-      # 'directreports' list has no duplicate entries.
-      @managers.each do |manager|
-        unless manager['directreports', @scenarioIdx].include?(@property)
-          manager['directreports', @scenarioIdx] << @property
+      @managers.map! do |managerId|
+        # First we need to map 'managerId' to an existing Resource.
+        if (manager = @project.resource(managerId)).nil?
+          error('resource_id_expected', "#{managerId} is not a defined " +
+                'resource.', @sourceFileInfo)
+        end
+        unless manager.leaf?
+          error('manager_is_group',
+                "Resource #{@property.fullId} has group #{manager.fullId} " +
+                "assigned as manager. Managers must be leaf resources.")
         end
+        if manager == @property
+          error('manager_is_self',
+                "Resource #{@property.fullId} cannot manage itself.")
+        end
+
+        # Only leaf resources have reporting lines.
+        if @property.leaf?
+          # The 'directreports' attribute is the reverse link for the 'managers'
+          # attribute. In contrast to the 'managers' attribute, the
+          # 'directreports' list has no duplicate entries.
+          unless manager['directreports', @scenarioIdx].include?(@property)
+            manager['directreports', @scenarioIdx] << @property
+          end
+        end
+
+        manager
       end
+      @managers.uniq!
     end
 
     def setReports
@@ -119,17 +128,6 @@ class TaskJuggler
     end
 
     def preScheduleCheck
-      @managers.each do |manager|
-        unless manager.leaf?
-          error('manager_is_group',
-                "Resource #{@property.fullId} has group #{manager.fullId} " +
-                "assigned as manager. Managers must be leaf resources.")
-        end
-        if manager == @property
-          error('manager_is_self',
-                "Resource #{@property.fullId} cannot manage itself.")
-        end
-      end
     end
 
     # This method does some housekeeping work after the scheduling is
@@ -387,7 +385,11 @@ class TaskJuggler
           headcount += query.to_num
         end
       else
-        headcount += @efficiency.round
+        if employed?(@project.dateToIdx(query.start))
+          # We only count headcount that is employed at the start date of the
+          # query interval.
+          headcount += @efficiency.round
+        end
       end
 
       query.sortable = query.numerical = headcount
@@ -894,6 +896,16 @@ class TaskJuggler
       end
     end
 
+    def employed?(sbIdx)
+      initScoreboard unless @scoreboard
+
+      val = @scoreboard[sbIdx]
+      return true unless val.is_a?(Fixnum)
+
+      leave_type = (val >> 2) & 0xF
+      leave_type < Leave::Types[:unemployed]
+    end
+
     # Returns true if the resource or any of its children is allocated during
     # the period specified with _startIdx_ and _endIdx_. If task is not nil
     # only allocations to this tasks are respected.