taskjuggler 3.6.0 → 3.7.1

data/lib/taskjuggler/MessageHandler.rb

@@ -230,7 +230,7 @@ class TaskJuggler
     private
 
     def checkLevel(level)
-      if level.is_a?(Fixnum)
+      if level.is_a?(Integer)
         if level < 0 || level > 5
           raise ArgumentError, "Unsupported level #{level}"
         end

data/lib/taskjuggler/PTNProxy.rb

@@ -104,7 +104,7 @@ class TaskJuggler
     end
 
     # Return the 'index' attributes of this property, prefixed by the 'index'
-    # attributes of all its parents. The result is an Array of Fixnums.
+    # attributes of all its parents. The result is an Array of Integers.
     def getIndicies
       idcs = []
       p = self

data/lib/taskjuggler/Project.rb

@@ -78,6 +78,7 @@ class TaskJuggler
         'currencyFormat' => RealFormat.new([ '-', '', '', ',', 2 ]),
         'dailyworkinghours' => 8.0,
         'end' => nil,
+        'markdate' => nil,
         'flags' => [],
         'journal' => Journal.new,
         'limits' => nil,
@@ -126,7 +127,7 @@ class TaskJuggler
               false, false,   false, true ],
         [ 'projection', 'Projection Mode', BooleanAttribute,
               true,  false,   false, false ],
-        [ 'seqno',    'No',          FixnumAttribute,
+        [ 'seqno',    'No',          IntegerAttribute,
               false, false,   false, nil ],
       ]
       attrs.each { |a| @scenarios.addAttributeType(AttributeDefinition.new(*a)) }
@@ -139,7 +140,7 @@ class TaskJuggler
               false, false,   false, "" ],
         [ 'id',       'ID',            StringAttribute,
               false, false,   false, nil ],
-        [ 'index',     'Index',        FixnumAttribute,
+        [ 'index',     'Index',        IntegerAttribute,
               false, false,   false, -1 ],
         [ 'leaves',    'Leaves',       LeaveListAttribute,
               true,  true,    true,  LeaveList.new ],
@@ -147,7 +148,7 @@ class TaskJuggler
               false, false,   false, nil ],
         [ 'replace',   'Replace',      BooleanAttribute,
               true,  false,   true,  false ],
-        [ 'seqno',    'No',            FixnumAttribute,
+        [ 'seqno',    'No',            IntegerAttribute,
               false, false,   false, nil ],
         [ 'timezone',  'Time Zone',    StringAttribute,
               true,  true,    true,  TjTime.timeZone ],
@@ -170,13 +171,13 @@ class TaskJuggler
               false, false,   true,  [] ],
         [ 'id',       'ID',         StringAttribute,
               false, false,   false, nil ],
-        [ 'index',     'Index',        FixnumAttribute,
+        [ 'index',     'Index',        IntegerAttribute,
               false, false,   false, -1 ],
         [ 'flags',     'Flags',        FlagListAttribute,
               true,  false,   true,  [] ],
         [ 'name',     'Name',       StringAttribute,
               false, false,   false, nil ],
-        [ 'seqno',    'No',          FixnumAttribute,
+        [ 'seqno',    'No',          IntegerAttribute,
               false, false,   false, nil ],
         [ 'tree',      'Tree Index',   StringAttribute,
               false, false,   false, "" ]
@@ -201,7 +202,7 @@ class TaskJuggler
               false, false,   true,  [] ],
         [ 'efficiency','Efficiency',   FloatAttribute,
               true,  false,   true,  1.0 ],
-        [ 'effort', 'Total Effort',    FixnumAttribute,
+        [ 'effort', 'Total Effort',    IntegerAttribute,
               false, false,   true,  0 ],
         [ 'email',     'Email',        StringAttribute,
               false, false,   false, nil ],
@@ -209,7 +210,7 @@ class TaskJuggler
               false, false,   false,  [] ],
         [ 'flags',     'Flags',        FlagListAttribute,
               true,  false,   true,  [] ],
-        [ 'index',     'Index',        FixnumAttribute,
+        [ 'index',     'Index',        IntegerAttribute,
               false, false,   false, -1 ],
         [ 'leaveallowances', 'Leave Allowances', LeaveAllowanceListAttribute,
               true,  false,   true,  LeaveAllowanceList.new ],
@@ -223,7 +224,7 @@ class TaskJuggler
               true,  true,    true,  0.0 ],
         [ 'reports', 'Reports', ResourceListAttribute,
               false, false,   true,  [] ],
-        [ 'seqno',    'No',          FixnumAttribute,
+        [ 'seqno',    'No',          IntegerAttribute,
               false, false,   false, nil ],
         [ 'shifts',    'Shifts',       ShiftAssignmentsAttribute,
               true, false,    true,  nil ],
@@ -264,9 +265,9 @@ class TaskJuggler
               false, false,   true,  0 ],
         [ 'effort',    'Effort',       DurationAttribute,
               false, false,   true,  0 ],
-        [ 'effortdone', 'Completed Effort', FixnumAttribute,
+        [ 'effortdone', 'Completed Effort', IntegerAttribute,
               false, false,   true,  nil ],
-        [ 'effortleft', 'Remaining Effort', FixnumAttribute,
+        [ 'effortleft', 'Remaining Effort', IntegerAttribute,
               false, false,   true,  nil ],
         [ 'end',       'End',          DateAttribute,
               false, false,   true,  nil ],
@@ -284,7 +285,7 @@ class TaskJuggler
               false, false,   true,  nil ],
         [ 'id',       'ID',         StringAttribute,
               false, false,   false, nil ],
-        [ 'index',     'Index',        FixnumAttribute,
+        [ 'index',     'Index',        IntegerAttribute,
               false, false,   false, -1 ],
         [ 'length',    'Length',       DurationAttribute,
               false, false,   true,  0 ],
@@ -308,7 +309,7 @@ class TaskJuggler
               false, false,   true, 0.0 ],
         [ 'precedes',  'Following tasks', DependencyListAttribute,
               true,  false,   true,  [] ],
-        [ 'priority',  'Priority',     FixnumAttribute,
+        [ 'priority',  'Priority',     IntegerAttribute,
               true,  true,    true,  500 ],
         [ 'projectid', 'Project ID',   SymbolAttribute,
               true,  true,    true,  nil ],
@@ -318,7 +319,7 @@ class TaskJuggler
               true,  false,   true,  false ],
         [ 'projectionmode', 'Projection Mode', BooleanAttribute,
               true,  false,   true,  false ],
-        [ 'seqno',    'No',          FixnumAttribute,
+        [ 'seqno',    'No',          IntegerAttribute,
               false, false,   false, nil ],
         [ 'shifts',     'Shifts',      ShiftAssignmentsAttribute,
               true,  false,   true, nil ],
@@ -361,6 +362,8 @@ class TaskJuggler
               true,  false,   false, KeywordArray.new([ '*' ]) ],
         [ 'end',       'End',          DateAttribute,
               true,  true,    false, nil ],
+        [ 'markdate',  'Markdate',     DateAttribute,
+              true,  true,    false, nil ],
         [ 'epilog',    'Epilog',       RichTextAttribute,
               true,  false,   false, nil ],
         [ 'flags',     'Flags',        FlagListAttribute,
@@ -383,11 +386,11 @@ class TaskJuggler
               true,  false,   false, nil ],
         [ 'hideTask',  'Hide Task',    LogicalExpressionAttribute,
               true,  false,   false, nil ],
-        [ 'height',    'Height',       FixnumAttribute,
+        [ 'height',    'Height',       IntegerAttribute,
               false,  false,   false, 480 ],
         [ 'id',       'ID',         StringAttribute,
               false, false,   false, nil ],
-        [ 'index',     'Index',        FixnumAttribute,
+        [ 'index',     'Index',        IntegerAttribute,
               false, false,   false, -1 ],
         [ 'interactive', 'Interactive', BooleanAttribute,
               false, false,   false, false ],
@@ -429,7 +432,7 @@ class TaskJuggler
               true, false,    false, [ 0 ] ],
         [ 'selfcontained', 'Selfcontained', BooleanAttribute,
               true, false,    false, false ],
-        [ 'seqno',    'No',          FixnumAttribute,
+        [ 'seqno',    'No',          IntegerAttribute,
               false, false,   false, nil ],
         [ 'shortTimeFormat', 'Short Time Format', StringAttribute,
               true,  true,    false, nil ],
@@ -461,8 +464,10 @@ class TaskJuggler
               false, false,   false, "" ],
         [ 'weekStartsMonday', 'Week Starts Monday', BooleanAttribute,
               true,  true,    false, false ],
-        [ 'width',     'Width',        FixnumAttribute,
-              true,  false,   false, 640 ]
+        [ 'width',     'Width',        IntegerAttribute,
+              true,  false,   false, 640 ],
+        [ 'novevents',  'No vevents in icalreports', BooleanAttribute,
+              true,  false,   false, false ]
       ]
       attrs.each { |a| @reports.addAttributeType(AttributeDefinition.new(*a)) }
 
@@ -560,7 +565,7 @@ class TaskJuggler
     #
     # Return the Scenario with the given _id_ or _index_.
     def scenario(arg)
-      if arg.is_a?(Fixnum)
+      if arg.is_a?(Integer)
         @scenarios.each do |sc|
           return sc if sc.sequenceNo - 1 == arg
         end
@@ -866,7 +871,7 @@ class TaskJuggler
     #   isWorkingTime(startTime, endTime) -> true or false
     #   isWorkingTime(interval) -> true or false
     #
-    # Return true if the slot or interval is withing globally defined working
+    # Return true if the slot or interval is within globally defined working
     # time or false if not. If the argument is a TimeInterval, all slots of
     # the interval must be working time to return true as result. Global work
     # time means, no global leaves defined and the slot lies within a
@@ -874,7 +879,7 @@ class TaskJuggler
     def isWorkingTime(*args)
       # Normalize argument(s) to TimeInterval
       if args.length == 1
-        if args[0].is_a?(Fixnum) || args[0].is_a?(Bignum)
+        if args[0].is_a?(Integer)
           return @scoreboard[args[0]].nil?
         elsif args[0].is_a?(TjTime)
           return @scoreboard[dateToIdx(args[0])].nil?
@@ -969,7 +974,7 @@ class TaskJuggler
 
     def collectTimeOffIntervals(iv, minDuration)
       @scoreboard.collectIntervals(iv, minDuration) do |val|
-        val.is_a?(Fixnum) && (val & 0x3E) != 0
+        val.is_a?(Integer) && (val & 0x3E) != 0
       end
     end
 

data/lib/taskjuggler/PropertyList.rb

@@ -3,7 +3,7 @@
 #
 # = PropertyList.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, 2019
 #               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -271,10 +271,16 @@ class TaskJuggler
 
             @query.property = a
             @query.process
+            unless @query.ok
+              fatal "List sort failed: #{@query.errorMessage}"
+            end
             aVal = @query.to_sort
 
             @query.property = b
             @query.process
+            unless @query.ok
+              fatal "List sort failed: #{@query.errorMessage}"
+            end
             bVal = @query.to_sort
           else
             # In case we don't have a query, we use the static mechanism.

data/lib/taskjuggler/PropertySet.rb

@@ -51,7 +51,7 @@ class TaskJuggler
       [
         [ 'id',   'ID',       StringAttribute, false,  false,  false,  '' ],
         [ 'name', 'Name',     StringAttribute, false,  false,  false,  '' ],
-        [ 'seqno', 'Seq. No', FixnumAttribute, false,  false,  false,  0 ]
+        [ 'seqno', 'Seq. No', IntegerAttribute, false,  false,  false,  0 ]
       ].each { |a| addAttributeType(AttributeDefinition.new(*a)) }
     end
 

data/lib/taskjuggler/PropertyTreeNode.rb

@@ -3,7 +3,7 @@
 #
 # = PropertyTreeNode.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, 2019
 #               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -331,7 +331,7 @@ class TaskJuggler
     end
 
     # Return the 'index' attributes of this property, prefixed by the 'index'
-    # attributes of all its parents. The result is an Array of Fixnums.
+    # attributes of all its parents. The result is an Array of Integers.
     def getIndicies
       idcs = []
       p = self
@@ -702,11 +702,13 @@ class TaskJuggler
       res += '-' * 75 + "\n"
     end
 
+    alias to_str to_s
+
     # Many PropertyTreeNode functions are scenario specific. These functions are
     # provided by the class *Scenario classes. In case we can't find a function
     # called for the base class we try to find it in corresponding *Scenario
     # class.
-    def method_missing(func, scenarioIdx, *args, &block)
+    def method_missing(func, scenarioIdx = 0, *args, &block)
       @data[scenarioIdx].send(func, *args, &block)
     end
 

data/lib/taskjuggler/Query.rb

@@ -81,7 +81,7 @@ class TaskJuggler
     end
 
     def startIdx=(idx)
-      if idx.is_a?(Fixnum)
+      if idx.is_a?(Integer)
         @startIdx = idx
         @start = @project.idxToDate(idx)
       else
@@ -99,7 +99,7 @@ class TaskJuggler
     end
 
     def endIdx=(idx)
-      if idx.is_a?(Fixnum)
+      if idx.is_a?(Integer)
         @endIdx = idx
         @end = @project.idxToDate(idx)
       else
@@ -239,7 +239,7 @@ class TaskJuggler
       @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
+    # Return the result of the Query as Integer or Float. The result may be
     # nil.
     def to_num
       @attr ? @attr.to_num : @numerical

data/lib/taskjuggler/RealFormat.rb

@@ -24,7 +24,7 @@ class TaskJuggler
   # thousandsSeparator: Separator used after 3 integer digits. (String)
   # fractionSeparator: Separator used between the inter part and the
   #                    fractional part. (String)
-  # fractionDigits: Number of fractional digits to show. (Fixnum)
+  # fractionDigits: Number of fractional digits to show. (Integer)
   class RealFormat
 
     attr_reader :signPrefix, :signSuffix, :thousandsSeparator,

data/lib/taskjuggler/Resource.rb

@@ -3,7 +3,7 @@
 #
 # = Resource.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, 2019
 #               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -37,7 +37,7 @@ class TaskJuggler
     # provided by the class ResourceScenario. In case we can't find a
     # function called for the Resource class we try to find it in
     # ResourceScenario.
-    def method_missing(func, scenarioIdx, *args, &block)
+    def method_missing(func, scenarioIdx = 0, *args, &block)
       @data[scenarioIdx].method(func).call(*args, &block)
     end
 

data/lib/taskjuggler/ResourceScenario.rb

@@ -20,7 +20,7 @@ class TaskJuggler
     def initialize(resource, scenarioIdx, attributes)
       super
 
-      # Scoreboard may be nil, a Task, or a bit vector encoded as a Fixnum
+      # Scoreboard may be nil, a Task, or a bit vector encoded as an Integer
       # nil:        Value has not been determined yet.
       # Task:       A reference to a Task object
       # Bit 0:      Reserved
@@ -279,6 +279,23 @@ class TaskJuggler
       query.string = query.scaleLoad(val)
     end
 
+    # Compute a list of the annual leave days within the period specified by
+    # the _query_. The result is a list of dates and how much of that day was
+    # taken.
+    def query_annualleavelist(query)
+      iv_list = collectLeaveIntervals(Interval.new(query.start, query.end), :annual)
+      iv_list.map! do |iv|
+        # The interval is at most one working day. We list the date of that
+        # day.
+        day = iv.start.strftime(@project['timeFormat'])
+        # And how much of the working day was taken. A full working day is
+        # 1.0, a half working day 0.5.
+        days = (iv.end - iv.start) / (60 * 60 * @project['dailyworkinghours'])
+        "#{day} (#{'%.1f' % days})"
+      end
+      query.assignList(iv_list)
+    end
+
     def query_annualleavebalance(query)
       if @property.leaf?
         leave = getLeave(query.startIdx, query.endIdx, :annual)
@@ -685,7 +702,22 @@ class TaskJuggler
       initScoreboard if @scoreboard.nil?
 
       @scoreboard.collectIntervals(iv, minDuration) do |val|
-        val.is_a?(Fixnum) && (val & 0x3E) != 0
+        val.is_a?(Integer) && (val & 0x3E) != 0
+      end
+    end
+
+    # Return a list of scoreboard intervals that are at least _minDuration_ long
+    # and only contain leave slots of the given type. The result is an Array of
+    # [ start, end ] TjTime values.
+    def collectLeaveIntervals(iv, type)
+      # Time-off intervals are only useful for leaf resources. Group resources
+      # would just default to the global working hours.
+      return [] unless @property.leaf?
+
+      initScoreboard if @scoreboard.nil?
+
+      @scoreboard.collectIntervals(iv, 60 * 60) do |val|
+        val.is_a?(Integer) && (val & 0x3E) == (Leave::Types[type] << 2)
       end
     end
 
@@ -723,7 +755,7 @@ class TaskJuggler
     # leave.
     def getLeaveSlots(startIdx, endIdx, type)
       countSlots(startIdx, endIdx) do |val|
-        val.is_a?(Fixnum) && (val & 0x3E) == (Leave::Types[type] << 2)
+        val.is_a?(Integer) && (val & 0x3E) == (Leave::Types[type] << 2)
       end
     end
 
@@ -739,7 +771,7 @@ class TaskJuggler
     def getTimeOffSlots(startIdx, endIdx)
       countSlots(startIdx, endIdx) do |val|
         # Bit 1 needs to be unset and the leave bits must not be 0.
-        val.is_a?(Fixnum) && (val & 0x2) == 0 && (val & 0x3C) != 0
+        val.is_a?(Integer) && (val & 0x2) == 0 && (val & 0x3C) != 0
       end
     end
 
@@ -900,7 +932,7 @@ class TaskJuggler
       initScoreboard unless @scoreboard
 
       val = @scoreboard[sbIdx]
-      return true unless val.is_a?(Fixnum)
+      return true unless val.is_a?(Integer)
 
       leave_type = (val >> 2) & 0xF
       leave_type < Leave::Types[:unemployed]

data/lib/taskjuggler/RichText/Snip.rb

@@ -27,7 +27,7 @@ class TaskJuggler
 
     # Create a RichTextSnip object. _document_ is a reference to the
     # RichTextDocument. _fileName_ is the name of the structured text file
-    # using RichText syntax. _sectionCounter_ is an 3 item Fixnum Array. These
+    # using RichText syntax. _sectionCounter_ is an 3 item Integer Array. These
     # 3 numbers are used to store the section counters over multiple
     # RichTextSnip objects.
     def initialize(document, fileName, sectionCounter)

data/lib/taskjuggler/RuntimeConfig.rb

@@ -45,7 +45,7 @@ class RuntimeConfig
   def configure(object, section)
     debug("Configuring object of type #{object.class}")
     sections = section.split('.')
-    p = @config
+    return false unless (p = @config)
     sections.each do |sec|
       p = p['_' + sec]
       unless p

data/lib/taskjuggler/Scoreboard.rb

@@ -3,7 +3,7 @@
 #
 # = Scoreboard.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, 2019
 #               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -175,9 +175,12 @@ class TaskJuggler
     end
 
     def inspect
+      s = ''
       0.upto(@sb.length - 1) do |i|
-        puts "#{idxToDate(i)}: #{@sb[i]}"
+        s << "#{idxToDate(i)}: #{@sb[i]}"
       end
+
+      s
     end
 
   end