jirametrics 2.31 → 3.0

data/lib/jirametrics/chart_base.rb

@@ -38,7 +38,7 @@ class ChartBase
   end
 
   def before_run
-    @call_before_run_procs&.each { |proc| proc.call }
+    @call_before_run_procs&.each(&:call)
   end
 
   def aggregated_project?
@@ -53,12 +53,13 @@ class ChartBase
   def render caller_binding, file
     pathname = Pathname.new(File.realpath(file))
     basename = pathname.basename.to_s
-    raise "Unexpected filename #{basename.inspect}" unless basename =~ /^(.+)\.rb$/
+    match = basename.match(/^(?<template_name>.+)\.rb$/)
+    raise "Unexpected filename #{basename.inspect}" unless match
 
     # Insert a incrementing chart_id so that all the chart names on the page are unique
     caller_binding.eval "chart_id='chart#{next_id}'" # chart_id=chart3
 
-    erb = ERB.new file_system.load "#{html_directory}/#{$1}.erb"
+    erb = ERB.new file_system.load "#{html_directory}/#{match[:template_name]}.erb"
     erb.result(caller_binding)
   end
 
@@ -85,26 +86,14 @@ class ChartBase
     @chart_colors[type] ||= random_color
   end
 
-  def label_days days
-    return 'unknown' if days.nil?
+  # Defines label_days, label_hours, label_minutes and label_issues - each renders a pluralised count
+  # like "3 days" or "1 issue", or 'unknown' for a nil count. Generated because only the unit differs.
+  %w[day hour minute issue].each do |unit|
+    define_method "label_#{unit}s" do |count|
+      return 'unknown' if count.nil?
 
-    "#{days} day#{'s' unless days == 1}"
-  end
-
-  def label_hours hours
-    return 'unknown' if hours.nil?
-
-    "#{hours} hour#{'s' unless hours == 1}"
-  end
-
-  def label_minutes minutes
-    return 'unknown' if minutes.nil?
-
-    "#{minutes} minute#{'s' unless minutes == 1}"
-  end
-
-  def label_issues count
-    "#{count} issue#{'s' unless count == 1}"
+      "#{count} #{unit}#{'s' unless count == 1}"
+    end
   end
 
   def to_human_readable number
@@ -146,25 +135,17 @@ class ChartBase
     erb.result(binding)
   end
 
+  # Returns the non-working stretches (weekends and holidays) within the range, each as a Date range of
+  # consecutive days.
   def holidays date_range: @date_range
-    result = []
-    start_date = nil
-    end_date = nil
-
-    date_range.each do |date|
-      if date.saturday? || date.sunday? || holiday_dates.include?(date)
-        if start_date.nil?
-          start_date = date
-        else
-          end_date = date
-        end
-      elsif start_date
-        result << (start_date..(end_date || start_date))
-        start_date = nil
-        end_date = nil
-      end
-    end
-    result
+    date_range
+      .select { |date| non_working_day?(date) }
+      .slice_when { |previous_date, date| date != previous_date + 1 }
+      .collect { |run| run.first..run.last }
+  end
+
+  def non_working_day? date
+    date.saturday? || date.sunday? || holiday_dates.include?(date)
   end
 
   def working_days_annotation
@@ -287,35 +268,40 @@ class ChartBase
   # if it's a ChangeItem then use_old_status will specify whether we're using the new or old
   # Either way, is_category will format the category rather than the status
   def format_status object, board:, is_category: false, use_old_status: false
-    status = nil
-    error_message = nil
+    status, error_message = resolve_status object, board: board, use_old_status: use_old_status
+    return "<span style='color: red'>#{error_message}</span>" if error_message
 
+    color = status_category_color status
+    visibility = is_category ? '' : not_visible_icon(status, board)
+    text = is_category ? status.category : status
+    "<span title='Category: #{status.category}'>#{color_block color.name} #{text}</span>#{visibility}"
+  end
+
+  # Resolves the object being formatted into [status, error_message]. A Status is itself; a ChangeItem is
+  # looked up by id, yielding an error message (the raw value) when the id isn't a known status.
+  def resolve_status object, board:, use_old_status:
     case object
     when ChangeItem
       id = use_old_status ? object.old_value_id : object.value_id
       status = board.possible_statuses.find_by_id(id)
-      if status.nil?
-        error_message = use_old_status ? object.old_value : object.value
-      end
+      return [status, nil] unless status.nil?
+
+      [nil, use_old_status ? object.old_value : object.value]
     when Status
-      status = object
+      [object, nil]
     else
       raise "Unexpected type: #{object.class}"
     end
+  end
 
-    return "<span style='color: red'>#{error_message}</span>" if error_message
-
-    color = status_category_color status
+  # The 👀 marker for a status that isn't mapped to any column, or '' when it is visible.
+  def not_visible_icon status, board
+    return '' if board.visible_columns.any? { |column| column.status_ids.include? status.id }
 
-    visibility = ''
-    if is_category == false && board.visible_columns.none? { |column| column.status_ids.include? status.id }
-      visibility = icon_span(
-        title: "Not visible: The status #{status.name.inspect} is not mapped to any column and will not be visible",
-        icon: ' 👀'
-      )
-    end
-    text = is_category ? status.category : status
-    "<span title='Category: #{status.category}'>#{color_block color.name} #{text}</span>#{visibility}"
+    icon_span(
+      title: "Not visible: The status #{status.name.inspect} is not mapped to any column and will not be visible",
+      icon: ' 👀'
+    )
   end
 
   def icon_span title:, icon:
@@ -388,12 +374,12 @@ class ChartBase
     @cycletime || issue.board.cycletime
   end
 
-  def seam_start type = 'chart'
-    "\n<!-- seam-start | chart#{@@chart_counter} | #{self.class} | #{header_text} | #{type} -->\n"
-  end
-
-  def seam_end type = 'chart'
-    "\n<!-- seam-end | chart#{@@chart_counter} | #{self.class} | #{header_text} | #{type} -->"
+  # seam_start and seam_end bracket each chart's HTML with a marker comment the stitcher uses to
+  # reassemble the report. Generated because only the start/end word differs.
+  %w[start end].each do |position|
+    define_method "seam_#{position}" do |type = 'chart'|
+      "\n<!-- seam-#{position} | chart#{@@chart_counter} | #{self.class} | #{header_text} | #{type} -->\n"
+    end
   end
 
   def render_axis_title axis_direction

data/lib/jirametrics/cumulative_flow_diagram.rb

@@ -35,7 +35,8 @@ class CumulativeFlowDiagram < ChartBase
   end
   private_constant :CfdColumnRules
 
-  def initialize block
+  # Long only because of the inline description_text heredoc and one-time setup; splitting wouldn't help.
+  def initialize block # rubocop:disable Metrics/MethodLength
     super()
     header_text 'Cumulative Flow Diagram'
     description_text <<~HTML
@@ -71,8 +72,14 @@ class CumulativeFlowDiagram < ChartBase
       </div>
       <div class="p">
         See also: This article on <a href="https://blog.mikebowler.ca/2026/03/27/cumulative-flow-diagram/">how to read a CFD</a>.
-      </div>      
+      </div>#{'      '}
     HTML
+    # Defaults come from CSS variables (theme handled in CSS). The config block below can still
+    # override any of them, or set one to nil to switch off that line/triangle.
+    @triangle_color = CssVariable['--cfd-triangle-color']
+    @arrival_rate_line_color = CssVariable['--cfd-arrival-rate-line-color']
+    @departure_rate_line_color = CssVariable['--cfd-departure-rate-line-color']
+
     instance_eval(&block)
   end
 
@@ -93,17 +100,7 @@ class CumulativeFlowDiagram < ChartBase
   end
 
   def run
-    all_columns = current_board.visible_columns
-
-    column_rules_list = all_columns.map do |column|
-      rules = CfdColumnRules.new
-      @column_rules_block&.call(column, rules)
-      rules
-    end
-
-    active_pairs   = all_columns.zip(column_rules_list).reject { |_, rules| rules.ignored? }
-    active_columns = active_pairs.map(&:first)
-    active_rules   = active_pairs.map(&:last)
+    active_columns, active_rules = active_columns_and_rules(current_board.visible_columns)
 
     cfd = CfdDataBuilder.new(
       board: current_board,
@@ -117,36 +114,16 @@ class CumulativeFlowDiagram < ChartBase
     correction_windows = cfd[:correction_windows]
     column_count       = columns.size
 
-    # Convert cumulative totals to marginal band heights for Chart.js stacking.
-    # cumulative[i] = issues that reached column i or further.
-    # marginal[i]   = cumulative[i] - cumulative[i+1]  (last column: marginal = cumulative)
-    daily_marginals = daily_counts.transform_values do |cumulative|
-      cumulative.each_with_index.map do |count, i|
-        i < column_count - 1 ? count - cumulative[i + 1] : count
-      end
-    end
+    daily_marginals = marginal_band_heights(daily_counts, column_count)
 
     border_colors = active_rules.map { |rules| rules.color || random_color }
 
     fill_colors = active_rules.zip(border_colors).map { |rules, border| fill_color_for(rules, border) }
 
-    # Datasets in reversed order: rightmost column first (bottom of stack), leftmost last (top).
-    data_sets = columns.each_with_index.map do |name, col_index|
-      col_windows = correction_windows
-        .select { |w| w[:column_index] == col_index }
-        .map { |w| { start_date: w[:start_date].to_s, end_date: w[:end_date].to_s } }
-
-      {
-        label: active_rules[col_index].label || name,
-        label_hint: active_rules[col_index].label_hint,
-        data: date_range.map { |date| { x: date.to_s, y: daily_marginals[date][col_index] } },
-        backgroundColor: fill_colors[col_index],
-        borderColor: border_colors[col_index],
-        fill: true,
-        tension: 0,
-        segment: Segment.new(col_windows)
-      }
-    end.reverse
+    data_sets = build_data_sets(
+      columns: columns, correction_windows: correction_windows, active_rules: active_rules,
+      daily_marginals: daily_marginals, fill_colors: fill_colors, border_colors: border_colors
+    )
 
     # Correction windows for the afterDraw hatch plugin, with dataset index in
     # Chart.js dataset array (reversed: done column = index 0).
@@ -160,19 +137,55 @@ class CumulativeFlowDiagram < ChartBase
       }
     end
 
-    @triangle_color = parse_theme_color(['#333333', '#ffffff']) unless instance_variable_defined?(:@triangle_color)
-    unless instance_variable_defined?(:@arrival_rate_line_color)
-      @arrival_rate_line_color = 'rgba(255,138,101,0.85)'
-    end
-    unless instance_variable_defined?(:@departure_rate_line_color)
-      @departure_rate_line_color = 'rgba(128,203,196,0.85)'
-    end
-
     wrap_and_render(binding, __FILE__)
   end
 
   private
 
+  # Build each column's rules (through the config block, if one was given) and drop the ignored
+  # columns, returning the surviving columns and their rules as parallel arrays.
+  def active_columns_and_rules all_columns
+    column_rules_list = all_columns.map do |column|
+      rules = CfdColumnRules.new
+      @column_rules_block&.call(column, rules)
+      rules
+    end
+    active_pairs = all_columns.zip(column_rules_list).reject { |_, rules| rules.ignored? }
+    [active_pairs.map(&:first), active_pairs.map(&:last)]
+  end
+
+  # Convert per-date cumulative totals to marginal band heights for Chart.js stacking.
+  # cumulative[i] = issues that reached column i or further; marginal[i] = cumulative[i] -
+  # cumulative[i + 1] (the last column keeps its cumulative total).
+  def marginal_band_heights daily_counts, column_count
+    daily_counts.transform_values do |cumulative|
+      cumulative.each_with_index.map do |count, i|
+        i < column_count - 1 ? count - cumulative[i + 1] : count
+      end
+    end
+  end
+
+  # One Chart.js dataset per active column, in reversed order: rightmost column first (bottom of
+  # the stack), leftmost last (top).
+  def build_data_sets columns:, correction_windows:, active_rules:, daily_marginals:, fill_colors:, border_colors:
+    columns.each_with_index.map do |name, col_index|
+      col_windows = correction_windows
+        .select { |w| w[:column_index] == col_index }
+        .map { |w| { start_date: w[:start_date].to_s, end_date: w[:end_date].to_s } }
+
+      {
+        label: active_rules[col_index].label || name,
+        label_hint: active_rules[col_index].label_hint,
+        data: date_range.map { |date| { x: date.to_s, y: daily_marginals[date][col_index] } },
+        backgroundColor: fill_colors[col_index],
+        borderColor: border_colors[col_index],
+        fill: true,
+        tension: 0,
+        segment: Segment.new(col_windows)
+      }
+    end.reverse
+  end
+
   def parse_theme_color color
     return color unless color.is_a?(Array)
 

data/lib/jirametrics/cycle_time_config.rb

@@ -39,63 +39,52 @@ class CycleTimeConfig
     started_stopped_times(issue).last
   end
 
-  def started_time issue
-    @file_system.deprecated date: '2024-10-16', message: 'Use started_stopped_times() instead'
-    started_stopped_times(issue).first
-  end
-
-  def stopped_time issue
-    @file_system.deprecated date: '2024-10-16', message: 'Use started_stopped_times() instead'
-    started_stopped_times(issue).last
-  end
-
-  def fabricate_change_item time
-    @file_system.deprecated(
-      date: '2024-12-16', message: "This method should now return a ChangeItem not a #{time.class}", depth: 4
-    )
-    raw = {
-      'field' => 'Fabricated change',
-      'to' => '0',
-      'toString' => '',
-      'from' => '0',
-      'fromString' => ''
-    }
-    ChangeItem.new raw: raw, time: time, artificial: true, author_raw: nil
-  end
-
   def started_stopped_changes issue
     cache_key = "#{issue.key}:#{issue.board.id}"
     last_result = (@cache ||= {})[cache_key]
     return *last_result if last_result && settings['cache_cycletime_calculations']
 
-    started = @start_at.call(issue)
-    stopped = @stop_at.call(issue)
-
-    # Obscure edge case where some of the start_at and stop_at blocks might return false in place of nil.
-    # If they are false then explicitly make them nil.
-    started ||= nil
-    stopped ||= nil
-
-    # These are only here for backwards compatibility. Hopefully nobody will ever need them.
-    started = fabricate_change_item(started) if !started.nil? && !started.is_a?(ChangeItem)
-    stopped = fabricate_change_item(stopped) if !stopped.nil? && !stopped.is_a?(ChangeItem)
-
-    # In the case where started and stopped are exactly the same time, we pretend that
-    # it just stopped and never started. This allows us to have logic like 'in or right of'
-    # for the start and not have it conflict.
-    started = nil if started&.time == stopped&.time
+    started = resolve_change(@start_at, issue)
+    stopped = resolve_change(@stop_at, issue)
+    started = collapse_zero_length_start(started, stopped)
 
     result = [started, stopped]
-    if last_result && result != last_result
-      @file_system.error(
-        "Calculation mismatch; this could break caching. #{issue.inspect} new=#{result.inspect}, " \
-          "previous=#{last_result.inspect}"
-      )
-    end
+    warn_on_cache_mismatch(issue: issue, result: result, last_result: last_result)
     @cache[cache_key] = result
     result
   end
 
+  # start_at/stop_at blocks must return a ChangeItem or nil. A legacy false (meaning "not found") is
+  # still tolerated as nil, but a bare Time -- once accepted and wrapped -- is no longer supported.
+  def resolve_change block, issue
+    change = block.call(issue)
+    return nil unless change
+
+    unless change.is_a?(ChangeItem)
+      raise "A start_at/stop_at block must return a ChangeItem or nil but returned a #{change.class}. " \
+        'If you were relying on a bare time such as `created`, use the ChangeItem form (e.g. `time_created`).'
+    end
+
+    change
+  end
+
+  # When start and stop land on the same instant, treat the issue as stopped-but-never-started so a
+  # zero-length span doesn't conflict with 'in or right of' start logic.
+  def collapse_zero_length_start started, stopped
+    return nil if started&.time == stopped&.time
+
+    started
+  end
+
+  def warn_on_cache_mismatch issue:, result:, last_result:
+    return unless last_result && result != last_result
+
+    @file_system.error(
+      "Calculation mismatch; this could break caching. #{issue.inspect} new=#{result.inspect}, " \
+        "previous=#{last_result.inspect}"
+    )
+  end
+
   def started_stopped_times issue
     started, stopped = started_stopped_changes(issue)
     [started&.time, stopped&.time]

data/lib/jirametrics/cycletime_histogram.rb

@@ -28,6 +28,13 @@ class CycletimeHistogram < TimeBasedHistogram
     end
   end
 
+  # Days-only until the working-days cycletime engine grows sub-day resolution. Inherited from
+  # TimeBasedChart so the option exists, but the unbuilt path fails loudly rather than mislabelling
+  # the axis while the value stays in days. See jirametrics-en5.
+  def cycletime_unit unit
+    raise NotImplementedError, "#{self.class} only supports :days for now (see jirametrics-en5)" unless unit == :days
+  end
+
   def all_items
     stopped_issues = completed_issues_in_range include_unstarted: true
 

data/lib/jirametrics/cycletime_scatterplot.rb

@@ -35,6 +35,13 @@ class CycletimeScatterplot < TimeBasedScatterplot
     end
   end
 
+  # Days-only until the working-days cycletime engine grows sub-day resolution. Inherited from
+  # TimeBasedChart so the option exists, but the unbuilt path fails loudly rather than mislabelling
+  # the axis while the value stays in days. See jirametrics-en5.
+  def cycletime_unit unit
+    raise NotImplementedError, "#{self.class} only supports :days for now (see jirametrics-en5)" unless unit == :days
+  end
+
   def minimum_y_value
     1 # Values under 1 day are data quality problems; they're flagged in the quality report instead
   end

data/lib/jirametrics/daily_view.rb

@@ -24,7 +24,9 @@ class DailyView < ChartBase
   def run
     aging_issues = select_aging_issues
 
-    return "<h1 class='foldable'>#{@header_text}</h1><div>There are no items currently in progress</div>" if aging_issues.empty?
+    if aging_issues.empty?
+      return "<h1 class='foldable'>#{@header_text}</h1><div>There are no items currently in progress</div>"
+    end
 
     result = +''
     result << render_top_text(binding)
@@ -35,10 +37,7 @@ class DailyView < ChartBase
   end
 
   def select_aging_issues
-    aging_issues = issues.select do |issue|
-      started_at, stopped_at = issue.started_stopped_times
-      started_at && !stopped_at
-    end
+    aging_issues = issues.select { |issue| issue.board.cycletime.in_progress?(issue) }
 
     today = date_range.end
     aging_issues.collect do |issue|
@@ -81,30 +80,40 @@ class DailyView < ChartBase
     )[today]
     return [] if blocked_stalled.active?
 
-    lines = []
     if blocked_stalled.blocked?
-      marker = color_block '--blocked-color'
-      lines << ["#{marker} Blocked by flag"] if blocked_stalled.flag
-      lines << ["#{marker} Blocked by status: #{blocked_stalled.status}"] if blocked_stalled.blocked_by_status?
-      blocked_stalled.blocking_issue_keys&.each do |key|
-        blocking_issue = issues.find_by_key key: key, include_hidden: true
-        if blocking_issue
-          lines << "<section><div class=\"foldable startFolded\">#{marker} Blocked by issue: " \
-            "#{make_issue_label issue: blocking_issue, done: blocking_issue.done?}</div>"
-          lines << blocking_issue
-          lines << '</section>'
-        else
-          lines << ["#{marker} Blocked by issue: #{key} (no description found)"]
-        end
-      end
+      blocked_lines blocked_stalled
     elsif blocked_stalled.stalled_by_status?
-      lines << ["#{color_block '--stalled-color'} Stalled by status: #{blocked_stalled.status}"]
+      [["#{color_block '--stalled-color'} Stalled by status: #{blocked_stalled.status}"]]
     else
-      lines << ["#{color_block '--stalled-color'} Stalled by inactivity: #{blocked_stalled.stalled_days} days"]
+      [["#{color_block '--stalled-color'} Stalled by inactivity: #{blocked_stalled.stalled_days} days"]]
+    end
+  end
+
+  def blocked_lines blocked_stalled
+    marker = color_block '--blocked-color'
+    lines = []
+    lines << ["#{marker} Blocked by flag"] if blocked_stalled.flag
+    lines << ["#{marker} Blocked by status: #{blocked_stalled.status}"] if blocked_stalled.blocked_by_status?
+    blocked_stalled.blocking_issue_keys&.each do |key|
+      lines.concat blocking_issue_lines(key, marker)
     end
     lines
   end
 
+  # The lines for one blocking issue: a foldable section embedding the issue when we have it, or a plain
+  # "no description found" line when we only know its key.
+  def blocking_issue_lines key, marker
+    blocking_issue = issues.find_by_key key: key, include_hidden: true
+    return [["#{marker} Blocked by issue: #{key} (no description found)"]] unless blocking_issue
+
+    [
+      "<section><div class=\"foldable startFolded\">#{marker} Blocked by issue: " \
+        "#{make_issue_label issue: blocking_issue, done: blocking_issue.done?}</div>",
+      blocking_issue,
+      '</section>'
+    ]
+  end
+
   def make_issue_label issue:, done:
     label = "<img src='#{issue.type_icon_url}' title='#{issue.type}' class='icon' /> "
     label << '<s>' if done
@@ -133,17 +142,8 @@ class DailyView < ChartBase
 
   def make_stats_lines issue:, done:
     line = []
-
     line << "<img src='#{issue.priority_url}' class='icon' /> <b>#{issue.priority_name}</b>"
-
-    if done
-      cycletime = issue.board.cycletime.cycletime(issue)
-
-      line << "Cycletime: <b>#{label_days cycletime}</b>"
-    else
-      age = issue.board.cycletime.age(issue, today: date_range.end)
-      line << "Age: <b>#{age ? label_days(age) : '(Not Started)'}</b>"
-    end
+    line << progress_line(issue, done)
     line << "Status: <b>#{format_status issue.status, board: issue.board}</b>"
 
     column = issue.board.visible_columns.find { |c| c.status_ids.include?(issue.status.id) }
@@ -153,29 +153,47 @@ class DailyView < ChartBase
       line << "Assignee: <img src='#{issue.assigned_to_icon_url}' class='icon' /> <b>#{issue.assigned_to}</b>"
     end
 
-    if issue.due_date
-      today = date_range.end
-      days = (issue.due_date - today).to_i
-      relative =
-        if days.zero? then 'today'
-        elsif days.positive? then "in #{label_days days}"
-        else "#{label_days(-days)} ago"
-        end
-      content = "#{issue.due_date} (#{relative})"
-      content = "<span style='background: var(--warning-banner)'>#{content}</span>" if days.negative?
-      line << "Due: <b>#{content}</b>"
+    due = due_date_line(issue)
+    line << due if due
+    line.concat label_lines(issue)
+
+    [line]
+  end
+
+  # 'Cycletime: ...' for finished issues, otherwise 'Age: ...' (or '(Not Started)' when it hasn't started).
+  def progress_line issue, done
+    if done
+      "Cycletime: <b>#{label_days issue.board.cycletime.cycletime(issue)}</b>"
+    else
+      age = issue.board.cycletime.age(issue, today: date_range.end)
+      "Age: <b>#{age ? label_days(age) : '(Not Started)'}</b>"
     end
+  end
+
+  # 'Due: ...' with a relative 'today/in N days/N days ago' hint, highlighted when overdue. nil when
+  # the issue has no due date.
+  def due_date_line issue
+    return nil unless issue.due_date
 
-    block = lambda do |collection, label|
-      unless collection.empty?
-        text = collection.collect { |l| "<span class='label'>#{l}</span>" }.join(' ')
-        line << "#{label} #{text}"
+    days = (issue.due_date - date_range.end).to_i
+    relative =
+      if days.zero? then 'today'
+      elsif days.positive? then "in #{label_days days}"
+      else "#{label_days(-days)} ago"
       end
-    end
-    block.call issue.labels, 'Labels:'
-    block.call issue.component_names, 'Components:'
+    content = "#{issue.due_date} (#{relative})"
+    content = "<span style='background: var(--warning-banner)'>#{content}</span>" if days.negative?
+    "Due: <b>#{content}</b>"
+  end
 
-    [line]
+  # One 'Labels: ...' and/or 'Components: ...' line, each listing its non-empty collection as label spans.
+  def label_lines issue
+    { 'Labels:' => issue.labels, 'Components:' => issue.component_names }.filter_map do |label, collection|
+      next if collection.empty?
+
+      spans = collection.collect { |item| "<span class='label'>#{item}</span>" }.join(' ')
+      "#{label} #{spans}"
+    end
   end
 
   def make_child_lines issue
@@ -215,19 +233,10 @@ class DailyView < ChartBase
   end
 
   def history_text change:, board:
-    convertor = ->(value, _id) { value.inspect }
-    convertor = ->(_value, id) { format_status(board.possible_statuses.find_by_id(id), board: board) } if change.status?
-
     if change.comment? || change.description?
       atlassian_document_format.to_html(change.value)
     elsif %w[status priority assignee duedate issuetype].include?(change.field)
-      to = convertor.call(change.value, change.value_id)
-      if change.old_value
-        from = convertor.call(change.old_value, change.old_value_id)
-        "Changed from #{from} to #{to}"
-      else
-        "Set to #{to}"
-      end
+      field_change_text change, board
     elsif change.flagged?
       change.value == '' ? 'Off' : 'On'
     else
@@ -235,6 +244,19 @@ class DailyView < ChartBase
     end
   end
 
+  # 'Set to X' or 'Changed from Y to X' for a status/priority/assignee/duedate/issuetype change. Status
+  # values are rendered as coloured status labels; everything else is shown inspected.
+  def field_change_text change, board
+    convertor = ->(value, _id) { value.inspect }
+    convertor = ->(_value, id) { format_status(board.possible_statuses.find_by_id(id), board: board) } if change.status?
+
+    to = convertor.call(change.value, change.value_id)
+    return "Set to #{to}" unless change.old_value
+
+    from = convertor.call(change.old_value, change.old_value_id)
+    "Changed from #{from} to #{to}"
+  end
+
   def make_sprints_lines issue
     return [] unless issue.board.scrum?