taskjuggler 0.0.8 → 0.0.9

data/lib/ProjectFileParser.rb

@@ -3,7 +3,8 @@
 #
 # = ProjectFileParser.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
@@ -104,7 +105,7 @@ class TaskJuggler
       open(attributes, false, true)
       @property = report
       @project = report.project
-      parse('reportAttributes')
+      parse(:reportAttributes)
     end
 
   private
@@ -431,6 +432,10 @@ class TaskJuggler
       @fileStackVariables.each do |var|
         instance_variable_set('@' + var, stackEntry[var])
       end
+      # Include files can only occur at global level or in the project header.
+      # In both cases, the @property was nil on including and must be reset to
+      # nil again after the include file.
+      @property = nil
     end
 
   end

data/lib/ProjectFileScanner.rb

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

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

@@ -3,7 +3,8 @@
 #
 # = PropertySet.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
@@ -63,11 +64,6 @@ class TaskJuggler
       }
     end
 
-    # Inherit all attributes of each property from the parent scenario.
-    def inheritAttributesFromScenario
-      @properties.each { |p| p.inheritAttributesFromScenario }
-    end
-
     # Use the function to declare the various attributes that properties of this
     # PropertySet can have. The attributes must be declared before the first
     # property is added to the set.

data/lib/PropertyTreeNode.rb

@@ -3,7 +3,8 @@
 #
 # = PropertyTreeNode.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
@@ -158,47 +159,6 @@ class TaskJuggler
       end
     end
 
-    # Inherit attribute values from the parent scenario. This is only being done
-    # for attributes that don't have a user-specified value already.
-    def inheritAttributesFromScenario
-      # Inherit scenario-specific values
-      @propertySet.eachAttributeDefinition do |attrDef|
-        next unless attrDef.scenarioSpecific
-
-        # We know that parent scenarios precede their children in the list. So
-        # it's safe to iterate over the list instead of recursively descend
-        # the tree.
-        @project.scenarioCount.times do |scenarioIdx|
-          scenario = @project.scenario(scenarioIdx)
-          next if scenario.parent.nil?
-          parentScenarioIdx = scenario.parent.sequenceNo - 1
-          # We copy only provided or inherited values from parent scenario when
-          # we don't have a provided value in this scenario. Inherited values
-          # will be overwritten
-          parPro = provided(attrDef.id, parentScenarioIdx)
-          parInh = inherited(attrDef.id, parentScenarioIdx)
-          chiPro = provided(attrDef.id, scenarioIdx)
-          chiInh = inherited(attrDef.id, scenarioIdx)
-          # Parent/Child inheritance matrix
-          # P: Provided   p: not provided
-          # I: Inherited  i: not inherited
-          # -: Illegal  N: Don't copy  Y: Copy
-          #
-          #          parent
-          #          PI  Pi  pI  pi
-          # child PI  -   -   -   -
-          #       Pi  -   N   N   N
-          #       pI  -   Y   N   N
-          #       pi  -   Y   Y   N
-          if ((parPro || parInh) && !(chiPro || chiInh)) ||
-              (parPro && !chiPro && chiInh)
-            @scenarioAttributes[scenarioIdx][attrDef.id] =
-              @scenarioAttributes[parentScenarioIdx][attrDef.id].deep_clone
-          end
-        end
-      end
-    end
-
     # Returns a list of this node and all transient sub nodes.
     def all
       res = [ self ]
@@ -416,13 +376,31 @@ class TaskJuggler
     # exception is raised.
     def []=(attributeId, scenario, value)
       if @scenarioAttributes[scenario].has_key?(attributeId)
-        @scenarioAttributes[scenario][attributeId].set(value)
+        if AttributeBase.mode == 0
+          # If we get values in 'provided' mode, we copy them immedidately to
+          # all derived scenarios.
+          @project.scenario(scenario).all.each do |sc|
+            scenarioIdx = @project.scenarioIdx(sc)
+            overwrite = @scenarioAttributes[scenarioIdx][attributeId].provided
+            if scenarioIdx == scenario
+              @scenarioAttributes[scenarioIdx][attributeId].set(value)
+            else
+              @scenarioAttributes[scenarioIdx][attributeId].inherit(value)
+            end
+            if overwrite
+              raise AttributeOverwrite,
+                "Overwriting a previously provided value for attribute " +
+                "#{attributeId}"
+            end
+          end
+        else
+          @scenarioAttributes[scenario][attributeId].set(value)
+        end
       elsif @attributes.has_key?(attributeId)
         @attributes[attributeId].set(value)
       else
         raise "Unknown attribute #{attributeId}"
       end
-      @scenarioAttributes[scenario][attributeId].set(value)
     end
 
     # Return the value of the attribute with ID _attributeId_. For

data/lib/Query.rb

@@ -3,7 +3,8 @@
 #
 # = Query.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
@@ -32,25 +33,23 @@ class TaskJuggler
   # Query#errorMessage contains an error message.
   class Query
 
-    attr_accessor :project, :propertyType, :propertyId, :property,
-                  :scopePropertyType, :scopePropertyId, :scopeProperty,
-                  :attributeId, :scenarioIdx,
-                  :timeFormat, :numberFormat, :currencyFormat, :costAccount,
-                  :revenueAccount,
-                  :loadUnit, :selfContained,
-                  :ok, :errorMessage
+    @@ps = %w( project propertyType propertyId property
+               scopePropertyType scopePropertyId scopeProperty
+               attributeId scenario scenarioIdx
+               loadUnit listType listMode numberFormat currencyFormat timeFormat
+               costAccount revenueAccount selfContained)
+    @@ps.each do |p|
+      attr_accessor p.to_sym
+    end
+    attr_accessor :ok, :errorMessage
     attr_reader :end, :endIdx, :start, :startIdx
     attr_writer :sortable, :numerical, :string, :rti
 
     # Create a new Query object. The _parameters_ need to be sufficent to
     # uniquely identify an attribute.
     def initialize(parameters = { })
-      ps = %w( project propertyType propertyId property scopePropertyId
-               scopeProperty attributeId scenario scenarioIdx
-               loadUnit numberFormat currencyFormat timeFormat
-               costAccount revenueAccount selfContained)
       @selfContained = false
-      ps.each do |p|
+      @@ps.each do |p|
         instance_variable_set('@' + p, parameters[p] ? parameters[p] : nil)
       end
 
@@ -170,6 +169,26 @@ class TaskJuggler
       @ok = true
     end
 
+    # Converts the String items in _listItems_ into a RichTextIntermediate
+    # objects and assigns it as result of the query.
+    def assignList(listItems)
+      list = ''
+      listItems.each do |item|
+        case @listType
+        when nil, :comma
+          list += ', ' unless list.empty?
+          list += item
+        when :bullets
+          list += "* #{item}\n"
+        when :numbered
+          list += "# #{item}\n"
+        end
+      end
+      @sortable = @string = list
+      rText = RichText.new(list)
+      @rti = rText.generateIntermediateFormat
+    end
+
     # Return the result of the Query as String. The result may be nil.
     def to_s
       @attr ? @attr.to_s(self) : (@rti ? @rti.to_s : (@string || ''))

data/lib/RTFHandlers.rb

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

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

@@ -3,7 +3,8 @@
 #
 # = RTFQuery.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
@@ -143,7 +144,7 @@ class TaskJuggler
 
     def setScenarioIdx(args)
       if args['scenario']
-        scenarioIdx = @project.scnearioIdx(args['scenario'])
+        scenarioIdx = @project.scenarioIdx(args['scenario'])
         unless scenarioIdx
           error('rtfq_bad_scenario', "Unknown scenario #{args['scenario']}")
         end

data/lib/RTFReport.rb

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

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

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

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

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

@@ -3,7 +3,8 @@
 #
 # = ResourceScenario.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
@@ -133,7 +134,7 @@ class TaskJuggler
     end
 
     def postScheduleCheck
-      if a('fail') || a('warn')
+      if !a('fail').empty? || !a('warn').empty?
         queryAttrs = { 'project' => @project,
                        'scenarioIdx' => @scenarioIdx,
                        'property' => @property,
@@ -145,18 +146,23 @@ class TaskJuggler
                        'timeFormat' => @project['timeFormat'],
                        'currencyFormat' => @project['currencyFormat'] }
         query = Query.new(queryAttrs)
-        if a('fail') && a('fail').eval(query)
-          error('resource_fail_check',
-                "User defined check failed for resource #{@property.fullId} \n" +
-                "Condition: #{a('fail').to_s}\n" +
-                "Result:    #{a('fail').to_s(query)}")
-        end
-        if a('warn') && a('warn').eval(query)
-          warning('resource_warn_check',
-                  "User defined warning triggered for resource " +
+        a('fail').each do |expr|
+          if expr.eval(query)
+            error('resource_fail_check',
+                  "User defined check failed for resource " +
                   "#{@property.fullId} \n" +
-                  "Condition: #{a('warn').to_s}\n" +
-                  "Result:    #{a('warn').to_s(query)}")
+                  "Condition: #{expr.to_s}\n" +
+                  "Result:    #{expr.to_s(query)}")
+          end
+        end
+        a('warn').each do |expr|
+          if expr.eval(query)
+            warning('resource_warn_check',
+                    "User defined warning triggered for resource " +
+                    "#{@property.fullId} \n" +
+                    "Condition: #{expr.to_s}\n" +
+                    "Result:    #{expr.to_s(query)}")
+          end
         end
       end
     end
@@ -479,7 +485,9 @@ class TaskJuggler
     end
 
     # Iterate over the scoreboard and turn its content into a set of Bookings.
-    def getBookings
+    #  _iv_ can be an Interval to limit the bookings within the provided
+    #  period.
+    def getBookings(iv = nil)
       return {} if @property.container? || @scoreboard.nil? ||
                    @firstBookedSlot.nil? || @lastBookedSlot.nil?
 
@@ -495,6 +503,15 @@ class TaskJuggler
       # In case the index markers are still uninitialized, we have no bookings.
       return {} if startIdx.nil? || endIdx.nil?
 
+      # If the user provided an Interval, we only return bookings within this
+      # Interval.
+      if iv
+        ivStartIdx = @project.dateToIdx(iv.start)
+        ivEndIdx = @project.dateToIdx(iv.end)
+        startIdx = ivStartIdx if ivStartIdx > startIdx
+        endIdx = ivEndIdx if ivEndIdx < endIdx
+      end
+
       startIdx.upto(endIdx) do |idx|
         task = @scoreboard[idx]
         # Now we watch for task changes.
@@ -527,6 +544,10 @@ class TaskJuggler
     # and contain only off-duty and vacation slots. The result is an Array of
     # [ start, end ] TjTime values.
     def collectTimeOffIntervals(iv, minDuration)
+      # Time-off intervals are only useful for leaf resources. Group resources
+      # would just default to the global working hours.
+      return [] unless @property.leaf?
+
       initScoreboard if @scoreboard.nil?
 
       @scoreboard.collectIntervals(iv, minDuration) do |val|

data/lib/RichText.rb

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

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