taskjuggler 0.0.4 → 0.0.5

data/lib/reports/ReportTableCell.rb

@@ -21,7 +21,8 @@ class TaskJuggler
 
     attr_reader :line
     attr_accessor :data, :category, :hidden, :alignment, :padding,
-                  :text, :tooltip, :selfcontained,
+                  :text, :tooltip, :showTooltipHint,
+                  :iconTooltip, :selfcontained,
                   :cellColor, :indent, :icon, :fontSize, :fontColor,
                   :bold, :width,
                   :rows, :columns, :special
@@ -43,6 +44,9 @@ class TaskJuggler
       self.text = text || ''
       # A custom text for the tooltip.
       @tooltip = nil
+      # Determines if the tooltip is triggered by an special hinting icon or
+      # the whole cell.
+      @showTooltipHint = true
       # The original data of the cell content (optional, nil if not provided)
       @data = nil
       @category = nil
@@ -56,6 +60,8 @@ class TaskJuggler
       @indent = nil
       # The basename of the icon file
       @icon = nil
+      # A custom tooltip for the cell icon
+      @iconTooltip = nil
       @fontSize = nil
       @cellColor = nil
       @fontColor = nil
@@ -93,97 +99,38 @@ class TaskJuggler
       attribs['style'] = "background-color: #{@cellColor}; " if @cellColor
       cell = XMLElement.new('td', attribs)
 
-      # Determine cell style
-      alignSymbols = [ :left, :center, :right ]
-      aligns = %w( left center right)
-      style = "text-align:#{aligns[alignSymbols.index(@alignment)]}; "
-      paddingLeft = paddingRight = 0
-      if @indent && @alignment != :center
-        if @alignment == :left
-          paddingLeft = @padding + @indent * 8
-          paddingRight = @padding
-        elsif @alignment == :right
-          paddingLeft = @padding
-          paddingRight = @padding + (@line.table.maxIndent - @indent) * 8
-        end
-        style += "padding-left:#{paddingLeft}px; " unless paddingLeft == 3
-        style += "padding-right:#{paddingRight}px; " unless paddingRight == 3
-      elsif @padding != 3
-        style += "padding-left:#{@padding}px; padding-right:#{@padding}px; "
-        paddingLeft = paddingRight = @padding
-      end
-      style += "width:#{@width - paddingLeft - paddingRight}px; " if @width
-      style += 'font-weight:bold; ' if @bold
-
-      # If we have a RichText content and a width limit, we enable line
-      # wrapping.
-      if @text.is_a?(RichTextIntermediate) && @width
-        style += "white-space:normal; "
-      end
-
-      style += "font-size: #{@fontSize}px; " if fontSize
-      if @fontColor
-        style += "color:#{@fontColor}; "
-      end
-      if @text.is_a?(RichTextIntermediate) && @line && @line.table.equiLines
-        style += "height:#{@line.height - 3}px; "
-      end
-      cell << (div = XMLElement.new('div',
-        'class' => @category ? 'celldiv' : 'headercelldiv', 'style' => style))
-
-      if @icon && !@selfcontained
-        div << XMLElement.new('img', 'src' => "icons/#{@icon}.png",
-                                     'align' => 'top',
-                                     'style' => 'margin-right:3px;' +
-                                                'margin-bottom:2px')
-      end
+      cell << (table = XMLElement.new('table',
+        'class' => @category ? 'tj_table_cell' : 'tj_table_header_cell',
+        'cellspacing' => '0', 'style' => cellStyle))
+      table << (row = XMLElement.new('tr'))
 
-      return cell if @text.nil?
+      calculateIndentation
 
-      if @text.respond_to?('functionHandler') && @text.functionHandler('query')
-        @text.functionHandler('query').setQuery(@query)
+      # Insert a padding cell for the left side indentation.
+      if @leftIndent
+        row << XMLElement.new('td', 'style' => "width:#{@leftIndent}px; ")
       end
+      row << cellIcon(cell)
 
-      shortText, singleLine = shortVersion(@text)
-      tooltip = nil
-      if (@line && @line.table.equiLines && (!singleLine || @width )) ||
-          !@category
-        # The cell is size-limited. We only put a shortened plain-text version
-        # in the cell and provide the full content via a tooltip.
-        div << XMLText.new(shortText)
-        tooltip = @text if @text != shortText
-      else
-        # The cell will adjust to the size of the content.
-        if @text.is_a?(RichTextIntermediate)
-          # Don't put the @text into a <div> but a <span>.
-          @text.blockMode = false #if singleLine
-          div << @text.to_html
-        else
-          div << XMLText.new(shortText)
-        end
-      end
+      labelDiv, tooltip = cellLabel
+      row << labelDiv
 
       # Overwrite the tooltip if the user has specified a custom tooltip.
       tooltip = @tooltip if @tooltip
       if tooltip && !tooltip.empty? && !@selfcontained
-        if tooltip.respond_to?('functionHandler') &&
-           tooltip.functionHandler('query')
-          tooltip.functionHandler('query').setQuery(@query)
+        if @showTooltipHint
+          row << (td = XMLElement.new('td'))
+          td << (tIcon = XMLElement.new('img', 'src' => 'icons/details.png',
+                                        'class' => 'tj_table_cell_tooltip'))
+          addHtmlTooltip(tooltip, td, cell)
+        else
+          addHtmlTooltip(tooltip, cell)
         end
-        div['onmouseover'] = "TagToTip('#{cell.object_id}')"
-        div['onmouseout'] = 'UnTip()'
-        div << (ltDiv = XMLElement.new('div',
-                                       'style' => 'position:fixed; ' +
-                                       'visibility:hidden',
-                                       'id' => "#{cell.object_id}"))
-        ltDiv << (tooltip.respond_to?('to_html') ? tooltip.to_html :
-                                                   XMLText.new(tooltip))
-
-        div << XMLElement.new('img', 'src' => 'icons/details.png',
-                              'width' => '6px',
-                              'style' => 'vertical-align:top; ' +
-                                         'margin:2px; ' +
-                                         'top:5px')
+      end
+
+      # Insert a padding cell for the right side indentation.
+      if @rightIndent
+        row << XMLElement.new('td', 'style' => "width:#{@rightIndent}px; ")
       end
 
       cell
@@ -208,6 +155,101 @@ class TaskJuggler
 
     private
 
+    def calculateIndentation
+      # In tree sorting mode, some cells have to be indented to reflect the
+      # tree nesting structure. The indentation is achieved with padding cells
+      # and needs to be applied to the proper side depending on the alignment.
+      @leftIndent = @rightIndent = 0
+      if @indent && @alignment != :center
+        if @alignment == :left
+          @leftIndent = @indent * 8
+        elsif @alignment == :right
+          @rightIndent = (@line.table.maxIndent - @indent) * 8
+        end
+      end
+    end
+
+    # Determine cell style
+    def cellStyle
+      style = "text-align:#{@alignment.to_s}; "
+      if @line && @line.table.equiLines
+        style += "height:#{@line.height - 7}px; "
+      end
+
+      style
+    end
+
+    def cellIcon(cell)
+      if @icon && !@selfcontained
+        td = XMLElement.new('td', 'class' => 'tj_table_cell_icon')
+        td << XMLElement.new('img', 'src' => "icons/#{@icon}.png",
+                                    'alt' => "Icon")
+        addHtmlTooltip(@iconTooltip, td, cell)
+        return td
+      end
+
+      nil
+    end
+
+    def cellLabel
+      # If we have a RichText content and a width limit, we enable line
+      # wrapping.
+      #                Overfl. Wrap. Height Width
+      # Fixed Height:    x      -      x     -
+      # Fixed Width:     x      x      -     x
+      # Both:            x      -      x     x
+      # None:            -      x      -     -
+      fixedHeight = @line && @line.table.equiLines
+      fixedWidth = !@width.nil?
+      style = "overflow:hidden; " if fixedHeight || fixedWidth
+      style = "white-space:#{fixedWidth && !fixedHeight ?
+                             'normal' : 'nowrap'}; "
+      if fixedHeight && !fixedWidth
+        style += "height:#{@line.height - 3}px; "
+      end
+      if fixedWidth && !fixedHeight
+        # @width does not really determine the column width. It only
+        # determines the with of the text label. Padding and icons can make
+        # the column significantly wider.
+        style += "max-width:#{@width}px; "
+      end
+      style += 'font-weight:bold; ' if @bold
+      style += "font-size: #{@fontSize}px; " if fontSize
+      if @fontColor
+        style += "color:#{@fontColor}; "
+      end
+      td = XMLElement.new('td', 'class' => 'tj_table_cell_label',
+                                'style' => style)
+
+      tooltip = nil
+      unless @text.nil? || @text.empty?
+        if @text.respond_to?('functionHandler') &&
+           @text.functionHandler('query')
+          @text.functionHandler('query').setQuery(@query)
+        end
+
+        shortText, singleLine = shortVersion(@text)
+        if (@line && @line.table.equiLines && (!singleLine || @width )) ||
+            !@category
+          # The cell is size-limited. We only put a shortened plain-text version
+          # in the cell and provide the full content via a tooltip.
+          td << XMLText.new(shortText)
+          tooltip = @text if @text != shortText
+        else
+          # The cell will adjust to the size of the content.
+          if @text.is_a?(RichTextIntermediate)
+            # Don't put the @text into a <div> but a <span>.
+            # @text.blockMode = false # if singleLine
+            td << @text.to_html
+          else
+            td << XMLText.new(@text)
+          end
+        end
+      end
+
+      return td, tooltip
+    end
+
     # Convert a RichText String into a small one-line plain text
     # version that fits the column.
     def shortVersion(itext)
@@ -219,9 +261,9 @@ class TaskJuggler
         singleLine = false
         modified = true
       end
-      # Assuming an average character width of 9 pixels
-      if @width && (text.length > (@width / 9))
-        text = text[0, @width / 9]
+      # Assuming an average character width of 8 pixels
+      if @width && (text.length > (@width / 8))
+        text = text[0, @width / 8]
         modified = shortened = true
       end
       # Add three dots to show that there is more info available.
@@ -229,6 +271,32 @@ class TaskJuggler
       [ text, singleLine ]
     end
 
+    def addHtmlTooltip(tooltip, trigger, hook = nil)
+      return unless tooltip && !tooltip.empty? && !@selfcontained
+
+      hook = trigger if hook.nil?
+      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'] = trigger['style'] ? trigger['style'] : 'cursor:help; '
+      hook << (ltDiv = XMLElement.new('div',
+                                      'class' => 'tj_tooltip_box',
+                                       'style' => 'cursor:help',
+                                       'id' => "ID#{trigger.object_id}"))
+      ltDiv << (tooltip.respond_to?('to_html') ? tooltip.to_html :
+                                                 XMLText.new(tooltip))
+    end
+
   end
 
 end

data/lib/reports/ReportTableLegend.rb

@@ -45,40 +45,30 @@ class TaskJuggler
       return nil if !@showGanttItems && @ganttItems.empty? &&
                     @calendarItems.empty?
 
-      table = XMLElement.new('table', 'class' => 'legendback',
-                             'style' => 'width:100%', 'border' => '0',
-                             'cellspacing' => '1', 'align' => 'center')
-      table << (tbody = XMLElement.new('tbody'))
-      tbody << (tr = XMLElement.new('tr'))
+      frame = XMLElement.new('div', 'class' => 'tj_table_legend_frame')
+      frame << (legend = XMLElement.new('table', 'class' => 'tj_table_legend',
+                                                 'cellspacing' => '1'))
 
-      # Empty line to create a bit of a vertical gap.
-      tr << XMLElement.new('td', 'colspan' => '8', 'style' => 'height:5px')
-
-      tbody << headlineToHTML('Gantt Chart Symbols:')
+      legend << headlineToHTML('Gantt Chart Symbols:')
       # Generate the Gantt chart symbols
       if @showGanttItems
-        tbody << (tr = XMLElement.new('tr'))
-
-        tr << ganttItemToHTML(GanttContainer.new(nil, 0, 15, 10, 35, 0),
-                              'Container Task', 40)
-        tr << spacerToHTML(8)
-        tr << ganttItemToHTML(GanttTaskBar.new(nil, 0, 15, 5, 35, 0),
-                              'Normal Task', 40)
-        tr << spacerToHTML
-        tr << ganttItemToHTML(GanttMilestone.new(nil, 15, 10, 0),
-                              'Milestone', 20)
+        legend << (row = XMLElement.new('tr', 'class' => 'tj_legend_row'))
+
+        row << ganttItemToHTML(GanttContainer.new(nil, 0, 15, 10, 35, 0),
+                               'Container Task', 40)
+        row << ganttItemToHTML(GanttTaskBar.new(nil, 0, 15, 5, 35, 0),
+                               'Normal Task', 40)
+        row << ganttItemToHTML(GanttMilestone.new(nil, 15, 10, 0),
+                               'Milestone', 20)
+        row << XMLElement.new('td', 'class' => 'tj_legend_spacer')
       end
 
-      tbody << itemsToHTML(@ganttItems)
-
-      tbody << headlineToHTML('Calendar Symbols:')
-      tbody << itemsToHTML(@calendarItems)
+      legend << itemsToHTML(@ganttItems)
 
-      # Empty line to create a bit of a vertical gap.
-      tbody << (tr = XMLElement.new('tr'))
-      tr << XMLElement.new('td', 'colspan' => '8', 'style' => 'height:5px')
+      legend << headlineToHTML('Calendar Symbols:')
+      legend << itemsToHTML(@calendarItems)
 
-      table
+      frame
     end
 
   private
@@ -88,77 +78,84 @@ class TaskJuggler
     # charts use the same colors for different meanings. This function generates
     # the HTML version of the headlines.
     def headlineToHTML(text)
-      tbody = []
       unless @calendarItems.empty? || @ganttItems.empty?
-        tbody << (tr = XMLElement.new('tr'))
-        tr << (td = XMLElement.new('td', 'colspan' => '8',
-                                   'style' => 'font-weight:bold; ' +
-                                              'padding-left:10px'))
-        td << XMLText.new(text)
-      else
-        nil
+        div = XMLElement.new('tr', 'class' => 'tj_legend_headline')
+        div << XMLNamedText.new(text, 'td', 'colspan' => '10')
+        return div
       end
-      tbody
+      nil
     end
 
     # Turn the Gantt symbold descriptions into HTML elements.
-    def ganttItemToHTML(item, name, width)
-      tr = []
-      tr << (td = XMLElement.new('td', 'style' => 'width:19%; ' +
-                                 'padding-left:10px; '))
-      td << XMLText.new(name)
-      tr << (td = XMLElement.new('td', 'style' => 'width:8%'))
-      td << (div = XMLElement.new('div',
-          'style' => "position:relative; width:#{width}px; height:15px;"))
-      div << item.to_html
-      tr
+    def ganttItemToHTML(itemRef, name, width)
+      cells = []
+      # Empty cell for margin first.
+      cells << (item = XMLElement.new('td', 'class' => 'tj_legend_spacer'))
+      # The symbol cell
+      cells << (item = XMLElement.new('td', 'class' => 'tj_legend_item'))
+      item << (symbol = XMLElement.new('div', 'class' => 'tj_legend_symbol',
+                                       'style' => 'top:3px'))
+      symbol << itemRef.to_html
+      # The label cell
+      cells << (item = XMLElement.new('td', 'class' => 'tj_legend_item'))
+      item << (label = XMLElement.new('div', 'class' => 'tj_legend_label'))
+      label << XMLText.new(name)
+
+      cells
+    end
+
+    # Turn a single color item into HTML elements.
+    def itemToHTML(itemRef)
+      cells = []
+      # Empty cell for margin first.
+      cells << XMLElement.new('td', 'class' => 'tj_legend_spacer')
+      # The symbol cell
+      cells << (item = XMLElement.new('td', 'class' => 'tj_legend_item'))
+      item << (symbol = XMLElement.new('div', 'class' => 'tj_legend_symbol'))
+      symbol << (box = XMLElement.new('div',
+                                      'style' => 'position:relative; ' +
+                                                 'top:2px;' +
+                                                 'width:20px; height:15px'))
+      box << (div = XMLElement.new('div', 'class' => 'loadstackframe',
+                                   'style' => 'position:absolute; ' +
+                                   'left:5px; width:16px; height:15px;'))
+      div << XMLElement.new('div', 'class' => "#{itemRef[1]}",
+                            'style' => 'position:absolute; ' +
+                                       'left:1px; top:1px; ' +
+                                       'width:14px; height:13px;')
+      # The label cell
+      cells << (item = XMLElement.new('td', 'class' => 'tj_legend_item'))
+      item << (label = XMLElement.new('div', 'class' => 'tj_legend_label'))
+      label << XMLText.new(itemRef[0])
+
+      cells
     end
 
     # Turn the color items into HTML elements.
     def itemsToHTML(items)
-      tbody = []
-
+      rows = []
+      row = nil
       gridCells = ((items.length / 3) + (items.length % 3 != 0 ? 1 : 0)) * 3
-      tr = nil
       gridCells.times do |i|
         # We show no more than 3 items in a row.
-        tbody << (tr = XMLElement.new('tr')) if i % 3 == 0
+        if i % 3 == 0
+          rows << (row = XMLElement.new('tr', 'class' => 'tj_legend_row'))
+        end
 
         # If we run out of items before the line is filled, we just insert
-        # spacers to fill the line.
+        # empty cells to fill the line.
         if i < items.length
-          tr << itemToHTML(items[i])
+          row << itemToHTML(items[i])
         else
-          tr << spacerToHTML(19)
-          tr << spacerToHTML(8)
+          row << XMLElement.new('td', 'class' => 'tj_legend_item',
+                                      'colspan' => '3')
+        end
+        if (i + 1) % 3 == 0
+          # Append an empty cell at the end of each row.
+          row << XMLElement.new('td', 'class' => 'tj_legend_spacer')
         end
-        tr << spacerToHTML() if i % 3 != 2
       end
-
-      tbody
-    end
-
-    # Turn a single color item into HTML elements.
-    def itemToHTML(item)
-      tr = []
-      tr << (td = XMLElement.new('td', 'style' => 'width:19%; ' +
-                                 'padding-left:10px; '))
-      td << XMLText.new(item[0])
-      tr << (td = XMLElement.new('td', 'style' => 'width:8%'))
-      td << (div = XMLElement.new('div', 'style' => 'position:relative; ' +
-                                                    'width:20px; height:15px')
-      div << XMLElement.new('div', 'class' => 'loadstackframe',
-                            'style' => 'position:absolute; ' +
-                            'left:5px; width:16px; height:15px;')
-      div << XMLElement.new('div', 'class' => "#{item[1]}",
-          'style' => 'position:absolute; left:1px; top:1px; ' +
-                     'width:14px; height:13px;'))
-      tr
-    end
-
-    # Generate an empty HTML cell. _width_ is the requested width in pixels.
-    def spacerToHTML(width = 9)
-      XMLElement.new('td', 'style' => "width:#{width}%")
+      rows
     end
 
   end

data/lib/reports/ResourceListRE.rb

@@ -43,11 +43,10 @@ class TaskJuggler
       resourceList.query = @report.project.reportContext.query
       resourceList.sort!
 
-      # Prepare the task list.
+      # Prepare the task list. Don't filter it yet! It would break the
+      # *_() LogicalFunctions.
       taskList = PropertyList.new(@project.tasks)
       taskList.setSorting(@report.get('sortTasks'))
-      taskList = filterTaskList(taskList, nil, @report.get('hideTask'),
-                                @report.get('rollupTask'))
       taskList.query = @report.project.reportContext.query
       taskList.sort!