taskjuggler 0.0.4 → 0.0.5

data/lib/reports/GanttLine.rb

@@ -28,25 +28,22 @@ class TaskJuggler
 
     include HTMLGraphics
 
-    attr_reader :y, :height, :property, :scenarioIdx
+    attr_reader :y, :height, :query
 
     # Create a GanttLine object and generate the abstract representation.
-    def initialize(chart, property, scopeProperty, scenarioIdx, y, height)
+    def initialize(chart, query, y, height, tooltip)
       # A reference to the chart that the line belongs to.
       @chart = chart
       # Register the line with the chart.
       @chart.addLine(self)
 
+      # The query is used to access the presented project data.
+      @query = query
+      # A CellSettingPatternList object to determine the tooltips for the
+      # line's content.
+      @tooltip = tooltip
       # The category determines the background color of the line.
       @category = nil
-      # The property that is displayed in this line.
-      @property = property
-      # In case this line lists the property in the scope of another property,
-      # this is a reference to the line of the enclosing property. Otherwise it
-      # is nil.
-      @scopeProperty = scopeProperty
-      # The scenario index.
-      @scenarioIdx = scenarioIdx
       # The y coordinate of the topmost pixel of this line.
       @y = y + chart.header.height + 1
       # The height of the line in screen pixels.
@@ -65,7 +62,7 @@ class TaskJuggler
       # boundaries of this div are cut off.
       div = XMLElement.new('div', 'class' => @category,
                            'style' => "margin:0px; padding:0px; " +
-                           "position:absolute; overflow:hidden; " +
+                           "position:absolute; " +
                            "left:0px; top:#{@y}px; " +
                            "width:#{@chart.width.to_i}px; " +
                            "height:#{@height}px; " +
@@ -82,7 +79,11 @@ class TaskJuggler
 
       # Now render the content as HTML elements.
       @content.each do |c|
-        div << c.to_html
+        html = c.to_html
+        if html && html[0]
+          addHtmlTooltip(@tooltip, @query, html[0], div)
+          div << html
+        end
       end
 
       # Render the 'now' line
@@ -120,7 +121,7 @@ class TaskJuggler
 
       generateTimeOffZones
 
-      if @property.is_a?(Task)
+      if @query.property.is_a?(Task)
         generateTask
       else
         generateResource
@@ -131,13 +132,15 @@ class TaskJuggler
     # appear in the scope of a resource.
     def generateTask
       # Set the background color
-      @category = "taskcell#{(@property.get('index') + 1) % 2 + 1}"
+      @category = "taskcell#{(@query.property.get('index') + 1) % 2 + 1}"
 
-      project = @property.project
-      taskStart = @property['start', @scenarioIdx] || project['start']
-      taskEnd = @property['end', @scenarioIdx] || project['end']
+      project = @query.project
+      property = @query.property
+      scopeProperty = @query.scopeProperty
+      taskStart = property['start', @query.scenarioIdx] || project['start']
+      taskEnd = property['end', @query.scenarioIdx] || project['end']
 
-      if @scopeProperty
+      if scopeProperty
         # The task is nested into a resource. We show the work the resource is
         # doing for this task relative to the work the resource is doing for
         # all tasks.
@@ -170,14 +173,14 @@ class TaskJuggler
               w = @chart.dateToX(endDate) - x
             end
 
-            overallWork = @scopeProperty.getEffectiveWork(@scenarioIdx,
-                                                          startDate, endDate) +
-                          @scopeProperty.getEffectiveFreeWork(@scenarioIdx,
-                                                              startDate,
-                                                              endDate)
-            workThisTask = @property.getEffectiveWork(@scenarioIdx,
+            overallWork = scopeProperty.getEffectiveWork(@query.scenarioIdx,
+                                                         startDate, endDate) +
+                          scopeProperty.getEffectiveFreeWork(@query.scenarioIdx,
+                                                             startDate,
+                                                             endDate)
+            workThisTask = property.getEffectiveWork(@query.scenarioIdx,
                                                       startDate, endDate,
-                                                      @scopeProperty)
+                                                      scopeProperty)
             # If all values are 0 we make sure we show an empty frame.
             if overallWork == 0 && workThisTask == 0
               values = [ 0, 1 ]
@@ -199,16 +202,17 @@ class TaskJuggler
         # bars for the task.
         xStart = @chart.dateToX(taskStart)
         xEnd = @chart.dateToX(taskEnd)
-        @chart.addTask(@property, self)
-        if @property['milestone', @scenarioIdx]
-          @content << GanttMilestone.new(@property, @height, xStart, @y)
-        elsif @property.container?
-          @content << GanttContainer.new(@property, @scenarioIdx, @height,
-                                         xStart, xEnd, @y)
-        else
-          @content << GanttTaskBar.new(@property, @scenarioIdx, @height,
-                                       xStart, xEnd, @y)
-        end
+        @chart.addTask(property, self)
+        @content <<
+          if property['milestone', @query.scenarioIdx]
+            GanttMilestone.new(property, @height, xStart, @y)
+          elsif property.container?
+            GanttContainer.new(property, @query.scenarioIdx, @height,
+                               xStart, xEnd, @y)
+          else
+            GanttTaskBar.new(property, @query.scenarioIdx, @height,
+                             xStart, xEnd, @y)
+          end
 
         # Make sure the legend includes the Gantt symbols.
         @chart.table.legend.showGanttItems = true if @chart.table
@@ -220,7 +224,7 @@ class TaskJuggler
     # line or appear in the scope of a task.
     def generateResource
       # Set the alternating background color
-      @category = "resourcecell#{(@property.get('index') + 1) % 2 + 1}"
+      @category = "resourcecell#{(@query.property.get('index') + 1) % 2 + 1}"
 
       # The cellStartDate Array contains the end of the final cell as last
       # element. We need to use a shift mechanism to start and end
@@ -228,16 +232,21 @@ class TaskJuggler
       x = nil
       startDate = endDate = nil
 
+      property = @query.property
+      scopeProperty = @query.scopeProperty
+
       # For unnested resource lines we show the assigned work and the
       # available work. For resources in a task scope we show the work
       # allocated to this task, the work allocated to other tasks and the free
       # work.
-      if @scopeProperty
+      if scopeProperty
         categories = [ 'assigned', 'busy', 'free' ]
 
-        project = @property.project
-        taskStart = @scopeProperty['start', @scenarioIdx] || project['start']
-        taskEnd = @scopeProperty['end', @scenarioIdx] || project['end']
+        project = @query.project
+        taskStart = scopeProperty['start', @query.scenarioIdx] ||
+                    project['start']
+        taskEnd = scopeProperty['end', @query.scenarioIdx] ||
+                  project['end']
 
         if @chart.table
           @chart.table.legend.addGanttItem('Resource assigned to this task',
@@ -267,7 +276,7 @@ class TaskJuggler
         startDate = endDate
         endDate = date
 
-        if @scopeProperty
+        if scopeProperty
           # If we have a scope limiting task, we only want to generate load
           # stacks that overlap with the task interval.
           next if endDate <= taskStart || taskEnd <= startDate
@@ -281,20 +290,20 @@ class TaskJuggler
             # of the scope task.
             endDate = taskEnd
           end
-          taskWork = @property.getEffectiveWork(@scenarioIdx,
-                                                startDate, endDate,
-                                                @scopeProperty)
-          overallWork = @property.getEffectiveWork(@scenarioIdx,
+          taskWork = property.getEffectiveWork(@query.scenarioIdx,
+                                               startDate, endDate,
+                                               scopeProperty)
+          overallWork = property.getEffectiveWork(@query.scenarioIdx,
+                                                  startDate, endDate)
+          freeWork = property.getEffectiveFreeWork(@query.scenarioIdx,
                                                    startDate, endDate)
-          freeWork = @property.getEffectiveFreeWork(@scenarioIdx,
-                                                    startDate, endDate)
           values = [ taskWork, overallWork - taskWork, freeWork ]
         else
           values = []
-          values << @property.getEffectiveWork(@scenarioIdx,
-                                               startDate, endDate)
-          values << @property.getEffectiveFreeWork(@scenarioIdx,
-                                                   startDate, endDate)
+          values << property.getEffectiveWork(@query.scenarioIdx,
+                                              startDate, endDate)
+          values << property.getEffectiveFreeWork(@query.scenarioIdx,
+                                                  startDate, endDate)
         end
 
         x = @chart.dateToX(startDate)
@@ -313,8 +322,8 @@ class TaskJuggler
       return if (minTimeOff = @chart.scale['minTimeOff']) <= 0
 
       # Get the time-off intervals.
-      @timeOffZones = @property.collectTimeOffIntervals(@scenarioIdx, iv,
-                                                        minTimeOff)
+      @timeOffZones = @query.property.collectTimeOffIntervals(
+                        @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.
       @timeOffZones.each do |zone|
@@ -323,6 +332,33 @@ class TaskJuggler
       end
     end
 
+    def addHtmlTooltip(tooltip, query, trigger, hook = nil)
+      return unless tooltip
+
+      tooltip = tooltip.getPattern(query)
+      return unless tooltip && !tooltip.empty?
+
+      if tooltip.respond_to?('functionHandler') &&
+         tooltip.functionHandler('query')
+        tooltip.functionHandler('query').setQuery(query)
+      end
+      if query
+        query.attributeId = 'name'
+        query.process
+        title = query.to_s
+      else
+        title = ''
+      end
+      trigger['onclick'] = "TagToTip('ID#{trigger.object_id}', " +
+                           "TITLE, '#{title}')"
+      trigger['style'] += 'cursor:help; '
+      hook = trigger unless hook
+      hook << (ltDiv = XMLElement.new('div', 'class' => 'tj_tooltip_box',
+                                      'id' => "ID#{trigger.object_id}"))
+      ltDiv << (tooltip.respond_to?('to_html') ? tooltip.to_html :
+                                                 XMLText.new(tooltip))
+    end
+
   end
 
 end

data/lib/reports/GanttMilestone.rb

@@ -67,10 +67,13 @@ class TaskJuggler
     # elements.
     def to_html
       html = []
-      (@@size + 1).times do |i|
-        html << rectToHTML(@x - (@@size - 1) + i, (@lineHeight / 2) - i,
-                           2 * (@@size - i) + 1, 2 * i + 1, 'milestone')
-      end
+
+      # Invisible trigger frame for tooltips.
+      html << rectToHTML(@x - (@lineHeight / 2), 0, @lineHeight, @lineHeight,
+                         'tj_gantt_frame')
+
+      # Draw a diamond shape.
+      html += diamondToHTML(@x, @lineHeight / 2)
       html
     end
 

data/lib/reports/GanttTaskBar.rb

@@ -77,14 +77,18 @@ class TaskJuggler
 
       html = []
 
+      # Invisible trigger frame for tooltips.
+      html << rectToHTML(xStart, 0, width, @lineHeight, 'tj_gantt_frame')
+
       # First we draw the task frame.
-      html << rectToHTML(xStart, yCenter - @@size, width, 2 * @@size,
-                         'taskbarframe')
+      html << (frame = rectToHTML(xStart, yCenter - @@size, width, 2 * @@size,
+                                  'taskbarframe'))
+
       # The we draw the filling.
       html << rectToHTML(xStart + 1, yCenter - @@size + 1, width - 2,
                          2 * @@size - 2, 'taskbar')
       # And then the progress bar. If task is null we assume 50% completion.
-      completion = @task ? @task['complete', @scenarioIdx] / 100 : 0.5
+      completion = @task ? @task['complete', @scenarioIdx] / 100.0 : 0.5
       html << rectToHTML(xStart + 1, yCenter - @@size / 2,
                          (width - 2) * completion, @@size, 'progressbar')
     end

data/lib/reports/HTMLGraphics.rb

@@ -39,10 +39,7 @@ class TaskJuggler
       else
         raise "Can't draw diagonal line #{xs}/#{ys} to #{xe}/#{ye}!"
       end
-      div = XMLElement.new('div', 'class' => category, 'style' => style)
-      div.mayNotBeEmpty = true
-
-      div
+      XMLElement.new('div', 'class' => category, 'style' => style)
     end
 
     # Draw a filled rectable at position _x_ and _y_ with the dimension _w_ and
@@ -51,12 +48,30 @@ class TaskJuggler
     def rectToHTML(x, y, w, h, category)
       style = "left:#{x.to_i}px; top:#{y.to_i}px; " +
               "width:#{w.to_i}px; height:#{h.to_i}px;"
-      div = XMLElement.new('div', 'class' => category, 'style' => style)
-      # Most browsers don't like the <div/> notation. So we need to make sure we
-      # generate <div></div> sequences.
-      div.mayNotBeEmpty = true
+      XMLElement.new('div', 'class' => category, 'style' => style)
+    end
+
+    def jagToHTML(x, y)
+      XMLElement.new('div', 'class' => 'tj_gantt_jag',
+                            'style' => "left:#{x.to_i - 5}px; " +
+                                       "top:#{y.to_i}px;")
+    end
+
+    def diamondToHTML(x, y)
+      html = []
+      html << XMLElement.new('div', 'class' => 'tj_diamond_top',
+                             'style' => "left:#{x.to_i - 6}px; " +
+                                        "top:#{y.to_i - 7}px;")
+      html << XMLElement.new('div', 'class' => 'tj_diamond_bottom',
+                             'style' => "left:#{x.to_i - 6}px; " +
+                                        "top:#{y.to_i}px;")
+      html
+    end
 
-      div
+    def arrowHeadToHTML(x, y)
+      XMLElement.new('div', 'class' => 'tj_arrow_head',
+                            'style' => "left:#{x.to_i - 5}px; " +
+                                       "top:#{y.to_i - 5}px;")
     end
 
   end