Skip to content

Show dashed comparison line for the incomplete interval in top graph #6222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sanne-san merged 1 commit into from
Apr 3, 2026
Merged

Show dashed comparison line for the incomplete interval in top graph #6222

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions assets/js/dashboard/stats/graph/graph-util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,38 @@ function plottable(dataArray) {
})
}

const buildComparisonDataset = function (comparisonPlot) {
const buildComparisonDataset = function (comparisonPlot, presentIndex) {
if (!comparisonPlot) return []

const data = presentIndex
? comparisonPlot.slice(0, presentIndex)
: comparisonPlot

return [
{
data: plottable(comparisonPlot),
data: plottable(data),
borderColor: 'rgba(99, 102, 241, 0.3)',
pointBackgroundColor: 'rgba(99, 102, 241, 0.2)',
pointHoverBackgroundColor: 'rgba(99, 102, 241, 0.5)',
yAxisID: 'yComparison'
}
]
}

const buildDashedComparisonDataset = function (comparisonPlot, presentIndex) {
if (!comparisonPlot || !presentIndex) return []
const dashedPart = comparisonPlot.slice(presentIndex - 1, presentIndex + 1)
const dashedPlot = new Array(presentIndex - 1).concat(dashedPart)
return [
{
data: plottable(dashedPlot),
borderDash: [3, 3],
borderColor: 'rgba(99, 102, 241, 0.3)',
pointHoverBackgroundColor: 'rgba(99, 102, 241, 0.5)',
yAxisID: 'yComparison'
}
]
}
const buildDashedDataset = function (plot, presentIndex) {
if (!presentIndex) return []
const dashedPart = plot.slice(presentIndex - 1, presentIndex + 1)
Expand Down Expand Up @@ -90,7 +109,8 @@ export const buildDataSet = (
const dataset = [
...buildMainPlotDataset(plot, present_index),
...buildDashedDataset(plot, present_index),
...buildComparisonDataset(comparisonPlot)
...buildComparisonDataset(comparisonPlot, present_index),
...buildDashedComparisonDataset(comparisonPlot, present_index)
]

return dataset.map((item) => Object.assign(item, defaultOptions))
Expand Down
Loading