taskjuggler 0.0.10 → 0.0.11

data/lib/{ResourceScenario.rb → taskjuggler/ResourceScenario.rb}

@@ -11,8 +11,7 @@
 # published by the Free Software Foundation.
 #
 
-
-require 'ScenarioData'
+require 'taskjuggler/ScenarioData'
 
 class TaskJuggler
 
@@ -133,40 +132,6 @@ class TaskJuggler
       end
     end
 
-    def postScheduleCheck
-      if !a('fail').empty? || !a('warn').empty?
-        queryAttrs = { 'project' => @project,
-                       'scenarioIdx' => @scenarioIdx,
-                       'property' => @property,
-                       'scopeProperty' => nil,
-                       'start' => @project['start'],
-                       'end' => @project['end'],
-                       'loadUnit' => :days,
-                       'numberFormat' => @project['numberFormat'],
-                       'timeFormat' => @project['timeFormat'],
-                       'currencyFormat' => @project['currencyFormat'] }
-        query = Query.new(queryAttrs)
-        a('fail').each do |expr|
-          if expr.eval(query)
-            error('resource_fail_check',
-                  "User defined check failed for resource " +
-                  "#{@property.fullId} \n" +
-                  "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
-
     # Returns true if the resource is available at the time specified by
     # _sbIdx_.
     def available?(sbIdx)
@@ -346,12 +311,12 @@ class TaskJuggler
       return work if work
 
       # Convert the interval dates to indexes if needed.
-      startIdx = @project.dateToIdx(startIdx, true) if startIdx.is_a?(TjTime)
-      endIdx = @project.dateToIdx(endIdx, true) if endIdx.is_a?(TjTime)
+      startIdx = @project.dateToIdx(startIdx) if startIdx.is_a?(TjTime)
+      endIdx = @project.dateToIdx(endIdx) if endIdx.is_a?(TjTime)
 
       work = 0.0
       if @property.container?
-        @property.children.each do |resource|
+        @property.kids.each do |resource|
           work += resource.getEffectiveWork(@scenarioIdx, startIdx, endIdx, task)
         end
       else
@@ -367,12 +332,12 @@ class TaskJuggler
     # Returns the allocated accumulated time of this resource and its children.
     def getAllocatedTime(startIdx, endIdx, task = nil)
       # Convert the interval dates to indexes if needed.
-      startIdx = @project.dateToIdx(startIdx, true) if startIdx.is_a?(TjTime)
-      endIdx = @project.dateToIdx(endIdx, true) if endIdx.is_a?(TjTime)
+      startIdx = @project.dateToIdx(startIdx) if startIdx.is_a?(TjTime)
+      endIdx = @project.dateToIdx(endIdx) if endIdx.is_a?(TjTime)
 
       time = 0
       if @property.container?
-        @property.children.each do |resource|
+        @property.kids.each do |resource|
           time += resource.getAllocatedTime(@scenarioIdx, startIdx, endIdx, task)
         end
       else
@@ -388,12 +353,12 @@ class TaskJuggler
     # children.
     def getEffectiveFreeTime(startIdx, endIdx)
       # Convert the interval dates to indexes if needed.
-      startIdx = @project.dateToIdx(startIdx, true) if startIdx.is_a?(TjTime)
-      endIdx = @project.dateToIdx(endIdx, true) if endIdx.is_a?(TjTime)
+      startIdx = @project.dateToIdx(startIdx) if startIdx.is_a?(TjTime)
+      endIdx = @project.dateToIdx(endIdx) if endIdx.is_a?(TjTime)
 
       freeTime = 0
       if @property.container?
-        @property.children.each do |resource|
+        @property.kids.each do |resource|
           freeTime += resource.getEffectiveFreeTime(@scenarioIdx, startIdx,
                                                     endIdx)
         end
@@ -408,12 +373,12 @@ class TaskJuggler
     # their efficiency.
     def getEffectiveFreeWork(startIdx, endIdx)
       # Convert the interval dates to indexes if needed.
-      startIdx = @project.dateToIdx(startIdx, true) if startIdx.is_a?(TjTime)
-      endIdx = @project.dateToIdx(endIdx, true) if endIdx.is_a?(TjTime)
+      startIdx = @project.dateToIdx(startIdx) if startIdx.is_a?(TjTime)
+      endIdx = @project.dateToIdx(endIdx) if endIdx.is_a?(TjTime)
 
       work = 0.0
       if @property.container?
-        @property.children.each do |resource|
+        @property.kids.each do |resource|
           work += resource.getEffectiveFreeWork(@scenarioIdx, startIdx, endIdx)
         end
       else
@@ -427,12 +392,12 @@ class TaskJuggler
     # Return the number of working days that are blocked by vacations.
     def getVacationDays(startIdx, endIdx)
       # Convert the interval dates to indexes if needed.
-      startIdx = @project.dateToIdx(startIdx, true) if startIdx.is_a?(TjTime)
-      endIdx = @project.dateToIdx(endIdx, true) if endIdx.is_a?(TjTime)
+      startIdx = @project.dateToIdx(startIdx) if startIdx.is_a?(TjTime)
+      endIdx = @project.dateToIdx(endIdx) if endIdx.is_a?(TjTime)
 
       vacationDays = 0.0
       if @property.container?
-        @property.children.each do |resource|
+        @property.kids.each do |resource|
           vacationDays += resource.getVacationDays(@scenarioIdx,
                                                    startIdx, endIdx)
         end
@@ -449,7 +414,7 @@ class TaskJuggler
     def turnover(startIdx, endIdx, account, task = nil)
       amount = 0.0
       if @property.container?
-        @property.children.each do |child|
+        @property.kids.each do |child|
           amount += child.turnover(@scenarioIdx, startIdx, endIdx, account, task)
         end
       else
@@ -475,8 +440,8 @@ class TaskJuggler
     def allocated?(iv, task = nil)
       return false if task && !a('duties').include?(task)
 
-      startIdx = @project.dateToIdx(iv.start, true)
-      endIdx = @project.dateToIdx(iv.end, true)
+      startIdx = @project.dateToIdx(iv.start)
+      endIdx = @project.dateToIdx(iv.end)
 
       startIdx, endIdx = fitIndicies(startIdx, endIdx, task)
       return false if startIdx >= endIdx
@@ -626,8 +591,8 @@ class TaskJuggler
 
       # Mark all resource specific vacation slots as such
       a('vacations').each do |vacation|
-        startIdx = @scoreboard.dateToIdx(vacation.start, true)
-        endIdx = @scoreboard.dateToIdx(vacation.end, true)
+        startIdx = @scoreboard.dateToIdx(vacation.start)
+        endIdx = @scoreboard.dateToIdx(vacation.end)
         startIdx.upto(endIdx - 1) do |i|
           # If the slot is nil, we don't set the time-off bit.
           @scoreboard[i] = (@scoreboard[i].nil? ? 0 : 2) | (1 << 2)
@@ -636,8 +601,8 @@ class TaskJuggler
 
       # Mark all global vacation slots as such
       @project['vacations'].each do |vacation|
-        startIdx = @scoreboard.dateToIdx(vacation.start, true)
-        endIdx = @scoreboard.dateToIdx(vacation.end, true)
+        startIdx = @scoreboard.dateToIdx(vacation.start)
+        endIdx = @scoreboard.dateToIdx(vacation.end)
         startIdx.upto(endIdx - 1) do |i|
           # If the slot is nil or set to 4 then don't set the time-off bit.
           sb = @scoreboard[i]
@@ -653,11 +618,7 @@ class TaskJuggler
           # the whole interval over to the resource scoreboard overriding any
           # global vacations.
           if (v & (1 << 8)) != 0
-            if (v & 0x3E) == 0
-              @scoreboard[i] = nil
-            else
-              @scoreboard[i] = v & 0x3E
-            end
+            @scoreboard[i] = (v & 0x3E == 0) ? nil : (v & 0x3D)
           elsif ((sbV = @scoreboard[i]).nil? || (sbV & 0x3C) == 0) &&
                 (v & 0x3C) != 0
             # We only add the shift vacations but don't turn global vacation
@@ -716,7 +677,7 @@ class TaskJuggler
     # only allocations to this tasks are respected.
     def allocatedSub(startIdx, endIdx, task)
       if @property.container?
-        @property.children.each do |resource|
+        @property.kids.each do |resource|
           return true if resource.allocatedSub(@scenarioIdx, startIdx, endIdx,
                                                task)
         end
@@ -737,7 +698,7 @@ class TaskJuggler
     def rate
       if @property.container?
         dailyRate = 0.0
-        @property.children.each do |resource|
+        @property.kids.each do |resource|
           dailyRate += resource.rate(@scenarioIdx)
         end
         dailyRate

data/lib/{RichText.rb → taskjuggler/RichText.rb}

@@ -11,9 +11,9 @@
 # published by the Free Software Foundation.
 #
 
-require 'RichTextElement'
-require 'RichTextParser'
-require 'MessageHandler'
+require 'taskjuggler/RichText/Element'
+require 'taskjuggler/RichText/Parser'
+require 'taskjuggler/MessageHandler'
 
 class TaskJuggler
 

data/lib/{RichTextDocument.rb → taskjuggler/RichText/Document.rb}

@@ -11,9 +11,9 @@
 # published by the Free Software Foundation.
 #
 
-require 'RichTextSnip'
-require 'TableOfContents'
-require 'RichTextFunctionHandler'
+require 'taskjuggler/RichText/Snip'
+require 'taskjuggler/RichText/TableOfContents'
+require 'taskjuggler/RichText/FunctionHandler'
 
 class TaskJuggler
 

data/lib/{RichTextElement.rb → taskjuggler/RichText/Element.rb}

@@ -11,10 +11,10 @@
 # published by the Free Software Foundation.
 #
 
-require 'UTF8String'
-require 'TjException'
-require 'XMLElement'
-require 'TextFormatter'
+require 'taskjuggler/UTF8String'
+require 'taskjuggler/TjException'
+require 'taskjuggler/XMLElement'
+require 'taskjuggler/TextFormatter'
 
 class TaskJuggler
 
@@ -221,6 +221,7 @@ class TaskJuggler
         pre = @richText.functionHandler(@data[0]).to_s(@data[1])
       when :italic
       when :bold
+      when :fontCol
       when :code
       when :text
       else
@@ -341,6 +342,9 @@ class TaskJuggler
       when :bold
         pre = '<b>'
         post = '</b>'
+      when :fontCol
+        pre = "<fcol:#{@data}>"
+        post = '</fcol>'
       when :code
         pre = '<code>'
         post = '</code>'
@@ -452,6 +456,8 @@ class TaskJuggler
         XMLElement.new('i')
       when :bold
         XMLElement.new('b')
+      when :fontCol
+        XMLElement.new('span', 'style' => "color:#{@data}")
       when :code
         XMLElement.new('code', attrs)
       when :text

data/lib/{RichTextFunctionExample.rb → taskjuggler/RichText/FunctionExample.rb}

@@ -11,9 +11,9 @@
 # published by the Free Software Foundation.
 #
 
-require 'RichTextFunctionHandler'
-require 'TjpExample'
-require 'XMLElement'
+require 'taskjuggler/RichText/FunctionHandler'
+require 'taskjuggler/TjpExample'
+require 'taskjuggler/XMLElement'
 
 class TaskJuggler
 

data/lib/{RichTextParser.rb → taskjuggler/RichText/Parser.rb}

@@ -11,9 +11,10 @@
 # published by the Free Software Foundation.
 #
 
-require 'TextParser'
-require 'RichTextScanner'
-require 'RichTextSyntaxRules'
+require 'taskjuggler/TextParser'
+require 'taskjuggler/RichText/Scanner'
+require 'taskjuggler/RichText/SyntaxRules'
+require 'taskjuggler/Log'
 
 class TaskJuggler
 
@@ -36,6 +37,7 @@ class TaskJuggler
       @variables = [ :LINEBREAK, :SPACE, :WORD,
                      :BOLD, :ITALIC, :CODE, :BOLDITALIC, :PRE,
                      :HREF, :HREFEND, :REF, :REFEND, :HLINE,
+                     :FCOLSTART, :FCOLEND,
                      :QUERY,
                      :INLINEFUNCSTART, :INLINEFUNCEND,
                      :BLOCKFUNCSTART, :BLOCKFUNCEND, :ID, :STRING,
@@ -68,7 +70,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)
+      @scanner = RichTextScanner.new(text + "\n\n", @messageHandler, Log)
       @scanner.open(true)
     end
 

data/lib/{RTFHandlers.rb → taskjuggler/RichText/RTFHandlers.rb}

@@ -11,10 +11,10 @@
 # published by the Free Software Foundation.
 #
 
-require 'RTFNavigator'
-require 'RTFQuery'
-require 'RTFReport'
-require 'RTFReportLink'
+require 'taskjuggler/RichText/RTFNavigator'
+require 'taskjuggler/RichText/RTFQuery'
+require 'taskjuggler/RichText/RTFReport'
+require 'taskjuggler/RichText/RTFReportLink'
 
 class TaskJuggler
 

data/lib/{RTFNavigator.rb → taskjuggler/RichText/RTFNavigator.rb}

@@ -11,9 +11,9 @@
 # published by the Free Software Foundation.
 #
 
-require 'RichTextFunctionHandler'
-require 'XMLElement'
-require 'reports/Navigator'
+require 'taskjuggler/RichText/FunctionHandler'
+require 'taskjuggler/XMLElement'
+require 'taskjuggler/reports/Navigator'
 
 class TaskJuggler
 

data/lib/{RTFQuery.rb → taskjuggler/RichText/RTFQuery.rb}

@@ -11,9 +11,9 @@
 # published by the Free Software Foundation.
 #
 
-require 'RTFWithQuerySupport'
-require 'XMLElement'
-require 'Query'
+require 'taskjuggler/RichText/RTFWithQuerySupport'
+require 'taskjuggler/XMLElement'
+require 'taskjuggler/Query'
 
 class TaskJuggler
 
@@ -29,30 +29,30 @@ class TaskJuggler
 
     # Return the result of the query as String.
     def to_s(args)
-      return '' unless prepareQuery(args)
-      if @query.ok
-        @query.to_s
+      return '' unless (query = prepareQuery(args))
+      if query.ok
+        query.to_s
       else
-        error('query_error', @query.errorMessage + recreateQuerySyntax(args))
-        'Query Error: ' + @query.errorMessage
+        error('query_error', query.errorMessage + recreateQuerySyntax(args))
+        'Query Error: ' + query.errorMessage
       end
     end
 
     # Return a XMLElement tree that represents the navigator in HTML code.
     def to_html(args)
-      return nil unless prepareQuery(args)
-      if @query.ok
-        if (rti = @query.to_rti)
+      return nil unless (query = prepareQuery(args))
+      if query.ok
+        if (rti = query.to_rti)
           rti.to_html
-        elsif (str = @query.to_s)
+        elsif (str = query.to_s)
           XMLText.new(str)
         else
           nil
         end
       else
-        error('query_error', @query.errorMessage + recreateQuerySyntax(args))
+        error('query_error', query.errorMessage + recreateQuerySyntax(args))
         font = XMLElement.new('font', 'color' => '#FF0000')
-        font << XMLText.new('Query Error: ' + @query.errorMessage)
+        font << XMLText.new('Query Error: ' + query.errorMessage)
         font
       end
     end
@@ -72,36 +72,59 @@ class TaskJuggler
       # Check the user provided arguments. Only the following list is allowed.
       validArgs = %w( family property scopeproperty attribute scenario
                       start end loadunit numberformat timeformat currencyformat )
-      args.each_key do |arg|
+      expandedArgs = {}
+      args.each do |arg, value|
         unless validArgs.include?(arg)
           error('bad_query_parameter', "Unknown query parameter '#{arg}'. " +
                 "Use one of #{validArgs.join(', ')}!")
           return nil
         end
+        expandedArgs[arg] =
+          SimpleQueryExpander.new(value, @query, @messageHandler,
+                                  @sourceFileInfo).expand
       end
 
+      if (expandedArgs['property'] || expandedArgs['scopeproperty']) &&
+          !(expandedArgs['family'] || query.propertyType)
+        error('missing_family',
+              "If you provide a property or scope property you need to " +
+              "provide a family type as well.")
+      end
+
+      query = @query.dup
+
       # Every provided query parameter will overwrite the corresponding value
       # in the Query that was provided by the ReportContext.  The name of the
       # arguments don't always exactly match the Query variables Let's start
       # with the easy ones.
-      @query.propertyId = args['property'] if args['property']
-      @query.scopeProperty = args['scopeproperty'] if args['scopeproperty']
-      @query.attributeId = args['attribute'] if args['attribute']
-      @query.start = args['start'] if args['start']
-      @query.end = args['end'] if args['end']
-      @query.numberFormat = args['numberformat'] if args['numberformat']
-      @query.timeFormat = args['timeformat'] if args['timeformat']
-      @query.currencyFormat = args['currencyformat'] if args['currencyformat']
+      if expandedArgs['property']
+        query.propertyId = expandedArgs['property']
+        query.property = nil
+      end
+      if expandedArgs['scopeproperty']
+        query.scopePropertyId = expandedArgs['scopeproperty']
+        query.scopeProperty = nil
+      end
+      query.attributeId = expandedArgs['attribute'] if expandedArgs['attribute']
+      query.start = expandedArgs['start'] if expandedArgs['start']
+      query.end = expandedArgs['end'] if expandedArgs['end']
+      if expandedArgs['numberformat']
+        query.numberFormat = expandedArgs['numberformat']
+      end
+      query.timeFormat = expandedArgs['timeformat'] if expandedArgs['timeformat']
+      if expandedArgs['currencyformat']
+        query.currencyFormat = expandedArgs['currencyformat']
+      end
 
       # And now the slighly more complicated ones.
-      setScenarioIdx(args)
-      setPropertyType(args)
-      setLoadUnit(args)
+      setScenarioIdx(query, expandedArgs)
+      setPropertyType(query, expandedArgs)
+      setLoadUnit(query, expandedArgs)
 
       # Now that we have put together the query, we can process it and return
       # the query object for result extraction.
-      @query.process
-      @query
+      query.process
+      query
     end
 
     # Regenerate the original query text based on the argument list.
@@ -113,7 +136,7 @@ class TaskJuggler
       queryText += "->"
     end
 
-    def setPropertyType(args)
+    def setPropertyType(query, args)
       validTypes = { 'account' => :Account,
                      'task' => :Task,
                      'resource' => :Resource }
@@ -124,34 +147,34 @@ class TaskJuggler
                 "Unknown query family type '#{args['family']}'. " +
                 "Use one of #{validTypes}.join(', ')!")
         end
-        @query.propertyType = validTypes[args['family']]
-        if @query.propertyType == :Task
-          @query.scopePropertyType = :Resource
-        elsif @query.propertyType == :Resource
-          @query.scopePropertyType = :Task
+        query.propertyType = validTypes[args['family']]
+        if query.propertyType == :Task
+          query.scopePropertyType = :Resource
+        elsif query.propertyType == :Resource
+          query.scopePropertyType = :Task
         end
       end
     end
 
-    def setLoadUnit(args)
+    def setLoadUnit(query, args)
       units = {
         'days' => :days, 'hours' => :hours, 'longauto' => :longauto,
         'minutes' => :minutes, 'months' => :months, 'shortauto' => :shortauto,
         'weeks' => :weeks, 'years' => :years
       }
-      @query.loadUnit = units[args['loadunit']] if args['loadunit']
+      query.loadUnit = units[args['loadunit']] if args['loadunit']
     end
 
-    def setScenarioIdx(args)
+    def setScenarioIdx(query, args)
       if args['scenario']
         scenarioIdx = @project.scenarioIdx(args['scenario'])
         unless scenarioIdx
           error('rtfq_bad_scenario', "Unknown scenario #{args['scenario']}")
         end
-        @query.scenarioIdx = scenarioIdx
+        query.scenarioIdx = scenarioIdx
       end
       # Default to 0 in case no scenario was provided.
-      @query.scenarioIdx = 0 unless @query.scenarioIdx
+      query.scenarioIdx = 0 unless query.scenarioIdx
     end
 
   end