taskjuggler 3.7.1 → 3.8.1

data/lib/taskjuggler/BatchProcessor.rb

@@ -69,16 +69,16 @@ class TaskJuggler
     def initialize(maxCpuCores)
       @maxCpuCores = maxCpuCores
       # Jobs submitted by calling queue() are put in the @toRunQueue. The
-      # pusher Thread will pick them up and fork them off into another
+      # launcher Thread will pick them up and fork them off into another
       # process.
-      @toRunQueue = Queue.new
+      @toRunQueue =  [ ]
       # A hash that maps the JobInfo objects of running jobs by their PID.
       @runningJobs = { }
       # A list of jobs that wait to complete their writing.
       @spoolingJobs = [ ]
       # The wait() method will then clean the @toDropQueue, executes the post
       # processing block and removes all JobInfo related objects.
-      @toDropQueue = Queue.new
+      @toDropQueue = []
 
       # A semaphore to guard accesses to @runningJobs, @spoolingJobs and
       # following shared data structures.
@@ -106,28 +106,34 @@ class TaskJuggler
     # to identify the job upon completion. +block+ is a Ruby code block to be
     # executed in a separate process.
     def queue(tag = nil, &block)
-      raise 'You cannot call queue() while wait() is running!' if @jobsOut > 0
-
-      # If this is the first queued job for this run, we have to start the
-      # helper threads.
-      if @jobsIn == 0
-        # The JobInfo objects in the @toRunQueue are processed by the pusher
-        # thread.  It forkes off processes to execute the code block associated
-        # with the JobInfo.
-        @pusher = Thread.new { pusher }
-        # The popper thread waits for terminated childs and picks up the
-        # results.
-        @popper = Thread.new { popper }
-        # The grabber thread collects $stdout and $stderr data from each child
-        # process and stores them in the corresponding JobInfo.
-        @grabber = Thread.new { grabber }
-      end
 
       # Create a new JobInfo object for the job and push it to the @toRunQueue.
-      job = JobInfo.new(@jobsIn, block, tag)
-      # Increase job counter
-      @lock.synchronize { @jobsIn += 1 }
-      @toRunQueue.push(job)
+      @lock.synchronize do
+        raise 'You cannot call queue() while wait() is running!' if @jobsOut > 0
+
+        # If this is the first queued job for this run, we have to start the
+        # helper threads.
+        if @jobsIn == 0
+          # The JobInfo objects in the @toRunQueue are processed by the
+          # launcher thread.  It forkes off processes to execute the code
+          # block associated with the JobInfo.
+          @launcher = Thread.new { launcher }
+          # The receiver thread waits for terminated child processes and picks
+          # up the results.
+          @receiver = Thread.new { receiver }
+          # The grabber thread collects $stdout and $stderr data from each
+          # child process and stores them in the corresponding JobInfo.
+          @grabber = Thread.new { grabber }
+        end
+
+        # To track a job through the queues, we use a JobInfo object to hold
+        # all data associated with a job.
+        job = JobInfo.new(@jobsIn, block, tag)
+        # Increase job counter
+        @jobsIn += 1
+        # Push the job to the toRunQueue.
+        @toRunQueue.push(job)
+      end
     end
 
     # Wait for all jobs to complete. The code block will get the JobInfo
@@ -138,29 +144,27 @@ class TaskJuggler
 
       # When we have received as many jobs in the @toDropQueue than we have
       # started then we're done.
-      while !@lock.synchronize { @jobsIn == @jobsOut }
-        if @toDropQueue.empty?
-          sleep(@timeout)
-        else
-          # We have completed jobs.
-          while !@toDropQueue.empty?
-            # Pop a job from the @toDropQueue and call the block with it.
-            job = @toDropQueue.pop
-            # Remove the job related entries from the housekeeping tables.
-            @lock.synchronize { @jobsOut += 1 }
-
+      while @lock.synchronize { @jobsOut < @jobsIn }
+        job = nil
+        @lock.synchronize do
+          if !@toDropQueue.empty? && (job = @toDropQueue.pop)
             # Call the post-processing block that was passed to wait() with
             # the JobInfo object as argument.
+            @jobsOut += 1
             yield(job)
           end
         end
+
+        unless job
+          sleep(@timeout)
+        end
       end
 
       # Signal threads to stop
       @terminate = true
       # Wait for treads to finish
-      @pusher.join
-      @popper.join
+      @launcher.join
+      @receiver.join
       @grabber.join
 
       # Reset some variables so we can reuse the object for further job runs.
@@ -175,25 +179,22 @@ class TaskJuggler
 
     # This function runs in a separate thread to pop JobInfo items from the
     # @toRunQueue and create child processes for them.
-    def pusher
+    def launcher
       # Run until the terminate flag is set.
       until @terminate
-        if @toRunQueue.empty? ||
-           @lock.synchronize{ @runningJobs.length >= @maxCpuCores }
+        job = nil
+        unless @lock.synchronize { @runningJobs.length < @maxCpuCores &&
+                                   (job = @toRunQueue.pop) }
           # We have no jobs in the @toRunQueue or all CPU cores in use already.
           sleep(@timeout)
         else
           @lock.synchronize do
-            # Get a new job from the @toRunQueue
-            job = @toRunQueue.pop
-
             job.openPipes
-            # Add the receiver end of the pipe to the @pipes Array.
+            # Add the receiver end of the pipe to the pipes Arrays.
             @pipes << job.stdoutP
+            @pipes << job.stderrP
             # Map the pipe end to this JobInfo object.
             @pipeToJob[job.stdoutP] = job
-            # Same for $stderr.
-            @pipes << job.stderrP
             @pipeToJob[job.stderrP] = job
 
             pid = fork do
@@ -224,15 +225,20 @@ class TaskJuggler
 
     # This function runs in a separate thread to wait for completed jobs. It
     # waits for the process completion and stores the result in the
-    # corresponding JobInfo object.
-    def popper
+    # corresponding JobInfo object. Aborted jobs are pushed to the
+    # @toDropQueue while completed jobs are pushed to the @spoolingJobs queue.
+    def receiver
       until @terminate
-        if @runningJobs.empty?
-          # No pending jobs, wait a bit.
-          sleep(@timeout)
-        else
+        pid = retVal = nil
+        begin
           # Wait for the next job to complete.
           pid, retVal = Process.wait2
+        rescue Errno::ECHILD
+          # No running jobs. Wait a bit.
+          sleep(@timeout)
+        end
+
+        if pid && retVal
           job = nil
           @lock.synchronize do
             # Get the JobInfo object that corresponds to the process ID. The
@@ -242,7 +248,7 @@ class TaskJuggler
             # Remove the job from the @runningJobs Hash.
             @runningJobs.delete(pid)
             # Save the return value.
-            job.retVal = retVal.dup
+            job.retVal = retVal.exitstatus
             if retVal.signaled?
               cleanPipes(job)
               # Aborted jobs will probably not send an EOT. So we fastrack
@@ -269,22 +275,27 @@ class TaskJuggler
         res = nil
         begin
           @lock.synchronize do
-            if (res = select(@pipes, nil, @pipes, @timeout))
+            if (res = IO.select(@pipes, nil, nil, @timeout))
               # We have output data from at least one child. Check which pipe
               # actually triggered the select.
               res[0].each do |pipe|
                 # Find the corresponding JobInfo object.
                 job = @pipeToJob[pipe]
-                # Store the output.
+
+                # Store the standard output.
                 if pipe == job.stdoutP
                   # Look for the EOT character to signal the end of the text.
-                  if (c = pipe.getc) == ?\004
+                  if pipe.closed? || (c = pipe.read_nonblock(1)) == ?\004
                     job.stdoutEOT = true
                   else
                     job.stdout << c
                   end
-                else
-                  if (c = pipe.getc) == ?\004
+                end
+
+                # Store the error output.
+                if pipe == job.stderrP
+                  # Look for the EOT character to signal the end of the text.
+                  if pipe.closed? || (c = pipe.read_nonblock(1)) == ?\004
                     job.stderrEOT = true
                   else
                     job.stderr << c

data/lib/taskjuggler/FileList.rb

@@ -17,7 +17,7 @@ class TaskJuggler
   class FileRecord
 
     def initialize(fileName)
-      @name = fileName.dup.untaint
+      @name = fileName.dup
       @mtime = File.mtime(@name)
     end
 

data/lib/taskjuggler/MessageHandler.rb

@@ -248,7 +248,6 @@ class TaskJuggler
 
       timeStamp = Time.new.strftime("%Y-%m-%d %H:%M:%S")
       begin
-        @logFile.untaint
         File.open(@logFile, 'a') do |f|
           f.write("#{timeStamp} #{type} #{@appName}[#{Process.pid}]: " +
                   "#{message}\n")

data/lib/taskjuggler/ResourceScenario.rb

@@ -3,7 +3,7 @@
 #
 # = ResourceScenario.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2020
 #               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -322,6 +322,34 @@ class TaskJuggler
       end
     end
 
+    # A list of the tasks that the resource has been  allocated to work on in
+    # the report time frame.
+    def query_duties(query)
+      list = []
+      iv = TimeInterval.new(query.start, query.end)
+      @duties.each do |task|
+        if task.hasResourceAllocated?(@scenarioIdx, iv, @property)
+          if query.listItem
+            rti = RichText.new(query.listItem, RTFHandlers.create(@project)).
+              generateIntermediateFormat
+            unless rti
+              error('bad_resource_ts_query',
+                    "Syntax error in query statement for task attribute " +
+                    "'resources'.")
+            end
+            q = query.dup
+            q.property = task
+            q.scopeProperty = @property
+            rti.setQuery(q)
+            list << "<nowiki>#{rti.to_s}</nowiki>"
+          else
+            list << "<nowiki>#{task.name} (#{task.id})</nowiki>"
+          end
+        end
+      end
+      query.assignList(list)
+    end
+
     # The effort allocated to the Resource in the specified interval. In case a
     # Task is given as scope property only the effort allocated to this Task is
     # taken into account.

data/lib/taskjuggler/RuntimeConfig.rb

@@ -48,7 +48,7 @@ class RuntimeConfig
     return false unless (p = @config)
     sections.each do |sec|
       p = p['_' + sec]
-      unless p
+      unless p && p.is_a?(Hash)
         debug("Section #{section} not found in config file")
         return false
       end

data/lib/taskjuggler/SheetHandlerBase.rb

@@ -166,11 +166,12 @@ class TaskJuggler
                   inReplyTo = nil)
       case @emailDeliveryMethod
       when 'smtp'
-        Mail.defaults do
-          delivery_method :smtp, {
+        settings_dto = {
             :address => @smtpServer,
-            :port => 25
-          }
+            :port => 25,
+        }
+        Mail.defaults do
+          delivery_method :smtp, settings_dto
         end
       when 'sendmail'
         Mail.defaults do

data/lib/taskjuggler/StatusSheetReceiver.rb

@@ -35,9 +35,9 @@ class TaskJuggler
       @logFile = 'statussheets.log'
 
       # Regular expression to identify status sheets.
-      @sheetHeader = /^[ ]*statussheet\s([a-z][a-z0-9_]*)\s[0-9\-:+]*\s-\s([0-9]*-[0-9]*-[0-9]*)/
+      @sheetHeader = /^[ ]*statussheet\s([a-zA-Z_][a-zA-Z0-9_]*)\s[0-9\-:+]*\s-\s([0-9]*-[0-9]*-[0-9]*)/
       # Regular expression to extract the sheet signature (time period).
-      @signatureFilter = /^[ ]*statussheet\s[a-z][a-z0-9_]*\s([0-9:\-+]*\s-\s[0-9:\-+]*)/
+      @signatureFilter = /^[ ]*statussheet\s[a-zA-Z_][a-zA-Z0-9_]*\s([0-9:\-+]*\s-\s[0-9:\-+]*)/
       @emailSubject = "Status report from %s for %s"
     end
 

data/lib/taskjuggler/StatusSheetSender.rb

@@ -39,7 +39,7 @@ class TaskJuggler
       # The log file
       @logFile = 'statussheets.log'
 
-      @signatureFilter = /^[ ]*statussheet\s[a-z][a-z0-9_]*\s([0-9:\-+]*\s-\s[0-9:\-+]*)/
+      @signatureFilter = /^[ ]*statussheet\s[a-zA-Z_][a-zA-Z0-9_]*\s([0-9:\-+]*\s-\s[0-9:\-+]*)/
       @introText = <<'EOT'
 Please find enclosed your weekly status report template. Please fill out the
 form and send it back to the sender of this email. You can either use the

data/lib/taskjuggler/TaskScenario.rb

@@ -1508,6 +1508,7 @@ class TaskJuggler
             end
             q = query.dup
             q.property = resource
+            q.scopeProperty = @property
             rti.setQuery(q)
             list << "<nowiki>#{rti.to_s}</nowiki>"
           else
@@ -2179,8 +2180,12 @@ class TaskJuggler
       # been set already.
       if @scheduled && @effort == 0 && @length == 0 && @duration == 0 &&
          !@milestone
-        @start = @project.idxToDate(firstSlotIdx) unless @start
-        @end = @project.idxToDate(lastSlotIdx + 1) unless @end
+        unless @start || !firstSlotIdx
+          @start = @project.idxToDate(firstSlotIdx)
+        end
+        unless @end || !lastSlotIdx
+          @end = @project.idxToDate(lastSlotIdx + 1)
+        end
       end
     end
 

data/lib/taskjuggler/TextParser/Scanner.rb

@@ -169,7 +169,7 @@ class TaskJuggler::TextParser
 
       def initialize(fileName, log, textScanner)
         super(log, textScanner)
-        @fileName = fileName.dup.untaint
+        @fileName = fileName.dup
         data = (fileName == '.' ? $stdin : File.new(@fileName, 'r')).read
         begin
           @stream = StringIO.new(data.forceUTF8Encoding)

data/lib/taskjuggler/TimeSheetReceiver.rb

@@ -32,9 +32,9 @@ class TaskJuggler
       @logFile = 'timesheets.log'
 
       # Regular expression to identify time sheets.
-      @sheetHeader = /^[ ]*timesheet\s([a-z][a-z0-9_]*)\s[0-9\-:+]*\s-\s([0-9]*-[0-9]*-[0-9]*)/
+      @sheetHeader = /^[ ]*timesheet\s([a-zA-Z_][a-zA-Z0-9_]*)\s[0-9\-:+]*\s-\s([0-9]*-[0-9]*-[0-9]*)/
       # Regular expression to extract the sheet signature (time period).
-      @signatureFilter = /^[ ]*timesheet\s[a-z][a-z0-9_]*\s([0-9:\-+]*\s-\s[0-9:\-+]*)/
+      @signatureFilter = /^[ ]*timesheet\s[a-zA-Z_][a-zA-Z0-9_]*\s([0-9:\-+]*\s-\s[0-9:\-+]*)/
       @emailSubject = "Report from %s for %s"
     end
 

data/lib/taskjuggler/TimeSheetSender.rb

@@ -38,7 +38,7 @@ class TaskJuggler
       # The log file
       @logFile = 'timesheets.log'
 
-      @signatureFilter = /^[ ]*timesheet\s[a-z][a-z0-9_]*\s([0-9:\-+]*\s-\s[0-9:\-+]*)/
+      @signatureFilter = /^[ ]*timesheet\s[a-zA-Z_][a-zA-Z0-9_]*\s([0-9:\-+]*\s-\s[0-9:\-+]*)/
       @introText = <<'EOT'
 Please find enclosed your weekly report template. Please fill out
 the form and send it back to the sender of this email. You can either

data/lib/taskjuggler/TimeSheets.rb

@@ -325,9 +325,10 @@ class TaskJuggler
     def totalGrossWorkingSlots
       project = @resource.project
       # Calculate the number of weeks in the report
-      weeksToReport = (@interval.end - @interval.start) / (60 * 60 * 24 * 7)
+      weeksToReport = (@interval.end - @interval.start).to_f /
+        (60 * 60 * 24 * 7)
 
-      daysToSlots(project.weeklyWorkingDays * weeksToReport)
+      daysToSlots((project.weeklyWorkingDays * weeksToReport).to_i)
     end
 
     # Compute the total number of actual working time slots of the

data/lib/taskjuggler/TjTime.rb

@@ -501,18 +501,25 @@ class TaskJuggler
         end
 
         @time = Time.utc(year, month, day, hour, minute, second)
-        sign = zone[0] == ?- ? 1 : -1
+        sign = zone[0] == ?- ? -1 : 1
         tzHour = zone[1..2].to_i
-        if tzHour < 0 || tzHour > 12
-          raise TjException.new, "Time zone adjustment hour out of range " +
-                                 "(0 - 12) but is #{tzHour}"
-        end
         tzMinute = zone[3..4].to_i
         if tzMinute < 0 || tzMinute > 59
           raise TjException.new, "Time zone adjustment minute out of range " +
                                  "(0 - 59) but is #{tzMinute}"
         end
-        @time += sign * (tzHour * 3600 + tzMinute * 60)
+
+        time_offset = sign * (tzHour * 3600 + tzMinute * 60)
+        # UTC-1200 is the most westerly time zone but UTC+1400 is the most
+        # easterly time zone (Republic of Kiribati).
+        if time_offset < -12 * 3600 || time_offset > 14 * 3600
+          raise TjException.new, "Time zone adjustment out of range " +
+                                 "(-1200 - +1400} but is #{zone})"
+        end
+
+        # The time offset must be substracted from the base time to convert it
+        # to UTC.
+        @time -= time_offset
       else
         @time = Time.mktime(year, month, day, hour, minute, second)
       end

data/lib/taskjuggler/TjpSyntaxRules.rb

@@ -3,7 +3,7 @@
 #
 # = TjpSyntaxRules.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2020
 #               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -673,7 +673,7 @@ EOT
   def rule_color
     pattern(%w( $STRING ), lambda {
       col = @val[0]
-      unless /#[0-9A-Fa-f]{3}/ =~ col || /#[0-9A-Fa-f]{3}/ =~ col
+      unless /#[0-9A-Fa-f]{3}/ =~ col || /#[0-9A-Fa-f]{6}/ =~ col
         error('bad_color',
               "Color values must be specified as '#RGB' or '#RRGGBB' values",
               @sourceFileInfo[0])
@@ -3932,7 +3932,13 @@ EOT
     descr('The duration of a task')
 
     singlePattern('_duties')
-    descr('List of tasks that the resource is allocated to')
+    descr(<<'EOT'
+List of tasks that the resource is allocated to
+
+The list can be customized by the [[listitem.column|listitem]] and
+[[listtype.column|listtype]] attribute.
+EOT
+         )
 
     singlePattern('_efficiency')
     descr('Measure for how efficient a resource can perform tasks')

data/lib/taskjuggler/XMLDocument.rb

@@ -52,7 +52,7 @@ class TaskJuggler
 
     # Write the XMLDocument to the specified file.
     def write(filename)
-      f = filename == '.' ? $stdout : File.new(filename.untaint, 'w')
+      f = filename == '.' ? $stdout : File.new(filename, 'w')
       @elements.each do |element|
         f.puts element.to_s(0)
       end

data/lib/taskjuggler/apps/Tj3Daemon.rb

@@ -37,7 +37,7 @@ class TaskJuggler
       @port = nil
       @webServer = false
       @webServerPort = 8080
-      @webdPidFile = File.join(Dir.getwd, ".tj3webd-#{$$}.pid").untaint
+      @webdPidFile = File.join(Dir.getwd, ".tj3webd-#{$$}.pid")
     end
 
     def processArguments(argv)
@@ -92,7 +92,7 @@ EOT
       # Set some config variables if corresponding data was provided via the
       # command line.
       broker.port = @port if @port
-      broker.uriFile = @uriFile.untaint
+      broker.uriFile = @uriFile
       broker.projectFiles = sortInputFiles(files) unless files.empty?
       broker.daemonize = @daemonize
       # Create log files for standard IO for each child process if the daemon

data/lib/taskjuggler/apps/Tj3WebD.rb

@@ -89,7 +89,7 @@ EOT
       # Set some config variables if corresponding data was provided via the
       # command line.
       webServer.port = @port if @port
-      webServer.uriFile = @uriFile.untaint
+      webServer.uriFile = @uriFile
       webServer.webServerPort = @webServerPort if @webServerPort
       webServer.daemonize = @daemonize
       webServer.pidFile = @pidFile

data/lib/taskjuggler/daemon/ProjectServer.rb

@@ -137,9 +137,9 @@ class TaskJuggler
     # directory. The second one is the master project file (.tjp file).
     # Additionally a list of optional .tji files can be provided.
     def loadProject(args)
-      dirAndFiles = args.dup.untaint
+      dirAndFiles = args.dup
       # The first argument is the working directory
-      Dir.chdir(args.shift.untaint)
+      Dir.chdir(args.shift)
 
       # Save a time stamp of when the project file loading started.
       @modifiedCheck = TjTime.new

data/lib/taskjuggler/reports/CSVFile.rb

@@ -221,7 +221,7 @@ class TaskJuggler
         field.to_s
       else
         # Duplicate quote characters.
-        f = field.gsub(/@quote/, "#{@quote * 2}")
+        f = field.gsub(Regexp.new(@quote), "#{@quote * 2}")
         # Enclose the field in quote characters
         @quote + f.to_s + @quote
       end

data/lib/taskjuggler/reports/MspXmlRE.rb

@@ -249,11 +249,15 @@ EOT
         t << XMLNamedText.new('1', 'Manual')
         t << XMLNamedText.new('0', 'Summary')
         t << XMLNamedText.new('0', 'Estimated')
-        t << XMLNamedText.new('5', 'DurationFormat')
+        t << XMLNamedText.new('7', 'DurationFormat')
         if task['milestone', @scenarioIdx]
           t << XMLNamedText.new('1', 'Milestone')
         else
+          duration = task['end', @scenarioIdx] - task['start', @scenarioIdx]
+          t << XMLNamedText.new(durationToMsp(duration), 'Duration')
+          t << XMLNamedText.new(durationToMsp(duration), 'Work')
           t << XMLNamedText.new('0', 'Milestone')
+          t << XMLNamedText.new('1', 'EffortDriven')
           t << XMLNamedText.new(percentComplete.to_i.to_s,
                                 'PercentComplete')
           t << XMLNamedText.new(percentComplete.to_i.to_s,
@@ -394,8 +398,6 @@ EOT
     end
 
     def durationToMsp(duration)
-      return '' if duration == 0
-
       hours = (duration / (60 * 60)).to_i
       minutes = ((duration - (hours * 60 * 60)) / 60).to_i
       seconds = (duration % 60).to_i

data/lib/taskjuggler/reports/Report.rb

@@ -401,7 +401,7 @@ EOT
       # The directory needs to be in the same directory as the HTML report.
       auxDstDir = File.dirname(absoluteFileName(@name)) + '/'
       # Find the data directory that came with the TaskJuggler installation.
-      auxSrcDir = AppConfig.dataDirs("data/#{dirName}")[0].untaint
+      auxSrcDir = AppConfig.dataDirs("data/#{dirName}")[0]
       # Raise an error if we haven't found the data directory
       if auxSrcDir.nil? || !File.exist?(auxSrcDir)
         dataDirError(dirName, AppConfig.dataSearchDirs("data/#{dirName}"))
@@ -419,13 +419,13 @@ EOT
     end
 
     def directoryUpToDate?(auxSrcDir, auxDstDir)
-      return false unless File.exist?(auxDstDir.untaint)
+      return false unless File.exist?(auxDstDir)
 
       Dir.entries(auxSrcDir).each do |file|
         next if file == '.' || file == '..'
 
-        srcFile = (auxSrcDir + '/' + file).untaint
-        dstFile = (auxDstDir + '/' + file).untaint
+        srcFile = (auxSrcDir + '/' + file)
+        dstFile = (auxDstDir + '/' + file)
         return false if !File.exist?(dstFile) ||
                         File.mtime(srcFile) > File.mtime(dstFile)
       end
@@ -473,7 +473,7 @@ EOT
     end
 
     def absoluteFileName(name)
-      ((absoluteFileName?(name) ? '' : @project.outputDir) + name).untaint
+      (absoluteFileName?(name) ? '' : @project.outputDir) + name
     end
 
   end

data/lib/taskjuggler/reports/ReportTableCell.rb

@@ -3,7 +3,7 @@
 #
 # = ReportTableCell.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2024
 #               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -21,7 +21,7 @@ class TaskJuggler
   class ReportTableCell
 
     attr_reader :line
-    attr_accessor :data, :category, :hidden, :alignment, :padding,
+    attr_accessor :data, :category, :hidden, :alignment, :padding, :force_string,
                   :text, :tooltip, :showTooltipHint,
                   :iconTooltip,
                   :cellColor, :indent, :icon, :fontSize, :fontColor,
@@ -60,6 +60,8 @@ class TaskJuggler
       @alignment = :center
       # Horizontal padding between frame and cell content
       @padding = 3
+      # Don't convert Strings that look like numbers to String
+      @force_string = false
       # Whether or not to indent the cell. If not nil, it is an Integer
       # indicating the indentation level.
       @indent = nil
@@ -181,11 +183,11 @@ class TaskJuggler
 
         # Try to convert numbers and other types to their native Ruby type if
         # they are supported by CSVFile.
-        native = CSVFile.strToNative(cell)
+        native = @force_string ? cell : CSVFile.strToNative(cell)
 
         # Only for String objects, we add the indentation.
-        csv[lineIdx][columnIdx] = (native.is_a?(String) ? indent + native :
-                                                          native)
+        csv[lineIdx][columnIdx] = (native.is_a?(String) && !@force_string ?
+                                   indent + native : native)
       end
 
       return columns

data/lib/taskjuggler/reports/TableReport.rb

@@ -3,7 +3,7 @@
 #
 # = TableReport.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2024
 #               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -755,6 +755,7 @@ class TaskJuggler
     def genCalculatedCell(query, line, columnDef)
       # Create a new cell
       cell = newCell(query, line)
+      cell.force_string = true if columnDef.id == 'bsi'
 
       unless setScenarioSettings(cell, query.scenarioIdx,
                                  TableReport.scenarioSpecific?(columnDef.id))