taskjuggler 0.0.8 → 0.0.9

data/lib/daemon/WebServer.rb

@@ -3,7 +3,8 @@
 #
 # = WebServer.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               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
@@ -16,11 +17,8 @@ require 'stringio'
 
 require 'AppConfig'
 require 'RichText'
-
-# StringIO needs to be extended so we can send $stdout and $stderr over DRb.
-class StringIO
-  include DRbUndumped
-end
+require 'daemon/WelcomePage'
+require 'daemon/ReportServlet'
 
 class TaskJuggler
 
@@ -37,6 +35,7 @@ class TaskJuggler
 
       config = { :Port => port }
       @server = WEBrick::HTTPServer.new(config)
+      @server.mount('/', WelcomePage, nil)
       @server.mount('/taskjuggler', ReportServlet, @broker)
 
       # Serve some directories via the FileHandler servlet.
@@ -75,149 +74,6 @@ EOT
       end
     end
 
-  end
-
-  class ReportServlet < WEBrick::HTTPServlet::AbstractServlet
-
-    def initialize(config, *options)
-      @broker = options[0]
-    end
-
-    def self.get_instance(config, options)
-      self.new(config, *options)
-    end
-
-    def do_GET(req, res)
-      @req = req
-      @res = res
-      begin
-        projectId = req.query['project']
-        reportId = req.query['report']
-        if projectId.nil? || reportId.nil?
-          generateWelcomePage(projectId)
-        else
-          attributes = req.query['attributes'] || ''
-          attributes = URLParameter.decode(attributes) unless attributes.empty?
-          generateReport(projectId, reportId, attributes)
-        end
-      rescue
-      end
-    end
-
-    private
-
-    def generateReport(projectId, reportId, attributes)
-      # Request the Project credentials from the ProbjectBroker.
-      @ps_uri, @ps_authKey = @broker.getProject(projectId)
-      if @ps_uri.nil?
-        error("No project with ID #{projectId} loaded")
-      end
-      # Get the responsible ReportServer that can generate the report.
-      begin
-        @projectServer = DRbObject.new(nil, @ps_uri)
-        @rs_uri, @rs_authKey = @projectServer.getReportServer(@ps_authKey)
-        @reportServer = DRbObject.new(nil, @rs_uri)
-      rescue
-        error("Cannot get report server")
-      end
-      # Create two StringIO buffers that will receive the $stdout and $stderr
-      # text from the report server. This buffer will contain the generated
-      # report as HTML encoded text.
-      stdOut = StringIO.new('')
-      stdErr = StringIO.new('')
-      begin
-        @reportServer.connect(@rs_authKey, stdOut, stdErr, $stdin, true)
-      rescue
-        error("Can't connect IO: #{$!}")
-      end
-
-      # Ask the ReportServer to generate the reports with the provided ID.
-      begin
-        @reportServer.generateReport(@rs_authKey, reportId, false, attributes)
-      rescue
-        stdOut.rewind
-        stdErr.rewind
-        error("Report server crashed: #{$!}\n#{stdErr.read}\n#{stdOut.read}")
-      end
-      # Disconnect the ReportServer
-      begin
-        @reportServer.disconnect(@rs_authKey)
-      rescue
-        error("Can't disconnect IO: #{$!}")
-      end
-      # And send a termination request.
-      begin
-        @reportServer.terminate(@rs_authKey)
-      rescue
-        error("Report server termination failed: #{$!}")
-      end
-      @reportServer = nil
-
-      @res['content-type'] = 'text/html'
-      stdErr.rewind
-      $stderr.puts stdErr.read
-      # To read the $stdout of the ReportServer we need to rewind the buffer
-      # and then read the full text.
-      stdOut.rewind
-      @res.body = stdOut.read
-    end
-
-    def generateWelcomePage(projectId)
-      projects = @broker.getProjectList
-
-      text = "== Welcome to the TaskJuggler Project Server ==\n----\n"
-      projects.each do |id|
-        if id == projectId
-          # Show the list of reports for this project.
-          text << "* [/taskjuggler #{getProjectName(id)}]\n"
-          reports = getReportList(id)
-          if reports.empty?
-            text << "** This project has no reports defined.\n"
-          else
-            reports.each do |reportId, reportName|
-              text << "** [/taskjuggler?project=#{id};report=#{reportId} " +
-                      "#{reportName}]\n"
-            end
-          end
-        else
-          # Just show a link to open the report list.
-          text << "* [/taskjuggler?project=#{id} #{getProjectName(id)}]\n"
-        end
-      end
-      rt = RichText.new(text)
-      rti = rt.generateIntermediateFormat
-      rti.sectionNumbers = false
-      page = HTMLDocument.new
-      page.generateHead("The TaskJuggler Project Server")
-      page << rti.to_html
-      @res['content-type'] = 'text/html'
-      @res.body = page.to_s
-    end
-
-    def getProjectName(id)
-      uri, authKey = @broker.getProject(id)
-      return nil unless uri
-      projectServer = DRbObject.new(nil, uri)
-      return nil unless projectServer
-      projectServer.getProjectName(authKey)
-    end
-
-    def getReportList(id)
-      uri, authKey = @broker.getProject(id)
-      return [] unless uri
-      projectServer = DRbObject.new(nil, uri)
-      return [] unless projectServer
-      projectServer.getReportList(authKey)
-    end
-
-    def error(message)
-      @res.status = 412
-      @res.body = "ERROR: #{message}"
-      @res['content-type'] = 'text/plain'
-      raise "Error: #{message}"
-    end
-
-  end
+   end
 
 end
-

data/lib/daemon/WelcomePage.rb

@@ -0,0 +1,80 @@
+#!/usr/bin/env ruby -w
+# encoding: UTF-8
+#
+# = WelcomePage.rb -- The TaskJuggler III Project Management Software
+#
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               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 'webrick'
+require 'Tj3Config'
+
+class TaskJuggler
+
+  class WelcomePage < WEBrick::HTTPServlet::AbstractServlet
+
+    def initialize(config, *options)
+      super
+    end
+
+    def self.get_instance(config, options)
+      self.new(config, *options)
+    end
+
+    def do_GET(req, res)
+      @req = req
+      @res = res
+      begin
+        generateWelcomePage
+      #rescue
+      end
+    end
+
+    private
+
+    def generateWelcomePage()
+      text = <<"EOT"
+== Welcome to TaskJuggler ==
+----
+
+This is the welcome page of your TaskJuggler built-in web server.
+To access your loaded TaskJuggler projects, click [/taskjuggler here].
+
+If you are seeing this page instead of the site you expected, please contact
+the administrator of the site involved. Try sending mail to
+<webmaster@domain>.
+
+Although this site is running the TaskJuggler software it almost certainly has
+no other connection to the TaskJuggler project, so please do not send mail
+about this site or its contents to the TaskJuggler authors. If you do, your
+message will be ignored.
+
+You can use the following links to learn more about TaskJuggler:
+
+* [#{AppConfig.contact} The TaskJuggler web site]
+* [#{AppConfig.contact+ "/tj3/manual/index.html"} User Manual]
+
+----
+#{AppConfig.softwareName} v#{AppConfig.version}
+- Copyright (c) #{AppConfig.copyright.join(', ')}
+by #{AppConfig.authors.join(', ')}
+EOT
+
+      rt = RichText.new(text)
+      rti = rt.generateIntermediateFormat
+      rti.sectionNumbers = false
+      page = HTMLDocument.new
+      page.generateHead("Welcome to TaskJuggler")
+      page << rti.to_html
+      @res['content-type'] = 'text/html'
+      @res.body = page.to_s
+    end
+
+  end
+
+end

data/lib/deep_copy.rb

@@ -3,7 +3,8 @@
 #
 # = deep_copy.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               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

data/lib/reports/CSVFile.rb

@@ -3,7 +3,8 @@
 #
 # = CSVFile.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               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

data/lib/reports/CollisionDetector.rb

@@ -3,7 +3,8 @@
 #
 # = CollisionDetector.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               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

data/lib/reports/ColumnTable.rb

@@ -3,7 +3,8 @@
 #
 # = ColumnTable.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               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

data/lib/reports/GanttChart.rb

@@ -3,7 +3,8 @@
 #
 # = GanttChart.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               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

data/lib/reports/GanttContainer.rb

@@ -3,7 +3,8 @@
 #
 # = GanttContainer.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               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
@@ -26,9 +27,7 @@ class TaskJuggler
     # is a reference to the GanttLine. _xStart_ is the left edge of the task in
     # chart coordinates. _xEnd_ is the right edge. The container extends over
     # the edges due to the shape of the jags.
-    def initialize(task, scenarioIdx, lineHeight, xStart, xEnd, y)
-      @task = task
-      @scenarioIdx = scenarioIdx
+    def initialize(lineHeight, xStart, xEnd, y)
       @lineHeight = lineHeight
       @start = xStart
       @end = xEnd

data/lib/reports/GanttHeader.rb

@@ -3,7 +3,8 @@
 #
 # = GanttHeader.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               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

data/lib/reports/GanttHeaderScaleItem.rb

@@ -3,7 +3,8 @@
 #
 # = GanttHeaderScaleItem.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               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

data/lib/reports/GanttLine.rb

@@ -3,7 +3,8 @@
 #
 # = GanttLine.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               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
@@ -205,17 +206,16 @@ class TaskJuggler
         @chart.addTask(property, self)
         @content <<
           if property['milestone', @query.scenarioIdx]
-            GanttMilestone.new(property, @height, xStart, @y)
+            GanttMilestone.new(@height, xStart, @y)
           elsif property.container?
-            GanttContainer.new(property, @query.scenarioIdx, @height,
-                               xStart, xEnd, @y)
+            GanttContainer.new(@height, xStart, xEnd, @y)
           else
-            GanttTaskBar.new(property, @query.scenarioIdx, @height,
-                             xStart, xEnd, @y)
+            GanttTaskBar.new(@query, @height, xStart, xEnd, @y)
           end
 
         # Make sure the legend includes the Gantt symbols.
         @chart.table.legend.showGanttItems = true if @chart.table
+        @chart.table.legend.addGanttItem('Off-duty period', 'offduty')
       end
 
     end
@@ -254,7 +254,7 @@ class TaskJuggler
           @chart.table.legend.addGanttItem('Resource assigned to task(s)',
                                            'busy')
           @chart.table.legend.addGanttItem('Resource available', 'free')
-          @chart.table.legend.addGanttItem('Resource off-duty', 'offduty')
+          @chart.table.legend.addGanttItem('Off-duty period', 'offduty')
         end
       else
         categories = [ 'busy', 'free' ]
@@ -262,7 +262,7 @@ class TaskJuggler
           @chart.table.legend.addGanttItem('Resource assigned to task(s)',
                                            'busy')
           @chart.table.legend.addGanttItem('Resource available', 'free')
-          @chart.table.legend.addGanttItem('Resource off-duty', 'offduty')
+          @chart.table.legend.addGanttItem('Off-duty period', 'offduty')
         end
       end
 
@@ -326,10 +326,12 @@ class TaskJuggler
                         @query.scenarioIdx, iv, minTimeOff)
       # Convert the start/end dates to X coordinates of the chart. When
       # finished, the zones in @timeOffZones are [ startX, endX ] touples.
+      zones = []
       @timeOffZones.each do |zone|
-        zone[0] = @chart.dateToX(zone[0])
-        zone[1] = @chart.dateToX(zone[1]) - zone[0]
+        zones << [ s = @chart.dateToX(zone.start),
+                   @chart.dateToX(zone.end) -  s ]
       end
+      @timeOffZones = zones
     end
 
     def addHtmlTooltip(tooltip, query, trigger, hook = nil)

data/lib/reports/GanttLoadStack.rb

@@ -3,7 +3,8 @@
 #
 # = GanttLoadStack.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               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

data/lib/reports/GanttMilestone.rb

@@ -3,7 +3,8 @@
 #
 # = GanttMilestone.rb -- The TaskJuggler III Project Management Software
 #
-# Copyright (c) 2006, 2007, 2008, 2009, 2010 by Chris Schlaeger <cs@kde.org>
+# Copyright (c) 2006, 2007, 2008, 2009, 2010, 2011
+#               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
@@ -26,8 +27,7 @@ class TaskJuggler
     # is a reference to the Task to be displayed. _lineHeight_ is the height of
     # the line this milestone is shown in. _x_ and _y_ are the coordinates of
     # the center of the milestone in the GanttChart.
-    def initialize(task, lineHeight, x, y)
-      @task = task
+    def initialize(lineHeight, x, y)
       @lineHeight = lineHeight
       @x = x
       @y = y