taskjuggler 3.1.0 → 3.2.0

data/lib/taskjuggler/ProjectFileParser.rb

@@ -31,13 +31,10 @@ class TaskJuggler
 
     include TjpSyntaxRules
 
-    # Create the parser object. _messageHandler_ is a TjMessageHandler that is
-    # used for error reporting.
-    def initialize(messageHandler)
+    # Create the parser object.
+    def initialize
       super
 
-      @tjMessageHandler = messageHandler
-
       # Define the token types that the ProjectFileScanner may return for
       # variable elements.
       @variables = [ :INTEGER, :FLOAT, :DATE, :TIME, :STRING, :LITERAL,
@@ -52,7 +49,7 @@ class TaskJuggler
     # Call this function with the master file to start processing a TJP file or
     # a set of TJP files.
     def open(file, master, fileNameIsBuffer = false)
-      @scanner = ProjectFileScanner.new(file, @messageHandler)
+      @scanner = ProjectFileScanner.new(file)
       # We need the ProjectFileScanner object for error reporting.
       if master && !fileNameIsBuffer && file != '.' && file[-4, 4] != '.tjp'
         error('illegal_extension', "Project file name must end with " +
@@ -216,22 +213,19 @@ class TaskJuggler
     # variable tokens, a subset can be provided by _tokenSet_.
     def newRichText(text, sfi, tokenSet = nil)
       rText = RichText.new(text, RTFHandlers.create(@project, sfi))
-      unless (rti = rText.generateIntermediateFormat( [ 0, 0, 0], tokenSet))
-        rText.messageHandler.messages.each do |msg|
-          # Map the SourceFileInfo of the RichText back to the original
-          # location in the input file.
-          sfi = TextParser::SourceFileInfo.new(
-            sfi.fileName, sfi.lineNo + msg.sourceFileInfo.lineNo - 1, 0)
-          # Then replay the error message.
-          @messageHandler.addMessage(msg.type, msg.id, msg.message, sfi,
-                                     msg.line)
-        end
-      end
-      rti.sectionNumbers = false
+      # The RichText is processed by a separate parser. Messages will not have
+      # the proper source file info unless we baseline them with the original
+      # source file info.
+      mh = MessageHandlerInstance.instance
+      mh.baselineSFI = sfi
+      rti = rText.generateIntermediateFormat( [ 0, 0, 0 ], tokenSet)
+      # Reset the baseline again.
+      mh.baselineSFI = nil
+      rti.sectionNumbers = false if rti
       rti
     end
 
-    # This method is a convenience wrapper around Project.new. It checks if
+    # This method is a convenience wrapper around Report.new. It checks if
     # the report name already exists. It also triggers the attribute
     # inheritance. +name+ is the name of the report, +type+ is the report
     # type. +sourceFileInfo+ is a SourceFileInfo of the report definition. The
@@ -432,8 +426,12 @@ class TaskJuggler
     # Determine the title of the column with the ID _colId_. The title may be
     # from the static set or be from a user defined attribute.
     def columnTitle(colId)
-      TableReport.defaultColumnTitle(colId) ||
-        @project.attributeName(colId)
+      if @property.typeSpec == :tracereport
+        "<-id->:<-scenario->.#{colId}"
+      else
+        TableReport.defaultColumnTitle(colId) ||
+          @project.attributeName(colId)
+      end
     end
 
 
@@ -485,7 +483,11 @@ class TaskJuggler
       end
       # The << operator does not set the 'provided' flag. Just do a self
       # assignment to trigget the flag to get set.
-      @property[attrId, @scenarioIdx] = @property[attrId, @scenarioIdx]
+      begin
+        @property[attrId, @scenarioIdx] = @property[attrId, @scenarioIdx]
+      rescue AttributeOverwrite
+        # Overwrites are ok here.
+      end
     end
 
   end

data/lib/taskjuggler/ProjectFileScanner.rb

@@ -19,7 +19,7 @@ class TaskJuggler
   # of the TJP syntax.
   class ProjectFileScanner < TextParser::Scanner
 
-    def initialize(masterFile, messageHandler)
+    def initialize(masterFile)
       tokenPatterns = [
         # Any white spaces
         [ nil, /\s+/, :tjp, method('newPos') ],
@@ -150,7 +150,7 @@ class TaskJuggler
         [ :LITERAL, /./ ]
       ]
 
-      super(masterFile, messageHandler, Log, tokenPatterns, :tjp)
+      super(masterFile, Log, tokenPatterns, :tjp)
     end
 
     private

data/lib/taskjuggler/PropertyTreeNode.rb

@@ -11,6 +11,8 @@
 # published by the Free Software Foundation.
 #
 
+require 'taskjuggler/MessageHandler'
+
 class TaskJuggler
 
   # This class is the base object for all Project properties. A Project property
@@ -27,6 +29,8 @@ class TaskJuggler
   # attribute like an URL that contains more details about the task.
   class PropertyTreeNode
 
+    include MessageHandler
+
     attr_reader :propertySet, :id, :subId, :parent, :project, :sequenceNo,
                 :children, :adoptees
     attr_accessor :name, :sourceFileInfo
@@ -363,11 +367,18 @@ class TaskJuggler
     end
 
     # Return a list with all parent nodes of this node.
-    def ancestors
+    def ancestors(includeStepParents = false)
       nodes = []
-      n = self
-      while n.parent
-        nodes << (n = n.parent)
+      if includeStepParents
+        parents.each do |parent|
+          nodes << parent
+          nodes += parent.ancestors(true)
+        end
+      else
+        n = self
+        while n.parent
+          nodes << (n = n.parent)
+        end
       end
       nodes
     end
@@ -554,16 +565,14 @@ class TaskJuggler
     def query_alert(query)
       journal = @project['journal']
       query.sortable = query.numerical = alert =
-        journal.alertLevel(query.end, self, query.hideJournalEntry)
+        journal.alertLevel(query.end, self, query)
       alertLevel = @project['alertLevels'][alert]
       query.string = alertLevel.name
       rText = "<fcol:#{alertLevel.color}><nowiki>#{alertLevel.name}" +
               "</nowiki></fcol>"
-      unless (rti = RichText.new(rText, RTFHandlers.create(@project),
-                                 @project.messageHandler).
-                                 generateIntermediateFormat)
-        @project.messageHandler.warning('ptn_journal',
-                                        "Syntax error in journal message")
+      unless (rti = RichText.new(rText, RTFHandlers.create(@project)).
+              generateIntermediateFormat)
+        warning('ptn_journal', "Syntax error in journal message")
         return nil
       end
       rti.blockMode = false
@@ -572,15 +581,13 @@ class TaskJuggler
 
     def query_alertmessages(query)
       journalMessages(@project['journal'].alertEntries(query.end, self, 1,
-                                                       query.start,
-                                                       query.hideJournalEntry),
+                                                       query.start, query),
                       query, true)
     end
 
     def query_alertsummaries(query)
       journalMessages(@project['journal'].alertEntries(query.end, self, 1,
-                                                       query.start,
-                                                       query.hideJournalEntry),
+                                                       query.start, query),
                       query, false)
     end
 
@@ -600,8 +607,8 @@ class TaskJuggler
 
     def query_alerttrend(query)
       journal = @project['journal']
-      startAlert = journal.alertLevel(query.start, self, query.hideJournalEntry)
-      endAlert = journal.alertLevel(query.end, self, query.hideJournalEntry)
+      startAlert = journal.alertLevel(query.start, self, query)
+      endAlert = journal.alertLevel(query.end, self, query)
       if startAlert < endAlert
         query.sortable = 0
         query.string = 'Up'
@@ -653,19 +660,6 @@ class TaskJuggler
       @data[scenarioIdx].send(func, *args, &block)
     end
 
-    def error(id, text)
-      @project.messageHandler.error(id, text, @sourceFileInfo, nil, self, nil)
-    end
-
-    def warning(id, text)
-      @project.messageHandler.warning(id, text, @sourceFileInfo, nil, self, nil)
-    end
-
-    def info(id, text)
-      @project.messageHandler.info(id, text, @sourceFileInfo, nil, self, nil)
-    end
-
-
   private
 
     # Create a blog-style list of all alert messages that match the Query.
@@ -693,11 +687,9 @@ class TaskJuggler
       end
       # Now convert the RichText markup String into RichTextIntermediate
       # format.
-      unless (rti = RichText.new(rText, RTFHandlers.create(@project),
-                                 @project.messageHandler).
-                                 generateIntermediateFormat)
-        @project.messageHandler.warning('ptn_journal',
-                                        "Syntax error in journal message")
+      unless (rti = RichText.new(rText, RTFHandlers.create(@project)).
+              generateIntermediateFormat)
+        warning('ptn_journal', "Syntax error in journal message")
         return nil
       end
       # No section numbers, please!

data/lib/taskjuggler/Query.rb

@@ -325,15 +325,19 @@ class TaskJuggler
         # should not exceed. nil means no limit. Never use quarters since it's
         # pretty uncommon to use.
         max = [ 60, 48, nil, 8, 24, 0, nil ]
+        stdFormat = RealFormat.new([ '-', '', '', '.',
+                                     @numberFormat.fractionDigits ])
 
         i = 0
+        fSep = @numberFormat.fractionSeparator
         factors.each do |factor|
           scaledValue = value * factor
           str = @numberFormat.format(scaledValue)
-          delta[i] = ((scaledValue - str.to_f).abs * 1000).to_i
+          stdStr = stdFormat.format(scaledValue)
+          delta[i] = (scaledValue - stdStr.to_f).abs
           # We ignore results that are 0 or exceed the maximum. To ensure that
           # we have at least one result the unscaled value is always taken.
-          if (factor != 1.0 && /^[0.]*$/ =~ str) ||
+          if (factor != 1.0 && /^[0.]*$/ =~ stdStr) ||
              (max[i] && scaledValue > max[i])
             options << nil
           else
@@ -346,13 +350,12 @@ class TaskJuggler
         # the default if all values have the same length.
         shortest = 2
         delta.length.times do |j|
-          shortest = j if options[j] && options[j][0, 2] != '0.' &&
-                          delta[j] <= delta[shortest]
+          shortest = j if options[j] && delta[j] < delta[shortest]
         end
 
         # Find the shortest option.
         6.times do |j|
-          shortest = j if options[j] && options[j][0, 2] != '0.' &&
+          shortest = j if options[j] && options[j][0, 2] != '0' + fSep &&
                           options[j].length < options[shortest].length
         end
 

data/lib/taskjuggler/RealFormat.rb

@@ -27,6 +27,9 @@ class TaskJuggler
   # fractionDigits: Number of fractional digits to show. (Fixnum)
   class RealFormat
 
+    attr_reader :signPrefix, :signSuffix, :thousandsSeparator,
+                :fractionSeparator, :fractionDigits
+
     # Create a new RealFormat object and define the formating rules.
     def initialize(args)
       iVars = %w( @signPrefix @signSuffix @thousandsSeparator

data/lib/taskjuggler/Resource.rb

@@ -85,11 +85,9 @@ class TaskJuggler
 
       # Now convert the RichText markup String into RichTextIntermediate
       # format.
-      unless (rti = RichText.new(rText, RTFHandlers.create(@project),
-                                 @project.messageHandler).
-                                 generateIntermediateFormat)
-        @project.messageHandler.warning(
-          'res_dashboard', 'Syntax error in dashboard text')
+      unless (rti = RichText.new(rText, RTFHandlers.create(@project)).
+              generateIntermediateFormat)
+        warning('res_dashboard', 'Syntax error in dashboard text')
         return nil
       end
       # No section numbers, please!

data/lib/taskjuggler/ResourceScenario.rb

@@ -136,11 +136,18 @@ class TaskJuggler
         resource.finishScheduling(@scenarioIdx)
       end
 
-      if (parent = @property.parent)
-        # Add the assigned task to the parent duties list.
+      # Add the parent tasks of each task to the duties list.
+      @duties.each do |task|
+        task.ancestors(true).each do |pTask|
+          @duties << pTask unless @duties.include?(pTask)
+        end
+      end
+
+      # Add the assigned task to the parent(s) resource duties list.
+      @property.parents.each do |pResource|
         @duties.each do |task|
-          unless parent['duties', @scenarioIdx].include?(task)
-            parent['duties', @scenarioIdx] << task
+          unless pResource['duties', @scenarioIdx].include?(task)
+            pResource['duties', @scenarioIdx] << task
           end
         end
       end
@@ -434,8 +441,11 @@ class TaskJuggler
 
 
     # Returns the work of the resource (and its children) weighted by their
-    # efficiency.
+    # efficiency. If _task_ is provided, only the work for this task and all
+    # its sub tasks are being counted.
     def getEffectiveWork(startIdx, endIdx, task = nil)
+      # Make sure we have the real Task and not a proxy.
+      task = task.ptn if task
       # There can't be any effective work if the start is after the end or the
       # todo list doesn't contain the specified task.
       return 0.0 if startIdx >= endIdx || (task && !@duties.include?(task))
@@ -632,7 +642,8 @@ class TaskJuggler
     end
 
     # Count the booked slots between the start and end index. If _task_ is not
-    # nil count only those slots that are assigned to this particular task.
+    # nil count only those slots that are assigned to this particular task or
+    # any of its sub tasks.
     def getAllocatedSlots(startIdx, endIdx, task)
       # If there is no scoreboard, we don't have any allocations.
       return 0 unless @scoreboard
@@ -641,8 +652,9 @@ class TaskJuggler
       return 0 if startIdx >= endIdx
 
       bookedSlots = 0
+      taskList = task ? task.all : []
       @scoreboard.each(startIdx, endIdx) do |slot|
-        if (task.nil? && slot.is_a?(Task)) || (task && slot == task)
+        if slot.is_a?(Task) && (task.nil? || taskList.include?(slot))
           bookedSlots += 1
         end
       end

data/lib/taskjuggler/RichText.rb

@@ -72,7 +72,7 @@ class TaskJuggler
   #
   class RichText
 
-    attr_reader :inputText, :messageHandler
+    attr_reader :inputText
 
     # The Parser uses complex to setup data structures that are identical for
     # all RichText instances. So, we'll share them across the instances.
@@ -83,11 +83,10 @@ class TaskJuggler
     # case an error occurs, an exception of type TjException will be raised.
     # _functionHandlers_ is a Hash that maps RichTextFunctionHandler objects
     # by their function name.
-    def initialize(text, functionHandlers = [], messageHandler = nil)
+    def initialize(text, functionHandlers = [])
       # Keep a copy of the original text.
       @inputText = text
       @functionHandlers = functionHandlers
-      @messageHandler = messageHandler || MessageHandler.new
     end
 
     # Convert the @inputText into an abstract syntax tree that can then be
@@ -103,11 +102,10 @@ class TaskJuggler
       # We'll setup the RichTextParser once and share it across all instances.
       if @@parser
         # We already have a RichTextParser that we can reuse.
-        @@parser.reuse(@messageHandler, rti, sectionCounter, tokenSet)
+        @@parser.reuse(rti, sectionCounter, tokenSet)
       else
         # There is no RichTextParser yet, create one.
-        @@parser = RichTextParser.new(@messageHandler, rti, sectionCounter,
-                                      tokenSet)
+        @@parser = RichTextParser.new(rti, sectionCounter, tokenSet)
       end
 
       @@parser.open(@inputText)

data/lib/taskjuggler/RichText/FunctionExample.rb

@@ -23,7 +23,7 @@ class TaskJuggler
   class RichTextFunctionExample < RichTextFunctionHandler
 
     def initialize
-      super(nil, 'example')
+      super('example')
       @blockFunction = true
     end
 

data/lib/taskjuggler/RichText/FunctionHandler.rb

@@ -11,6 +11,8 @@
 # published by the Free Software Foundation.
 #
 
+require 'taskjuggler/MessageHandler'
+
 class TaskJuggler
 
   # This class is the abstract base class for all RichText function handlers.
@@ -24,19 +26,16 @@ class TaskJuggler
   # second is the argument Array.
   class RichTextFunctionHandler
 
+    include MessageHandler
+
     attr_reader :function, :blockFunction
 
-    def initialize(messageHandler, function, sourceFileInfo = nil)
-      @messageHandler = messageHandler
+    def initialize(function, sourceFileInfo = nil)
       @function = function
       @blockFunction = false
       @sourceFileInfo = sourceFileInfo
     end
 
-    def error(id, text)
-      @messageHandler.error(id, text, @sourceFileInfo) if @messageHandler
-    end
-
   end
 
 end

data/lib/taskjuggler/RichText/Parser.rb

@@ -29,9 +29,8 @@ class TaskJuggler
 
     # Create the parser and initialize the rule set. _rt_ is the RichText object
     # the resulting tree of RichTextElement objects should belong to.
-    def initialize(messageHandler, rti, sectionCounter = [ 0, 0, 0, 0 ],
-                   tokenSet = nil)
-      super(messageHandler)
+    def initialize(rti, sectionCounter = [ 0, 0, 0, 0 ], tokenSet = nil)
+      super()
       @richTextI = rti
       # These are the tokens that can be returned by the RichTextScanner.
       @variables = [ :LINEBREAK, :SPACE, :WORD,
@@ -56,12 +55,11 @@ class TaskJuggler
       @numberListCounter = [ 0, 0, 0, 0 ]
     end
 
-    def reuse(messageHandler, rti, sectionCounter = [ 0, 0, 0, 0],
+    def reuse(rti, sectionCounter = [ 0, 0, 0, 0],
               tokenSet = nil)
       @blockedVariables = {}
       @stack = nil
       @richTextI = rti
-      @messageHandler = messageHandler
       @sectionCounter = sectionCounter
       limitTokenSet(tokenSet)
     end
@@ -70,7 +68,7 @@ class TaskJuggler
     def open(text)
       # Make sure that the last line is properly terminated with a newline.
       # Multiple newlines at the end are simply ignored.
-      @scanner = RichTextScanner.new(text + "\n\n", @messageHandler, Log)
+      @scanner = RichTextScanner.new(text + "\n\n", Log)
       @scanner.open(true)
     end