taskjuggler 0.0.4 → 0.0.5

data/lib/reports/TimeSheetReport.rb

@@ -18,9 +18,12 @@ class TaskJuggler
   class TSResourceRecord
 
     attr_reader :resource, :tasks
+    attr_accessor :vacationHours, :vacationPercent
 
     def initialize(resource)
       @resource = resource
+      @vacationHours = 0.0
+      @vacationPercent = 0.0
       @tasks = []
     end
 
@@ -29,11 +32,12 @@ class TaskJuggler
   # Utility class for the intermediate TimeSheetReport format.
   class TSTaskRecord
 
-    attr_reader :task, :work, :remaining, :endDate
+    attr_reader :task, :workDays, :workPercent, :remaining, :endDate
 
-    def initialize(task, work, remaining = nil, endDate = nil)
+    def initialize(task, workDays, workPercent, remaining = nil, endDate = nil)
       @task = task
-      @work = work
+      @workDays = workDays
+      @workPercent = workPercent
       @remaining = remaining
       @endDate = endDate
     end
@@ -44,21 +48,12 @@ class TaskJuggler
   # sheets. The time sheet is structured using the TJP file syntax.
   class TimeSheetReport < ReportBase
 
-    attr_reader :mainFile
-
     # Create a new object and set some default values.
     def initialize(report)
       super(report)
 
-      @report.set('scenarios', [ 0 ])
-      # Show all tasks, sorted by seqno-up.
-      @report.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
-      @report.set('sortTasks', [ [ 'seqno', true, -1 ] ])
-      # Show all resources, sorted by seqno-up.
-      @report.set('hideResource', LogicalExpression.new(LogicalOperation.new(0)))
-      @report.set('sortResources', [ [ 'seqno', true, -1 ] ])
-
-      @records = []
+      @current = []
+      @future = []
     end
 
     # In the future we might want to generate other output than TJP synatx. So
@@ -67,7 +62,108 @@ class TaskJuggler
     # records holds a TSTaskRecord for each assigned task.
     def generateIntermediateFormat
       super
+      @current = collectRecords(a('start'), a('end'))
+      newEnd = a('end') + (a('end').to_i - a('start').to_i)
+      newEnd = @project['end'] if newEnd > @project['end']
+      @future = collectRecords(a('end'), a('end') + (a('end') - a('start')))
+    end
+
+    # Generate a time sheet in TJP syntax format.
+    def to_tjp
+      # This String will hold the result.
+      @file = <<'EOT'
+# The status headline should be no more than 60 characters and may
+# not be empty! The status summary is optional and should be no
+# longer than one or two sentences of plain text. The details section
+# is also optional has no length limitation. You can use simple
+# markup in this section.  It is recommended that you provide at
+# least a summary or a details section.
+# See http://www.taskjuggler.org/tj3/manual/timesheet.html for details.
+#
+# --------8<--------8<--------
+EOT
+
+      # Iterate over all the resources that we have TSResourceRecords for.
+      @current.each do |rr|
+        resource = rr.resource
+        # Generate the time sheet header
+        @file << "timesheet #{resource.fullId} " +
+                 "#{a('start')} - #{a('end')} {\n\n"
+
+        @file << "  # Vacation time: #{rr.vacationPercent}%\n\n"
+
+        if rr.tasks.empty?
+          # If there were no assignments, just write a comment.
+          @file << "  # There were no planned tasks assignments for " +
+                   "this period!\n\n"
+        else
+          rr.tasks.each do |tr|
+            task = tr.task
+
+            @file << "  # Task: #{task.name}\n"
+            @file << "  task #{task.fullId} {\n"
+            #@file << "    work #{tr.workDays *
+            #                     @project['dailyworkinghours']}h\n"
+            @file << "    work #{tr.workPercent}%\n"
+            if tr.remaining
+              @file << "    remaining #{tr.remaining}d\n"
+            else
+              @file << "    end #{tr.endDate}\n"
+            end
+            c = tr.workDays > 1.0 ? '' : '# '
+            @file << "    #{c}status green \"Your headline here!\" {\n" +
+                     "    #  summary -8<-\n" +
+                     "    #  A summary text\n" +
+                     "    #  ->8-\n" +
+                     "    #  details -8<-\n" +
+                     "    #  Some more details\n" +
+                     "    #  ->8-\n" +
+                     "    #{c}}\n"
+            @file << "  }\n\n"
+          end
+        end
+        @file << <<'EOT'
+  # If you had unplanned tasks, uncomment and fill out the
+  # following lines:
+  # newtask new.task.id "A task title" {
+  #   work X%
+  #   remaining Y.Yd
+  # }
 
+  # You can use the following section to report personal notes.
+  # status green "A headline" {
+  #   summary -8<-
+  #   A summary text
+  #   ->8-
+  #   details -8<-
+  #   Some more details
+  #   ->8-
+  # }
+EOT
+        future = @future[@future.index { |r| r.resource == resource }]
+        if future && !future.tasks.empty?
+          @file << <<'EOT'
+  #
+  # Your upcoming tasks for the next period
+  # Please check them carefully and discuss any necessary
+  # changes with your manager or project manager!
+  #
+EOT
+          future.tasks.each do |taskRecord|
+            @file << "  # #{taskRecord.task.name}: #{taskRecord.workPercent}%\n"
+          end
+          @file << "\n"
+        else
+          @file << "\n  # You have no future assignments for this project!\n"
+        end
+        @file << "}\n# -------->8-------->8--------\n\n"
+      end
+      @file
+    end
+
+    private
+
+    def collectRecords(from, to)
       # Prepare the resource list.
       resourceList = PropertyList.new(@project.resources)
       resourceList.setSorting(@report.get('sortResources'))
@@ -83,7 +179,7 @@ class TaskJuggler
                      'numberFormat' => a('numberFormat'),
                      'timeFormat' => a('timeFormat'),
                      'currencyFormat' => a('currencyFormat'),
-                     'start' => a('start'), 'end' => a('end'),
+                     'start' => from, 'end' => to,
                      'costAccount' => a('costAccount'),
                      'revenueAccount' => a('revenueAccount') }
       resourceList.query = Query.new(queryAttrs)
@@ -95,12 +191,30 @@ class TaskJuggler
       taskList = filterTaskList(taskList, nil, @report.get('hideTask'),
                                 @report.get('rollupTask'))
 
+      records = []
       resourceList.each do |resource|
         # Time sheets only make sense for leaf resources that actuall do work.
         next unless resource.leaf?
 
         # Create a new TSResourceRecord for the resource.
-        @records << (resourceRecord = TSResourceRecord.new(resource))
+        records << (resourceRecord = TSResourceRecord.new(resource))
+
+        # Calculate the average working days per week (usually 5)
+        weeklyWorkingDays = @project['yearlyworkingdays'] / 52.1428
+        # Calculate the number of weeks in the report
+        weeksToReport = (to - from) / (60 * 60 * 24 * 7)
+
+        # Get the vacation days for the resource for this period.
+        queryAttrs['property'] = resource
+        query = Query.new(queryAttrs)
+        query.attributeId = 'vacationdays'
+        query.start = from
+        query.end = to
+        query.process
+        resourceRecord.vacationHours = query.to_s
+        resourceRecord.vacationPercent =
+          (query.to_num / (weeksToReport * weeklyWorkingDays)) * 100.0
+
 
         # Now we have to find all the task that the resource is allocated to
         # during the report period.
@@ -113,23 +227,30 @@ class TaskJuggler
 
         assignedTaskList.each do |task|
           # Time sheet task records only make sense for leaf tasks.
-          next unless task.leaf?
+          reportIv = Interval.new(from, to)
+          taskIv = Interval.new(task['start', scenarioIdx],
+                                task['end', scenarioIdx])
+          next if !task.leaf? || !reportIv.overlaps?(taskIv)
 
           queryAttrs['property'] = task
           query = Query.new(queryAttrs)
 
           # Get the allocated effort for the task for this period.
           query.attributeId = 'effort'
-          query.start = a('start')
-          query.end = a('end')
+          query.start = from
+          query.end = to
           query.process
-          work = query.to_s
+          # The Query.to_num of an effort always returns the value in days.
+          workDays = query.to_num
+          workPercent = (workDays / (weeksToReport * weeklyWorkingDays)) *
+                        100.0
 
-          if task['effort', scenarioIdx]
+          if task['effort', scenarioIdx] > 0
             # The task is an effort based task.
             # Get the remaining effort for this task.
-            query.start = a('end')
+            query.start = to
             query.end = task['end', scenarioIdx]
+            query.loadUnit = :days
             query.process
             remaining = query.to_s
             endDate = nil
@@ -143,69 +264,13 @@ class TaskJuggler
           # Put all data into a TSTaskRecord and push it into the resource
           # record.
           resourceRecord.tasks <<
-            TSTaskRecord.new(task, work, remaining, endDate)
+            TSTaskRecord.new(task, workDays, workPercent, remaining, endDate)
         end
       end
-    end
-
-    # Generate a time sheet in TJP syntax format.
-    def to_tjp
-
-      # Prepare the task list.
-      @taskList = PropertyList.new(@project.tasks)
-      @taskList.setSorting(a('sortTasks'))
-      @taskList = filterTaskList(@taskList, nil, a('hideTask'), a('rollupTask'))
-      @taskList.sort!
-
-      # This String will hold the result.
-      @file = ''
 
-      # Iterate over all the resources that we have TSResourceRecords for.
-      @records.each do |rr|
-        resource = rr.resource
-        # Generate the time sheet header
-        @file << "timesheet #{resource.fullId} " +
-                 "#{a('start')} - #{a('end')} {\n\n"
-
-        if rr.tasks.empty?
-          # If there were no assignments, just write a comment.
-          @file << "  # There were no planned tasks assignements for " +
-                   "this period!\n\n"
-        else
-          rr.tasks.each do |tr|
-            task = tr.task
-
-            @file << "  # Task: #{task.name}\n"
-            @file << "  task #{task.fullId} {\n"
-            @file << "    work #{tr.work}\n"
-            if tr.remaining
-              @file << "    remaining #{tr.remaining}\n"
-            else
-              @file << "    end #{tr.endDate.to_tjp}\n"
-            end
-            @file << "    status green \"Your status here!\" {\n" +
-                     "      summary\n" +
-                     "      -8<-\n" +
-                     "      Your summary here!\n" +
-                     "      ->8-\n" +
-                     "    }\n"
-            @file << "  }\n\n"
-          end
-        end
-        @file << <<'EOT'
-  # If you had unplanned tasks, uncomment and fill out the following lines:
-  # newtask new.task.id "A task title" {
-  #   work X.Xd
-  #   remaining Y.Yd
-  # }
-EOT
-        @file << "}\n\n"
-      end
-      @file
+      records
     end
 
-  private
-
     # This utility function is used to indent multi-line attributes. All
     # attributes should be filtered through this function. Attributes that
     # contain line breaks will be indented properly. In addition to the

data/lib/reports/TjpExportRE.rb

@@ -37,7 +37,8 @@ class TaskJuggler
       @report.set('hideTask', LogicalExpression.new(LogicalOperation.new(0)))
       @report.set('sortTasks', [ [ 'seqno', true, -1 ] ])
       # Show all resources, sorted by seqno-up.
-      @report.set('hideResource', LogicalExpression.new(LogicalOperation.new(0)))
+      @report.set('hideResource',
+                  LogicalExpression.new(LogicalOperation.new(0)))
       @report.set('sortResources', [ [ 'seqno', true, -1 ] ])
     end
 
@@ -64,7 +65,7 @@ class TaskJuggler
 
       @file = ''
 
-      generateProjectProperty if @mainFile
+      generateProjectProperty unless a('definitions').include?('project')
 
       generateFlagDeclaration if a('definitions').include?('flags')
       generateProjectIDs if a('definitions').include?('projectids')
@@ -295,8 +296,7 @@ class TaskJuggler
         @project.tasks.eachAttributeDefinition do |attrDef|
           id = attrDef.id
           attr = task.getAttr(id)
-          next if (!@supportedTaskAttrs.include?(id) &&
-                   ! attrDef.userDefined) ||
+          next if (!@supportedTaskAttrs.include?(id) && !attrDef.userDefined) ||
                   !a('taskAttributes').include?(id)
 
           if attrDef.scenarioSpecific

data/lib/ruby-signal-bug.rb

@@ -0,0 +1,43 @@
+$:.unshift "."
+
+require 'BatchProcessor'
+
+def test_fileIO
+  # First parameter should be larger than the number of CPU cores.
+  doRun(3, 2000) do
+    fname = "test#{$$}.txt"
+    f = File.new(fname, 'w')
+    0.upto(10000) do |i|
+      f.puts "#{i} Hello, world! "
+    end
+    f.close
+    File.delete(fname)
+
+    # Allow some time for the OS to recycle file descriptors.
+    sleep(0.05)
+  end
+end
+
+def doRun(maxCPUs, jobs, &block)
+  # Create a BatchProcessor
+  bp = TaskJuggler::BatchProcessor.new(maxCPUs)
+
+  # Queue jobs
+  jobs.times do |i|
+    bp.queue("job #{i}") { yield }
+  end
+
+  ok = error = 0
+
+  # Wait for them to finish
+  bp.wait do |j|
+    if j.retVal.signaled?
+      error += 1
+    else
+      ok += 1
+    end
+  end
+  puts "Ok: #{ok}  Errors: #{error}"
+end
+
+test_fileIO

data/lib/taskjuggler3.rb

@@ -10,6 +10,7 @@
 # published by the Free Software Foundation.
 #
 
+require 'rubygems'
 require 'optparse'
 require 'Tj3Config'
 require 'TaskJuggler'
@@ -44,10 +45,17 @@ def processArguments(argv)
           'Generate reports despite scheduling errors') do
     @forceReports = true
   end
-  opts.on('-s', '--report-server',
-          'Parse and schedule the project and wait for remote report ' +
-          'requests') do
-    @reportServer = true
+  opts.on('--check-time-sheet <tji-file>', String,
+          "Check the given time sheet") do |arg|
+    @timeSheets << arg
+  end
+  opts.on('--check-status-sheet <tji-file>', String,
+          "Check the given status sheet") do |arg|
+    @statusSheets << arg
+  end
+  opts.on('--warn-ts-deltas',
+          'Turn on warnings for requested changes in time sheets') do
+   @warnTsDeltas = true
   end
   opts.on('-o', '--output-dir <directory>', String,
           'Directory the reports should go into') do |arg|
@@ -97,8 +105,10 @@ end
 def main
   @maxCpuCores = 1
   @forceReports = false
-  @reportServer = false
+  @warnTsDeltas = false
   @outputDir = ''
+  @timeSheets = []
+  @statusSheets = []
 
   # Install signal handler to exit gracefully on CTRL-C.
   Kernel.trap('INT') do
@@ -109,16 +119,23 @@ def main
   files = processArguments(ARGV)
   tj = TaskJuggler.new(true)
   tj.maxCpuCores = @maxCpuCores
-  exit 1 unless tj.parse(files, @reportServer)
+  tj.warnTsDeltas = @warnTsDeltas
+  keepParser = !@timeSheets.empty? || !@statusSheets.empty?
+  exit 1 unless tj.parse(files, keepParser)
   if !tj.schedule
     exit 1 unless @forceReports
   end
 
-  if @reportServer
-    tj.serveReports
-  else
-    exit 1 if !tj.generateReports(@outputDir) || tj.errors > 0
+  # The checks of time and status sheets is probably only used for debugging.
+  # Normally, this function is provided by tj3client.
+  @timeSheets.each do |ts|
+    exit 1 if !tj.checkTimeSheet(ts, File.read(ts)) || tj.errors > 0
   end
+  @statusSheets.each do |ss|
+    exit 1 if !tj.checkStatusSheet(ss, File.read(ss)) || tj.errors > 0
+  end
+
+  exit 1 if !tj.generateReports(@outputDir) || tj.errors > 0
 
 end