taskjuggler 0.0.5 → 0.0.6

data/lib/reports/ResourceListRE.rb

@@ -39,15 +39,16 @@ class TaskJuggler
       resourceList.setSorting(@report.get('sortResources'))
       resourceList = filterResourceList(resourceList, nil,
                                         @report.get('hideResource'),
-                                        @report.get('rollupResource'))
-      resourceList.query = @report.project.reportContext.query
+                                        @report.get('rollupResource'),
+                                        @report.get('openNodes'))
+      resourceList.query = @report.project.reportContexts.last.query
       resourceList.sort!
 
       # Prepare the task list. Don't filter it yet! It would break the
       # *_() LogicalFunctions.
       taskList = PropertyList.new(@project.tasks)
       taskList.setSorting(@report.get('sortTasks'))
-      taskList.query = @report.project.reportContext.query
+      taskList.query = @report.project.reportContexts.last.query
       taskList.sort!
 
       adjustReportPeriod(taskList, @report.get('scenarios'),

data/lib/reports/StatusSheetReport.rb

@@ -74,7 +74,8 @@ class TaskJuggler
       resourceList.setSorting(@report.get('sortResources'))
       resourceList = filterResourceList(resourceList, nil,
                                         @report.get('hideResource'),
-                                        @report.get('rollupResource'))
+                                        @report.get('rollupResource'),
+                                        @report.get('openNodes'))
       # Prepare a template for the Query we will use to get all the data.
       scenarioIdx = a('scenarios')[0]
       queryAttrs = { 'project' => @project,
@@ -94,7 +95,7 @@ class TaskJuggler
       taskList = PropertyList.new(@project.tasks)
       taskList.setSorting(@report.get('sortTasks'))
       taskList = filterTaskList(taskList, nil, @report.get('hideTask'),
-                                @report.get('rollupTask'))
+                                @report.get('rollupTask'), @report.get('openNodes'))
       taskList.sort!
 
       resourceList.each do |resource|
@@ -118,16 +119,10 @@ class TaskJuggler
         @managers << (manager = ManagerStatusRecord.new(resource))
 
         topLevelTasks.each do |task|
-          entries = @project['journal'].entries(a('start'), a('end'), task)
-          # Get a list of all current Entries of this task. This list may not
-          # contain all entries of the previous list, but it will for sure
-          # contain older entries with higher alert levels.
-          oldEntries = @project['journal'].currentEntries(a('end'), task,
-                                                          0, a('start'))
-          # Remove entries that are in both lists.
-          oldEntries.delete_if { |e| entries.include?(e) }
-          # Combine the list with oldEntries going first.
-          entries = oldEntries + entries
+          # Get a list of all the current Journal entries for this task and
+          # all it's sub tasks.
+          entries = @project['journal'].currentEntriesR(a('end'), task,
+                                                        0, a('start') + 1)
           next if entries.empty?
 
           manager.responsibilities << ManagerResponsibilities.new(task, entries)
@@ -185,7 +180,7 @@ class TaskJuggler
                 end
                 @file << "\n"
               end
-              @file << "    #   author #{entry.author.fullId}\n"
+              @file << "    #   author #{entry.author.fullId}\n" if entry.author
               if entry.summary
                 @file << "    #   summary -8<-\n" +
                          indentBlock(4, entry.summary.richText.inputText) +

data/lib/reports/TableReport.rb

@@ -26,33 +26,35 @@ class TaskJuggler
     attr_reader :legend
 
     @@propertiesById = {
-      # ID                Header           Indent  Align   Scen Spec.
-      'alert'        => [ 'Alert',         true,   :left,  false ],
-      'alertmessage' => [ 'Alert Message', false,  :left,  false ],
-      'alertsummary' => [ 'Alert Summary', false,  :left,  false ],
-      'alerttrend'   => [ 'Alert Trend',   false,  :left,  false ],
-      'complete'     => [ 'Completion',    false,  :right, true ],
-      'cost'         => [ 'Cost',          true,   :right, true ],
-      'duration'     => [ 'Duration',      true,   :right, true ],
-      'effort'       => [ 'Effort',        true,   :right, true ],
-      'effortdone'   => [ 'Effort Done',   true,   :right, true ],
-      'effortleft'   => [ 'Effort Left',   true,   :right, true ],
-      'freetime'     => [ 'Free Time',     true,   :right, true ],
-      'followers'    => [ 'Followers',     false,  :left,  true ],
-      'id'           => [ 'Id',            false,  :left,  false ],
-      'journal'      => [ 'Journal',       false,  :left,  false ],
-      'line'         => [ 'Line No.',      false,  :right, false ],
-      'name'         => [ 'Name',          true,   :left,  false ],
-      'no'           => [ 'No.',           false,  :right, false ],
-      'precursors'   => [ 'Precursors',    false,  :left,  true ],
-      'rate'         => [ 'Rate',          true,   :right, true ],
-      'resources'    => [ 'Resources',     false,  :left,  true ],
-      'responsible'  => [ 'Responsible',   false,  :left,  true ],
-      'revenue'      => [ 'Revenue',       true,   :right, true ],
-      'scenario'     => [ 'Scenario',      false,  :left,  true ],
-      'status'       => [ 'Status',        false,  :left,  true ],
-      'targets'      => [ 'Targets',       false,  :left,  true ],
-      'wbs'          => [ 'WBS',           false,  :left,  false ]
+      # ID                  Header                 Indent  Align   Scen Spec.
+      'alert'            => [ 'Alert',             true,   :left,  false ],
+      'alertmessages'    => [ 'Alert Messages',    false,  :left,  false ],
+      'alertsummaries'   => [ 'Alert Summaries',   false,  :left,  false ],
+      'alerttrend'       => [ 'Alert Trend',       false,  :left,  false ],
+      'complete'         => [ 'Completion',        false,  :right, true ],
+      'cost'             => [ 'Cost',              true,   :right, true ],
+      'duration'         => [ 'Duration',          true,   :right, true ],
+      'effort'           => [ 'Effort',            true,   :right, true ],
+      'effortdone'       => [ 'Effort Done',       true,   :right, true ],
+      'effortleft'       => [ 'Effort Left',       true,   :right, true ],
+      'freetime'         => [ 'Free Time',         true,   :right, true ],
+      'followers'        => [ 'Followers',         false,  :left,  true ],
+      'id'               => [ 'Id',                false,  :left,  false ],
+      'journal'          => [ 'Journal',           false,  :left,  false ],
+      'journalmessages'  => [ 'Journal Messages',  false,  :left,  false ],
+      'journalsummaries' => [ 'Journal Summaries', false,  :left,  false ],
+      'line'             => [ 'Line No.',          false,  :right, false ],
+      'name'             => [ 'Name',              true,   :left,  false ],
+      'no'               => [ 'No.',               false,  :right, false ],
+      'precursors'       => [ 'Precursors',        false,  :left,  true ],
+      'rate'             => [ 'Rate',              true,   :right, true ],
+      'resources'        => [ 'Resources',         false,  :left,  true ],
+      'responsible'      => [ 'Responsible',       false,  :left,  true ],
+      'revenue'          => [ 'Revenue',           true,   :right, true ],
+      'scenario'         => [ 'Scenario',          false,  :left,  true ],
+      'status'           => [ 'Status',            false,  :left,  true ],
+      'targets'          => [ 'Targets',           false,  :left,  true ],
+      'wbs'              => [ 'WBS',               false,  :left,  false ]
     }
     @@propertiesByType = {
       # Type                     Indent  Align
@@ -84,6 +86,9 @@ class TaskJuggler
     def to_html
       html = []
 
+      html << XMLComment.new("Dynamic Report ID: " +
+                             "#{@report.project.reportContexts.last.
+                                dynamicReportId}")
       html << rt_to_html('header')
       html << (tableFrame = generateHtmlTableFrame)
 
@@ -333,7 +338,7 @@ class TaskJuggler
       taskList.each do |task|
         # Get the current Query from the report context and create a copy. We
         # are going to modify it.
-        query = @project.reportContext.query.dup
+        query = @project.reportContexts.last.query.dup
         query.property = task
         query.scopeProperty = scopeLine ? scopeLine.property : nil
 
@@ -363,7 +368,7 @@ class TaskJuggler
           # filter.
           resourceList.setSorting(a('sortResources'))
           assignedResourceList = filterResourceList(resourceList, task,
-              a('hideResource'), a('rollupResource'))
+              a('hideResource'), a('rollupResource'), a('openNodes'))
           assignedResourceList.sort!
           lineNo = generateResourceList(assignedResourceList, nil, line)
         end
@@ -397,7 +402,7 @@ class TaskJuggler
       resourceList.each do |resource|
         # Get the current Query from the report context and create a copy. We
         # are going to modify it.
-        query = @project.reportContext.query.dup
+        query = @project.reportContexts.last.query.dup
         query.property = resource
         query.scopeProperty = scopeLine ? scopeLine.property : nil
 
@@ -427,8 +432,8 @@ class TaskJuggler
           # filter.
           taskList.setSorting(a('sortTasks'))
           assignedTaskList = filterTaskList(taskList, resource,
-                                            a('hideTask'),
-                                            a('rollupTask'))
+                                            a('hideTask'), a('rollupTask'),
+                                            a('openNodes'))
           assignedTaskList.sort!
           lineNo = generateTaskList(assignedTaskList, nil, line)
         end
@@ -629,6 +634,11 @@ class TaskJuggler
       cellColor = columnDef.cellColor.getPattern(query)
       cell.cellColor = cellColor if cellColor
 
+      # Replace the default cell alignment if the user has requested a custom
+      # alignment.
+      hAlign = columnDef.hAlign.getPattern(query)
+      cell.alignment = hAlign if hAlign
+
       # If the user has requested a custom tooltip, add it to the cell.
       cell.tooltip = columnDef.tooltip.getPattern(query) || nil
 
@@ -710,6 +720,11 @@ class TaskJuggler
       fontColor = columnDef.fontColor.getPattern(query)
       cell.fontColor = fontColor if fontColor
 
+      # Replace the default cell alignment if the user has requested a custom
+      # alignment.
+      hAlign = columnDef.hAlign.getPattern(query)
+      cell.alignment = hAlign if hAlign
+
       # Register the custom tooltip if the user has requested one.
       cdTooltip = columnDef.tooltip.getPattern(query)
       cell.tooltip = cdTooltip if cdTooltip

data/lib/reports/TaskListRE.rb

@@ -38,15 +38,15 @@ class TaskJuggler
       taskList = PropertyList.new(@project.tasks)
       taskList.setSorting(@report.get('sortTasks'))
       taskList = filterTaskList(taskList, nil, @report.get('hideTask'),
-                                @report.get('rollupTask'))
-      taskList.query = @report.project.reportContext.query
+                                @report.get('rollupTask'), @report.get('openNodes'))
+      taskList.query = @report.project.reportContexts.last.query
       taskList.sort!
 
       # Prepare the resource list. Don't filter it yet! It would break the
       # *_() LogicalFunctions.
       resourceList = PropertyList.new(@project.resources)
       resourceList.setSorting(@report.get('sortResources'))
-      resourceList.query = @report.project.reportContext.query
+      resourceList.query = @report.project.reportContexts.last.query
       resourceList.sort!
 
       adjustReportPeriod(taskList, @report.get('scenarios'),

data/lib/reports/TimeSheetReport.rb

@@ -128,10 +128,18 @@ EOT
   # newtask new.task.id "A task title" {
   #   work X%
   #   remaining Y.Yd
+  #   status green "Your headline here!" {
+  #     summary -8<-
+  #     A summary text
+  #     -8<-
+  #     details -8<-
+  #     Some more details
+  #     ->8-
+  #   }
   # }
 
   # You can use the following section to report personal notes.
-  # status green "A headline" {
+  # status green "Your headline here!" {
   #   summary -8<-
   #   A summary text
   #   ->8-
@@ -169,7 +177,8 @@ EOT
       resourceList.setSorting(@report.get('sortResources'))
       resourceList = filterResourceList(resourceList, nil,
                                         @report.get('hideResource'),
-                                        @report.get('rollupResource'))
+                                        @report.get('rollupResource'),
+                                        @report.get('openNodes'))
       # Prepare a template for the Query we will use to get all the data.
       scenarioIdx = a('scenarios')[0]
       queryAttrs = { 'project' => @project,
@@ -189,7 +198,7 @@ EOT
       taskList = PropertyList.new(@project.tasks)
       taskList.setSorting(@report.get('sortTasks'))
       taskList = filterTaskList(taskList, nil, @report.get('hideTask'),
-                                @report.get('rollupTask'))
+                                @report.get('rollupTask'), @report.get('openNodes'))
 
       records = []
       resourceList.each do |resource|
@@ -219,8 +228,8 @@ EOT
         # Now we have to find all the task that the resource is allocated to
         # during the report period.
         assignedTaskList = filterTaskList(taskList, resource,
-                                          a('hideTask'),
-                                          a('rollupTask'))
+                                          a('hideTask'), a('rollupTask'),
+                                          a('openNodes'))
         queryAttrs['scopeProperty'] = resource
         assignedTaskList.query = Query.new(queryAttrs)
         assignedTaskList.sort!

data/lib/reports/TjpExportRE.rb

@@ -18,15 +18,10 @@ class TaskJuggler
   # project data in the TJP syntax format.
   class TjpExportRE < ReportBase
 
-    attr_reader :mainFile
-
     # Create a new object and set some default values.
     def initialize(report)
       super(report)
 
-      # Indicates whether this is a full .tjp file or just an .tji include file.
-      @mainFile = a('name')[-4, 4] != '.tji'
-
       @supportedTaskAttrs = %w( booking complete depends flags maxend
                                 maxstart minend minstart note priority
                                 responsible )
@@ -52,20 +47,21 @@ class TaskJuggler
       @resourceList = PropertyList.new(@project.resources)
       @resourceList.setSorting(a('sortResources'))
       @resourceList = filterResourceList(@resourceList, nil, a('hideResource'),
-                                         a('rollupResource'))
+                                         a('rollupResource'), a('openNodes'))
       @resourceList.sort!
 
       # Prepare the task list.
       @taskList = PropertyList.new(@project.tasks)
       @taskList.setSorting(a('sortTasks'))
-      @taskList = filterTaskList(@taskList, nil, a('hideTask'), a('rollupTask'))
+      @taskList = filterTaskList(@taskList, nil, a('hideTask'), a('rollupTask'),
+                                 a('openNodes'))
       @taskList.sort!
 
       getBookings
 
       @file = ''
 
-      generateProjectProperty unless a('definitions').include?('project')
+      generateProjectProperty if a('definitions').include?('project')
 
       generateFlagDeclaration if a('definitions').include?('flags')
       generateProjectIDs if a('definitions').include?('projectids')
@@ -136,11 +132,11 @@ class TaskJuggler
       a('scenarios').each do |scenarioIdx|
         @taskList.each do |task|
           pid = task['projectid', scenarioIdx]
-          projectIDs << pid unless projectIDs.include?(pid)
+          projectIDs << pid unless pid.nil? || projectIDs.include?(pid)
         end
       end
 
-      @file << "projectids #{projectIDs.join(', ')}\n\n"
+      @file << "projectids #{projectIDs.join(', ')}\n\n" unless projectIDs.empty?
     end
 
     def generateResourceList
@@ -220,19 +216,18 @@ class TaskJuggler
       if isLeafTask
         a('scenarios').each do |scenarioIdx|
           generateAttribute(task, 'start', indent + 2, scenarioIdx)
-          unless task['milestone', scenarioIdx]
+          if task['milestone', scenarioIdx]
+            generateAttributeText('milestone', indent + 2, scenarioIdx)
+          else
             generateAttribute(task, 'end', indent + 2, scenarioIdx)
+            generateAttributeText('scheduling ' +
+                                  (task['forward', scenarioIdx] ?
+                                   'asap' : 'alap'),
+                                  indent + 2, scenarioIdx)
           end
           if task['scheduled', scenarioIdx]
             generateAttributeText('scheduled', indent + 2, scenarioIdx)
           end
-          generateAttributeText('scheduling ' +
-                                (task['forward', scenarioIdx] ?
-                                 'asap' : 'alap'),
-                                indent + 2, scenarioIdx)
-          if task['milestone', scenarioIdx]
-            generateAttributeText('milestone', indent + 2, scenarioIdx)
-          end
         end
       end
 
@@ -332,7 +327,7 @@ class TaskJuggler
     def generateAttributeText(text, indent, scenarioIdx)
       @file << ' ' * indent
       tag = ''
-      unless scenarioIdx.nil?
+      if !scenarioIdx.nil? && scenarioIdx != 0
         tag = @project.scenario(scenarioIdx).id
         @file << "#{tag}:"
       end

data/lib/taskjuggler3.rb

@@ -57,6 +57,14 @@ def processArguments(argv)
           'Turn on warnings for requested changes in time sheets') do
    @warnTsDeltas = true
   end
+  opts.on('--check-syntax',
+          'Only parse the input files and check the syntax.') do
+   @checkSyntax = true
+  end
+  opts.on('--no-reports',
+          'Just schedule the project, but don\'t generate any reports.') do
+   @noReports = true
+  end
   opts.on('-o', '--output-dir <directory>', String,
           'Directory the reports should go into') do |arg|
     @outputDir = arg + '/'
@@ -106,6 +114,8 @@ def main
   @maxCpuCores = 1
   @forceReports = false
   @warnTsDeltas = false
+  @checkSyntax = false
+  @noReports = false
   @outputDir = ''
   @timeSheets = []
   @statusSheets = []
@@ -122,6 +132,9 @@ def main
   tj.warnTsDeltas = @warnTsDeltas
   keepParser = !@timeSheets.empty? || !@statusSheets.empty?
   exit 1 unless tj.parse(files, keepParser)
+
+  exit 0 if @checkSyntax
+
   if !tj.schedule
     exit 1 unless @forceReports
   end
@@ -135,6 +148,8 @@ def main
     exit 1 if !tj.checkStatusSheet(ss, File.read(ss)) || tj.errors > 0
   end
 
+  exit 0 if @noReports
+
   exit 1 if !tj.generateReports(@outputDir) || tj.errors > 0
 
 end

data/lib/tj3client.rb

@@ -206,7 +206,7 @@ EOT
         end
       rescue
         error("TaskJuggler server on host '#{@host}' port " +
-              "#{@port} is not responding: #{$!}")
+              "#{@port} is not responding")
       end
     end
 
@@ -222,6 +222,7 @@ EOT
         $stdout.puts callDaemon(:status, [])
       when 'terminate'
         callDaemon(:stop, [])
+        info('Daemon terminated')
       when 'add'
         # Ask the daemon to create a new ProjectServer process and return a
         # DRbObject to access it.
@@ -240,6 +241,7 @@ EOT
             error("Project '#{arg}' not found in list")
           end
         end
+        info('Project removed')
       when 'report'
         # The first value of args is the project ID. The following values
         # could be either report IDs or TJI file # names ('.' or '*.tji').
@@ -259,7 +261,7 @@ EOT
         unless failed
           reportIds.each do |reportId|
             unless @reportServer.generateReport(@rs_authKey, reportId,
-                                                @regExpMode)
+                                                @regExpMode, nil)
               failed = true
               break
             end
@@ -373,11 +375,6 @@ EOT
         error("Report server termination failed: #{$!}")
       end
       @reportServer = nil
-      begin
-        @projectServer.dropReportServer(@ps_authKey, @rs_uri)
-      rescue
-        error("Cannot drop report server: #{$!}")
-      end
       @rs_uri = nil
       @rs_authKey = nil
       @projectServer = nil
@@ -431,6 +428,11 @@ EOT
       true
     end
 
+    def info(message)
+      return if @silent
+      $stdout.puts "#{message}"
+    end
+
     def error(message)
       $stderr.puts "ERROR: #{message}"
       exit 1