taskjuggler 3.0.0 → 3.1.0

data/lib/header.tmpl

@@ -3,7 +3,7 @@
 #
 # = $FILE -- 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/Account.rb

@@ -3,7 +3,7 @@
 #
 # = Account.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
@@ -22,7 +22,7 @@ class TaskJuggler
   class Account < PropertyTreeNode
 
     def initialize(project, id, name, parent)
-      super(project.resources, id, name, parent)
+      super(project.accounts, id, name, parent)
       project.addAccount(self)
 
       @data = Array.new(@project.scenarioCount, nil)

data/lib/taskjuggler/AccountCredit.rb

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = AccountCredit.rb -- The TaskJuggler III Project Management Software
+#
+# 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
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+
+class TaskJuggler
+
+  class AccountCredit
+
+    attr_reader :date, :description, :amount
+
+    def initialize(date, description, amount)
+      @date = date
+      @description = description
+      @amount = amount
+    end
+
+  end
+
+end
+

data/lib/taskjuggler/AccountScenario.rb

@@ -3,7 +3,7 @@
 #
 # = AccountScenario.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
@@ -20,16 +20,82 @@ class TaskJuggler
 
     def initialize(account, scenarioIdx, attributes)
       super
+      %w( credits ).each do |attr|
+        @property[attr, @scenarioIdx]
+      end
+    end
+
+    def query_balance(query)
+      # The account balance is the turnover from project start (index 0) to
+      # the start of the query period. It's the start because that's what the
+      # label in the column header says.
+      startIdx = 0
+      endIdx = @project.dateToIdx(query.start)
+
+      query.sortable = query.numerical = amount = turnover(startIdx, endIdx)
+      query.string = query.currencyFormat.format(amount)
     end
 
-    # Compute the turnover for the _period_. Period should be a TimeInterval.
-    def turnover(period)
+    def query_turnover(query)
+      startIdx = @project.dateToIdx(query.start)
+      endIdx = @project.dateToIdx(query.end)
+
+      query.sortable = query.numerical = amount = turnover(startIdx, endIdx)
+      query.string = query.currencyFormat.format(amount)
+    end
+
+    private
+
+    # Compute the turnover for the period between _startIdx_ end _endIdx_.
+    # TODO: This method is horribly inefficient!
+    def turnover(startIdx, endIdx)
       amount = 0.0
-      if container?
-        @children.each { |child| amount += child.turnover }
+
+      # Accumulate the amounts that were directly credited to the account
+      # during the given interval.
+      unless @credits.empty?
+        # For this, we need the real dates again. Conver the indices back to
+        # dates.
+        startDate = @project.idxToDate(startIdx)
+        endDate = @project.idxToDate(endIdx)
+
+        @credits.each do |credit|
+          if startDate <= credit.date && credit.date < endDate
+            amount += credit.amount
+          end
+        end
+      end
+
+      if @property.container?
+        if @property.adoptees.empty?
+          # Normal case. Accumulate turnover of child accounts.
+          @property.children.each do |child|
+            amount += child.turnover(@scenarioIdx, startIdx, endIdx)
+          end
+        else
+          # Special case for meta account that is used to calculate a balance.
+          # The first adoptee is the top-level cost account, the second the
+          # top-level revenue account.
+          amount +=
+            -@property.adoptees[0].turnover(@scenarioIdx, startIdx, endIdx) +
+            @property.adoptees[1].turnover(@scenarioIdx, startIdx, endIdx)
+        end
       else
-        @project.tasks.each do |task|
-          amount += task.turnover(period, self)
+        case @property.get('aggregate')
+        when :tasks
+          @project.tasks.each do |task|
+            amount += task.turnover(@scenarioIdx, startIdx, endIdx, @property,
+                                    nil, false)
+          end
+        when :resources
+          @project.resources.each do |resource|
+            next unless resource.leaf?
+
+            amount += resource.turnover(@scenarioIdx, startIdx, endIdx,
+                                        @property, nil, false)
+          end
+        else
+          raise "Unknown aggregation type #{@property.get('aggregate')}"
         end
       end
       amount

data/lib/taskjuggler/AlertLevelDefinitions.rb

@@ -0,0 +1,104 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = AlertLevelDefinitions.rb -- The TaskJuggler III Project Management Software
+#
+# 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
+# it under the terms of version 2 of the GNU General Public License as
+# published by the Free Software Foundation.
+#
+
+class TaskJuggler
+
+  # This class holds all information to describe a alert level as used by
+  # TaskJuggler. A level has a unique ID, a unique name and a unique color.
+  # Colors are stored as HTML compatible strings, e. g. "#RGB" where R, G, B
+  # are a single or two-digit hex value.
+  class AlertLevelDefinition < Struct.new(:id, :name, :color)
+
+    def to_s
+      "#{id} '#{name}' '#{color}'"
+    end
+
+  end
+
+  # This class holds a list of AlertLevelDefinition objects. There are 3
+  # default levels. If they are changed, the :modified flag will indicate
+  # this.
+  class AlertLevelDefinitions
+
+    def initialize
+      # By default, we have a green, a yellow and a red level defined.
+      @levels = []
+      add(AlertLevelDefinition.new('green', 'Green', '#008000'))
+      add(AlertLevelDefinition.new('yellow', 'Yellow', '#BEA800'))
+      add(AlertLevelDefinition.new('red', 'Red', '#C00000'))
+
+      # Since those are the default values, we reset the modified flag.
+      @modified = false
+    end
+
+    # Remove all AlertLevelDefinition objects from the list.
+    def clear
+      @levels = []
+      @modified = true
+    end
+
+    # Add a new AlertLevelDefinition.
+    def add(level)
+      raise ArgumentError unless level.is_a?(AlertLevelDefinition)
+      if indexById(level.id) || indexByName(level.name)
+        raise ArgumentError, "ID and name must be unique"
+      end
+
+      @levels << level
+      @modified = true
+    end
+
+    # Return true if the alert levels are no longer the default ones,
+    # otherwise return false.
+    def modified?
+      @modified
+    end
+
+    # Try to match _id_ to a defined alert level ID and return the
+    # index of it. If no level is found, nil is returned.
+    def indexById(id)
+      @levels.index { |level| id == level.id }
+    end
+
+    # Try to match _name_ to a defined alert level ID and return the
+    # index of it. If no level is found, nil is returned.
+    def indexByName(name)
+      @levels.index { |level| name == level.name }
+    end
+
+    # Try to match _color_ to a defined alert level ID and return the
+    # index of it. If no level is found, nil is returned.
+    def indexByColor(color)
+      @levels.index { |level| color == level.color }
+    end
+
+    # Return the AlertLevelDefinition at _index_ or nil if _index_ is out of
+    # range.
+    def [](index)
+      @levels[index]
+    end
+
+    # Pass map call to @levels.
+    def map(&block)
+      @levels.map(&block)
+    end
+
+    # Return the definition of the alert levels in TJP syntax.
+    def to_tjp
+      "alertlevels #{@levels.join(",\n")}"
+    end
+
+  end
+
+end
+

data/lib/taskjuggler/AlgorithmDiff.rb

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = AccountScenario.rb -- The TaskJuggler III Project Management Software
+# = AlgorithmDiff.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/Allocation.rb

@@ -3,7 +3,7 @@
 #
 # = Allocation.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/AppConfig.rb

@@ -3,7 +3,7 @@
 #
 # = AppConfig.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/AttributeBase.rb

@@ -3,7 +3,7 @@
 #
 # = AttributeBase.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/AttributeDefinition.rb

@@ -3,7 +3,7 @@
 #
 # = AttributeDefinition.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/Attributes.rb

@@ -3,7 +3,7 @@
 #
 # = Attributes.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
@@ -41,6 +41,19 @@ class TaskJuggler
 
   end
 
+  class AccountCreditListAttribute < ListAttributeBase
+    def initialize(property, type, container)
+      super
+
+      set(Array.new)
+    end
+
+    def AccountCreditListAttribute::tjpId
+      'credits'
+    end
+
+  end
+
   class AllocationAttribute < AttributeBase
     def initialize(property, type, container)
       super
@@ -306,19 +319,19 @@ class TaskJuggler
     end
 
   end
+
   class JournalSortListAttribute < ListAttributeBase
 
     def initialize(property, type, container)
       super
     end
 
-    def JournalSortListAttribute ::tjpId
+    def JournalSortListAttribute::tjpId
       'journalsorting'
     end
 
   end
 
-
   class TimeIntervalListAttribute < ListAttributeBase
     def initialize(property, type, container)
       super
@@ -342,6 +355,30 @@ class TaskJuggler
 
   end
 
+  class LeaveAllowanceListAttribute < ListAttributeBase
+
+    def initialize(property, type, container)
+      super
+    end
+
+  end
+
+  class LeaveListAttribute < ListAttributeBase
+
+    def initialize(property, type, container)
+      super
+    end
+
+    def LeaveListAttribute::tjpId
+      'leave'
+    end
+
+    def to_tjp
+      "leaves #{get.join(",\n")}"
+    end
+
+  end
+
   class LimitsAttribute < AttributeBase
 
     def initialize(property, type, container)

data/lib/taskjuggler/BatchProcessor.rb

@@ -3,7 +3,7 @@
 #
 # = BatchProcessor.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
@@ -178,23 +178,24 @@ class TaskJuggler
     def pusher
       # Run until the terminate flag is set.
       until @terminate
-        if @toRunQueue.empty? || @runningJobs.length >= @maxCpuCores
+        if @toRunQueue.empty? ||
+           @lock.synchronize{ @runningJobs.length >= @maxCpuCores }
           # We have no jobs in the @toRunQueue or all CPU cores in use already.
           sleep(@timeout)
         else
-          # Get a new job from the @toRunQueue
-          job = @toRunQueue.pop
-
-          job.openPipes
-          # Add the receiver end of the pipe to the @pipes Array.
-          @pipes << job.stdoutP
-          # Map the pipe end to this JobInfo object.
-          @pipeToJob[job.stdoutP] = job
-          # Same for $stderr.
-          @pipes << job.stderrP
-          @pipeToJob[job.stderrP] = job
-
           @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.
+            @pipes << job.stdoutP
+            # 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
               # This is the child process now. Connect $stdout and $stderr to
               # the pipes.

data/lib/taskjuggler/Booking.rb

@@ -3,7 +3,7 @@
 #
 # = Booking.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