taskjuggler 0.2.1 → 0.2.2

data/lib/taskjuggler/ProjectFileScanner.rb

@@ -382,7 +382,8 @@ class TaskJuggler
         end
 
         unless scanner.eos?
-          raise "Junk found at end of macro: #{scanner.post_match}"
+          error('junk_at_eom',
+                "Junk found at end of macro: #{scanner.post_match}")
         end
 
         # Expand the macro and inject it into the scanner.

data/lib/taskjuggler/PropertySet.rb

@@ -266,6 +266,9 @@ class TaskJuggler
       @properties.length
     end
 
+    alias length items
+
+
     # Return true if the set is empty.
     def empty?
       @properties.empty?

data/lib/taskjuggler/PropertyTreeNode.rb

@@ -545,6 +545,10 @@ class TaskJuggler
       end
     end
 
+    def query_journal(query)
+      @project['journal'].to_rti(query)
+    end
+
     def query_alert(query)
       journal = @project['journal']
       query.sortable = query.numerical = alert =

data/lib/taskjuggler/Query.rb

@@ -38,7 +38,8 @@ class TaskJuggler
                attributeId scenario scenarioIdx
                loadUnit numberFormat currencyFormat timeFormat
                listItem listType hideJournalEntry
-               costAccount revenueAccount selfContained)
+               journalMode journalAttributes sortJournalEntries
+               costAccount revenueAccount selfContained )
     @@ps.each do |p|
       attr_accessor p.to_sym
     end

data/lib/taskjuggler/Resource.rb

@@ -41,115 +41,12 @@ class TaskJuggler
       @data[scenarioIdx].method(func).call(*args)
     end
 
-    def query_journal(query)
-      journalText(query, true)
-    end
-
     def query_dashboard(query)
       dashboard(query)
     end
 
     private
 
-    # Create a blog-style list of all alert messages that match the Query.
-    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.
-      rText = ''
-      list = @project['journal'].entriesByResource(self, query.start, query.end,
-                                                   query.hideJournalEntry)
-      # Sort all entries in buckets by their alert level.
-      numberOfLevels = project['alertLevels'].length
-      listByLevel = []
-      numberOfLevels.times { |i| listByLevel[i] = [] }
-      list.each do |entry|
-        listByLevel[entry.alertLevel] << entry
-      end
-      (numberOfLevels - 1).downto(0) do |level|
-        levelList = listByLevel[level]
-        levelRecord = @project['alertLevels'][level]
-        if query.selfContained
-          alertName = "<nowiki>[</nowiki><fcol:#{levelRecord[0]}>" +
-                      "#{levelRecord[1]}</fcol><nowiki>]</nowiki>"
-        else
-          alertName = "[[File:icons/flag-#{levelRecord[0]}.png|" +
-          "alt=[#{levelRecord[1]}]|text-bottom]]"
-        end
-        levelList.each do |entry|
-          tsRecord = entry.timeSheetRecord
-
-          if entry.property.is_a?(Task)
-            rText += "=== #{alertName} <nowiki>#{entry.property.name}" +
-                     "</nowiki> (ID: #{entry.property.fullId}) ===\n\n"
-            unless entry.flags.empty?
-              rText += "'''Flags:''' #{entry.flags.join(', ')}\n\n"
-            end
-            if tsRecord
-              rText += "'''Work:''' #{tsRecord.actualWorkPercent.to_i}% "
-              if tsRecord.actualWorkPercent != tsRecord.planWorkPercent
-                rText += "(#{tsRecord.planWorkPercent.to_i}%) "
-              end
-              if tsRecord.remaining
-                rText += "'''Remaining:''' #{tsRecord.actualRemaining}d "
-                if tsRecord.actualRemaining !=  tsRecord.planRemaining
-                  rText += "(#{tsRecord.planRemaining}d) "
-                end
-              else
-                rText += "'''End:''' " +
-                         "#{tsRecord.actualEnd.to_s(query.timeFormat)} "
-                if tsRecord.actualEnd != tsRecord.planEnd
-                  rText += "(#{tsRecord.planEnd.to_s(query.timeFormat)}) "
-                end
-              end
-              rText += "\n\n"
-            end
-          elsif !(tsRecord = entry.timeSheetRecord).nil? &&
-                entry.timeSheetRecord.task.is_a?(String)
-            rText += "== #{alertName} <nowiki>[New Task] #{tsRecord.name} " +
-                     "</nowiki> "+
-              "(ID: #{tsRecord.task}) ==\n\n"
-            if tsRecord
-              rText += "'''Work:''' #{tsRecord.actualWorkPercent}% "
-              if tsRecord.remaining
-                rText += "'''Remaining:''' #{tsRecord.actualRemaining}d "
-              else
-                rText += "'''End:''' " +
-                         "#{tsRecord.actualEnd.to_s(query.timeFormat)} "
-              end
-              rText += "\n\n"
-            end
-          else
-            rText += "== #{alertName} Personal Notes ==\n\n"
-          end
-          unless entry.headline.empty?
-            rText += "'''<nowiki>#{entry.headline}</nowiki>'''\n\n"
-          end
-          if entry.summary
-            rText += entry.summary.richText.inputText + "\n\n"
-          end
-          if longVersion && entry.details
-            rText += entry.details.richText.inputText + "\n\n"
-          end
-        end
-      end
-
-      # Now convert the RichText markup String into RichTextIntermediate
-      # format.
-      unless (rti = RichText.new(rText, RTFHandlers.create(@project),
-                                 @project.messageHandler).
-                                 generateIntermediateFormat)
-        @project.messageHandler.warning(
-          'res_journal_text', 'Syntax error in journal text')
-        return nil
-      end
-      # No section numbers, please!
-      rti.sectionNumbers = false
-      # We use a special class to allow CSS formating.
-      rti.cssClass = 'tj_journal'
-      query.rti = rti
-    end
-
     # Create a dashboard-like list of all task that have a current alert
     # status.
     def dashboard(query)

data/lib/taskjuggler/RichText/RTFQuery.rb

@@ -69,9 +69,12 @@ class TaskJuggler
         raise "No Query has been registered for this RichText yet!"
       end
 
+      query = @query.dup
+
       # Check the user provided arguments. Only the following list is allowed.
-      validArgs = %w( family property scopeproperty attribute scenario
-                      start end loadunit numberformat timeformat currencyformat )
+      validArgs = %w( attribute currencyformat end family journalattributes
+                      journalmode loadunit numberformat property scenario
+                      scopeproperty start timeformat )
       expandedArgs = {}
       args.each do |arg, value|
         unless validArgs.include?(arg)
@@ -91,8 +94,6 @@ class TaskJuggler
               "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
@@ -115,11 +116,14 @@ class TaskJuggler
       if expandedArgs['currencyformat']
         query.currencyFormat = expandedArgs['currencyformat']
       end
+      query.project = @project
 
       # And now the slighly more complicated ones.
       setScenarioIdx(query, expandedArgs)
       setPropertyType(query, expandedArgs)
       setLoadUnit(query, expandedArgs)
+      setJournalMode(query, expandedArgs)
+      setJournalAttributes(query, expandedArgs)
 
       # Now that we have put together the query, we can process it and return
       # the query object for result extraction.
@@ -177,6 +181,40 @@ class TaskJuggler
       query.scenarioIdx = 0 unless query.scenarioIdx
     end
 
+    def setJournalMode(query, args)
+      if (mode = args['journalmode'])
+        validModes = %w( journal journal_sub status_up status_down alerts_down )
+        unless validModes.include?(mode)
+          error('rtfq_bad_journalmode',
+                "Unknown journalmode #{mode}. Must be one of " +
+                "#{validModes.join(', ')}.")
+        end
+        query.journalMode = mode.intern
+      elsif !query.journalMode
+        query.journalMode = :journal
+      end
+    end
+
+    def setJournalAttributes(query, args)
+      if (attrListStr = args['journalattributes'])
+        attrs = attrListStr.split(', ').map { |a| a.delete(' ') }
+        query.journalAttributes = []
+        validAttrs = %w( author date details flags headline property propertyid
+                         summary timesheet )
+        attrs.each do |attr|
+          if validAttrs.include?(attr)
+            query.journalAttributes << attr
+          else
+            error('rtfq_bad_journalattr',
+                  "Unknown journalattribute #{attr}. Must be one of " +
+                  "#{validAttrs.join(', ')}.")
+          end
+        end
+      elsif !query.journalAttributes
+        query.journalAttributes = %w( date summary details )
+      end
+    end
+
   end
 
 end

data/lib/taskjuggler/SheetHandlerBase.rb

@@ -85,26 +85,6 @@ class TaskJuggler
       text
     end
 
-    # Convert all CR+LF and CR line breaks into LF line breaks.
-    def fixLineBreaks(text)
-      out = ''
-      cr = false
-      text.each_utf8_char do |c|
-        if c == "\r"
-          # We don't know yet if it's a CR or CR+LF.
-          cr = true
-        else
-          if cr
-            # If we only found a CR. Replace it with a LF.
-            out << "\n" if c != "\n"
-            cr = false
-          end
-          out << c
-        end
-      end
-      out
-    end
-
     def setWorkingDir
       # Make sure the user has provided a properly setup config file.
       error('\'smtpServer\' not configured') unless @smtpServer

data/lib/taskjuggler/SheetReceiver.rb

@@ -80,31 +80,27 @@ class TaskJuggler
 
       createDirectories
 
-      # Read the RFC 822 compliant mail from STDIN.
-      rawMail = $stdin.read
-
-      # To get line-accurate error reports for encoding errors, we scan the
-      # email for obvious ecoding errors and try to get a sender fallback
-      # address. This will not find encoding problems inside encoded mime
-      # parts.
-      fromLine = nil
       begin
+        # Read the RFC 822 compliant mail from STDIN.
+        rawMail = $stdin.read
+        rawMail = rawMail.forceUTF8Encoding
+
+        mail = Mail.new(rawMail)
+      rescue
+        # In certain cases, Mail will fail to create the Mail object. Since we
+        # don't have the email sender yet, we have to try to extract it
+        # ourself.
+        fromLine = nil
         rawMail.each_line do |line|
           unless fromLine
-            matches = line.encode('UTF-8', :invalid => :replace,
-                                            :replace => '?').match('^From: .*')
-            fromLine = matches[0] if matches
-          end
-          begin
-            # Try the encoding. If it fails, we'll get an exception.
-            line.encode!('UTF-8')
-          rescue
-            raise "Encoding error in line: #{line.encode('UTF-8', :invalid)}"
+            matches = line.match('^From: .*')
+            if matches
+              fromLine = matches[0]
+              break
+            end
           end
         end
 
-        mail = Mail.new(rawMail)
-      rescue
         # Try to extract the mail sender the dirty way so we can at least send
         # a response to the submitter.
         @submitter = fromLine[6..-1] if fromLine && fromLine.is_a?(String)
@@ -150,8 +146,14 @@ EOT
 
     # Isolate the actual syntax from _sheet_ and process it.
     def processSheet(sheet)
-      @sheet = fixLineBreaks(sheet)
-      @sheet = cutOut(@sheet) unless @sheetWasAttached
+      @sheet = @sheetWasAttached ? cutOut(sheet) : sheet
+
+      begin
+        @sheet = @sheet.forceUTF8Encoding
+      rescue
+        error($!)
+      end
+
       # A valid sheet must have the poper header line.
       if @sheetHeader.match(@sheet)
         checkSignature(@sheet)

data/lib/taskjuggler/Task.rb

@@ -32,10 +32,6 @@ class TaskJuggler
       @data[scenarioIdx].readyForScheduling?
     end
 
-    def query_journal(query)
-      journalText(query, true, false)
-    end
-
     def query_journal_sub(query)
       journalText(query, true, true)
     end
@@ -55,7 +51,9 @@ class TaskJuggler
         list = @project['journal'].entriesByTask(self, query.start, query.end,
                                                  query.hideJournalEntry)
       end
-      list.reverse.each do |entry|
+      list.setSorting([ [ :alert, -1 ], [ :date, -1 ], [ :seqno, 1 ] ])
+      list.sort!
+      list.each do |entry|
         tsRecord = entry.timeSheetRecord
 
         if entry.property.is_a?(Task)

data/lib/taskjuggler/TaskJuggler.rb

@@ -303,6 +303,10 @@ class TaskJuggler
                      'scenarioIdx' => @project['trackingScenarioIdx'],
                      'start' => ts.interval.start,
                      'end' => ts.interval.end,
+                     'journalMode' => :journal,
+                     'journalAttributes' => %w( alert property headline flags
+                                                timesheet summary details ),
+                     'sortJournalEntries' => [ [ :seqno, 1 ] ],
                      'timeFormat' => '%Y-%m-%d',
                      'selfContained' => true }
       query = Query.new(queryAttrs)

data/lib/taskjuggler/TaskScenario.rb

@@ -29,7 +29,7 @@ class TaskJuggler
       %w( allocate assignedresources booking charge chargeset complete
           criticalness depends duration effort end forward length
           maxend maxstart minend minstart milestone pathcriticalness
-          precedes scheduled shifts start status ).each do |attr|
+          precedes priority scheduled shifts start status ).each do |attr|
         @property[attr, @scenarioIdx]
       end
 
@@ -80,7 +80,7 @@ class TaskJuggler
       if @start && @end && @effort == 0 && @length == 0 && @duration == 0 &&
          @allocate.empty?
         @scheduled = true
-        Log << "Task #{@property.fullId}: #{@start} -> #{@end}"
+        Log.msg { "Task #{@property.fullId}: #{period_to_s}" }
       end
 
       # Collect the limits of this task and all parent tasks into a single
@@ -153,19 +153,19 @@ class TaskJuggler
     def propagateInitialValues
       unless @startPropagated
         if @start
-          propagateDate(@start, false)
+          propagateDate(@start, false, true)
         elsif @property.parent.nil? &&
               @property.canInheritDate?(@scenarioIdx, false)
-          propagateDate(@project['start'], false)
+          propagateDate(@project['start'], false, true)
         end
       end
 
       unless @endPropagated
         if @end
-          propagateDate(@end, true)
+          propagateDate(@end, true, true)
         elsif @property.parent.nil? &&
               @property.canInheritDate?(@scenarioIdx, true)
-          propagateDate(@project['end'], true)
+          propagateDate(@project['end'], true, true)
         end
       end
     end
@@ -895,6 +895,8 @@ class TaskJuggler
       # Check if the task has already been scheduled e. g. by propagateDate().
       return true if @scheduled
 
+      logTag = "schedule_#{@property.id}"
+      Log.enter(logTag, "Scheduling task #{@property.id}")
       # Compute the date of the next slot this task wants to have scheduled.
       # This must either be the first slot ever or it must be directly
       # adjecent to the previous slot. If this task has not yet been scheduled
@@ -927,16 +929,21 @@ class TaskJuggler
         @currentSlotIdx += delta
         if @currentSlotIdx < lowerLimit || upperLimit < @currentSlotIdx
           markAsRunaway
+          Log.exit(logTag, "Scheduling of task #{@property.id} failed")
           return false
         end
       end
 
+      Log.exit(logTag, "Scheduling of task #{@property.id} completed")
       true
     end
 
     # Set a new start or end date and propagate the value to all other
     # task ends that have a direct dependency to this end of the task.
     def propagateDate(date, atEnd, ignoreEffort = false)
+      logTag = "propagateDate_#{@property.id}_#{atEnd ? 'end' : 'start'}"
+      Log.enter(logTag, "Propagating #{atEnd ? 'end' : 'start'} date " +
+                        "to task #{@property.id}")
       thisEnd = atEnd ? 'end' : 'start'
       otherEnd = atEnd ? 'start' : 'end'
       #puts "Propagating #{thisEnd} date #{date} of #{@property.fullId} " +
@@ -954,7 +961,7 @@ class TaskJuggler
       # are only set in scheduleContainer().
       if @property.leaf?
         instance_variable_set(('@' + thisEnd).intern, date)
-        Log << "Task #{@property.fullId}: #{@start} -> #{@end}"
+        Log.msg { "Task #{@property.fullId}: #{period_to_s}" }
       end
 
       if @milestone
@@ -963,12 +970,12 @@ class TaskJuggler
         if a(otherEnd).nil?
           propagateDate(a(thisEnd), !atEnd)
         end
-        Log << "Milestone #{@property.fullId}: #{@start} -> #{@end}"
+        Log.msg { "Milestone #{@property.fullId}: #{period_to_s}" }
       elsif !@scheduled && @start && @end &&
             !(@length == 0 && @duration == 0 && @effort == 0 &&
               !@allocate.empty?)
         @scheduled = true
-        Log << "Task #{@property.fullId} has been scheduled"
+        Log.msg { "Task #{@property.fullId} has been scheduled" }
       end
 
       # Propagate date to all dependent tasks. Don't do this for start
@@ -1010,9 +1017,11 @@ class TaskJuggler
       @property.parents.each do |parent|
         parent.scheduleContainer(@scenarioIdx)
       end
+      Log.exit(logTag, "Finished propagation of " +
+                       "#{atEnd ? 'end' : 'start'} date " +
+                       "to task #{@property.id}")
     end
 
-
     # This function determines if a task can inherit the start or end date
     # from a parent task or the project time frame. +atEnd+ specifies whether
     # the check should be done for the task end (true) or task start (false).
@@ -1034,13 +1043,15 @@ class TaskJuggler
       thisEnd, thatEnd = atEnd ? [ 'end', 'start' ] : [ 'start', 'end' ]
       # Return false if we already have a date for this end or if we have a
       # strong dependency for this end.
-      return false if a(thisEnd) || hasStrongDeps(atEnd)
+      return false if instance_variable_get('@' + thisEnd) ||
+                      hasStrongDeps?(atEnd)
 
       # Containter task can inherit the date if they have no dependencies at
       # this end.
       return true if @property.container?
 
-      hasThatSpec = a(thatEnd) || hasStrongDeps(!atEnd)
+      hasThatSpec = !instance_variable_get('@' + thatEnd).nil? ||
+                    hasStrongDeps?(!atEnd)
       hasDurationSpec = hasDurationSpec?
 
       # Check for tasks that have no start and end spec, no duration spec but
@@ -1054,8 +1065,8 @@ class TaskJuggler
         return hasThatSpec
       else
         # the scheduling direction is pointing towards this end
-        return a(thatEnd) && !hasDurationSpec &&
-               @booking.empty? #&& @allocate.empty?
+        return !instance_variable_get('@' + thatEnd).nil? &&
+               !hasDurationSpec && @booking.empty? #&& @allocate.empty?
       end
     end
 
@@ -1097,7 +1108,7 @@ class TaskJuggler
         raise "Start (#{@start}) and end (#{@end}) must be set"
       end
       @scheduled = true
-      Log << "Container task #{@property.fullId} completed: #{@start} -> #{@end}"
+      Log.msg { "Container task #{@property.fullId} completed: #{period_to_s}" }
 
       # If we have modified the start or end date, we need to communicate this
       # new date to surrounding tasks.
@@ -1327,6 +1338,22 @@ class TaskJuggler
       query.assignList(list)
     end
 
+    def query_maxend(query)
+      queryDateLimit(query, @maxend)
+    end
+
+    def query_minend(query)
+      queryDateLimit(query, @minend)
+    end
+
+    def query_maxstart(query)
+      queryDateLimit(query, @maxstart)
+    end
+
+    def query_minstart(query)
+      queryDateLimit(query, @minstart)
+    end
+
     def query_precursors(query)
       list = []
 
@@ -1744,15 +1771,15 @@ class TaskJuggler
           if @effort > 0 && @assignedresources.empty?
             if @forward
               @start = @project.idxToDate(@currentSlotIdx)
-              Log << "Task #{@property.fullId} first assignment: " +
-                     "#{@start} -> #{@end}"
+              Log.msg { "Task #{@property.fullId} first assignment: " +
+                        "#{period_to_s}" }
               @startsuccs.each do |task, onEnd|
                 task.propagateDate(@scenarioIdx, @start, false, true)
               end
             else
               @end = @project.idxToDate(@currentSlotIdx + 1)
-              Log << "Task #{@property.fullId} last assignment: " +
-                     "#{@start} -> #{@end}"
+              Log.msg { "Task #{@property.fullId} last assignment: " +
+                        "#{period_to_s}" }
               @endpreds.each do |task, onEnd|
                 task.propagateDate(@scenarioIdx, @end, true, true)
               end
@@ -1843,8 +1870,7 @@ class TaskJuggler
         firstSlotDate = @project.idxToDate(firstSlotIdx)
         if @start.nil? || firstSlotDate > @start
           @start = firstSlotDate
-          Log << "Task #{@property.fullId} first booking: " +
-            "#{@start} -> #{@end}"
+          Log.msg { "Task #{@property.fullId} first booking: #{period_to_s}" }
         end
       end
 
@@ -1965,82 +1991,18 @@ class TaskJuggler
       false
     end
 
-    def hasStrongDeps(atEnd)
-      # A dependency that could determine the date on this side of the
-      # dependency is a strong dependency. If the scheduling direction of the
-      # task on the other side leads away from the dependency point, then the
-      # dependency is weak. This date will influence the other date for weak
-      # dependencies. > means ASAP task, < means ALAP task.
-      #
-      #
-      # T2 depends on T1 start
-      #
-      # +---          SS -> S> : Weak
-      # |-+           SS -> S< : Weak
-      # +-|-          SP -> S> : Strong
-      #   | +---      SP -> S< : Strong
-      #   +-|
-      #     +---
-      #
-      #
-      # T2 depends on T1 end
-      # T1 precedes T2 start
-      #
-      # ---+          ES -> S> : Weak
-      #    |-+        ES -> S< : Strong
-      # ---+ |        SP -> E> : Strong
-      #      | +---   SP -> E< : Weak
-      #      +-|
-      #        +---
-      #
-      #
-      # T1 precedes T2 end
-      #
-      #     ---+      ES -> E> : Strong
-      #      +-|      ES -> E< : Strong
-      #     -|-+      EP -> E> : Weak
-      # ---+ |        EP -> E< : Weak
-      #    |-+
-      # ---+
-      #
-      # All other combinations are illegal and should be caught earlier. So,
-      # illegal values can be considered don't care values.
-      #
-      # f/t S>  S<  E>  E<
-      # SP  S   S   S   W     Row 1
-      # SS  W   W   x   x     Row 2
-      # EP  x   x   W   W     Row 3
-      # ES  W   S   S   S     Row 4
-      #
-      # If the other end of the dependency already has a date, it's a strong
-      # dependency no matter how it was set.
-      unless atEnd
-        # Row 1
-        @startpreds.each do |task, onEnd|
-          if (onEnd && (task['forward', @scenarioIdx] ||
-                        task['end', @scenarioIdx])) || !onEnd
-            return true
-          end
-        end
-        # Row 2
-        @startsuccs.each do |task, onEnd|
-          return true if task[onEnd ? 'end' : 'start', @scenarioIdx]
-        end
+    # Return true if the task has a 'strong' dependency at the start if
+    # _atEnd_ is false or at the end. A 'strong' dependency is an outer
+    # dependency. At the start a predecessor is strong, and the end a
+    # successor. start successors or end predecessors are considered weak
+    # dependencies since this task will always have to get the date first and
+    # then pass it on to the inner dependencies.
+    def hasStrongDeps?(atEnd)
+      if atEnd
+        return !@endsuccs.empty?
       else
-        # Row 3
-        @endpreds.each do |task, onEnd|
-          return true if task[onEnd ? 'end' : 'start', @scenarioIdx]
-        end
-        # Row 4
-        @endsuccs.each do |task, onEnd|
-          if (!onEnd && (!task['forward', @scenarioIdx] ||
-                         task['start', @scenarioIdx])) || onEnd
-            return true
-          end
-        end
+        return !@startpreds.empty?
       end
-
-      false
     end
 
     def markAsRunaway
@@ -2150,7 +2112,7 @@ class TaskJuggler
 
       # Looks like it is ok to propagate the date.
       task.propagateDate(@scenarioIdx, nDate, atEnd)
-      # puts "Propagate #{atEnd ? 'end' : 'start'} to dep. #{task.fullId} done"
+      #puts "Propagate #{atEnd ? 'end' : 'start'} to dep. #{task.fullId} done"
     end
 
     # This is a helper function for calcPathCriticalness(). It computes the
@@ -2202,7 +2164,13 @@ class TaskJuggler
       else
         # The task is in progress. Calculate the current completion
         # degree.
-        if !property.leaf?
+        if @end <= @project['now']
+          # The task has ended already. It's 100% complete.
+          completion = 100.0
+        elsif @project['now'] <= @start
+          # The task has not started yet. Its' 0% complete.
+          completion = 0.0
+        elsif !property.leaf?
           # For container task the completion degree is the average of the
           # sub tasks.
           completion = 0.0
@@ -2211,12 +2179,6 @@ class TaskJuggler
             completion += comp
           end
           completion /= @property.children.length
-        elsif @end <= @project['now']
-          # The task has ended already. It's 100% complete.
-          completion = 100.0
-        elsif @project['now'] <= @start
-          # The task has not started yet. Its' 0% complete.
-          completion = 0.0
         elsif @effort > 0
           # Effort based leaf tasks. The completion degree is the percentage
           # of effort that has been done already.
@@ -2420,6 +2382,22 @@ class TaskJuggler
       @property['booking', @property.project.scenarioIdx(scenario)]
     end
 
+    # Date limits may be nil and this is not an error. TjTime.to_s() would
+    # report it as such if we don't use this wrapper method.
+    def queryDateLimit(query, date)
+      if date
+        query.sortable = query.numerical = date
+        query.string = date.to_s(query.timeFormat)
+      else
+        query.sortable = query.numerical = -1
+        query.string = ''
+      end
+    end
+
+    def period_to_s
+      "#{@start ? @start.to_s : '<?>'} -> #{@end ? @end.to_s : '<?>'}"
+    end
+
   end
 
 end