taskjuggler 3.0.0 → 3.1.0

data/lib/taskjuggler/RichText.rb

@@ -3,7 +3,7 @@
 #
 # = RichText.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/RichText/Document.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = RichTextDocument.rb -- The TaskJuggler III Project Management Software
+# = Document.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/RichText/Element.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = RichTextElement.rb -- The TaskJuggler III Project Management Software
+# = Element.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/RichText/FunctionExample.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = RichTextFunctionExample.rb -- The TaskJuggler III Project Management Software
+# = FunctionExample.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/RichText/FunctionHandler.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = RichTextFunctionHandler.rb -- The TaskJuggler III Project Management Software
+# = FunctionHandler.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/RichText/Parser.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = RichTextParser.rb -- The TaskJuggler III Project Management Software
+# = Parser.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/RichText/RTFHandlers.rb

@@ -3,7 +3,7 @@
 #
 # = RTFHandlers.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/RichText/RTFNavigator.rb

@@ -3,7 +3,7 @@
 #
 # = RTFNavigator.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/RichText/RTFQuery.rb

@@ -3,7 +3,7 @@
 #
 # = RTFQuery.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/RichText/RTFReport.rb

@@ -3,7 +3,7 @@
 #
 # = RTFReport.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/RichText/RTFReportLink.rb

@@ -3,7 +3,7 @@
 #
 # = RTFReportLink.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/RichText/RTFWithQuerySupport.rb

@@ -3,7 +3,7 @@
 #
 # = RTFWithQuerySupport.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/RichText/Scanner.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = RichTextScanner.rb -- The TaskJuggler III Project Management Software
+# = Scanner.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -56,7 +56,8 @@ class TaskJuggler
         # :bop, :bol and :inline mode rules
         # The <nowiki> token puts the scanner into :nowiki mode.
         [ nil, /<nowiki>/, [ :bop, :bol, :inline ], method('nowikiStart') ],
-        [ :FCOLSTART, /<fcol:[a-z]+>/, [ :bop, :bol, :inline ],
+        [ :FCOLSTART, /<fcol:([a-z]+|#[0-9A-Fa-f]{3,6})>/, [ :bop, :bol,
+          :inline ],
           method('fontColorStart') ],
         [ :FCOLEND, /<\/fcol>/, [ :bop, :bol, :inline ],
           method('fontColorEnd') ],
@@ -139,7 +140,20 @@ class TaskJuggler
 
     def fontColorStart(type, match)
       # Extract color name from <fcol:colname>
-      [ type, match[6..-2] ]
+      colName = match[6..-2]
+      if colName =~ /#([0-9A-Fa-f]{3}|[0-9A-Fa-f]{6})/
+        # We've got a valid hex number.
+      else
+        validColors = %w( black maroon green olive navy purple teal silver
+                          gray red lime yellow blue fuchsia aqua white )
+        unless validColors.include?(colName)
+          error('bad_color_name',
+                "#{colName} is not a supported color. Use one of " +
+                "#{validColors.join(', ')} or #RGB where 'R', 'G' and 'B' " +
+                "are one or two digit hexadecimal numbers.")
+        end
+      end
+      [ type, colName ]
     end
 
     def fontColorEnd(type, match)

data/lib/taskjuggler/RichText/Snip.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = RichTextSnip.rb -- The TaskJuggler III Project Management Software
+# = Snip.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/RichText/SyntaxRules.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = RichTextSyntaxRules.rb -- The TaskJuggler III Project Management Software
+# = SyntaxRules.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -60,7 +60,6 @@ class TaskJuggler
         RichTextElement.new(@richTextI, :pre, @val[0].join)
       })
       pattern(%w( !bulletList1 ), lambda {
-
         RichTextElement.new(@richTextI, :bulletlist1, @val[0])
       })
       pattern(%w( !numberList1 ), lambda {
@@ -173,7 +172,7 @@ class TaskJuggler
 
     def rule_numberList1
       repeatable
-      pattern(%w( $NUMBER1 !text ), lambda {
+      pattern(%w( $NUMBER1 !text !blankLines ), lambda {
         el = RichTextElement.new(@richTextI, :numberitem1, @val[1])
         @numberListCounter[0] += 1
         el.data = @numberListCounter.dup
@@ -187,7 +186,7 @@ class TaskJuggler
 
     def rule_numberList2
       repeatable
-      pattern(%w( $NUMBER2 !text ), lambda {
+      pattern(%w( $NUMBER2 !text !blankLines ), lambda {
         el = RichTextElement.new(@richTextI, :numberitem2, @val[1])
         @numberListCounter[1] += 1
         el.data = @numberListCounter.dup
@@ -201,7 +200,7 @@ class TaskJuggler
 
     def rule_numberList3
       repeatable
-      pattern(%w( $NUMBER3 !text ), lambda {
+      pattern(%w( $NUMBER3 !text !blankLines ), lambda {
         el = RichTextElement.new(@richTextI, :numberitem3, @val[1])
         @numberListCounter[2] += 1
         el.data = @numberListCounter.dup
@@ -215,7 +214,7 @@ class TaskJuggler
 
     def rule_numberList4
       repeatable
-      pattern(%w( $NUMBER4 !text ), lambda {
+      pattern(%w( $NUMBER4 !text !blankLines ), lambda {
         el = RichTextElement.new(@richTextI, :numberitem4, @val[1])
         @numberListCounter[3] += 1
         el.data = @numberListCounter.dup
@@ -275,13 +274,6 @@ class TaskJuggler
       })
       pattern(%w( $FCOLSTART !space !plainTextWithLinks $FCOLEND !space ),
               lambda {
-        validColors = %w( black maroon green olive navy purple teal silver
-                          gray red lime yellow blue fuchsia aqua white )
-        unless validColors.include?(@val[0])
-          error('bad_color_name',
-                "#{@val[0]} is not a supported color. Use one of " +
-                "#{validColors.join(', ')}.")
-        end
         el = RichTextElement.new(@richTextI, :fontCol, @val[2])
         el.data = @val[0]
         el.appendSpace = !@val[4].nil?

data/lib/taskjuggler/RichText/TOCEntry.rb

@@ -3,7 +3,7 @@
 #
 # = TOCEntry.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -48,13 +48,22 @@ class TaskJuggler
         td << XMLElement.new('div', 'style' => 'height:10px')
       end
 
-      fontSizes = [ 20, 17, 15 ]
+      # Use a different font size depending on the element level.
+      fontSizes = [ 20, 17, 15, 14, 14 ]
+
       tr = XMLElement.new('tr', 'style' => "font-size:#{fontSizes[level]}px;")
-      tr << (td = XMLElement.new('td',
-                                 'style' => "padding-left:#{10 * level}px"))
-      td << XMLText.new(@number)
-      tr << (td = XMLElement.new('td',
-                                 'style' => "padding-left:#{5 + 20 * level}px"))
+      tr << (td = XMLElement.new('td', 'style' => "width:30px;"))
+      # Top-level headings have their number in the left column.
+      td << XMLText.new(@number) if level == 0
+
+      tr << (td = XMLElement.new('td'))
+      if level > 0
+        # Lower level headings have their number in the right column with the
+        # heading text.
+        td << XMLElement.new('span', 'style' => 'padding-right:15px') do
+          XMLText.new(@number)
+        end
+      end
       tag = @tag ? "##{@tag}" : ''
       td << (a = XMLElement.new('a', 'href' => "#{@file}.html#{tag}"))
       a << XMLText.new(@title)

data/lib/taskjuggler/RichText/TableOfContents.rb

@@ -3,7 +3,7 @@
 #
 # = TableOfContents.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,8 @@ class TaskJuggler
     # Return HTML elements that represent the content of the TableOfContents
     # object. The result is a tree of XMLElement objects.
     def to_html
-      div = XMLElement.new('div', 'style' => 'margin-left:15%; margin-right:15%;')
+      div = XMLElement.new('div',
+                           'style' => 'margin-left:15%; margin-right:15%;')
       div << (table = XMLElement.new('table'))
       @entries.each { |e| table << e.to_html }
 

data/lib/taskjuggler/RuntimeConfig.rb

@@ -3,7 +3,7 @@
 #
 # = RuntimeConfig.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/Scenario.rb

@@ -3,7 +3,7 @@
 #
 # = Scenario.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/ScenarioData.rb

@@ -3,7 +3,7 @@
 #
 # = ScenarioData.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

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
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/SheetHandlerBase.rb

@@ -3,7 +3,7 @@
 #
 # = SheetHandlerBase.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/SheetReceiver.rb

@@ -3,7 +3,7 @@
 #
 # = SheetReceiver.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify

data/lib/taskjuggler/SheetSender.rb

@@ -3,7 +3,7 @@
 #
 # = SheetSender.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -112,9 +112,9 @@ EOF
           error("Resource '#{id}' must have a valid email address")
         end
 
-        # Ignore resources that are on vacation for the whole period.
+        # Ignore resources that are on leave for the whole period.
         if effort == 0.0 && free == 0.0 && efficiency != 0.0
-          info("Resource '#{id}' was on vacation the whole period")
+          info("Resource '#{id}' was on leave the whole period")
           next
         end
 

data/lib/taskjuggler/Shift.rb

@@ -3,7 +3,7 @@
 #
 # = Shift.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ require 'taskjuggler/ShiftScenario'
 class TaskJuggler
 
   # A shift is a definition of working hours for each day of the week. It may
-  # also contain a list of intervals that define off-duty periods or vacations.
+  # also contain a list of intervals that define off-duty periods or leaves.
   class Shift < PropertyTreeNode
 
     def initialize(project, id, name, parent)

data/lib/taskjuggler/ShiftAssignments.rb

@@ -3,7 +3,7 @@
 #
 # = ShiftAssignments.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012
 #               by Chris Schlaeger <chris@linux.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -43,7 +43,7 @@ class TaskJuggler
     end
 
     # Returns true if the shift is active and requests to replace global
-    # vacation settings.
+    # leave settings.
     def replace?(date)
       @interval.start <= date && date < @interval.end && @shiftScenario.replace?
     end
@@ -58,9 +58,9 @@ class TaskJuggler
       @shiftScenario.onShift?(date)
     end
 
-    # Returns true if the shift has a vacation defined for the _date_.
-    def onVacation?(date)
-      @shiftScenario.onVacation?(date)
+    # Returns true if the shift has a leave defined for the _date_.
+    def onLeave?(date)
+      @shiftScenario.onLeave?(date)
     end
 
     # Primarily used for debugging
@@ -72,7 +72,7 @@ class TaskJuggler
   # This class manages a list of ShiftAssignment elements. The intervals of the
   # assignments must not overlap.
   #
-  # Since it is fairly costly to determine the onShift and onVacation values
+  # Since it is fairly costly to determine the onShift and onLeave values
   # for a given date we use a scoreboard to cache all computed values.
   # Changes to the assigment set invalidate the cache again.
   #
@@ -83,13 +83,18 @@ class TaskJuggler
   # nil: Value has not been determined yet.
   # Bit 0:      0: No assignment
   #             1: Has assignement
-  # Bit 1:      0: Work time
-  #             1: Off time
-  # Bit 2 - 5:  0: No vacation or leave time
-  #             1: Regular vacation
-  #             2 - 15: Reserved
-  # Bit 6:      Reserved
-  # Bit 7:      0: No global override
+  # Bit 1:      0: Work time (as defined by working hours)
+  #             1: No work time (as defined by working hours)
+  # Bit 2 - 5:  0: No holiday or leave time
+  #             1: Public holiday (holiday)
+  #             2: Annual leave
+  #             3: Special leave
+  #             4: Sick leave
+  #             5: unpaid leave
+  #             6: blocked for other projects
+  #             7 - 15: Reserved
+  # Bit 6 - 7:  Reserved
+  # Bit 8:      0: No global override
   #             1: Override global setting
   class ShiftAssignments < Monitor
 
@@ -160,10 +165,10 @@ class TaskJuggler
         # Set bit 1 if the shift is not active
         @scoreboard[idx] |= 1 << 1 unless sa.onShift?(date)
 
-        # Set bits 2 - 5 to 1 if it's a vacation slot.
-        @scoreboard[idx] |= 1 << 3 if sa.onVacation?(date)
+        # Set bits 2 - 5 to 1 if it's a leave slot.
+        @scoreboard[idx] |= 1 << 3 if sa.onLeave?(date)
 
-        # Set the 8th bit if the shift replaces global vacations.
+        # Set the 8th bit if the shift replaces global leaves.
         @scoreboard[idx] |= 1 << 8 if sa.replace?(date)
 
         return @scoreboard[idx]
@@ -187,16 +192,16 @@ class TaskJuggler
     end
 
     # Returns true if any of the defined shift periods contains the date
-    # specified by the scoreboard index _idx_ and the shift has a vacation
+    # specified by the scoreboard index _idx_ and the shift has a leave
     # defined or all off hours defined for that date.
     def timeOff?(idx)
       (getSbSlot(idx) & 0x3E) != 0
     end
 
     # Returns true if any of the defined shift periods contains the date
-    # specified by the scoreboard index _idx_ and if the shift has a vacation
+    # specified by the scoreboard index _idx_ and if the shift has a leave
     # defined for the date.
-    def onVacation?(idx)
+    def onLeave?(idx)
       (getSbSlot(idx) & 0x3C) != 0
     end