taskjuggler 0.0.5 → 0.0.6

data/lib/Query.rb

@@ -179,7 +179,7 @@ class TaskJuggler
 
     # Return the result of the Query as String. The result may be nil.
     def to_s
-      @attr ? @attr.to_s(self) : (@string || '')
+      @attr ? @attr.to_s(self) : (@rti ? @rti.to_s : (@string || ''))
     end
 
     # Return the result of the Query as Fixnum or Float. The result may be
@@ -207,6 +207,8 @@ class TaskJuggler
         else
           @attr.value
         end
+      elsif @rti
+        @rti
       elsif @numerical
         @numerical
       else

data/lib/RTFHandlers.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = RTFHandlers.rb -- The TaskJuggler III Project Management Software
+#
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.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
+# published by the Free Software Foundation.
+#
+
+require 'RTFNavigator'
+require 'RTFQuery'
+require 'RTFReport'
+require 'RTFReportLink'
+
+class TaskJuggler
+
+  # This convenience class creates an Array containing all RichTextFunction
+  # objects used by TaskJuggler.
+  class RTFHandlers
+
+    def RTFHandlers.create(project, sourceFileInfo = nil)
+      [
+        RTFNavigator.new(project, sourceFileInfo),
+        RTFQuery.new(project, sourceFileInfo),
+        RTFReport.new(project, sourceFileInfo),
+        RTFReportLink.new(project, sourceFileInfo)
+      ]
+    end
+
+  end
+
+end

data/lib/RTFReport.rb

@@ -40,16 +40,33 @@ class TaskJuggler
         error('rtp_report_unknown_id', "Unknown report #{id}")
         return nil
       end
+      # Detect recursive nesting
+      found = false
+      @project.reportContexts.each do |c|
+        if c.report == report
+          found = true
+          break
+        end
+      end
+      if found
+        stack = ""
+        @project.reportContexts.each do |context|
+          stack += ' -> ' unless stack.empty?
+          stack += '[ ' if context.report == report
+          stack += context.report.fullId
+        end
+        stack += " -> #{report.fullId} ] ..."
+        error('rtp_report_recursion',
+              "Recursive nesting of reports detected: #{stack}")
+        return nil
+      end
 
-      # Save the old report context record
-      oldReportContext = @project.reportContext
       # Create a new context for the report.
-      @project.reportContext = ReportContext.new(@project, report)
+      @project.reportContexts.push(ReportContext.new(@project, report))
       # Generate the report with the new context
-      report.generate
+      report.generateIntermediateFormat
       html = report.to_html
-      # Restore the global report context record again.
-      @project.reportContext = oldReportContext
+      @project.reportContexts.pop
 
       html
     end

data/lib/RTFReportLink.rb

@@ -0,0 +1,72 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = RTFReportLink.rb -- The TaskJuggler III Project Management Software
+#
+# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.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
+# published by the Free Software Foundation.
+#
+
+require 'RichTextFunctionHandler'
+require 'XMLElement'
+require 'URLParameter'
+
+class TaskJuggler
+
+  # This class is a specialized RichTextFunctionHandler that generates a link
+  # to another report. It's not available on all output formats.
+  class RTFReportLink < RichTextFunctionHandler
+
+    def initialize(project, sourceFileInfo = nil)
+      super(project, 'reportlink', sourceFileInfo)
+      @blockFunction = false
+    end
+
+    # Not supported for this function
+    def to_s(args)
+      ''
+    end
+
+    # Return a HTML tree for the report.
+    def to_html(args)
+      if args.nil? || (id = args['id']).nil?
+        error('rtp_report_id',
+              "Argument 'id' missing to specify the report to be used.")
+        return nil
+      end
+      unless (report = @project.report(id))
+        error('rtp_report_unknown_id', "Unknown report #{id}")
+        return nil
+      end
+
+      # The URL for interactive reports is different than for static reports.
+      if report.interactive?
+        # The project and report ID must be provided as query.
+        url = "taskjuggler?project=#{@project['projectid']};" +
+              "report=#{report.fullId}"
+
+        if args['attributes']
+          url += ";attributes=" + URLParameter.encode(args['attributes'])
+        end
+      else
+        # The report name just gets a '.html' extension.
+        url = report.name + ".html"
+      end
+      a = XMLElement.new('a', 'href'=> url)
+      a << XMLText.new(report.name)
+      a
+    end
+
+    # Not supported for this function.
+    def to_tagged(args)
+      nil
+    end
+
+  end
+
+end
+
+

data/lib/Resource.rb

@@ -37,7 +37,7 @@ class TaskJuggler
     end
 
     def query_journal(query)
-      journalMessages(query, true)
+      journalText(query, true)
     end
 
     def query_dashboard(query)
@@ -47,7 +47,7 @@ class TaskJuggler
     private
 
     # Create a blog-style list of all alert messages that match the Query.
-    def journalMessages(query, longVersion)
+    def journalText(query, longVersion)
       # The components of the message are either UTF-8 text or RichText. For
       # the RichText components, we use the originally provided markup since
       # we compose the result as RichText markup first.
@@ -66,8 +66,8 @@ class TaskJuggler
         alertName = "[[File:icons/flag-#{levelRecord[0]}.png|" +
                     "alt=[#{levelRecord[1]}]|text-bottom]]"
         levelList.each do |entry|
-          # The TimeSheetRecords associated with this entry.
           tsRecord = entry.timeSheetRecord
+
           if entry.property.is_a?(Task)
             rText += "== #{alertName} <nowiki>#{entry.property.name}</nowiki> "+
               "(ID: #{entry.property.fullId}) ==\n\n"
@@ -122,13 +122,9 @@ class TaskJuggler
 
       # Now convert the RichText markup String into RichTextIntermediate
       # format.
-      handlers = [
-        RTFNavigator.new(@project),
-        RTFQuery.new(@project),
-        RTFReport.new(@project)
-      ]
       begin
-        rti = RichText.new(rText, handlers).generateIntermediateFormat
+        rti = RichText.new(rText, RTFHandlers.create(@project)).
+          generateIntermediateFormat
       rescue RichTextException => msg
         $stderr.puts "Error while processing Rich Text\n" +
                      "Line #{msg.lineNo}: #{msg.text}\n" +
@@ -167,19 +163,15 @@ class TaskJuggler
         taskList.each do |task|
           rText += "== <nowiki>[#{task.query_alert(query)}] Task: " +
             "#{task.name}</nowiki> (#{task.fullId}) ==\n\n"
-            rText += task.query_alertmessage(query).richText.inputText + "\n\n"
+          rText += task.query_journalmessages(query).richText.inputText + "\n\n"
         end
       end
 
       # Now convert the RichText markup String into RichTextIntermediate
       # format.
-      handlers = [
-        RTFNavigator.new(@project),
-        RTFQuery.new(@project),
-        RTFReport.new(@project)
-      ]
       begin
-        rti = RichText.new(rText, handlers).generateIntermediateFormat
+        rti = RichText.new(rText, RTFHandlers.create(@project)).
+          generateIntermediateFormat
       rescue RichTextException => msg
         $stderr.puts "Error while processing Rich Text\n" +
                      "Line #{msg.lineNo}: #{msg.text}\n" +

data/lib/ResourceScenario.rb

@@ -310,27 +310,6 @@ class TaskJuggler
       work
     end
 
-    # Returns the allocated work of the resource (and its children).
-    def getAllocatedWork(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)
-
-      work = 0.0
-      if @property.container?
-        @property.children.each do |resource|
-          work += resource.getAllocatedWork(@scenarioIdx, startIdx, endIdx, task)
-        end
-      else
-        return 0.0 if @scoreboard.nil?
-
-        work = @project.convertToDailyLoad(
-                 getAllocatedSlots(startIdx, endIdx, task) *
-                 @project['scheduleGranularity'])
-      end
-      work
-    end
-
     # 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.
@@ -340,7 +319,7 @@ class TaskJuggler
       time = 0
       if @property.container?
         @property.children.each do |resource|
-          time += resource.getAllocatedWork(@scenarioIdx, startIdx, endIdx, task)
+          time += resource.getAllocatedTime(@scenarioIdx, startIdx, endIdx, task)
         end
       else
         return 0 if @scoreboard.nil?

data/lib/RichTextElement.rb

@@ -98,6 +98,8 @@ class TaskJuggler
         number = "#{@data[0]}.#{@data[1]} "
       when :title3
         number = "#{@data[0]}.#{@data[1]}.#{@data[2]} "
+      when :title4
+        number = "#{@data[0]}.#{@data[1]}.#{@data[2]}.#{@data[3]} "
       end
       if number
         # We've found a section heading. The String value of the Element is the
@@ -153,6 +155,10 @@ class TaskJuggler
         return textBlockFormat(@richText.indent + @richText.titleIndent,
                                sTitle(3), children_to_s,
                                @richText.lineWidth) + "\n"
+      when :title4
+        return textBlockFormat(@richText.indent + @richText.titleIndent,
+                               sTitle(4), children_to_s,
+                               @richText.lineWidth) + "\n"
       when :hline
         return "#{' ' * @richText.indent}" +
                "#{'-' * (@richText.lineWidth - @richText.indent)}\n"
@@ -178,6 +184,11 @@ class TaskJuggler
         return textBlockFormat(@richText.indent + @richText.listIndent * 3,
                                '* ', children_to_s,
                                @richText.lineWidth) + "\n"
+      when :bulletlist4
+      when :bulletitem4
+        return textBlockFormat(@richText.indent + @richText.listIndent * 4,
+                               '* ', children_to_s,
+                               @richText.lineWidth) + "\n"
       when :numberlist1
       when :numberitem1
         return textBlockFormat(@richText.indent + @richText.listIndent,
@@ -193,6 +204,12 @@ class TaskJuggler
         return textBlockFormat(@richText.indent + @richText.listIndent,
                                "#{@data[0]}.#{@data[1]}.#{@data[2]} ",
                                children_to_s, @richText.lineWidth) + "\n"
+      when :numberlist4
+      when :numberitem4
+        return textBlockFormat(@richText.indent + @richText.listIndent,
+                               "#{@data[0]}.#{@data[1]}.#{@data[2]}." +
+                               "#{@data[3]} ",
+                               children_to_s, @richText.lineWidth) + "\n"
       when :img
         pre = @data.altText if @data.altText
       when :ref
@@ -232,6 +249,9 @@ class TaskJuggler
       when :title3
         pre = "<h3>#{@data[0]}.#{@data[1]}.#{@data[2]} "
         post = "</h3>\n\n"
+      when :title4
+        pre = "<h4>#{@data[0]}.#{@data[1]}.#{@data[2]}.#{@data[3]} "
+        post = "</h4>\n\n"
       when :hline
         pre = '<hr>'
         post = "</hr>\n"
@@ -259,6 +279,12 @@ class TaskJuggler
       when :bulletitem3
         pre = '<li>  * '
         post = "</li>\n"
+      when :bulletlist4
+        pre = '<ul>'
+        post = '</ul>'
+      when :bulletitem4
+        pre = '<li>   * '
+        post = "</li>\n"
       when :numberlist1
         pre = '<ol>'
         post = '</ol>'
@@ -277,6 +303,12 @@ class TaskJuggler
       when :numberitem3
         pre = "<li>#{@data[0]}.#{@data[1]}.#{@data[2]} "
         post = "</li>\n"
+      when :numberlist4
+        pre = '<ol>'
+        post = '</ol>'
+      when :numberitem4
+        pre = "<li>#{@data[0]}.#{@data[1]}.#{@data[2]}.#{@data[3]} "
+        post = "</li>\n"
       when :img
         pre = "<img file=\"#{@data.fileName}\"/>"
       when :ref
@@ -346,6 +378,8 @@ class TaskJuggler
         htmlTitle(2)
       when :title3
         htmlTitle(3)
+      when :title4
+        htmlTitle(4)
       when :hline
         noChilds = true
         XMLElement.new('hr', attrs, true)
@@ -370,6 +404,10 @@ class TaskJuggler
         XMLElement.new('ul')
       when :bulletitem3
         XMLElement.new('li')
+      when :bulletlist4
+        XMLElement.new('ul')
+      when :bulletitem4
+        XMLElement.new('li')
       when :numberlist1
         XMLElement.new('ol')
       when :numberitem1
@@ -382,6 +420,10 @@ class TaskJuggler
         XMLElement.new('ol')
       when :numberitem3
         XMLElement.new('li')
+      when :numberlist4
+        XMLElement.new('ol')
+      when :numberitem4
+        XMLElement.new('li')
       when :img
         el = XMLElement.new('img', 'src' => @data.fileName)
         el['alt'] = @data.altText if @data.altText

data/lib/RichTextParser.rb

@@ -27,7 +27,7 @@ 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(rti, sectionCounter = [ 0, 0, 0], tokenSet = nil)
+    def initialize(rti, sectionCounter = [ 0, 0, 0, 0 ], tokenSet = nil)
       super()
       @richTextI = rti
       # These are the tokens that can be returned by the RichTextScanner.
@@ -36,15 +36,17 @@ class TaskJuggler
                        QUERY
                        INLINEFUNCSTART INLINEFUNCEND
                        BLOCKFUNCSTART BLOCKFUNCEND ID STRING
-                       TITLE1 TITLE2 TITLE3 TITLE1END TITLE2END TITLE3END
-                       BULLET1 BULLET2 BULLET3 NUMBER1 NUMBER2 NUMBER3 )
+                       TITLE1 TITLE2 TITLE3 TITLE4
+                       TITLE1END TITLE2END TITLE3END TITLE4END
+                       BULLET1 BULLET2 BULLET3 BULLET4
+                       NUMBER1 NUMBER2 NUMBER3 NUMBER4 )
       limitTokenSet(tokenSet)
       # Load the rule set into the parser.
       initRules
       # The sections and numbered list can each nest 3 levels deep. We use these
       # counter Arrays to generate proper 1.2.3 type labels.
       @sectionCounter = sectionCounter
-      @numberListCounter = [ 0, 0, 0 ]
+      @numberListCounter = [ 0, 0, 0, 0 ]
     end
 
     # Construct the parser and get ready to read.

data/lib/RichTextScanner.rb

@@ -112,7 +112,7 @@ class TaskJuggler
     end
 
     # The parser uses this function to report any errors during parsing.
-    def error(id, text, foo)
+    def error(id, text, foo = nil, bar = nil)
       if @debug
         $stderr.puts "Line #{@lineNo}: #{text}\n" +
                      "#{@text[@lineStart, @pos - @lineStart]}"
@@ -237,7 +237,7 @@ class TaskJuggler
       case (c = nextChar)
       when '='
         # Headings start with 2 or more = and must be followed by a space.
-        level = readSequenceMax('=', 4)
+        level = readSequenceMax('=', 5)
         if level == 1
           # 1 = does not mean anything. Push it back and process it as normal
           # text further down.
@@ -256,7 +256,7 @@ class TaskJuggler
         returnChar(level)
       when '*'
         # Bullet lists start with one to three * characters.
-        level = readSequenceMax('*')
+        level = readSequenceMax('*', 4)
         # Between the * characters and the bullet text must be exactly one
         # space.
         return [ "BULLET#{level}", '*' * level ] if nextChar == ' '
@@ -264,7 +264,7 @@ class TaskJuggler
         returnChar(level + 1)
       when '#'
         # Numbered list start with one to three # characters.
-        level = readSequenceMax('#')
+        level = readSequenceMax('#', 4)
         # Between the # characters and the bullet text must be exactly one
         # space.
         return [ "NUMBER#{level}", '#' * level ] if nextChar == ' '
@@ -322,7 +322,7 @@ class TaskJuggler
           nil
         end
       elsif c == '=' && !@ignoreInlineMarkup
-        level = readSequenceMax('=', 4)
+        level = readSequenceMax('=', 5)
         if level > 1
           [ "TITLE#{level - 1}END", '=' * level ]
         else