Skip to content

feat: power ramp intervals in workout editor (W and % FTP) #4809

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
cagnulein merged 4 commits into from
Aug 11, 2026
Merged

feat: power ramp intervals in workout editor (W and % FTP) #4809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
70be991
feat: improve power ramp support in workout editor
cagnulein Jul 13, 2026
15f86b6
Fix ramp interval duration loss on save/reload round-trip
cagnulein Jul 13, 2026
bff3827
Always show the ramp unit selector without an enable checkbox
cagnulein Jul 13, 2026
f088cdb
Fix ramp chart preview rendering as a vertical spike instead of a slope
cagnulein Jul 13, 2026
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
95 changes: 88 additions & 7 deletions src/inner_templates/workouteditor/workout-editor-app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
{ key: 'resistance', labelKey: 'workoutEditor.resistance', label: 'Resistance', type: 'number', step: 1, min: 0, max: 100, group: 'basic', devices: ['bike', 'elliptical'], defaultValue: 20 },
{ key: 'cadence', labelKey: 'workoutEditor.cadence', label: 'Cadence', type: 'number', unitSuffix: 'rpm', min: 0, max: 240, group: 'basic', devices: ['bike', 'elliptical', 'rower'], defaultValue: 80 },
{ key: 'power', labelKey: 'workoutEditor.power', label: 'Power', type: 'number', unitSuffix: 'W', min: 0, max: 2000, group: 'basic', devices: ['bike', 'rower'], defaultValue: 150 },
{ key: 'powerrampunit', labelKey: 'workoutEditor.powerRampUnit', label: 'Ramp Unit', type: 'select', options: ['W', '% FTP'], group: 'advanced', devices: ['bike', 'rower'], defaultValue: 'W', noToggle: true },
{ key: 'powerfrom', labelKey: 'workoutEditor.powerRampFrom', label: 'Ramp From', type: 'number', min: 0, max: 2000, group: 'advanced', devices: ['bike', 'rower'], defaultValue: 100 },
{ key: 'powerto', labelKey: 'workoutEditor.powerRampTo', label: 'Ramp To', type: 'number', min: 0, max: 2000, group: 'advanced', devices: ['bike', 'rower'], defaultValue: 200 },
{ key: 'forcespeed', labelKey: 'workoutEditor.forceSpeed', label: 'Force Speed', type: 'bool', group: 'basic', devices: ['treadmill'], linkedTo: 'speed' },
{ key: 'fanspeed', labelKey: 'workoutEditor.fan', label: 'Fan', type: 'number', min: 0, max: 8, group: 'advanced', devices: 'all', defaultValue: 0 },
{ key: 'requested_peloton_resistance', labelKey: 'workoutEditor.pelotonResistance', label: 'Peloton Res.', type: 'number', min: -1, max: 100, group: 'advanced', devices: ['bike'] },
Expand All @@ -52,14 +55,14 @@
bike: [
{ key: 'resistance', label: () => t('workoutEditor.resistance', 'Resistance'), color: '#ab47bc', unit: () => 'lvl', axis: 'resistanceAxis', axisLabel: () => t('workoutEditor.resistance', 'Resistance'), axisPosition: 'left' },
{ key: 'cadence', label: () => t('workoutEditor.cadence', 'Cadence'), color: '#29b6f6', unit: () => 'rpm', axis: 'cadenceAxis', axisLabel: () => t('workoutEditor.cadenceRpm', 'Cadence (rpm)'), axisPosition: 'right' },
{ key: 'power', label: () => t('workoutEditor.power', 'Power'), color: '#ef6c00', unit: () => 'W', axis: 'powerAxis', axisLabel: () => t('workoutEditor.powerW', 'Power (W)'), axisPosition: 'left' }
{ key: 'power', label: () => t('workoutEditor.power', 'Power'), color: '#ef6c00', unit: () => 'W', axis: 'powerAxis', axisLabel: () => t('workoutEditor.powerW', 'Power (W)'), axisPosition: 'left', stepped: false }
],
elliptical: [
{ key: 'resistance', label: () => t('workoutEditor.resistance', 'Resistance'), color: '#7e57c2', unit: () => 'lvl', axis: 'resistanceAxis', axisLabel: () => t('workoutEditor.resistance', 'Resistance'), axisPosition: 'left' },
{ key: 'inclination', label: () => t('workoutEditor.ramp', 'Ramp'), color: '#66bb6a', unit: () => '%', axis: 'inclineAxis', axisLabel: () => t('workoutEditor.rampPercent', 'Ramp (%)'), axisPosition: 'right' }
],
rower: [
{ key: 'power', label: () => t('workoutEditor.power', 'Power'), color: '#fb8c00', unit: () => 'W', axis: 'powerAxis', axisLabel: () => t('workoutEditor.powerW', 'Power (W)'), axisPosition: 'left' },
{ key: 'power', label: () => t('workoutEditor.power', 'Power'), color: '#fb8c00', unit: () => 'W', axis: 'powerAxis', axisLabel: () => t('workoutEditor.powerW', 'Power (W)'), axisPosition: 'left', stepped: false },
{ key: 'cadence', label: () => t('workoutEditor.strokeRate', 'Stroke Rate'), color: '#26a69a', unit: () => 'spm', axis: 'cadenceAxis', axisLabel: () => t('workoutEditor.strokesPerMinute', 'Strokes/min'), axisPosition: 'right' }
],
jumprope: [],
Expand Down Expand Up @@ -340,6 +343,9 @@
return;
}
state.miles = !!content.miles;
if (content.ftp !== undefined) {
state.ftp = Number(content.ftp);
}
state.translations = content.translations || {};
if (window.qzSetTranslations) {
window.qzSetTranslations(state.translations);
Expand Down Expand Up @@ -611,6 +617,21 @@
out['__enabled_' + def.key] = false;
}
});
// FTP% ramp (from backend that collapsed the rows)
if (row.powerzonefrom !== undefined && row.powerzonefrom !== null && Number(row.powerzonefrom) >= 0) {
out.powerrampunit = '% FTP';
out['__enabled_powerrampunit'] = true;
out.powerfrom = Math.round(Number(row.powerzonefrom) * 100);
out['__enabled_powerfrom'] = true;
out.powerto = Math.round(Number(row.powerzoneto) * 100);
out['__enabled_powerto'] = true;
}
// Watts ramp
else if (row.powerfrom !== undefined && row.powerfrom !== null && Number(row.powerfrom) >= 0) {
out.powerrampunit = 'W';
out['__enabled_powerrampunit'] = true;
// powerfrom/powerto already read by the FIELD_DEFS loop above
}
out.__enabled_duration = out.__enabled_distance === true ? false : true;
out.__selected = false;
return out;
Expand Down Expand Up @@ -800,8 +821,8 @@
return;
}
const value = row[field.key];
// For pace field, use speed's enabled state
const isEnabled = field.syncWith ? (row['__enabled_' + field.syncWith] !== false) : (row['__enabled_' + field.key] !== false);
// For pace field, use speed's enabled state; fields without a toggle are always enabled
const isEnabled = field.noToggle ? true : (field.syncWith ? (row['__enabled_' + field.syncWith] !== false) : (row['__enabled_' + field.key] !== false));
const fieldWrap = document.createElement('div');
fieldWrap.className = 'field';
if (!isEnabled) {
Expand All @@ -813,7 +834,7 @@
const labelWrap = document.createElement('label');
labelWrap.className = 'field-label';

const allowToggle = field.key !== 'name' && !field.linkedTo && !field.syncWith;
const allowToggle = field.key !== 'name' && !field.linkedTo && !field.syncWith && !field.noToggle;
if (allowToggle) {
const enableCheckbox = document.createElement('input');
enableCheckbox.type = 'checkbox';
Expand Down Expand Up @@ -859,7 +880,7 @@
}

const labelText = document.createElement('span');
labelText.textContent = resolveFieldLabel(field);
labelText.textContent = resolveFieldLabel(field, row);
labelWrap.appendChild(labelText);
fieldWrap.appendChild(labelWrap);

Expand All @@ -872,6 +893,24 @@
checkbox.dataset.type = field.type;
checkbox.addEventListener('change', handleFieldChange);
fieldWrap.appendChild(checkbox);
} else if (field.type === 'select') {
const sel = document.createElement('select');
sel.className = 'field-input field-select';
(field.options || []).forEach(opt => {
const option = document.createElement('option');
option.value = opt;
option.textContent = opt;
const currentVal = String(row[field.key] !== undefined ? row[field.key] : (field.defaultValue !== undefined ? field.defaultValue : ''));
if (currentVal === opt) {
option.selected = true;
}
sel.appendChild(option);
});
sel.addEventListener('change', () => {
row[field.key] = sel.value;
renderIntervals();
});
fieldWrap.appendChild(sel);
} else {
const inputWrapper = document.createElement('div');
inputWrapper.className = 'field-with-buttons';
Expand Down Expand Up @@ -946,7 +985,7 @@
return Array.isArray(field.devices) && field.devices.indexOf(state.device) >= 0;
}

function resolveFieldLabel(field) {
function resolveFieldLabel(field, interval) {
if (typeof field.label === 'function') {
return field.label();
}
Expand All @@ -960,6 +999,10 @@
if (field.unitKey === 'pace') {
return `${label} (${state.miles ? 'min/mi' : 'min/km'})`;
}
if ((field.key === 'powerfrom' || field.key === 'powerto') && interval) {
const unit = interval.powerrampunit || 'W';
return `${label} (${unit})`;
}
if (field.unitSuffix) {
return `${label} (${field.unitSuffix})`;
}
Expand Down Expand Up @@ -1284,6 +1327,11 @@
return;
}

// Power ramp fields are handled separately after this loop
if (['powerrampunit', 'powerfrom', 'powerto'].includes(field.key)) {
return;
}

// Check if field is valid for current device type
if (!isFieldValidForDevice(field, state.device)) {
return;
Expand Down Expand Up @@ -1324,6 +1372,22 @@
row[field.key] = finalValue;
}
});

// Power ramp
const rampFromEnabled = interval['__enabled_powerfrom'] !== false;
const rampToEnabled = interval['__enabled_powerto'] !== false;
if (rampFromEnabled && rampToEnabled &&
isFieldValidForDevice({ devices: ['bike', 'rower'] }, state.device) &&
interval.powerfrom !== undefined && interval.powerto !== undefined) {
const unit = interval.powerrampunit || 'W';
if (unit === '% FTP') {
row.powerzonefrom = Number(interval.powerfrom) / 100;
row.powerzoneto = Number(interval.powerto) / 100;
} else {
row.powerfrom = Number(interval.powerfrom);
row.powerto = Number(interval.powerto);
}
}
list.push(row);
}
return {
Expand Down Expand Up @@ -1381,6 +1445,7 @@
axis: def.axis,
axisLabel: typeof def.axisLabel === 'function' ? def.axisLabel() : def.axisLabel,
axisPosition: def.axisPosition,
stepped: def.stepped !== false,
points: []
}));

Expand Down Expand Up @@ -1413,6 +1478,22 @@
});
rows.push(Object.assign({ start, durationSeconds: duration }, intervalCopy));
series.forEach(serie => {
// For the power series, check if we have a power ramp (powerfrom/powerto)
if (serie.key === 'power' &&
interval['__enabled_powerfrom'] !== false &&
interval['__enabled_powerto'] !== false &&
interval.powerfrom !== undefined && interval.powerto !== undefined) {
const rampUnit = interval.powerrampunit || 'W';
const fromVal = rampUnit === '% FTP'
? Number(interval.powerfrom) / 100 * (state.ftp || 200)
: Number(interval.powerfrom);
const toVal = rampUnit === '% FTP'
? Number(interval.powerto) / 100 * (state.ftp || 200)
: Number(interval.powerto);
serie.points.push({ x: start, y: fromVal });
serie.points.push({ x: end, y: toVal });
return;
}
// Skip disabled fields in the chart
const isEnabled = interval['__enabled_' + serie.key] !== false;
if (!isEnabled) {
Expand Down
2 changes: 1 addition & 1 deletion src/inner_templates/workouteditor/workout-editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
backgroundColor: fillColor,
unit: series.unit || '',
yAxisID: series.axis || 'y',
stepped: true,
stepped: series.stepped !== false,
borderWidth: series.lineWidth || 2,
fill: Boolean(series.fill),
tension: 0,
Expand Down
Loading
Loading