taskjuggler 3.0.0 → 3.1.0

data/lib/taskjuggler/URLParameter.rb

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

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

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

@@ -3,7 +3,7 @@
 #
 # = VimSyntax.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
@@ -21,7 +21,8 @@ class TaskJuggler
 
     # Create a generator object.
     def initialize
-      @reference = SyntaxReference.new
+      # Create a syntax reference for all current keywords.
+      @reference = SyntaxReference.new(nil, true)
 
       @properties = []
       @attributes = []
@@ -58,6 +59,8 @@ class TaskJuggler
     private
 
     def header
+      # Generate the header section. Mostly consists of comments and a check
+      # if we have source the syntax file already.
       @file.write <<"EOT"
 " Vim syntax file
 " Language:     TaskJuggler
@@ -81,7 +84,7 @@ setlocal softtabstop=2
 setlocal cindent shiftwidth=2
 setlocal tabstop=2
 setlocal expandtab
-setlocal cinoptions=g0,t0,+0,(0,c0,C1
+setlocal cinoptions=g0,t0,+0,(0,c0,C1,n-2
 EOT
       @file.write "setlocal cinwords=#{cinwords.join(',')}\n"
       @file.write <<'EOT'
@@ -100,7 +103,7 @@ EOT
           tag = name == 'supplement' ?
                         kw.keyword.gsub(/\./, ' ') : name
           @file.write "syn region tjpblk_#{normalizedName}" +
-                      " start=/^\\s*#{tag}\\s.*{/ end=/^\\s*}/ transparent"
+                      " start=/^\\s*#{tag}\\s.*{\\s*$/ end=/^\\s*}\\s*$/ transparent"
           # We allow properties and special attributes to be folded.
           foldable = %w( task.timesheet project )
           @file.write " fold" if @properties.include?(kw) ||
@@ -131,7 +134,7 @@ EOT
 syn region tjpblk_macro start=/macro\s\+\h\w*\s*\[/ end=/\]$/ transparent fold contains=ALL
 syn region tjpstring start=/"/ skip=/\\"/ end=/"/
 syn region tjpstring start=/'/ skip=/\\'/ end=/'/
-syn region tjpstring start=/\s-8<-$/ end=/^\s*->8-/
+syn region tjpstring start=/\s-8<-$/ end=/^\s*->8-/ fold
 syn region tjpmlcomment start=+/\*+ end=+\*/+
 
 syn sync fromstart
@@ -212,7 +215,7 @@ let b:current_syntax = "tjp"
 
 " Support running tj3 from within vim. Just type ':make your_project.tjp' to
 " activate it.
-set makeprg=tj3
+set makeprg=tj3\ --silent
 
 " Support browsing the man page by typing Shift-k while having the cursor over
 " any syntax keyword

data/lib/taskjuggler/WorkingHours.rb

@@ -3,7 +3,7 @@
 #
 # = WorkingHours.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
@@ -163,6 +163,17 @@ class TaskJuggler
       true
     end
 
+    # Return the number of working hours per week.
+    def weeklyWorkingHours
+      seconds = 0
+      @days.each do |day|
+        day.each do |from, to|
+           seconds += (to - from)
+        end
+      end
+      seconds / (60 * 60)
+    end
+
     # Returns the time interval settings for each day in a human readable form.
     def to_s
       dayNames = %w( Sun Mon Tue Wed Thu Fri Sat )

data/lib/taskjuggler/XMLDocument.rb

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

@@ -3,7 +3,7 @@
 #
 # = XMLElement.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/apps/Tj3.rb

@@ -3,7 +3,7 @@
 #
 # = Tj3.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
@@ -137,6 +137,9 @@ EOT
         if files.empty?
           error('You must provide at least one .tjp file', 1)
         end
+        if @outputDir != '' && !Dir.exists?(@outputDir)
+          error("Output directory #{@outputDir} does not exist!")
+        end
 
         tj = TaskJuggler.new(true)
         tj.maxCpuCores = @maxCpuCores
@@ -161,8 +164,10 @@ EOT
         end
 
         # Check for freeze mode and generate the booking file if requested.
-        return 1 if @freeze && tj.freeze(@freezeDate, @freezeByTask) &&
-                    tj.errors > 0
+        if @freeze
+          return 1 unless tj.freeze(@freezeDate, @freezeByTask) &&
+                          tj.errors == 0
+        end
 
         return 0 if @noReports
 

data/lib/taskjuggler/apps/Tj3Client.rb

@@ -3,7 +3,7 @@
 #
 # = Tj3Client.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/apps/Tj3Daemon.rb

@@ -3,7 +3,7 @@
 #
 # = Tj3Daemon.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/apps/Tj3Man.rb

@@ -3,7 +3,7 @@
 #
 # = Tj3Man.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/apps/Tj3SsReceiver.rb

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

@@ -3,7 +3,7 @@
 #
 # = Tj3SsSender.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/apps/Tj3TsReceiver.rb

@@ -3,7 +3,7 @@
 #
 # = Tj3TsReceiver.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/apps/Tj3TsSender.rb

@@ -3,7 +3,7 @@
 #
 # = Tj3TsSender.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/apps/Tj3TsSummary.rb

@@ -3,7 +3,7 @@
 #
 # = Tj3TsSummary.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/daemon/Daemon.rb

@@ -3,7 +3,7 @@
 #
 # = Daemon.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/daemon/ProcessIntercom.rb

@@ -3,7 +3,7 @@
 #
 # = ProcessIntercom.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/daemon/ProjectBroker.rb

@@ -3,7 +3,7 @@
 #
 # = ProjectBroker.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/daemon/ProjectServer.rb

@@ -3,7 +3,7 @@
 #
 # = ProjectServer.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/daemon/ReportServer.rb

@@ -3,7 +3,7 @@
 #
 # = ReportServer.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
@@ -99,7 +99,7 @@ class TaskJuggler
 
     def addFile(file)
       begin
-        @tj.parseFile(file, :properties)
+        @tj.parseFile(file, :reportPropertiesFile)
       rescue TjException
         return false
       end

data/lib/taskjuggler/daemon/ReportServlet.rb

@@ -3,7 +3,7 @@
 #
 # = ReportServlet.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/daemon/WebServer.rb

@@ -3,7 +3,7 @@
 #
 # = WebServer.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/daemon/WelcomePage.rb

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

@@ -3,7 +3,7 @@
 #
 # = deep_copy.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/reports/AccountListRE.rb

@@ -0,0 +1,115 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = AccountListRE.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.
+#
+
+require 'taskjuggler/reports/TableReport'
+require 'taskjuggler/reports/ReportTable'
+require 'taskjuggler/TableColumnDefinition'
+require 'taskjuggler/LogicalExpression'
+
+class TaskJuggler
+
+  # This specialization of TableReport implements a task listing. It
+  # generates a list of tasks that can optionally have the allocated resources
+  # nested underneath each task line.
+  class AccountListRE < TableReport
+
+    # Create a new object and set some default values.
+    def initialize(report)
+      super
+      @table = ReportTable.new
+    end
+
+    # Generate the table in the intermediate format.
+    def generateIntermediateFormat
+      super
+
+      # Prepare the task list.
+      accountList = PropertyList.new(@project.accounts)
+      accountList.setSorting(@report.get('sortAccounts'))
+      accountList.query = @report.project.reportContexts.last.query
+      accountList = filterAccountList(accountList,
+                                      @report.get('hideAccount'),
+                                      @report.get('rollupAccount'),
+                                      @report.get('openNodes'))
+      accountList.sort!
+
+      # Generate the table header.
+      @report.get('columns').each do |columnDescr|
+        adjustColumnPeriod(columnDescr)
+        generateHeaderCell(columnDescr)
+      end
+
+      if (costAccount = @report.get('costAccount')) &&
+         (revenueAccount = @report.get('revenueAccount'))
+        # We are in balance mode. First show the cost and then the revenue
+        # accounts and then the total balance.
+        costAccountList = PropertyList.new(@project.accounts)
+        costAccountList.clear
+        costAccountList.setSorting(@report.get('sortAccounts'))
+        costAccountList.query = @report.project.reportContexts.last.query
+
+        revenueAccountList = PropertyList.new(@project.accounts)
+        revenueAccountList.clear
+        revenueAccountList.setSorting(@report.get('sortAccounts'))
+        revenueAccountList.query = @report.project.reportContexts.last.query
+
+        # Split the account list into a cost and a revenue account list.
+        accountList.each do |account|
+          if account.isChildOf?(costAccount) || account == costAccount
+            costAccountList << account
+          elsif account.isChildOf?(revenueAccount) || account == revenueAccount
+            revenueAccountList << account
+          end
+        end
+
+        # Make sure that the top-level cost and revenue accounts are always
+        # included in the lists.
+        unless costAccountList.include?(costAccount)
+          costAccountList << costAccount
+        end
+        unless revenueAccountList.include?(revenueAccount)
+          revenueAccountList << revenueAccount
+        end
+
+        generateAccountList(costAccountList, 0, nil)
+        generateAccountList(revenueAccountList, costAccountList.length, nil)
+
+        # To generate a total line that reports revenue minus cost, we create
+        # a temporary Account object that adopts the cost and revenue
+        # accounts.
+        totalAccount = Account.new(@report.project, '0', "Total", nil)
+        totalAccount.adopt(costAccount)
+        totalAccount.adopt(revenueAccount)
+
+        totalAccountList = PropertyList.new(@project.accounts)
+        totalAccountList.clear
+        totalAccountList.setSorting(@report.get('sortAccounts'))
+        totalAccountList.query = @report.project.reportContexts.last.query
+        totalAccountList << totalAccount
+
+        generateAccountList(totalAccountList,
+                            costAccountList.length + revenueAccountList.length,
+                            nil)
+        @report.project.removeAccount(totalAccount)
+
+      else
+        # We are not in balance mode. Simply show a list of all reports that
+        # aren't filtered out.
+        generateAccountList(accountList, 0, nil)
+      end
+    end
+
+  end
+
+end
+