taskjuggler 0.0.2 → 0.0.3

data/lib/reports/{ReportTableElement.rb → TableReport.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby -w
 # encoding: UTF-8
 #
-# = ReportTableElement.rb -- The TaskJuggler III Project Management Software
+# = TableReport.rb -- The TaskJuggler III Project Management Software
 #
 # Copyright (c) 2006, 2007, 2008, 2009 by Chris Schlaeger <cs@kde.org>
 #
@@ -10,6 +10,7 @@
 # published by the Free Software Foundation.
 #
 
+require 'reports/ReportBase'
 require 'reports/GanttChart'
 require 'reports/ReportTableLegend'
 require 'reports/ColumnTable'
@@ -17,50 +18,63 @@ require 'Query'
 
 class TaskJuggler
 
-  # This is base class for all types of tabular report elements. All tabular
-  # report elements are converted to an abstract (output independent)
-  # intermediate form first, before the are turned into the requested output
-  # format.
-  class ReportTableElement < ReportElement
+  # This is base class for all types of tabular reports. All tabular reports
+  # are converted to an abstract (output independent) intermediate form first,
+  # before the are turned into the requested output format.
+  class TableReport < ReportBase
 
     attr_reader :legend
 
-    # Generate a new ReportTableElement object.
+    @@propertiesById = {
+      # ID               Header        Indent  Align   Calced. Scen Spec.
+      'complete'    => [ 'Completion', false,  :right, true,   true ],
+      'cost'        => [ 'Cost',       true,   :right, true,   true ],
+      'duration'    => [ 'Duration',   true,   :right, true,   true ],
+      'effort'      => [ 'Effort',     true,   :right, true,   true ],
+      'id'          => [ 'Id',         false,  :left,  true,   false ],
+      'line'        => [ 'Line No.',   false,  :right, true,   false ],
+      'name'        => [ 'Name',       true,   :left,  false,  false ],
+      'no'          => [ 'No.',        false,  :right, true,   false ],
+      'rate'        => [ 'Rate',       true,   :right, true,   true ],
+      'resources'   => [ 'Resources',  false,  :left,  true,   true ],
+      'revenue'     => [ 'Revenue',    true,   :right, true,   true ],
+      'scenario'    => [ 'Scenario',   false,  :left,  true,   true ],
+      'wbs'         => [ 'WBS',        false,  :left,  true,   false ]
+    }
+    @@propertiesByType = {
+      # Type                  Indent  Align
+      DateAttribute      => [ false,  :left ],
+      FixnumAttribute    => [ false,  :right ],
+      FloatAttribute     => [ false,  :right ],
+      RichTextAttribute  => [ false,  :left ],
+      StringAttribute    => [ false,  :left ]
+    }
+    # Generate a new TableReport object.
     def initialize(report)
       super
+      @report.content = self
 
       # Reference to the intermediate representation.
       @table = nil
+      @start = @end = nil
 
       @legend = ReportTableLegend.new
-    end
 
-    # This is an abstract member that all sub classes must re-implement. It may
-    # or may not do something though.
-    def generateIntermediateFormat
-      raise 'This function must be overriden by derived classes.'
     end
 
-    # Turn the ReportTableElement into an equivalent HTML element tree.
+
+    # Turn the TableReport into an equivalent HTML element tree.
     def to_html
       html = []
 
-      # Make sure we have some margins around the report.
-      html << (frame = XMLElement.new('div',
-                                      'style' => 'margin: 35px 5% 25px 5%; '))
-
-      if @prolog
-        @prolog.sectionNumbers = false
-        frame << @prolog.to_html
-      end
-
-      frame << (table = XMLElement.new('table', 'summary' => 'Report Table',
+      html << rt_to_html('header')
+      html << (table = XMLElement.new('table', 'summary' => 'Report Table',
                                      'cellspacing' => '2', 'border' => '0',
                                      'cellpadding' => '0', 'align' => 'center',
                                      'class' => 'tabback'))
 
       # The headline is put in a sub-table to appear bigger.
-      if @headline
+      if a('headline')
         table << (thead = XMLElement.new('thead'))
         thead << (tr = XMLElement.new('tr'))
         tr << (td = XMLElement.new('td'))
@@ -73,7 +87,7 @@ class TaskJuggler
                                      'style' => 'font-size:16px; ' +
                                                 'font-weight:bold',
                                      'class' => 'tabfront'))
-        td1 << XMLNamedText.new(@headline, 'p')
+        td1 << XMLNamedText.new(a('headline'), 'p')
       end
 
       # Now generate the actual table with the data.
@@ -83,13 +97,13 @@ class TaskJuggler
       td << @table.to_html
 
       # Embedd the caption as RichText into the table footer.
-      if @caption
+      if a('caption')
         tbody << (tr = XMLElement.new('tr'))
         tr << (td = XMLElement.new('td', 'class' => 'tabback'))
         td << (div = XMLElement.new('div', 'class' => 'caption',
                                     'style' => 'margin:1px'))
-        @caption.sectionNumbers = false
-        div << @caption.to_html
+        a('caption').sectionNumbers = false
+        div << a('caption').to_html
       end
 
       # A sub-table with the legend.
@@ -110,22 +124,179 @@ class TaskJuggler
                              'href' => "#{AppConfig.contact}")
       td << XMLText.new(" v#{AppConfig.version}")
 
-      if @epilog
-        @epilog.sectionNumbers = false
-        frame << @epilog.to_html
-      end
-
+      html << rt_to_html('footer')
       html
     end
 
-    # Convert the ReportElement into an Array of Arrays. It has one Array for
-    # each line. The nested Arrays have one String for each column.
+    # Convert the table into an Array of Arrays. It has one Array for each
+    # line. The nested Arrays have one String for each column.
     def to_csv
       @table.to_csv
     end
 
+    # This is the default attribute value to text converter. It is used
+    # whenever we need no special treatment.
+    def cellText(value, type)
+      begin
+        if value.nil?
+          if type == DateAttribute
+            nil
+          else
+            ''
+          end
+        else
+          # Certain attribute types need special treatment.
+          if type == DateAttribute
+            value.value.to_s(a('timeFormat'))
+          elsif type == RichTextAttribute
+            value.value
+          elsif type == ReferenceAttribute
+            value.label
+          else
+            value.to_s
+          end
+        end
+      rescue TjException
+        ''
+      end
+    end
+
+    # This function returns true if the values for the _colId_ column need to be
+    # calculated.
+    def calculated?(colId)
+      if @@propertiesById.has_key?(colId)
+        return @@propertiesById[colId][3]
+      end
+      return false
+    end
+
+    # This functions returns true if the values for the _col_id_ column are
+    # scenario specific.
+    def scenarioSpecific?(colId)
+      if @@propertiesById.has_key?(colId)
+        return @@propertiesById[colId][4]
+      end
+      return false
+    end
+
+    # Return if the column values should be indented based on the _colId_ or the
+    # _propertyType_.
+    def indent(colId, propertyType)
+      if @@propertiesById.has_key?(colId)
+        return @@propertiesById[colId][1]
+      elsif @@propertiesByType.has_key?(propertyType)
+        return @@propertiesByType[propertyType][0]
+      else
+        false
+      end
+    end
+
+    # Return the alignment of the column based on the _colId_ or the
+    # _propertyType_.
+    def alignment(colId, propertyType)
+      if @@propertiesById.has_key?(colId)
+        return @@propertiesById[colId][2]
+      elsif @@propertiesByType.has_key?(propertyType)
+        return @@propertiesByType[propertyType][1]
+      else
+        :center
+      end
+    end
+
+    # Returns the default column title for the columns _id_.
+    def TableReport::defaultColumnTitle(id)
+      # Return an empty string for some special columns that don't have a fixed
+      # title.
+      specials = %w( chart hourly daily weekly monthly quarterly yearly)
+      return '' if specials.include?(id)
+
+      # Return the title for build-in hardwired columns.
+      @@propertiesById.include?(id) ? @@propertiesById[id][0] : nil
+    end
+
+    def supportedColumns
+      @@propertiesById.keys
+    end
+
   protected
 
+    # These can't be determined during initialization as they have have been
+    # changed afterwards.
+    def setReportPeriod
+      @start = a('start')
+      @end = a('end')
+    end
+
+    # In case the user has not specified the report period, we try to fit all
+    # the _tasks_ in and add an extra 5% time at both ends. _scenarios_ is a
+    # list of scenario indexes.
+    def adjustReportPeriod(tasks, scenarios, columns)
+      return if tasks.empty? ||
+        a('start') != @project['start'] || a('end') != @project['end']
+
+      @start = @end = nil
+      scenarios.each do |scenarioIdx|
+        tasks.each do |task|
+          date = task['start', scenarioIdx] || @project['start']
+          @start = date if @start.nil? || date < @start
+          date = task['end', scenarioIdx] || @project['end']
+          @end = date if @end.nil? || date > @end
+        end
+      end
+      # We want to add at least 5% on both ends.
+      margin = 0
+      minWidth = @end - @start + 1
+      columns.each do |column|
+        case column.id
+        when 'chart'
+          # In case we have a 'chart' column, we enforce certain minimum width
+          # of the chart. The width depends on the selected scale.
+          # The following table contains an entry for each scale. The entry
+          # consists of the triple 'seconds per unit', 'minimum width units'
+          # and 'margin units'. The minimum with does not include the margins
+          # since they are always added.
+          mwMap = {
+            'hour' =>    [ 60 * 60,            18, 2 ],
+            'day' =>     [ 60 * 60 * 24,       18, 2 ],
+            'week' =>    [ 60 * 60 * 24 * 7,    6, 1 ],
+            'month' =>   [ 60 * 60 * 24 * 31,  10, 1 ],
+            'quarter' => [ 60 * 60 * 24 * 90,   6, 1 ],
+            'year' =>    [ 60 * 60 * 24 * 365,  4, 1 ]
+          }
+          entry = mwMap[column.scale]
+          raise "Unknown scale #{column.scale}" unless entry
+          margin = entry[0] * entry[2]
+          # If the with determined by start and end dates of the task is below
+          # the minimum width, we increase the width to the value provided by
+          # the table.
+          minWidth = entry[0] * entry[1] if minWidth < entry[0] * entry[1]
+          break
+        when 'hourly', 'daily', 'weekly', 'monthly', 'quarterly', 'yearly'
+          # For the calendar columns we use a similar approach as we use for
+          # the 'chart' column.
+          mwMap = {
+            'hourly' =>    [ 60 * 60,            18, 2 ],
+            'daily' =>     [ 60 * 60 * 24,       18, 2 ],
+            'weekly' =>    [ 60 * 60 * 24 * 7,    6, 1 ],
+            'monthly' =>   [ 60 * 60 * 24 * 31,  10, 1 ],
+            'quarterly' => [ 60 * 60 * 24 * 90,   6, 1 ],
+            'yearly' =>    [ 60 * 60 * 24 * 365,  4, 1 ]
+          }
+          entry = mwMap[column.id]
+          raise "Unknown scale #{column.id}" unless entry
+          margin = entry[0] * entry[2]
+          minWidth = entry[0] * entry[1] if minWidth < entry[0] * entry[1]
+          break
+        end
+      end
+
+      if minWidth > (@end - @start + 1)
+        margin += (minWidth - (@end - @start + 1)) / 2
+      end
+      @start -= margin
+      @end += margin
+    end
+
     # Generates cells for the table header. _columnDef_ is the
     # TableColumnDefinition object that describes the column. Based on the id of
     # the column different actions need to be taken to generate the header text.
@@ -135,7 +306,8 @@ class TaskJuggler
         # For the 'chart' column we generate a GanttChart object. The sizes are
         # set so that the lines of the Gantt chart line up with the lines of the
         # table.
-        gantt = GanttChart.new(@now, @weekStartsMonday, self)
+        gantt = GanttChart.new(a('now'),
+                               a('weekStartsMonday'), self)
         gantt.generateByScale(@start, @end, columnDef.scale)
         # The header consists of 2 lines separated by a 1 pixel boundary.
         gantt.header.height = @table.headerLineHeight * 2 + 1
@@ -153,10 +325,11 @@ class TaskJuggler
                           :weekdayAndDate, :hour)
       when 'daily'
         genCalChartHeader(columnDef, @start.midnight, :sameTimeNextDay,
-                          :shortMonthName, :day)
+                          :monthAndYear, :day)
       when 'weekly'
-        genCalChartHeader(columnDef, @start.beginOfWeek(@weekStartsMonday),
-                          :sameTimeNextWeek, :shortMonthName, :day)
+        genCalChartHeader(columnDef,
+                          @start.beginOfWeek(a('weekStartsMonday')),
+                          :sameTimeNextWeek, :monthAndYear, :day)
       when 'monthly'
         genCalChartHeader(columnDef, @start.beginOfMonth, :sameTimeNextMonth,
                           :year, :shortMonthName)
@@ -183,12 +356,12 @@ class TaskJuggler
     # line.
     def generateTaskList(taskList, resourceList, scopeLine)
       queryAttrs = { 'scopeProperty' => scopeLine ? scopeLine.property : nil,
-                     'loadUnit' => @loadUnit,
-                     'numberFormat' => @numberFormat,
-                     'currencyFormat' => @currencyFormat,
+                     'loadUnit' => a('loadUnit'),
+                     'numberFormat' => a('numberFormat'),
+                     'currencyFormat' => a('currencyFormat'),
                      'start' => @start, 'end' => @end,
-                     'costAccount' => @costAccount,
-                     'revenueAccount' => @revenueAccount }
+                     'costAccount' => a('costAccount'),
+                     'revenueAccount' => a('revenueAccount') }
       taskList.query = Query.new(queryAttrs)
       taskList.sort!
 
@@ -202,17 +375,17 @@ class TaskJuggler
         no += 1
         Log.activity if lineNo % 10 == 0
         lineNo += 1
-        @scenarios.each do |scenarioIdx|
+        a('scenarios').each do |scenarioIdx|
           # Generate line for each task.
           line = ReportTableLine.new(@table, task, scopeLine)
 
           line.no = no unless scopeLine
           line.lineNo = lineNo
           line.subLineNo = @table.lines
-          setIndent(line, @taskRoot, taskList.treeMode?)
+          setIndent(line, a('taskRoot'), taskList.treeMode?)
 
           # Generate a cell for each column in this line.
-          @columns.each do |columnDef|
+          a('columns').each do |columnDef|
             next unless generateTableCell(line, task, columnDef, scenarioIdx)
           end
         end
@@ -221,9 +394,9 @@ class TaskJuggler
           # If we have a resourceList we generate nested lines for each of the
           # resources that are assigned to this task and pass the user-defined
           # filter.
-          resourceList.setSorting(@sortResources)
+          resourceList.setSorting(a('sortResources'))
           assignedResourceList = filterResourceList(resourceList, task,
-              @hideResource, @rollupResource)
+              a('hideResource'), a('rollupResource'))
           assignedResourceList.sort!
           lineNo = generateResourceList(assignedResourceList, nil, line)
         end
@@ -237,12 +410,12 @@ class TaskJuggler
     # generated resource lines will be within the scope this task line.
     def generateResourceList(resourceList, taskList, scopeLine)
       queryAttrs = { 'scopeProperty' => scopeLine ? scopeLine.property : nil,
-                     'loadUnit' => @loadUnit,
-                     'numberFormat' => @numberFormat,
-                     'currencyFormat' => @currencyFormat,
+                     'loadUnit' => a('loadUnit'),
+                     'numberFormat' => a('numberFormat'),
+                     'currencyFormat' => a('currencyFormat'),
                      'start' => @start, 'end' => @end,
-                     'costAccount' => @costAccount,
-                     'revenueAccount' => @revenueAccount }
+                     'costAccount' => a('costAccount'),
+                     'revenueAccount' => a('revenueAccount') }
       resourceList.query = Query.new(queryAttrs)
       resourceList.sort!
 
@@ -256,17 +429,17 @@ class TaskJuggler
         no += 1
         Log.activity if lineNo % 10 == 0
         lineNo += 1
-        @scenarios.each do |scenarioIdx|
+        a('scenarios').each do |scenarioIdx|
           # Generate line for each resource.
           line = ReportTableLine.new(@table, resource, scopeLine)
 
           line.no = no unless scopeLine
           line.lineNo = lineNo
           line.subLineNo = @table.lines
-          setIndent(line, @resourceRoot, resourceList.treeMode?)
+          setIndent(line, a('resourceRoot'), resourceList.treeMode?)
 
           # Generate a cell for each column in this line.
-          @columns.each do |column|
+          a('columns').each do |column|
             next unless generateTableCell(line, resource, column, scenarioIdx)
           end
         end
@@ -275,9 +448,10 @@ class TaskJuggler
           # If we have a taskList we generate nested lines for each of the
           # tasks that the resource is assigned to and pass the user-defined
           # filter.
-          taskList.setSorting(@sortTasks)
+          taskList.setSorting(a('sortTasks'))
           assignedTaskList = filterTaskList(taskList, resource,
-              @hideTask, @rollupTask)
+                                            a('hideTask'),
+                                            a('rollupTask'))
           assignedTaskList.sort!
           lineNo = generateTaskList(assignedTaskList, nil, line)
         end
@@ -320,14 +494,15 @@ class TaskJuggler
         firstColumn = nil
         # The innter loops terminates when the label for the upper scale has
         # changed to the next scale cell.
-        while t < @end && (name1Func.nil? || t.send(name1Func) == currentInterval)
+        while t < @end && (name1Func.nil? ||
+                           t.send(name1Func) == currentInterval)
           # call TjTime::sameTimeNext... function to get the end of the column.
           nextT = t.send(sameTimeNextFunc)
           iv = Interval.new(t, nextT)
           # Create the new column object.
           column = ReportTableColumn.new(table, nil, '')
           # Store the date of the column in the original form.
-          column.cell1.data = t.to_s(@timeFormat)
+          column.cell1.data = t.to_s(a('timeFormat'))
           # The upper scale cells will be merged into one large cell that spans
           # all lower scale cells that belong to this upper cell.
           if firstColumn.nil?
@@ -391,7 +566,7 @@ class TaskJuggler
         start = @start.midnight
         sameTimeNextFunc = :sameTimeNextDay
       when 'weekly'
-        start = @start.beginOfWeek(@weekStartsMonday)
+        start = @start.beginOfWeek(a('weekStartsMonday'))
         sameTimeNextFunc = :sameTimeNextWeek
       when 'monthly'
         start = @start.beginOfMonth
@@ -435,22 +610,36 @@ class TaskJuggler
     # hidden cell.
     def genStandardCell(scenarioIdx, line, columnDef)
       property = line.property
-      # Create a new cell
-      cell = newCell(line, cellText(property, scenarioIdx, columnDef.id))
 
+      # Find out, what type of PropertyTreeNode we are dealing with.
       if property.is_a?(Task)
-        properties = @project.tasks
+        propertyList = @project.tasks
       elsif property.is_a?(Resource)
-        properties = @project.resources
+        propertyList = @project.resources
       else
         raise "Unknown property type #{property.class}"
       end
+      colId = columnDef.id
+      # Get the value no matter if it's scenario specific or not.
+      if propertyList.scenarioSpecific?(colId)
+        value = property.getAttr(colId, scenarioIdx)
+      else
+        value = property.getAttr(colId)
+      end
+      # Get the type of the property
+      type = propertyList.attributeType(colId)
+
+      # Create a new cell
+      cell = newCell(line, cellText(value, type))
+      if type == ReferenceAttribute
+        cell.url = value.url
+      end
 
       # Check if we are dealing with multiple scenarios.
-      if @scenarios.length > 1
+      if a('scenarios').length > 1
         # Check if the attribute is not scenario specific
-        unless properties.scenarioSpecific?(columnDef.id)
-          if scenarioIdx == @scenarios.first
+        unless propertyList.scenarioSpecific?(columnDef.id)
+          if scenarioIdx == a('scenarios').first
             #  Use a somewhat bigger font.
             cell.fontSize = 15
           else
@@ -458,23 +647,24 @@ class TaskJuggler
             cell.hidden = true
             return false
           end
-          cell.rows = @scenarios.length
+          cell.rows = a('scenarios').length
         end
       end
 
       setStandardCellAttributes(cell, columnDef,
-                                properties.attributeType(columnDef.id), line)
+                                propertyList.attributeType(columnDef.id), line)
 
       scopeProperty = line.scopeLine ? line.scopeLine.property : nil
       query = Query.new('property' => property,
                         'scopeProperty' => scopeProperty,
                         'attributeId' => columnDef.id,
-                        'scenarioIdx' => scenarioIdx, 'loadUnit' => @loadUnit,
-                        'numberFormat' => @numberFormat,
-                        'currencyFormat' => @currencyFormat,
+                        'scenarioIdx' => scenarioIdx,
+                        'loadUnit' => a('loadUnit'),
+                        'numberFormat' => a('numberFormat'),
+                        'currencyFormat' => a('currencyFormat'),
                         'start' => @start, 'end' => @end,
-                        'costAccount' => @costAccount,
-                        'revenueAccount' => @revenueAccount)
+                        'costAccount' => a('costAccount'),
+                        'revenueAccount' => a('revenueAccount'))
       if cell.text
         if columnDef.cellText
           cell.text = expandMacros(columnDef.cellText, cell.text, query)
@@ -499,28 +689,29 @@ class TaskJuggler
       cell = newCell(line)
 
       unless scenarioSpecific?(columnDef.id)
-        if scenarioIdx != @scenarios.first
+        if scenarioIdx != a('scenarios').first
           cell.hidden = true
           return false
         end
-        cell.rows = @scenarios.length
+        cell.rows = a('scenarios').length
       end
 
       setStandardCellAttributes(cell, columnDef, nil, line)
 
+      scopeProperty = line.scopeLine ? line.scopeLine.property : nil
       return if columnDef.hideCellText &&
-                endcolumnDef.hideCellText.eval(property, scopeProperty)
+                columnDef.hideCellText.eval(property, scopeProperty)
 
-      scopeProperty = line.scopeLine ? line.scopeLine.property : nil
       query = Query.new('property' => property,
                         'scopeProperty' => scopeProperty,
                         'attributeId' => columnDef.id,
-                        'scenarioIdx' => scenarioIdx, 'loadUnit' => @loadUnit,
-                        'numberFormat' => @numberFormat,
-                        'currencyFormat' => @currencyFormat,
+                        'scenarioIdx' => scenarioIdx,
+                        'loadUnit' => a('loadUnit'),
+                        'numberFormat' => a('numberFormat'),
+                        'currencyFormat' => a('currencyFormat'),
                         'start' => @start, 'end' => @end,
-                        'costAccount' => @costAccount,
-                        'revenueAccount' => @revenueAccount)
+                        'costAccount' => a('costAccount'),
+                        'revenueAccount' => a('revenueAccount'))
       query.process
       cell.text = query.result
 
@@ -532,6 +723,8 @@ class TaskJuggler
         cell.text = line.no.to_s
       when 'wbs'
         cell.indent = 2 if line.scopeLine
+      when 'scenario'
+        cell.text = @project.scenario(scenarioIdx).name
       end
 
       if columnDef.cellText
@@ -564,11 +757,12 @@ class TaskJuggler
                             @project['end'] : task['end', scenarioIdx])
 
       query = Query.new('property' => task, 'scopeProperty' => resource,
-                        'scenarioIdx' => scenarioIdx, 'loadUnit' => @loadUnit,
-                        'numberFormat' => @numberFormat,
-                        'currencyFormat' => @currencyFormat,
-                        'costAccount' => @costAccount,
-                        'revenueAccount' => @revenueAccount)
+                        'scenarioIdx' => scenarioIdx,
+                        'loadUnit' => a('loadUnit'),
+                        'numberFormat' => a('numberFormat'),
+                        'currencyFormat' => a('currencyFormat'),
+                        'costAccount' => a('costAccount'),
+                        'revenueAccount' => a('revenueAccount'))
 
       firstCell = nil
       while t < @end
@@ -637,11 +831,12 @@ class TaskJuggler
       end
 
       query = Query.new('property' => resource,
-                        'scenarioIdx' => scenarioIdx, 'loadUnit' => @loadUnit,
-                        'numberFormat' => @numberFormat,
-                        'currencyFormat' => @currencyFormat,
-                        'costAccount' => @costAccount,
-                        'revenueAccount' => @revenueAccount)
+                        'scenarioIdx' => scenarioIdx,
+                        'loadUnit' => a('loadUnit'),
+                        'numberFormat' => a('numberFormat'),
+                        'currencyFormat' => a('currencyFormat'),
+                        'costAccount' => a('costAccount'),
+                        'revenueAccount' => a('revenueAccount'))
 
       firstCell = nil
       while t < @end
@@ -777,8 +972,13 @@ class TaskJuggler
     def setCellURL(cell, columnDef, query)
       return unless columnDef.cellURL
 
-      url = expandMacros(columnDef.cellURL, cell.text, query)
-      cell.url = url unless url.empty?
+      if columnDef.hideCellURL &&
+         columnDef.hideCellURL.eval(query.property, query.scopeProperty)
+        url = nil
+      else
+        url = expandMacros(columnDef.cellURL, cell.text, query)
+      end
+      cell.url = url unless url.nil? || url.empty?
     end
 
     # Try to merge equal cells without text to multi-column cells.