taskjuggler 3.5.0 → 3.6.0

data/examples/ProjectTemplate/template.tjp

@@ -1,5 +1,5 @@
 /*
- * This file contains a project skeletton. It is part of the
+ * This file contains a project skeleton. It is part of the
  * TaskJuggler project management tool. You can use this as a basis to
  * start you own project file.
  */
@@ -27,7 +27,7 @@ project your_project_id "Your Project Title"  2011-11-11-0:00--0500 +4m {
   #}
 
   # You can define your own attributes for tasks and resources. This
-  # is handy to capture additonal information about the project that
+  # is handy to capture additional information about the project that
   # is not directly impacting the project schedule but you like to
   # keep in one place.
   #extend task {

data/lib/header.tmpl

@@ -3,8 +3,8 @@
 #
 # = $FILE -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/Account.rb

@@ -3,8 +3,8 @@
 #
 # = Account.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/AccountCredit.rb

@@ -3,8 +3,8 @@
 #
 # = AccountCredit.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/AccountScenario.rb

@@ -3,8 +3,8 @@
 #
 # = AccountScenario.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/AlertLevelDefinitions.rb

@@ -3,8 +3,8 @@
 #
 # = AlertLevelDefinitions.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/AlgorithmDiff.rb

@@ -3,8 +3,8 @@
 #
 # = AlgorithmDiff.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -13,10 +13,10 @@
 
 # This class is an implementation of the classic UNIX diff functionality. It's
 # based on an original implementation by Lars Christensen, which based his
-# version on the Perl Algorithm::Diff implementation. This is largly a
+# version on the Perl Algorithm::Diff implementation. This is largely a
 # from-scratch implementation that tries to have a less intrusive and more
 # user-friendly interface. But some code fragments are very similar to the
-# origninal and are copyright (C) 2001 Lars Christensen.
+# original and are copyright (C) 2001 Lars Christensen.
 class Diff
 
   # A Hunk stores all information about a contiguous change of the destination

data/lib/taskjuggler/Allocation.rb

@@ -3,8 +3,8 @@
 #
 # = Allocation.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/AppConfig.rb

@@ -3,8 +3,8 @@
 #
 # = AppConfig.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -109,7 +109,7 @@ class AppConfig
     dirs = dataSearchDirs(baseDir)
     # Remove non-existing directories from the list again
     dirs.delete_if do |dir|
-      !File.exists?(dir.untaint)
+      !File.exist?(dir.untaint)
     end
     dirs
   end

data/lib/taskjuggler/AttributeBase.rb

@@ -3,8 +3,8 @@
 #
 # = AttributeBase.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -120,11 +120,15 @@ class TaskJuggler
       end
     end
 
-    # We overwrite this for ListAttributeBase.
     def isList?
       false
     end
 
+    # We overwrite this for ListAttributeBase.
+    def AttributeBase::isList?
+      false
+    end
+
     # Return the value as String.
     def to_s(query = nil)
       get.to_s
@@ -184,11 +188,15 @@ class TaskJuggler
       get.join(', ')
     end
 
-    # We overwrite this for ListAttributeBase.
     def isList?
       true
     end
 
+    # We overwrite this for ListAttributeBase.
+    def ListAttributeBase::isList?
+      true
+    end
+
   end
 
   class AttributeOverwrite < ArgumentError

data/lib/taskjuggler/AttributeDefinition.rb

@@ -3,8 +3,8 @@
 #
 # = AttributeDefinition.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/Attributes.rb

@@ -3,8 +3,8 @@
 #
 # = Attributes.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -454,7 +454,7 @@ class TaskJuggler
       'reference'
     end
 
-    def to_s(query)
+    def to_s(query = nil)
       url || ''
     end
 

data/lib/taskjuggler/BatchProcessor.rb

@@ -3,8 +3,8 @@
 #
 # = BatchProcessor.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/Booking.rb

@@ -3,8 +3,8 @@
 #
 # = Booking.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/Charge.rb

@@ -3,8 +3,8 @@
 #
 # = Charge.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/ChargeSet.rb

@@ -3,8 +3,8 @@
 #
 # = ChargeSet.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/DataCache.rb

@@ -3,8 +3,8 @@
 #
 # = DataCache.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/FileList.rb

@@ -3,8 +3,8 @@
 #
 # = FileList.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/HTMLDocument.rb

@@ -3,8 +3,8 @@
 #
 # = HTMLDocument.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/HTMLElements.rb

@@ -3,8 +3,8 @@
 #
 # = HTMLElements.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -19,7 +19,7 @@ class TaskJuggler
 
     # A list of supported HTML tags.
     htmlTags = %w( a b body br code col colgroup div em frame frameset footer
-                   h1 h2 h3 head html hr meta p pre table td title tr )
+                   h1 h2 h3 head html hr meta p pre span table td title tr )
     # A list of HTML tags that are self-closing.
     closureTags = %w( area base basefont br hr input img link meta )
 

data/lib/taskjuggler/ICalendar.rb

@@ -3,8 +3,8 @@
 #
 # = ICalendar.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/Interval.rb

@@ -3,8 +3,8 @@
 #
 # = Interval.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/IntervalList.rb

@@ -3,8 +3,8 @@
 #
 # = IntervalList.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/Journal.rb

@@ -3,8 +3,8 @@
 #
 # = Journal.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/KateSyntax.rb

@@ -3,8 +3,8 @@
 #
 # = KateSyntax.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/KeywordArray.rb

@@ -3,8 +3,8 @@
 #
 # = KeywordArray.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as

data/lib/taskjuggler/KeywordDocumentation.rb

@@ -3,8 +3,8 @@
 #
 # = KeywordDocumentation.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
-#               by Chris Schlaeger <chris@linux.com>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
+#               by Chris Schlaeger <cs@taskjuggler.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of version 2 of the GNU General Public License as
@@ -150,32 +150,18 @@ class TaskJuggler
       end
     end
 
-    def computeInheritance(keywords, rules)
-      property = nil
-      @contexts.each do |kwd|
-        if %w( task resource account shift scenario
-               accountreport resourcereport taskreport textreport ).
-               include?(kwd.keyword)
-          property = kwd.keyword
-          break
-        end
+    def listAttribute?
+      if (propertySet = findPropertySet)
+        keyword = @keyword
+        keyword = keyword.split('.')[0] if keyword.include?('.')
+        return propertySet.listAttribute?(keyword)
       end
-      if property
-        project = Project.new('id', 'dummy', '1.0')
-        propertySet = case property
-                      when 'task'
-                        project.tasks
-                      when 'resource'
-                        project.resources
-                      when 'account'
-                        project.accounts
-                      when 'shift'
-                        project.shifts
-                      when 'scenario'
-                        project.scenarios
-                      else
-                        project.reports
-                      end
+
+      false
+    end
+
+    def computeInheritance
+      if (propertySet = findPropertySet)
         keyword = @keyword
         keyword = keyword.split('.')[0] if keyword.include?('.')
         @inheritedFromProject = propertySet.inheritedFromProject?(keyword)
@@ -202,7 +188,8 @@ class TaskJuggler
       textW = 79
 
       # Top line with multiple elements
-      str = "#{blue('Keyword:')}     #{bold(@keyword)}\n\n"
+      str = "#{blue('Keyword:')}     #{bold(@keyword)}" +
+            "#{listAttribute? ? ' (List Attribute)' : '' }\n\n"
 
       if @pattern.supportLevel != :supported
         msg = supportLevelMessage
@@ -446,9 +433,7 @@ class TaskJuggler
             newRichText("<fcol:red>#{supportLevelMessage}</fcol>").to_html
           end,
           [ :deprecated, :removed ].include?(@pattern.supportLevel) ?
-            P.new do
-              useInsteadMessage
-            end : nil
+            (P.new { useInsteadMessage }) : nil
         ]
       else
         nil
@@ -463,8 +448,13 @@ class TaskJuggler
             [
               TD.new({ 'class' => 'tag',
                        'style' => 'width:16%'}) { 'Keyword' },
-              TD.new({ 'class' => 'descr',
-                       'style' => 'width:84%; font-weight:bold' }) { title }
+              TD.new({ 'class' => 'descr', 'style' => 'width:84%' }) do
+                [
+                  B.new() { title },
+                  listAttribute? ? A.new({ 'href' => "List_Attributes.html" }) {
+                                     "List Attribute" } : ""
+                ]
+              end
             ]
           end
         end
@@ -735,6 +725,38 @@ class TaskJuggler
       end
       descr << " instead."
     end
+
+    def findPropertySet
+      property = nil
+      @contexts.each do |kwd|
+        if %w( task resource account shift scenario
+               accountreport resourcereport taskreport textreport ).
+               include?(kwd.keyword)
+          property = kwd.keyword
+          break
+        end
+      end
+      if property
+        project = Project.new('id', 'dummy', '1.0')
+        case property
+        when 'task'
+          project.tasks
+        when 'resource'
+          project.resources
+        when 'account'
+          project.accounts
+        when 'shift'
+          project.shifts
+        when 'scenario'
+          project.scenarios
+        else
+          project.reports
+        end
+      else
+        nil
+      end
+    end
+
   end
 
 end