@@ -6234,82 +6370,82 @@ class VitruvianApp {
})
.join("");
- if (
- (this.selectedHistoryKey !== null || this.selectedHistoryIndex !== null) &&
- !matchedSelection
- ) {
- this.selectedHistoryKey = null;
- this.selectedHistoryIndex = null;
- }
-
- this.updateHistoryPaginationControls({
- totalPages: maxPages,
- filterOptions,
- totalHistoryCount: history.length,
- });
- this.updateExportButtonLabel();
- }
-
- updateHistoryPaginationControls({ totalPages, filterOptions = [], totalHistoryCount = 0 }) {
- const paginationEl = document.getElementById("historyPagination");
- if (!paginationEl) {
- return;
- }
-
- const hasHistory = Number.isFinite(totalHistoryCount) && totalHistoryCount > 0;
- if (!hasHistory) {
- paginationEl.style.display = "none";
- paginationEl.innerHTML = "";
- return;
- }
-
- const safePages = Number.isFinite(totalPages) && totalPages > 0 ? totalPages : 1;
- const prevDisabledAttrs = this.historyPage <= 1 ? 'disabled aria-disabled="true"' : "";
- const nextDisabledAttrs = this.historyPage >= safePages ? 'disabled aria-disabled="true"' : "";
- const activeKey = this.getActiveHistoryFilterKey();
- const allLabel = Number.isFinite(totalHistoryCount)
- ? `All exercises (${totalHistoryCount})`
- : "All exercises";
-
- const filterOptionsHtml = [
- `
`,
- ...filterOptions.map(
- (option) =>
- `
`,
- ),
- ].join("");
-
- paginationEl.style.display = "flex";
- paginationEl.innerHTML = `
-
-
-
- `;
-
- const filterSelect = paginationEl.querySelector("#historyExerciseFilter");
- if (filterSelect) {
- filterSelect.value = activeKey;
- filterSelect.addEventListener("change", (event) => {
- this.setHistoryFilter(event.target.value);
- });
- }
- }
-
- getHistoryPageCount() {
- const filteredEntries = this.getFilteredHistoryEntries();
- if (filteredEntries.length === 0) {
- return 0;
- }
- const pageSize = this.getHistoryPageSize();
- return Math.ceil(filteredEntries.length / pageSize);
- }
+ if (
+ (this.selectedHistoryKey !== null || this.selectedHistoryIndex !== null) &&
+ !matchedSelection
+ ) {
+ this.selectedHistoryKey = null;
+ this.selectedHistoryIndex = null;
+ }
+
+ this.updateHistoryPaginationControls({
+ totalPages: maxPages,
+ filterOptions,
+ totalHistoryCount: history.length,
+ });
+ this.updateExportButtonLabel();
+ }
+
+ updateHistoryPaginationControls({ totalPages, filterOptions = [], totalHistoryCount = 0 }) {
+ const paginationEl = document.getElementById("historyPagination");
+ if (!paginationEl) {
+ return;
+ }
+
+ const hasHistory = Number.isFinite(totalHistoryCount) && totalHistoryCount > 0;
+ if (!hasHistory) {
+ paginationEl.style.display = "none";
+ paginationEl.innerHTML = "";
+ return;
+ }
+
+ const safePages = Number.isFinite(totalPages) && totalPages > 0 ? totalPages : 1;
+ const prevDisabledAttrs = this.historyPage <= 1 ? 'disabled aria-disabled="true"' : "";
+ const nextDisabledAttrs = this.historyPage >= safePages ? 'disabled aria-disabled="true"' : "";
+ const activeKey = this.getActiveHistoryFilterKey();
+ const allLabel = Number.isFinite(totalHistoryCount)
+ ? `All exercises (${totalHistoryCount})`
+ : "All exercises";
+
+ const filterOptionsHtml = [
+ `
`,
+ ...filterOptions.map(
+ (option) =>
+ `
`,
+ ),
+ ].join("");
+
+ paginationEl.style.display = "flex";
+ paginationEl.innerHTML = `
+
+
+
+ `;
+
+ const filterSelect = paginationEl.querySelector("#historyExerciseFilter");
+ if (filterSelect) {
+ filterSelect.value = activeKey;
+ filterSelect.addEventListener("change", (event) => {
+ this.setHistoryFilter(event.target.value);
+ });
+ }
+ }
+
+ getHistoryPageCount() {
+ const filteredEntries = this.getFilteredHistoryEntries();
+ if (filteredEntries.length === 0) {
+ return 0;
+ }
+ const pageSize = this.getHistoryPageSize();
+ return Math.ceil(filteredEntries.length / pageSize);
+ }
setHistoryPage(page) {
const totalPages = this.getHistoryPageCount();
@@ -6368,16 +6504,16 @@ class VitruvianApp {
return;
}
- const selectedIndex = this.getSelectedHistoryIndex();
- const hasSelection = selectedIndex >= 0;
- const hasHistorySelection = hasSelection && this.selectedHistoryKey !== null;
-
- exportBtn.textContent = hasSelection ? "Export Workout CSV" : "Export CSV";
- exportBtn.title = hasSelection
- ? "Export detailed movement data for the selected workout to Dropbox."
- : "Export the current load history window as a CSV file.";
- exportBtn.classList.toggle("export-selected", hasHistorySelection);
- }
+ const selectedIndex = this.getSelectedHistoryIndex();
+ const hasSelection = selectedIndex >= 0;
+ const hasHistorySelection = hasSelection && this.selectedHistoryKey !== null;
+
+ exportBtn.textContent = hasSelection ? "Export Workout CSV" : "Export CSV";
+ exportBtn.title = hasSelection
+ ? "Export detailed movement data for the selected workout to Dropbox."
+ : "Export the current load history window as a CSV file.";
+ exportBtn.classList.toggle("export-selected", hasHistorySelection);
+ }
completeWorkout(options = {}) {
const {
@@ -6410,24 +6546,31 @@ class VitruvianApp {
)
: [];
- const workout = {
- mode: this.currentWorkout.mode,
- weightKg: this.currentWorkout.weightKg,
- plannedWeightKg: Number.isFinite(
- this.currentWorkout.originalWeightKg,
- )
- ? this.currentWorkout.originalWeightKg
- : this.currentWorkout.weightKg,
- reps: this.workingReps,
- exerciseId: typeof this.currentWorkout.exerciseId === "string"
- ? this.currentWorkout.exerciseId
- : null,
- exerciseIdNew: this.toNumericExerciseId(this.currentWorkout.exerciseIdNew),
- timestamp: endTime,
- startTime: this.currentWorkout.startTime,
- warmupEndTime: this.currentWorkout.warmupEndTime,
- endTime,
-
+ // Compute average loads between warmup end and workout end
+ const averageLoads = this.calculateAverageLoadForWorkout(
+ movementData,
+ this.currentWorkout.warmupEndTime,
+ endTime,
+ );
+
+ const workout = {
+ mode: this.currentWorkout.mode,
+ weightKg: this.currentWorkout.weightKg,
+ plannedWeightKg: Number.isFinite(
+ this.currentWorkout.originalWeightKg,
+ )
+ ? this.currentWorkout.originalWeightKg
+ : this.currentWorkout.weightKg,
+ reps: this.workingReps,
+ exerciseId: typeof this.currentWorkout.exerciseId === "string"
+ ? this.currentWorkout.exerciseId
+ : null,
+ exerciseIdNew: this.toNumericExerciseId(this.currentWorkout.exerciseIdNew),
+ timestamp: endTime,
+ startTime: this.currentWorkout.startTime,
+ warmupEndTime: this.currentWorkout.warmupEndTime,
+ endTime,
+
setName: this.currentWorkout.setName || null,
setNumber: this.currentWorkout.setNumber ?? null,
setTotal: this.currentWorkout.setTotal ?? null,
@@ -6435,6 +6578,11 @@ class VitruvianApp {
// Include detailed movement data (positions and loads over time)
movementData: movementData,
+ // Average loads between warmup end and workout end
+ // averageLoad: total (left+right), averageLoadLeft: left cable, averageLoadRight: right cable
+ averageLoad: averageLoads ? averageLoads.averageTotal : null,
+ averageLoadLeft: averageLoads ? averageLoads.averageLeft : null,
+ averageLoadRight: averageLoads ? averageLoads.averageRight : null,
};
const isSkipped = reason === "skipped";
@@ -6469,6 +6617,26 @@ class VitruvianApp {
// Auto-save to Dropbox if connected
if (!isSkipped && this.dropboxManager.isConnected) {
const workoutToPersist = storedWorkout || summaryWorkout;
+
+ // Ensure average fields are present on the persisted object (after normalization)
+ try {
+ const avgsPersist = this.calculateAverageLoadForWorkout(
+ Array.isArray(workoutToPersist.movementData)
+ ? workoutToPersist.movementData
+ : [],
+ workoutToPersist.warmupEndTime,
+ workoutToPersist.endTime,
+ );
+ workoutToPersist.averageLoad = avgsPersist ? avgsPersist.averageTotal : null;
+ workoutToPersist.averageLoadLeft = avgsPersist ? avgsPersist.averageLeft : null;
+ workoutToPersist.averageLoadRight = avgsPersist ? avgsPersist.averageRight : null;
+ } catch (e) {
+ // no-op, fall through with nulls
+ workoutToPersist.averageLoad = workoutToPersist.averageLoad ?? null;
+ workoutToPersist.averageLoadLeft = workoutToPersist.averageLoadLeft ?? null;
+ workoutToPersist.averageLoadRight = workoutToPersist.averageLoadRight ?? null;
+ }
+
this.dropboxManager
.saveWorkout(workoutToPersist)
.then(() => {
@@ -6565,6 +6733,49 @@ class VitruvianApp {
}));
}
+ // Calculate average total, left and right loads between warmupEndTime and endTime
+ // Returns an object: { averageTotal, averageLeft, averageRight } or null if no points
+ calculateAverageLoadForWorkout(movementData = [], warmupEndTime, endTime) {
+ if (!Array.isArray(movementData) || movementData.length === 0) {
+ return null;
+ }
+
+ const windowStartMs =
+ warmupEndTime instanceof Date ? warmupEndTime.getTime() : null;
+ const windowEndMs = endTime instanceof Date ? endTime.getTime() : null;
+
+ let sumLeft = 0;
+ let sumRight = 0;
+ let count = 0;
+
+ for (const pt of movementData) {
+ const ts = pt && pt.timestamp ? new Date(pt.timestamp).getTime() : NaN;
+ if (!isFinite(ts)) continue;
+
+ if (windowEndMs && ts > windowEndMs) continue;
+ if (windowStartMs && ts < windowStartMs) continue;
+
+ const left = Number(pt.loadA) || 0;
+ const right = Number(pt.loadB) || 0;
+ sumLeft += left;
+ sumRight += right;
+ count += 1;
+ }
+
+ if (count === 0) return null;
+
+ const avgLeft = sumLeft / count;
+ const avgRight = sumRight / count;
+ const avgTotal = avgLeft + avgRight;
+
+ // Return rounded integer values for compatibility with existing files; change to decimals if desired
+ return {
+ averageTotal: Math.round(avgTotal),
+ averageLeft: Math.round(avgLeft),
+ averageRight: Math.round(avgRight),
+ };
+ }
+
// Get dynamic window size based on workout phase
getWindowSize() {
@@ -7614,17 +7825,17 @@ class VitruvianApp {
? this.planItems?.[planIndex] || null
: null;
const activePlanName = this.planActive ? this.getActivePlanDisplayName() : null;
- const planName =
- typeof activePlanName === "string" && activePlanName.trim().length > 0
- ? activePlanName.trim()
- : null;
- const planExerciseId = this.getPlanExerciseId(planItem);
- const planExerciseNumericId = this.getPlanExerciseNumericId(planItem);
- const cableCount = this.getPlanCableCount(planItem);
- const totalLoadKg = Number.isFinite(perCableKg)
- ? perCableKg * cableCount
- : null;
-
+ const planName =
+ typeof activePlanName === "string" && activePlanName.trim().length > 0
+ ? activePlanName.trim()
+ : null;
+ const planExerciseId = this.getPlanExerciseId(planItem);
+ const planExerciseNumericId = this.getPlanExerciseNumericId(planItem);
+ const cableCount = this.getPlanCableCount(planItem);
+ const totalLoadKg = Number.isFinite(perCableKg)
+ ? perCableKg * cableCount
+ : null;
+
this.currentWorkout = {
mode: modeName || "Program",
weightKg: perCableKg,
@@ -7637,14 +7848,14 @@ class VitruvianApp {
setName: planItem?.name || null,
setNumber:
this.planActive && planItem ? this.planCursor?.set ?? null : null,
- setTotal: planItem?.sets ?? null,
- itemType: planItem?.type || "exercise",
- planName,
- exerciseId: planExerciseId,
- exerciseIdNew: planExerciseNumericId,
- cableCount,
- totalLoadKg,
- };
+ setTotal: planItem?.sets ?? null,
+ itemType: planItem?.type || "exercise",
+ planName,
+ exerciseId: planExerciseId,
+ exerciseIdNew: planExerciseNumericId,
+ cableCount,
+ totalLoadKg,
+ };
this.updateWorkingCounterControlsState();
this.initializeCurrentWorkoutPersonalBest();
this.updateRepCounters();
@@ -7658,10 +7869,10 @@ class VitruvianApp {
this._lastTargetSyncError = null;
this._lastWeightSyncError = null;
- await this.device.startProgram(params);
-
- // Update stop button state
- this.updateStopButtonState();
+ await this.device.startProgram(params);
+
+ // Update stop button state
+ this.updateStopButtonState();
// Close sidebar on mobile after starting
this.closeSidebar();
@@ -7736,17 +7947,17 @@ class VitruvianApp {
? this.planItems?.[planIndex] || null
: null;
const activePlanName = this.planActive ? this.getActivePlanDisplayName() : null;
- const planName =
- typeof activePlanName === "string" && activePlanName.trim().length > 0
- ? activePlanName.trim()
- : null;
- const planExerciseId = this.getPlanExerciseId(planItem);
- const planExerciseNumericId = this.getPlanExerciseNumericId(planItem);
- const cableCount = this.getPlanCableCount(planItem);
- const plannedPerCableKg = Number(planItem?.perCableKg);
- const totalLoadKg =
- Number.isFinite(plannedPerCableKg) && plannedPerCableKg > 0
- ? plannedPerCableKg * cableCount
+ const planName =
+ typeof activePlanName === "string" && activePlanName.trim().length > 0
+ ? activePlanName.trim()
+ : null;
+ const planExerciseId = this.getPlanExerciseId(planItem);
+ const planExerciseNumericId = this.getPlanExerciseNumericId(planItem);
+ const cableCount = this.getPlanCableCount(planItem);
+ const plannedPerCableKg = Number(planItem?.perCableKg);
+ const totalLoadKg =
+ Number.isFinite(plannedPerCableKg) && plannedPerCableKg > 0
+ ? plannedPerCableKg * cableCount
: null;
this.currentWorkout = {
@@ -7761,14 +7972,14 @@ class VitruvianApp {
setName: planItem?.name || null,
setNumber:
this.planActive && planItem ? this.planCursor?.set ?? null : null,
- setTotal: planItem?.sets ?? null,
- itemType: planItem?.type || "echo",
- planName,
- exerciseId: planExerciseId,
- exerciseIdNew: planExerciseNumericId,
- cableCount,
- totalLoadKg,
- };
+ setTotal: planItem?.sets ?? null,
+ itemType: planItem?.type || "echo",
+ planName,
+ exerciseId: planExerciseId,
+ exerciseIdNew: planExerciseNumericId,
+ cableCount,
+ totalLoadKg,
+ };
this.updateWorkingCounterControlsState();
this.initializeCurrentWorkoutPersonalBest();
this.updateRepCounters();
@@ -7778,10 +7989,10 @@ class VitruvianApp {
// Enable auto-stop indicator if Just Lift mode (including Echo Just Lift)
this.updateAutoStopTimerVisibility(isJustLift);
- await this.device.startEcho(params);
-
- // Update stop button state
- this.updateStopButtonState();
+ await this.device.startEcho(params);
+
+ // Update stop button state
+ this.updateStopButtonState();
// Close sidebar on mobile after starting
this.closeSidebar();
@@ -7806,14 +8017,14 @@ class VitruvianApp {
perCableKg: 10, // stored as kg
reps: 10,
sets: 3,
- restSec: 60,
- cables: 2,
- justLift: false,
- stopAtTop: false,
- progressionKg: 0, // reuse progression logic if desired
- intensity: "none", // intensity technique (none|dropset|restpause|slownegatives)
- };
- }
+ restSec: 60,
+ cables: 2,
+ justLift: false,
+ stopAtTop: false,
+ progressionKg: 0, // reuse progression logic if desired
+ intensity: "none", // intensity technique (none|dropset|restpause|slownegatives)
+ };
+ }
// Make an empty Echo row
makeEchoRow() {
@@ -7917,63 +8128,63 @@ class VitruvianApp {
}
}
- logDropboxConsole(context, message, options = {}) {
- const prefix = `[WorkoutTime][Dropbox][${context}]`;
- const { level = "info" } = options;
- const output = `${prefix} ${message}`;
- if (level === "error") {
- console.error(output);
- } else {
- console.log(output);
- }
- }
-
- toNumericExerciseId(value) {
- if (value === null || value === undefined) {
- return null;
- }
- const numeric = Number(value);
- if (!Number.isFinite(numeric)) {
- return null;
- }
- const integer = Math.trunc(numeric);
- if (integer !== numeric) {
- return null;
- }
- if (integer < 0 || integer > 0xffff) {
- return null;
- }
- return integer;
- }
-
- getPlanExerciseNumericId(planItem) {
- if (!planItem || typeof planItem !== "object") {
- return null;
- }
-
- const candidates = [
- planItem.exerciseIdNew,
- planItem.id_new,
- planItem.builderMeta?.exerciseIdNew,
- planItem.builderMeta?.exerciseNumericId,
- planItem.builderMeta?.exercise?.id_new,
- ];
-
- for (const candidate of candidates) {
- const numeric = this.toNumericExerciseId(candidate);
- if (numeric !== null) {
- return numeric;
- }
- }
-
- return null;
- }
-
- getPlanExerciseId(planItem) {
- if (!planItem || typeof planItem !== "object") {
- return null;
- }
-
+ logDropboxConsole(context, message, options = {}) {
+ const prefix = `[WorkoutTime][Dropbox][${context}]`;
+ const { level = "info" } = options;
+ const output = `${prefix} ${message}`;
+ if (level === "error") {
+ console.error(output);
+ } else {
+ console.log(output);
+ }
+ }
+
+ toNumericExerciseId(value) {
+ if (value === null || value === undefined) {
+ return null;
+ }
+ const numeric = Number(value);
+ if (!Number.isFinite(numeric)) {
+ return null;
+ }
+ const integer = Math.trunc(numeric);
+ if (integer !== numeric) {
+ return null;
+ }
+ if (integer < 0 || integer > 0xffff) {
+ return null;
+ }
+ return integer;
+ }
+
+ getPlanExerciseNumericId(planItem) {
+ if (!planItem || typeof planItem !== "object") {
+ return null;
+ }
+
+ const candidates = [
+ planItem.exerciseIdNew,
+ planItem.id_new,
+ planItem.builderMeta?.exerciseIdNew,
+ planItem.builderMeta?.exerciseNumericId,
+ planItem.builderMeta?.exercise?.id_new,
+ ];
+
+ for (const candidate of candidates) {
+ const numeric = this.toNumericExerciseId(candidate);
+ if (numeric !== null) {
+ return numeric;
+ }
+ }
+
+ return null;
+ }
+
+ getPlanExerciseId(planItem) {
+ if (!planItem || typeof planItem !== "object") {
+ return null;
+ }
+
const candidate =
typeof planItem.exerciseId === "string"
? planItem.exerciseId
@@ -8110,27 +8321,27 @@ class VitruvianApp {
PLAN — UI RENDER
========================= */
- renderPlanUI() {
- const container = document.getElementById("planItems");
- if (!container) return;
-
- const items = Array.isArray(this.planItems) ? this.planItems : [];
-
- const unit = this.getUnitLabelShort();
- const toAttrValue = (raw) =>
- escapeHtml(raw === null || raw === undefined ? "" : String(raw));
- const toNumberString = (value) => {
- if (value === null || value === undefined) {
- return "";
- }
- const numeric = Number(value);
- return Number.isFinite(numeric) ? String(numeric) : "";
- };
-
- const makeRow = (item, i) => {
- const card = document.createElement("div");
- card.className = "plan-card";
-
+ renderPlanUI() {
+ const container = document.getElementById("planItems");
+ if (!container) return;
+
+ const items = Array.isArray(this.planItems) ? this.planItems : [];
+
+ const unit = this.getUnitLabelShort();
+ const toAttrValue = (raw) =>
+ escapeHtml(raw === null || raw === undefined ? "" : String(raw));
+ const toNumberString = (value) => {
+ if (value === null || value === undefined) {
+ return "";
+ }
+ const numeric = Number(value);
+ return Number.isFinite(numeric) ? String(numeric) : "";
+ };
+
+ const makeRow = (item, i) => {
+ const card = document.createElement("div");
+ card.className = "plan-card";
+
const sectionTitle =
item.type === "exercise"
? `Exercise`
@@ -8138,207 +8349,207 @@ class VitruvianApp {
const title = document.createElement("div");
title.className = "plan-card__header";
- title.innerHTML = `
-
-
-
-
-
-
- `;
- card.appendChild(title);
+ title.innerHTML = `
+
+
+
+
+
+
+ `;
+ card.appendChild(title);
const grid = document.createElement("div");
grid.className = "plan-card__grid";
- // Common: Name, Sets, Rest, JL, StopAtTop
- const nameValue = toAttrValue(item.name || "");
- const setsValue = toAttrValue(toNumberString(item.sets));
- const restValue = toAttrValue(toNumberString(item.restSec));
-
- const nameField = `
-
-
-
-
- `;
-
- const setsField = `
-
-
-
-
- `;
-
- const restField = `
-
-
-
-
- `;
-
- const toggleFields = `
-
-
-
-
- `;
-
- if (item.type === "exercise") {
- const modeOptions = [
- [ProgramMode.OLD_SCHOOL, "Old School"],
- [ProgramMode.PUMP, "Pump"],
- [ProgramMode.TUT, "TUT"],
- [ProgramMode.TUT_BEAST, "TUT Beast"],
- [ProgramMode.ECCENTRIC_ONLY, "Eccentric Only"],
- ]
- .map(
- ([val, label]) =>
- `
`,
- )
- .join("");
-
- let perCableDisplayRaw = "";
- const numericPerCableKg = Number(item.perCableKg);
- if (Number.isFinite(numericPerCableKg)) {
- const converted = this.convertKgToDisplay(numericPerCableKg);
- perCableDisplayRaw = Number.isFinite(converted)
- ? converted.toFixed(this.getWeightInputDecimals())
- : "";
- }
- const perCableAttr = toAttrValue(perCableDisplayRaw);
-
- const repsValue = toAttrValue(toNumberString(item.reps));
- const parsedCables = Number(item.cables);
- const normalizedCables = Number.isFinite(parsedCables)
- ? Math.min(2, Math.max(1, parsedCables))
- : "";
- const cablesValue = toAttrValue(
- normalizedCables === "" ? "" : String(normalizedCables),
- );
-
- let progressionDisplayRaw = "";
- const numericProgressionKg = Number(item.progressionKg);
- if (Number.isFinite(numericProgressionKg)) {
- const convertedProgression = this.convertKgToDisplay(numericProgressionKg);
- progressionDisplayRaw = Number.isFinite(convertedProgression)
- ? convertedProgression.toFixed(this.getProgressionInputDecimals())
- : "";
- }
- const progressionAttr = toAttrValue(progressionDisplayRaw);
-
- const progressionMin = toAttrValue(this.convertKgToDisplay(-3));
- const progressionMax = toAttrValue(this.convertKgToDisplay(3));
- const perCableStep = unit === "lb" ? "1" : "0.5";
- const progressionStep = unit === "lb" ? "0.2" : "0.1";
-
- grid.innerHTML = `
- ${nameField}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${setsField}
-
-
-
-
-
-
-
-
-
-
-
- ${restField}
- ${toggleFields}
- `;
- } else {
- // echo
- const levelOptions = [
- [EchoLevel.HARD, "Hard"],
- [EchoLevel.HARDER, "Harder"],
- [EchoLevel.HARDEST, "Hardest"],
- [EchoLevel.EPIC, "Epic"],
- ]
- .map(
- ([val, label]) =>
- `
`,
- )
- .join("");
-
- const eccentricValue = toAttrValue(toNumberString(item.eccentricPct));
- const targetRepsValue = toAttrValue(toNumberString(item.targetReps));
-
- grid.innerHTML = `
- ${nameField}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ${setsField}
- ${restField}
- ${toggleFields}
- `;
- }
+ // Common: Name, Sets, Rest, JL, StopAtTop
+ const nameValue = toAttrValue(item.name || "");
+ const setsValue = toAttrValue(toNumberString(item.sets));
+ const restValue = toAttrValue(toNumberString(item.restSec));
+
+ const nameField = `
+
+
+
+
+ `;
+
+ const setsField = `
+
+
+
+
+ `;
+
+ const restField = `
+
+
+
+
+ `;
+
+ const toggleFields = `
+
+
+
+
+ `;
+
+ if (item.type === "exercise") {
+ const modeOptions = [
+ [ProgramMode.OLD_SCHOOL, "Old School"],
+ [ProgramMode.PUMP, "Pump"],
+ [ProgramMode.TUT, "TUT"],
+ [ProgramMode.TUT_BEAST, "TUT Beast"],
+ [ProgramMode.ECCENTRIC_ONLY, "Eccentric Only"],
+ ]
+ .map(
+ ([val, label]) =>
+ `
`,
+ )
+ .join("");
+
+ let perCableDisplayRaw = "";
+ const numericPerCableKg = Number(item.perCableKg);
+ if (Number.isFinite(numericPerCableKg)) {
+ const converted = this.convertKgToDisplay(numericPerCableKg);
+ perCableDisplayRaw = Number.isFinite(converted)
+ ? converted.toFixed(this.getWeightInputDecimals())
+ : "";
+ }
+ const perCableAttr = toAttrValue(perCableDisplayRaw);
+
+ const repsValue = toAttrValue(toNumberString(item.reps));
+ const parsedCables = Number(item.cables);
+ const normalizedCables = Number.isFinite(parsedCables)
+ ? Math.min(2, Math.max(1, parsedCables))
+ : "";
+ const cablesValue = toAttrValue(
+ normalizedCables === "" ? "" : String(normalizedCables),
+ );
+
+ let progressionDisplayRaw = "";
+ const numericProgressionKg = Number(item.progressionKg);
+ if (Number.isFinite(numericProgressionKg)) {
+ const convertedProgression = this.convertKgToDisplay(numericProgressionKg);
+ progressionDisplayRaw = Number.isFinite(convertedProgression)
+ ? convertedProgression.toFixed(this.getProgressionInputDecimals())
+ : "";
+ }
+ const progressionAttr = toAttrValue(progressionDisplayRaw);
+
+ const progressionMin = toAttrValue(this.convertKgToDisplay(-3));
+ const progressionMax = toAttrValue(this.convertKgToDisplay(3));
+ const perCableStep = unit === "lb" ? "1" : "0.5";
+ const progressionStep = unit === "lb" ? "0.2" : "0.1";
+
+ grid.innerHTML = `
+ ${nameField}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${setsField}
+
+
+
+
+
+
+
+
+
+
+
+ ${restField}
+ ${toggleFields}
+ `;
+ } else {
+ // echo
+ const levelOptions = [
+ [EchoLevel.HARD, "Hard"],
+ [EchoLevel.HARDER, "Harder"],
+ [EchoLevel.HARDEST, "Hardest"],
+ [EchoLevel.EPIC, "Epic"],
+ ]
+ .map(
+ ([val, label]) =>
+ `
`,
+ )
+ .join("");
+
+ const eccentricValue = toAttrValue(toNumberString(item.eccentricPct));
+ const targetRepsValue = toAttrValue(toNumberString(item.targetReps));
+
+ grid.innerHTML = `
+ ${nameField}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ${setsField}
+ ${restField}
+ ${toggleFields}
+ `;
+ }
card.appendChild(grid);
return card;
@@ -8875,14 +9086,14 @@ class VitruvianApp {
if (!sel) return;
const names = this.getAllPlanNames();
const previous = sel.value;
- sel.innerHTML = names.length
- ? names
- .map((n) => {
- const safe = escapeHtml(n);
- return `
`;
- })
- .join("")
- : `
`;
+ sel.innerHTML = names.length
+ ? names
+ .map((n) => {
+ const safe = escapeHtml(n);
+ return `
`;
+ })
+ .join("")
+ : `
`;
if (names.length > 0) {
let nextValue = "";
@@ -8988,49 +9199,49 @@ class VitruvianApp {
`Saved plan "${planName}" could not be parsed: ${err.message}`,
);
}
- this.planItems = Array.isArray(parsed) ? parsed : [];
- this._loadedPlanName = planName;
- this._preferredPlanSelection = planName;
- this.syncPlanNameInputTo(planName);
-
- const inferredUnit = this.inferPlanWeightUnit(this.planItems);
- const normalizedPlanUnit =
- inferredUnit === "lb" || inferredUnit === "kg" ? inferredUnit : null;
-
- if (normalizedPlanUnit && normalizedPlanUnit !== this.weightUnit) {
- this.setWeightUnit(normalizedPlanUnit, { force: true });
- if (!suppressLog) {
- const friendly = this.getFriendlyUnitLabel(normalizedPlanUnit);
- this.addLogEntry(
- `Switched to ${friendly} to match plan "${planName}".`,
- "info",
- );
- }
- }
-
- const normalized = this.ensurePlanItemsRepresentUnit(
- this.planItems,
- this.weightUnit,
- );
- if (normalized) {
- this.savePlanLocally(planName, this.planItems);
- if (this.dropboxManager?.isConnected) {
- this.syncPlanToDropbox(planName, this.planItems, {
- silent: true,
- suppressError: true,
- });
- }
- this.addLogEntry(
- `Normalized plan units to ${this.getFriendlyUnitLabel()}.`,
- "info",
- );
- }
- this.renderPlanUI();
- if (!suppressLog) {
- this.addLogEntry(`Loaded plan "${planName}"`, "success");
- }
- } catch (e) {
- if (!silentIfMissing) {
+ this.planItems = Array.isArray(parsed) ? parsed : [];
+ this._loadedPlanName = planName;
+ this._preferredPlanSelection = planName;
+ this.syncPlanNameInputTo(planName);
+
+ const inferredUnit = this.inferPlanWeightUnit(this.planItems);
+ const normalizedPlanUnit =
+ inferredUnit === "lb" || inferredUnit === "kg" ? inferredUnit : null;
+
+ if (normalizedPlanUnit && normalizedPlanUnit !== this.weightUnit) {
+ this.setWeightUnit(normalizedPlanUnit, { force: true });
+ if (!suppressLog) {
+ const friendly = this.getFriendlyUnitLabel(normalizedPlanUnit);
+ this.addLogEntry(
+ `Switched to ${friendly} to match plan "${planName}".`,
+ "info",
+ );
+ }
+ }
+
+ const normalized = this.ensurePlanItemsRepresentUnit(
+ this.planItems,
+ this.weightUnit,
+ );
+ if (normalized) {
+ this.savePlanLocally(planName, this.planItems);
+ if (this.dropboxManager?.isConnected) {
+ this.syncPlanToDropbox(planName, this.planItems, {
+ silent: true,
+ suppressError: true,
+ });
+ }
+ this.addLogEntry(
+ `Normalized plan units to ${this.getFriendlyUnitLabel()}.`,
+ "info",
+ );
+ }
+ this.renderPlanUI();
+ if (!suppressLog) {
+ this.addLogEntry(`Loaded plan "${planName}"`, "success");
+ }
+ } catch (e) {
+ if (!silentIfMissing) {
alert(`Could not load plan: ${e.message}`);
}
}
diff --git a/workout-time/chart.js b/workout-time/chart.js
index 1cd4fa6..a6c72ec 100644
--- a/workout-time/chart.js
+++ b/workout-time/chart.js
@@ -1,635 +1,808 @@
-// chart.js - Chart management and visualization
-
-class ChartManager {
- constructor(containerId) {
- this.containerId = containerId;
- this.chart = null;
- this.container = null;
- this.loadHistory = [];
- this.maxHistoryPoints = 72000; // 2hrs at 100ms polling (7200s / 0.1s = 72000 points)
- this.currentTimeRange = 30; // Current time range in seconds (default 30s)
- this.live = true;
- this.onLog = null; // Callback for logging
- this.updateInterval = null; // Interval handle for periodic updates
- this.updateFrequency = 10; // Update chart every 10ms
- this.chartHeight = 300;
- this.loadUnit = {
- label: "kg",
- decimals: 1,
- toDisplay: (value) => value,
- };
- this.eventMarkers = []; // Array of {time: Date, label: string, color: string}
- this.resizeObserver = null;
- this._handleWindowResize = null;
- }
-
- // Initialize uPlot chart
- init() {
- const container = document.getElementById(this.containerId);
- if (!container) {
- console.warn("Chart container not found yet, will initialize later");
- return false;
- }
-
- this.container = container;
-
- // uPlot expects data in this format: [timestamps, series1, series2, ...]
- const data = [
- [], // timestamps (Unix time in seconds)
- [], // Total Load
- [], // Left Cable Load (B)
- [], // Right Cable Load (A)
- [], // Left Cable Position (B)
- [], // Right Cable Position (A)
- ];
-
- const manager = this;
-
- // Plugin to draw event markers
- const eventMarkersPlugin = {
- hooks: {
- draw: [
- (u) => {
- const { ctx } = u;
- const { left, top, width, height } = u.bbox;
-
- ctx.save();
-
- // Draw each event marker
- manager.eventMarkers.forEach((marker) => {
- const markerTime = marker.time.getTime() / 1000; // Convert to Unix seconds
- const x = u.valToPos(markerTime, "x", true);
-
- // Only draw if marker is within visible range
- if (x >= left && x <= left + width) {
- // Draw vertical line
- ctx.strokeStyle = marker.color || "#ff6b6b";
- ctx.lineWidth = 2;
- ctx.setLineDash([5, 5]);
- ctx.beginPath();
- ctx.moveTo(x, top);
- ctx.lineTo(x, top + height);
- ctx.stroke();
- ctx.setLineDash([]);
-
- // Draw label
- ctx.fillStyle = marker.color || "#ff6b6b";
- ctx.font = "14px sans-serif";
- ctx.textAlign = "left";
- ctx.textBaseline = "top";
-
- // Rotate text 90 degrees and offset from line
- ctx.save();
- ctx.translate(x + 14, top + 5);
- ctx.rotate(Math.PI / 2);
- ctx.fillText(marker.label, 0, 0);
- ctx.restore();
- }
- });
-
- ctx.restore();
- },
- ],
- },
- };
-
- const opts = {
- width: container.clientWidth || 800,
- height: this.chartHeight,
- plugins: [eventMarkersPlugin],
- cursor: {
- drag: {
- x: true,
- y: false,
- },
- },
- scales: {
- x: { time: true },
-
- load: {
- auto: true,
- range: (u, min, max) => {
- // Handle invalid data
- if (!isFinite(max) || max <= 0) {
- return [0, 10]; // Default to 0–10 when no data or all zeros
- }
-
- // Always start from 0, pad 10% above data max
- const paddedMax = max + max * 0.1;
- return [0, paddedMax];
- },
- },
-
- position: {
- auto: true,
- range: (u, min, max) => {
- if (!isFinite(max) || max <= 0) {
- return [0, 100]; // Default to 0–100 when no data or all zeros
- }
-
- const paddedMax = max + max * 0.1;
- return [0, paddedMax];
- },
- },
- },
- series: [
- {
- label: "Time",
- value: (u, v) => {
- if (v == null) return "-";
- const date = new Date(v * 1000);
- return date.toLocaleTimeString("en-US", {
- hour: "2-digit",
- minute: "2-digit",
- second: "2-digit",
- hour12: false,
- });
- },
- },
- {
- label: "Total Load",
- stroke: "#667eea",
- width: 1.5,
- scale: "load",
- value: (u, v) => manager.formatLoadValue(v),
- },
- {
- label: "Left Load",
- stroke: "#ff6b6b",
- width: 1.5,
- scale: "load",
- value: (u, v) => manager.formatLoadValue(v),
- },
- {
- label: "Right Load",
- stroke: "#51cf66",
- width: 1.5,
- scale: "load",
- value: (u, v) => manager.formatLoadValue(v),
- },
- {
- label: "Left Position",
- stroke: "#ffa94d",
- width: 1.5,
- scale: "position",
- dash: [5, 5],
- value: (u, v) => (v == null ? "-" : v.toFixed(0)),
- },
- {
- label: "Right Position",
- stroke: "#94d82d",
- width: 1.5,
- scale: "position",
- dash: [5, 5],
- value: (u, v) => (v == null ? "-" : v.toFixed(0)),
- },
- ],
- axes: [
- {
- stroke: "#6c757d",
- grid: {
- show: true,
- stroke: "#dee2e6",
- width: 1,
- },
- ticks: {
- show: true,
- stroke: "#dee2e6",
- },
- values: (u, vals) => {
- // Format x-axis timestamps as HH:MM:SS only
- return vals.map((v) => {
- const date = new Date(v * 1000);
- return date.toLocaleTimeString("en-US", {
- hour: "2-digit",
- minute: "2-digit",
- second: "2-digit",
- hour12: false,
- });
- });
- },
- },
- {
- scale: "load",
- label: `Load (${this.loadUnit.label})`,
- labelSize: 20,
- stroke: "#6c757d",
- size: 40,
- grid: {
- show: true,
- stroke: "#dee2e6",
- width: 1,
- },
- ticks: {
- show: true,
- stroke: "#dee2e6",
- },
- },
- {
- scale: "position",
- label: "Position (cm)",
- labelSize: 20,
- stroke: "#6c757d",
- size: 50,
- side: 1, // 1 = right side
- grid: {
- show: false, // Don't show grid for position to avoid clutter
- },
- ticks: {
- show: true,
- stroke: "#dee2e6",
- },
- },
- ],
- legend: {
- show: true,
- live: true,
- },
- };
-
- this.chart = new uPlot(opts, data, container);
-
- this.attachResizeObservers(container);
-
- // Start periodic updates
- this.startPeriodicUpdates();
-
- return true;
- }
-
- attachResizeObservers(container) {
- if (typeof window === "undefined" || !container) {
- return;
- }
-
- if (!this._handleWindowResize) {
- this._handleWindowResize = () => {
- this.resize();
- };
- window.addEventListener("resize", this._handleWindowResize);
- }
-
- if (typeof window.ResizeObserver === "function") {
- if (this.resizeObserver) {
- this.resizeObserver.disconnect();
- }
- this.resizeObserver = new window.ResizeObserver(() => {
- this.resize();
- });
- this.resizeObserver.observe(container);
- }
- }
-
- resize() {
- const container =
- this.container ||
- (typeof document !== "undefined"
- ? document.getElementById(this.containerId)
- : null);
-
- if (!this.chart || !container) {
- return false;
- }
-
- const width = container.clientWidth || container.offsetWidth || 0;
-
- this.chart.setSize({
- width,
- height: this.chartHeight,
- });
-
- return true;
- }
-
- // Start periodic chart updates
- startPeriodicUpdates() {
- if (this.updateInterval) {
- clearInterval(this.updateInterval);
- }
-
- // Update chart every 10ms, separate from data collection
- this.updateInterval = setInterval(() => {
- this.update();
- }, this.updateFrequency);
- }
-
- // Stop periodic updates
- stopPeriodicUpdates() {
- if (this.updateInterval) {
- clearInterval(this.updateInterval);
- this.updateInterval = null;
- }
- }
-
- // Add new data point to chart
- addData(sample) {
- // Add to load history
- this.loadHistory.push({
- timestamp: sample.timestamp,
- loadA: sample.loadA,
- loadB: sample.loadB,
- posA: sample.posA,
- posB: sample.posB,
- });
-
- // Trim history to max points (2hr limit)
- if (this.loadHistory.length > this.maxHistoryPoints) {
- const removed = this.loadHistory.shift();
-
- // Log when we hit the limit for the first time
- if (this.loadHistory.length === this.maxHistoryPoints && this.onLog) {
- this.onLog(
- "Reached 2hr data limit. Oldest data points will be removed as new data arrives.",
- "info",
- );
- }
- }
-
- // Chart updates happen on periodic interval
- }
-
- // Update function called periodically to either add new data or if not live, do nothing.
- update() {
- if (!this.chart || this.loadHistory.length === 0 || !this.live) return;
- this.updateChartData();
- }
-
- setLoadUnit(config) {
- if (!config) {
- return;
- }
-
- this.loadUnit = {
- label: config.label || "kg",
- decimals: typeof config.decimals === "number" ? config.decimals : 1,
- toDisplay:
- typeof config.toDisplay === "function"
- ? config.toDisplay
- : (value) => value,
- };
-
- if (this.chart && this.chart.axes && this.chart.axes[1]) {
- this.chart.axes[1].label = `Load (${this.loadUnit.label})`;
- this.updateChartData();
- }
- }
-
- formatLoadValue(value) {
- if (value == null || !isFinite(value)) {
- return "-";
- }
-
- return `${value.toFixed(this.loadUnit.decimals)} ${this.loadUnit.label}`;
- }
-
- buildSeriesFromPoints(points) {
- const timestamps = [];
- const totalLoads = [];
- const loadsB = [];
- const loadsA = [];
- const positionsB = [];
- const positionsA = [];
-
- for (const point of points) {
- if (!point || !(point.timestamp instanceof Date)) {
- continue;
- }
-
- const timestampSeconds = point.timestamp.getTime() / 1000;
- timestamps.push(timestampSeconds);
-
- const loadA = Number(point.loadA) || 0;
- const loadB = Number(point.loadB) || 0;
- const totalKg = loadA + loadB;
-
- const displayTotal = this.loadUnit.toDisplay(totalKg);
- const displayB = this.loadUnit.toDisplay(loadB);
- const displayA = this.loadUnit.toDisplay(loadA);
-
- totalLoads.push(
- displayTotal != null && isFinite(displayTotal) ? displayTotal : 0,
- );
- loadsB.push(displayB != null && isFinite(displayB) ? displayB : 0);
- loadsA.push(displayA != null && isFinite(displayA) ? displayA : 0);
- positionsB.push(Number(point.posB) || 0);
- positionsA.push(Number(point.posA) || 0);
- }
-
- return [
- timestamps,
- totalLoads,
- loadsB,
- loadsA,
- positionsB,
- positionsA,
- ];
- }
-
- // Update chart with all data and trim time scale to current time range.
- updateChartData() {
- const data = this.buildSeriesFromPoints(this.loadHistory);
- const timestamps = data[0];
-
- this.chart.setData(data);
-
- // Auto-scroll to show latest data if user hasn't manually panned
- if (this.currentTimeRange !== null && timestamps.length > 0) {
- const latestTime = timestamps[timestamps.length - 1];
- const minTime = latestTime - this.currentTimeRange;
- this.chart.setScale("x", { min: minTime, max: latestTime });
- }
- }
-
- // Set time range for chart view
- setTimeRange(seconds) {
- this.currentTimeRange = seconds;
-
- // Update button active states
- document.getElementById("range10s").classList.remove("active");
- document.getElementById("range30s").classList.remove("active");
- document.getElementById("range60s").classList.remove("active");
- document.getElementById("range2m").classList.remove("active");
- document.getElementById("rangeAll").classList.remove("active");
-
- if (seconds) {
- this.live = true;
- }
-
- if (seconds === 10) {
- document.getElementById("range10s").classList.add("active");
- } else if (seconds === 30) {
- document.getElementById("range30s").classList.add("active");
- } else if (seconds === 60) {
- document.getElementById("range60s").classList.add("active");
- } else if (seconds === 120) {
- document.getElementById("range2m").classList.add("active");
- } else {
- this.live = false;
- this.updateChartData(); // Update chart with all data
- document.getElementById("rangeAll").classList.add("active");
- }
-
- // Update chart view
- this.update();
- }
-
- // Export chart data as CSV
- exportCSV() {
- if (this.loadHistory.length === 0) {
- alert("No data to export yet!");
- return;
- }
-
- // Build CSV content
- const unitLabel = this.loadUnit.label;
- const csvDecimals = Math.max(2, this.loadUnit.decimals);
- const formatCsvValue = (kg) => {
- const converted = this.loadUnit.toDisplay(kg);
- if (converted == null || !isFinite(converted)) {
- return "";
- }
- return converted.toFixed(csvDecimals);
- };
-
- let csv = `Timestamp,Total Load (${unitLabel}),Right Load (${unitLabel}),Left Load (${unitLabel}),Right Position,Left Position\n`;
-
- for (const point of this.loadHistory) {
- const timestamp = point.timestamp.toISOString();
- const totalKg = point.loadA + point.loadB;
- const totalLoad = formatCsvValue(totalKg);
- const loadA = formatCsvValue(point.loadA);
- const loadB = formatCsvValue(point.loadB);
- const posA = point.posA;
- const posB = point.posB;
- csv += `${timestamp},${totalLoad},${loadA},${loadB},${posA},${posB}\n`;
- }
-
- // Create download link
- const blob = new Blob([csv], { type: "text/csv" });
- const url = URL.createObjectURL(blob);
- const a = document.createElement("a");
- a.href = url;
- a.download = `workout_${new Date().toISOString().split("T")[0]}_${Date.now()}.csv`;
- document.body.appendChild(a);
- a.click();
- document.body.removeChild(a);
- URL.revokeObjectURL(url);
-
- if (this.onLog) {
- this.onLog(
- `Exported ${this.loadHistory.length} data points to CSV`,
- "success",
- );
- }
- }
-
- // Clear all data
- clear() {
- this.loadHistory = [];
- this.update();
- }
-
- // Get current data point count
- getDataCount() {
- return this.loadHistory.length;
- }
-
- // Set event markers for a workout
- setEventMarkers(markers) {
- this.eventMarkers = markers;
- if (this.chart) {
- this.chart.redraw();
- }
- }
-
- // Clear event markers
- clearEventMarkers() {
- this.eventMarkers = [];
- if (this.chart) {
- this.chart.redraw();
- }
- }
-
- // View a specific workout on the graph
- viewWorkout(workout) {
- if (!workout.startTime || !workout.endTime) {
- if (this.onLog) {
- this.onLog("Workout does not have timing information", "error");
- }
- return;
- }
-
- // Set event markers for this workout
- const markers = [
- {
- time: workout.startTime,
- label: "Start",
- color: "#51cf66",
- },
- ];
-
- if (workout.warmupEndTime) {
- markers.push({
- time: workout.warmupEndTime,
- label: "Load",
- color: "#ffa94d",
- });
- }
-
- markers.push({
- time: workout.endTime,
- label: "End",
- color: "#ff6b6b",
- });
-
- this.setEventMarkers(markers);
-
- // Replace chart data with the workout's movement data if available
- let displayedReplayData = false;
- if (Array.isArray(workout.movementData) && workout.movementData.length > 0) {
- const data = this.buildSeriesFromPoints(workout.movementData);
- if (data[0].length > 0) {
- this.chart.setData(data);
- displayedReplayData = true;
- } else if (this.onLog) {
- this.onLog("Workout does not have valid movement data for the chart", "warning");
- }
- } else if (this.onLog) {
- this.onLog("Workout does not have movement data to display", "warning");
- }
-
- // Set time range to show the workout
- this.live = false;
- this.currentTimeRange = null;
-
- // If no replay data was shown, fall back to current load history
- if (!displayedReplayData) {
- this.updateChartData();
- }
-
- // Update button active states to show "All" is active
- document.getElementById("range10s").classList.remove("active");
- document.getElementById("range30s").classList.remove("active");
- document.getElementById("range60s").classList.remove("active");
- document.getElementById("range2m").classList.remove("active");
- document.getElementById("rangeAll").classList.add("active");
-
- // Calculate time bounds with some padding
- const startTime = workout.startTime.getTime() / 1000;
- const endTime = workout.endTime.getTime() / 1000;
- const duration = endTime - startTime;
- const padding = duration * 0.1; // 10% padding on each side
-
- // Set chart scale to show the workout
- if (this.chart) {
- this.chart.setScale("x", {
- min: startTime - padding,
- max: endTime + padding,
- });
- }
-
- if (this.onLog) {
- this.onLog(`Viewing workout: ${workout.mode}`, "info");
- }
- }
-}
+// chart.js - Chart management and visualization
+
+class ChartManager {
+ constructor(containerId) {
+ this.containerId = containerId;
+ this.chart = null;
+ this.container = null;
+ this.loadHistory = [];
+ this.maxHistoryPoints = 72000; // 2hrs at 100ms polling (7200s / 0.1s = 72000 points)
+ this.currentTimeRange = 30; // Current time range in seconds (default 30s)
+ this.live = true;
+ this.onLog = null; // Callback for logging
+ this.updateInterval = null; // Interval handle for periodic updates
+ this.updateFrequency = 10; // Update chart every 10ms
+ this.chartHeight = 300;
+ this.loadUnit = {
+ label: "kg",
+ decimals: 1,
+ toDisplay: (value) => value,
+ };
+ this.eventMarkers = []; // Array of {time: Date, label: string, color: string}
+ this.resizeObserver = null;
+ this._handleWindowResize = null;
+ this.averageLoadLines = null; // Store average load lines: { averageTotal, averageLeft, averageRight, warmupEndTime, endTime }
+ }
+
+ // Initialize uPlot chart
+ init() {
+ const container = document.getElementById(this.containerId);
+ if (!container) {
+ console.warn("Chart container not found yet, will initialize later");
+ return false;
+ }
+
+ this.container = container;
+
+ // uPlot expects data in this format: [timestamps, series1, series2, ...]
+ const data = [
+ [], // timestamps (Unix time in seconds)
+ [], // Total Load
+ [], // Left Cable Load (B)
+ [], // Right Cable Load (A)
+ [], // Left Cable Position (B)
+ [], // Right Cable Position (A)
+ [], // Average Total Load (constant line)
+ [], // Average Left Load (constant line)
+ [], // Average Right Load (constant line)
+ ];
+
+ const manager = this;
+
+ // Plugin to draw event markers
+ const eventMarkersPlugin = {
+ hooks: {
+ draw: [
+ (u) => {
+ const { ctx } = u;
+ const { left, top, width, height } = u.bbox;
+
+ ctx.save();
+
+ // Draw each event marker
+ manager.eventMarkers.forEach((marker) => {
+ const markerTime = marker.time.getTime() / 1000; // Convert to Unix seconds
+ const x = u.valToPos(markerTime, "x", true);
+
+ // Only draw if marker is within visible range
+ if (x >= left && x <= left + width) {
+ // Draw vertical line
+ ctx.strokeStyle = marker.color || "#ff6b6b";
+ ctx.lineWidth = 2;
+ ctx.setLineDash([5, 5]);
+ ctx.beginPath();
+ ctx.moveTo(x, top);
+ ctx.lineTo(x, top + height);
+ ctx.stroke();
+ ctx.setLineDash([]);
+
+ // Draw label
+ ctx.fillStyle = marker.color || "#ff6b6b";
+ ctx.font = "14px sans-serif";
+ ctx.textAlign = "left";
+ ctx.textBaseline = "top";
+
+ // Rotate text 90 degrees and offset from line
+ ctx.save();
+ ctx.translate(x + 14, top + 5);
+ ctx.rotate(Math.PI / 2);
+ ctx.fillText(marker.label, 0, 0);
+ ctx.restore();
+ }
+ });
+
+ ctx.restore();
+ },
+ ],
+ },
+ };
+
+ // Plugin to draw average load lines
+ const averageLoadLinesPlugin = {
+ hooks: {
+ draw: [
+ (u) => {
+ const { ctx } = u;
+ const { left, top, width, height } = u.bbox;
+
+ if (!manager.averageLoadLines) {
+ return;
+ }
+
+ const { averageTotal, averageLeft, averageRight, warmupEndTime, endTime } = manager.averageLoadLines;
+
+ // Only draw if we have time bounds for the workout
+ if (!warmupEndTime || !endTime) {
+ return;
+ }
+
+ const warmupEndSec = warmupEndTime.getTime() / 1000;
+ const endSec = endTime.getTime() / 1000;
+ const x1 = u.valToPos(warmupEndSec, "x", true);
+ const x2 = u.valToPos(endSec, "x", true);
+
+ // Only draw if the window is at least partially within visible range
+ if (x2 < left || x1 > left + width) {
+ return;
+ }
+
+ // Clamp x coordinates to visible area
+ const drawX1 = Math.max(x1, left);
+ const drawX2 = Math.min(x2, left + width);
+
+ ctx.save();
+ ctx.setLineDash([3, 3]);
+ ctx.lineWidth = 1.5;
+
+ // Draw average total load line (blue)
+ if (Number.isFinite(averageTotal)) {
+ const y = u.valToPos(averageTotal, "load", true);
+ if (y >= top && y <= top + height) {
+ ctx.strokeStyle = "rgba(102, 126, 234, 0.6)"; // Semi-transparent blue
+ ctx.beginPath();
+ ctx.moveTo(drawX1, y);
+ ctx.lineTo(drawX2, y);
+ ctx.stroke();
+ }
+ }
+
+ // Draw average left load line (red)
+ if (Number.isFinite(averageLeft)) {
+ const y = u.valToPos(averageLeft, "load", true);
+ if (y >= top && y <= top + height) {
+ ctx.strokeStyle = "rgba(255, 107, 107, 0.6)"; // Semi-transparent red
+ ctx.beginPath();
+ ctx.moveTo(drawX1, y);
+ ctx.lineTo(drawX2, y);
+ ctx.stroke();
+ }
+ }
+
+ // Draw average right load line (green)
+ if (Number.isFinite(averageRight)) {
+ const y = u.valToPos(averageRight, "load", true);
+ if (y >= top && y <= top + height) {
+ ctx.strokeStyle = "rgba(81, 207, 102, 0.6)"; // Semi-transparent green
+ ctx.beginPath();
+ ctx.moveTo(drawX1, y);
+ ctx.lineTo(drawX2, y);
+ ctx.stroke();
+ }
+ }
+
+ ctx.restore();
+ },
+ ],
+ },
+ };
+
+ const opts = {
+ width: container.clientWidth || 800,
+ height: this.chartHeight,
+ plugins: [eventMarkersPlugin, averageLoadLinesPlugin],
+ cursor: {
+ drag: {
+ x: true,
+ y: false,
+ },
+ },
+ scales: {
+ x: { time: true },
+
+ load: {
+ auto: true,
+ range: (u, min, max) => {
+ // Handle invalid data
+ if (!isFinite(max) || max <= 0) {
+ return [0, 10]; // Default to 0–10 when no data or all zeros
+ }
+
+ // Always start from 0, pad 10% above data max
+ const paddedMax = max + max * 0.1;
+ return [0, paddedMax];
+ },
+ },
+
+ position: {
+ auto: true,
+ range: (u, min, max) => {
+ if (!isFinite(max) || max <= 0) {
+ return [0, 100]; // Default to 0–100 when no data or all zeros
+ }
+
+ const paddedMax = max + max * 0.1;
+ return [0, paddedMax];
+ },
+ },
+ },
+ series: [
+ {
+ label: "Time",
+ value: (u, v) => {
+ if (v == null) return "-";
+ const date = new Date(v * 1000);
+ return date.toLocaleTimeString("en-US", {
+ hour: "2-digit",
+ minute: "2-digit",
+ second: "2-digit",
+ hour12: false,
+ });
+ },
+ },
+ {
+ label: "Total Load",
+ stroke: "#667eea",
+ width: 1.5,
+ scale: "load",
+ value: (u, v) => manager.formatLoadValue(v),
+ },
+ {
+ label: "Left Load",
+ stroke: "#ff6b6b",
+ width: 1.5,
+ scale: "load",
+ value: (u, v) => manager.formatLoadValue(v),
+ },
+ {
+ label: "Right Load",
+ stroke: "#51cf66",
+ width: 1.5,
+ scale: "load",
+ value: (u, v) => manager.formatLoadValue(v),
+ },
+ {
+ label: "Left Position",
+ stroke: "#ffa94d",
+ width: 1.5,
+ scale: "position",
+ dash: [5, 5],
+ value: (u, v) => (v == null ? "-" : v.toFixed(0)),
+ },
+ {
+ label: "Right Position",
+ stroke: "#94d82d",
+ width: 1.5,
+ scale: "position",
+ dash: [5, 5],
+ value: (u, v) => (v == null ? "-" : v.toFixed(0)),
+ },
+ {
+ label: "Average Total Load",
+ stroke: "rgba(102, 126, 234, 0.6)",
+ width: 1.5,
+ scale: "load",
+ dash: [3, 3],
+ value: (u, v) => (v == null || v === 0 ? "-" : manager.formatLoadValue(v)),
+ },
+ {
+ label: "Average Left Load",
+ stroke: "rgba(255, 107, 107, 0.6)",
+ width: 1.5,
+ scale: "load",
+ dash: [3, 3],
+ value: (u, v) => (v == null || v === 0 ? "-" : manager.formatLoadValue(v)),
+ },
+ {
+ label: "Average Right Load",
+ stroke: "rgba(81, 207, 102, 0.6)",
+ width: 1.5,
+ scale: "load",
+ dash: [3, 3],
+ value: (u, v) => (v == null || v === 0 ? "-" : manager.formatLoadValue(v)),
+ },
+ ],
+ axes: [
+ {
+ stroke: "#6c757d",
+ grid: {
+ show: true,
+ stroke: "#dee2e6",
+ width: 1,
+ },
+ ticks: {
+ show: true,
+ stroke: "#dee2e6",
+ },
+ values: (u, vals) => {
+ // Format x-axis timestamps as HH:MM:SS only
+ return vals.map((v) => {
+ const date = new Date(v * 1000);
+ return date.toLocaleTimeString("en-US", {
+ hour: "2-digit",
+ minute: "2-digit",
+ second: "2-digit",
+ hour12: false,
+ });
+ });
+ },
+ },
+ {
+ scale: "load",
+ label: `Load (${this.loadUnit.label})`,
+ labelSize: 20,
+ stroke: "#6c757d",
+ size: 40,
+ grid: {
+ show: true,
+ stroke: "#dee2e6",
+ width: 1,
+ },
+ ticks: {
+ show: true,
+ stroke: "#dee2e6",
+ },
+ },
+ {
+ scale: "position",
+ label: "Position (cm)",
+ labelSize: 20,
+ stroke: "#6c757d",
+ size: 50,
+ side: 1, // 1 = right side
+ grid: {
+ show: false, // Don't show grid for position to avoid clutter
+ },
+ ticks: {
+ show: true,
+ stroke: "#dee2e6",
+ },
+ },
+ ],
+ legend: {
+ show: true,
+ live: true,
+ },
+ };
+
+ this.chart = new uPlot(opts, data, container);
+
+ this.attachResizeObservers(container);
+
+ // Start periodic updates
+ this.startPeriodicUpdates();
+
+ return true;
+ }
+
+ attachResizeObservers(container) {
+ if (typeof window === "undefined" || !container) {
+ return;
+ }
+
+ if (!this._handleWindowResize) {
+ this._handleWindowResize = () => {
+ this.resize();
+ };
+ window.addEventListener("resize", this._handleWindowResize);
+ }
+
+ if (typeof window.ResizeObserver === "function") {
+ if (this.resizeObserver) {
+ this.resizeObserver.disconnect();
+ }
+ this.resizeObserver = new window.ResizeObserver(() => {
+ this.resize();
+ });
+ this.resizeObserver.observe(container);
+ }
+ }
+
+ resize() {
+ const container =
+ this.container ||
+ (typeof document !== "undefined"
+ ? document.getElementById(this.containerId)
+ : null);
+
+ if (!this.chart || !container) {
+ return false;
+ }
+
+ const width = container.clientWidth || container.offsetWidth || 0;
+
+ this.chart.setSize({
+ width,
+ height: this.chartHeight,
+ });
+
+ return true;
+ }
+
+ // Start periodic chart updates
+ startPeriodicUpdates() {
+ if (this.updateInterval) {
+ clearInterval(this.updateInterval);
+ }
+
+ // Update chart every 10ms, separate from data collection
+ this.updateInterval = setInterval(() => {
+ this.update();
+ }, this.updateFrequency);
+ }
+
+ // Stop periodic updates
+ stopPeriodicUpdates() {
+ if (this.updateInterval) {
+ clearInterval(this.updateInterval);
+ this.updateInterval = null;
+ }
+ }
+
+ // Add new data point to chart
+ addData(sample) {
+ // Add to load history
+ this.loadHistory.push({
+ timestamp: sample.timestamp,
+ loadA: sample.loadA,
+ loadB: sample.loadB,
+ posA: sample.posA,
+ posB: sample.posB,
+ });
+
+ // Trim history to max points (2hr limit)
+ if (this.loadHistory.length > this.maxHistoryPoints) {
+ const removed = this.loadHistory.shift();
+
+ // Log when we hit the limit for the first time
+ if (this.loadHistory.length === this.maxHistoryPoints && this.onLog) {
+ this.onLog(
+ "Reached 2hr data limit. Oldest data points will be removed as new data arrives.",
+ "info",
+ );
+ }
+ }
+
+ // Chart updates happen on periodic interval
+ }
+
+ // Update function called periodically to either add new data or if not live, do nothing.
+ update() {
+ if (!this.chart || this.loadHistory.length === 0 || !this.live) return;
+ this.updateChartData();
+ }
+
+ setLoadUnit(config) {
+ if (!config) {
+ return;
+ }
+
+ this.loadUnit = {
+ label: config.label || "kg",
+ decimals: typeof config.decimals === "number" ? config.decimals : 1,
+ toDisplay:
+ typeof config.toDisplay === "function"
+ ? config.toDisplay
+ : (value) => value,
+ };
+
+ if (this.chart && this.chart.axes && this.chart.axes[1]) {
+ this.chart.axes[1].label = `Load (${this.loadUnit.label})`;
+ this.updateChartData();
+ }
+ }
+
+ formatLoadValue(value) {
+ if (value == null || !isFinite(value)) {
+ return "-";
+ }
+
+ return `${value.toFixed(this.loadUnit.decimals)} ${this.loadUnit.label}`;
+ }
+
+ buildSeriesFromPoints(points) {
+ const timestamps = [];
+ const totalLoads = [];
+ const loadsB = [];
+ const loadsA = [];
+ const positionsB = [];
+ const positionsA = [];
+ const avgTotalSeries = [];
+ const avgLeftSeries = [];
+ const avgRightSeries = [];
+
+ for (const point of points) {
+ if (!point || !(point.timestamp instanceof Date)) {
+ continue;
+ }
+
+ const timestampSeconds = point.timestamp.getTime() / 1000;
+ timestamps.push(timestampSeconds);
+
+ const loadA = Number(point.loadA) || 0;
+ const loadB = Number(point.loadB) || 0;
+ const totalKg = loadA + loadB;
+
+ const displayTotal = this.loadUnit.toDisplay(totalKg);
+ const displayB = this.loadUnit.toDisplay(loadB);
+ const displayA = this.loadUnit.toDisplay(loadA);
+
+ totalLoads.push(
+ displayTotal != null && isFinite(displayTotal) ? displayTotal : 0,
+ );
+ loadsB.push(displayB != null && isFinite(displayB) ? displayB : 0);
+ loadsA.push(displayA != null && isFinite(displayA) ? displayA : 0);
+ positionsB.push(Number(point.posB) || 0);
+ positionsA.push(Number(point.posA) || 0);
+
+ // Placeholder for average lines (will be populated when averageLoadLines is set)
+ avgTotalSeries.push(0);
+ avgLeftSeries.push(0);
+ avgRightSeries.push(0);
+ }
+
+ return [
+ timestamps,
+ totalLoads,
+ loadsB,
+ loadsA,
+ positionsB,
+ positionsA,
+ avgTotalSeries,
+ avgLeftSeries,
+ avgRightSeries,
+ ];
+ }
+
+ // Update chart with all data and trim time scale to current time range.
+ updateChartData() {
+ const data = this.buildSeriesFromPoints(this.loadHistory);
+ const timestamps = data[0];
+
+ this.chart.setData(data);
+
+ // Auto-scroll to show latest data if user hasn't manually panned
+ if (this.currentTimeRange !== null && timestamps.length > 0) {
+ const latestTime = timestamps[timestamps.length - 1];
+ const minTime = latestTime - this.currentTimeRange;
+ this.chart.setScale("x", { min: minTime, max: latestTime });
+ }
+ }
+
+ // Set time range for chart view
+ setTimeRange(seconds) {
+ this.currentTimeRange = seconds;
+
+ // Update button active states
+ document.getElementById("range10s").classList.remove("active");
+ document.getElementById("range30s").classList.remove("active");
+ document.getElementById("range60s").classList.remove("active");
+ document.getElementById("range2m").classList.remove("active");
+ document.getElementById("rangeAll").classList.remove("active");
+
+ if (seconds) {
+ this.live = true;
+ }
+
+ if (seconds === 10) {
+ document.getElementById("range10s").classList.add("active");
+ } else if (seconds === 30) {
+ document.getElementById("range30s").classList.add("active");
+ } else if (seconds === 60) {
+ document.getElementById("range60s").classList.add("active");
+ } else if (seconds === 120) {
+ document.getElementById("range2m").classList.add("active");
+ } else {
+ this.live = false;
+ this.updateChartData(); // Update chart with all data
+ document.getElementById("rangeAll").classList.add("active");
+ }
+
+ // Update chart view
+ this.update();
+ }
+
+ // Export chart data as CSV
+ exportCSV() {
+ if (this.loadHistory.length === 0) {
+ alert("No data to export yet!");
+ return;
+ }
+
+ // Build CSV content
+ const unitLabel = this.loadUnit.label;
+ const csvDecimals = Math.max(2, this.loadUnit.decimals);
+ const formatCsvValue = (kg) => {
+ const converted = this.loadUnit.toDisplay(kg);
+ if (converted == null || !isFinite(converted)) {
+ return "";
+ }
+ return converted.toFixed(csvDecimals);
+ };
+
+ let csv = `Timestamp,Total Load (${unitLabel}),Right Load (${unitLabel}),Left Load (${unitLabel}),Right Position,Left Position\n`;
+
+ for (const point of this.loadHistory) {
+ const timestamp = point.timestamp.toISOString();
+ const totalKg = point.loadA + point.loadB;
+ const totalLoad = formatCsvValue(totalKg);
+ const loadA = formatCsvValue(point.loadA);
+ const loadB = formatCsvValue(point.loadB);
+ const posA = point.posA;
+ const posB = point.posB;
+ csv += `${timestamp},${totalLoad},${loadA},${loadB},${posA},${posB}\n`;
+ }
+
+ // Create download link
+ const blob = new Blob([csv], { type: "text/csv" });
+ const url = URL.createObjectURL(blob);
+ const a = document.createElement("a");
+ a.href = url;
+ a.download = `workout_${new Date().toISOString().split("T")[0]}_${Date.now()}.csv`;
+ document.body.appendChild(a);
+ a.click();
+ document.body.removeChild(a);
+ URL.revokeObjectURL(url);
+
+ if (this.onLog) {
+ this.onLog(
+ `Exported ${this.loadHistory.length} data points to CSV`,
+ "success",
+ );
+ }
+ }
+
+ // Clear all data
+ clear() {
+ this.loadHistory = [];
+ this.update();
+ }
+
+ // Get current data point count
+ getDataCount() {
+ return this.loadHistory.length;
+ }
+
+ // Set event markers for a workout
+ setEventMarkers(markers) {
+ this.eventMarkers = markers;
+ if (this.chart) {
+ this.chart.redraw();
+ }
+ }
+
+ // Clear event markers
+ clearEventMarkers() {
+ this.eventMarkers = [];
+ if (this.chart) {
+ this.chart.redraw();
+ }
+ }
+
+ // Set average load lines to display on chart
+ setAverageLoadLines(averageTotal, averageLeft, averageRight, warmupEndTime, endTime) {
+ this.averageLoadLines = {
+ averageTotal: Number.isFinite(averageTotal) ? averageTotal : null,
+ averageLeft: Number.isFinite(averageLeft) ? averageLeft : null,
+ averageRight: Number.isFinite(averageRight) ? averageRight : null,
+ warmupEndTime: warmupEndTime instanceof Date ? warmupEndTime : null,
+ endTime: endTime instanceof Date ? endTime : null,
+ };
+
+ // Update the average series with the constant values if chart data exists
+ if (this.chart && this.chart.data) {
+ const data = [...this.chart.data];
+ // Series indices: 6 = avgTotal, 7 = avgLeft, 8 = avgRight
+ if (data[6]) {
+ data[6] = data[6].map(() => (Number.isFinite(averageTotal) ? this.loadUnit.toDisplay(averageTotal) : 0));
+ }
+ if (data[7]) {
+ data[7] = data[7].map(() => (Number.isFinite(averageLeft) ? this.loadUnit.toDisplay(averageLeft) : 0));
+ }
+ if (data[8]) {
+ data[8] = data[8].map(() => (Number.isFinite(averageRight) ? this.loadUnit.toDisplay(averageRight) : 0));
+ }
+ this.chart.setData(data);
+ }
+
+ if (this.chart) {
+ this.chart.redraw();
+ }
+ }
+
+ // Clear average load lines
+ clearAverageLoadLines() {
+ this.averageLoadLines = null;
+ if (this.chart) {
+ this.chart.redraw();
+ }
+ }
+
+ // View a specific workout on the graph
+ viewWorkout(workout) {
+ if (!workout.startTime || !workout.endTime) {
+ if (this.onLog) {
+ this.onLog("Workout does not have timing information", "error");
+ }
+ return;
+ }
+
+ // Set event markers for this workout
+ const markers = [
+ {
+ time: workout.startTime,
+ label: "Start",
+ color: "#51cf66",
+ },
+ ];
+
+ if (workout.warmupEndTime) {
+ markers.push({
+ time: workout.warmupEndTime,
+ label: "Load",
+ color: "#ffa94d",
+ });
+ }
+
+ markers.push({
+ time: workout.endTime,
+ label: "End",
+ color: "#ff6b6b",
+ });
+
+ this.setEventMarkers(markers);
+
+ // Replace chart data with the workout's movement data if available
+ let displayedReplayData = false;
+ if (Array.isArray(workout.movementData) && workout.movementData.length > 0) {
+ const data = this.buildSeriesFromPoints(workout.movementData);
+ if (data[0].length > 0) {
+ this.chart.setData(data);
+ displayedReplayData = true;
+ } else if (this.onLog) {
+ this.onLog("Workout does not have valid movement data for the chart", "warning");
+ }
+ } else if (this.onLog) {
+ this.onLog("Workout does not have movement data to display", "warning");
+ }
+
+ // Set average load lines if available
+ const averageTotal = Number.isFinite(workout.averageLoad) ? workout.averageLoad : null;
+ const averageLeft = Number.isFinite(workout.averageLoadLeft) ? workout.averageLoadLeft : null;
+ const averageRight = Number.isFinite(workout.averageLoadRight) ? workout.averageLoadRight : null;
+ if (averageTotal !== null || averageLeft !== null || averageRight !== null) {
+ this.setAverageLoadLines(
+ averageTotal,
+ averageLeft,
+ averageRight,
+ workout.warmupEndTime,
+ workout.endTime,
+ );
+ } else {
+ this.clearAverageLoadLines();
+ }
+
+ // Set time range to show the workout
+ this.live = false;
+ this.currentTimeRange = null;
+
+ // If no replay data was shown, fall back to current load history
+ if (!displayedReplayData) {
+ this.updateChartData();
+ }
+
+ // Update button active states to show "All" is active
+ document.getElementById("range10s").classList.remove("active");
+ document.getElementById("range30s").classList.remove("active");
+ document.getElementById("range60s").classList.remove("active");
+ document.getElementById("range2m").classList.remove("active");
+ document.getElementById("rangeAll").classList.add("active");
+
+ // Calculate time bounds with some padding
+ const startTime = workout.startTime.getTime() / 1000;
+ const endTime = workout.endTime.getTime() / 1000;
+ const duration = endTime - startTime;
+ const padding = duration * 0.1; // 10% padding on each side
+
+ // Set chart scale to show the workout
+ if (this.chart) {
+ this.chart.setScale("x", {
+ min: startTime - padding,
+ max: endTime + padding,
+ });
+ }
+
+ if (this.onLog) {
+ this.onLog(`Viewing workout: ${workout.mode}`, "info");
+ }
+ }
+}
diff --git a/workout-time/dropbox.js b/workout-time/dropbox.js
index d4afc0c..10e7dcc 100644
--- a/workout-time/dropbox.js
+++ b/workout-time/dropbox.js
@@ -1,6 +1,6 @@
-// dropbox.js - Dropbox integration for user-owned cloud storage
-
-class DropboxManager {
+// dropbox.js - Dropbox integration for user-owned cloud storage
+
+class DropboxManager {
constructor() {
// IMPORTANT: Replace this with your actual Dropbox App Key
// Create app at: https://www.dropbox.com/developers/apps
@@ -15,28 +15,28 @@ class DropboxManager {
this._tokenInfo = null;
this._currentAccessToken = null;
}
-
- log(message, type = "info") {
- console.log(`[Dropbox ${type}] ${message}`);
- if (this.onLog) {
- this.onLog(message, type);
- }
- }
-
- // Initialize - check if we have a stored token or if we're returning from OAuth
- async init() {
- // Check if we're returning from OAuth redirect
- const urlParams = new URLSearchParams(window.location.search);
- const code = urlParams.get("code");
-
- if (code) {
- // Complete OAuth flow
- await this.handleOAuthCallback(code);
- // Clean up URL
- window.history.replaceState({}, document.title, window.location.pathname);
- return;
- }
-
+
+ log(message, type = "info") {
+ console.log(`[Dropbox ${type}] ${message}`);
+ if (this.onLog) {
+ this.onLog(message, type);
+ }
+ }
+
+ // Initialize - check if we have a stored token or if we're returning from OAuth
+ async init() {
+ // Check if we're returning from OAuth redirect
+ const urlParams = new URLSearchParams(window.location.search);
+ const code = urlParams.get("code");
+
+ if (code) {
+ // Complete OAuth flow
+ await this.handleOAuthCallback(code);
+ // Clean up URL
+ window.history.replaceState({}, document.title, window.location.pathname);
+ return;
+ }
+
// Check for existing token
const storedToken = this.getStoredToken();
if (storedToken?.refreshToken && this.isTokenExpired(storedToken)) {
@@ -67,72 +67,72 @@ class DropboxManager {
}
}
}
-
- // Start OAuth flow with PKCE
- async connect() {
- if (this.clientId === "YOUR_DROPBOX_APP_KEY") {
- alert(
- "Dropbox integration not configured. Please set your Dropbox App Key in dropbox.js\n\n" +
- "Steps:\n" +
- "1. Create app at https://www.dropbox.com/developers/apps\n" +
- "2. Choose 'Scoped access' and 'App folder' access\n" +
- "3. Copy App key and replace YOUR_DROPBOX_APP_KEY in dropbox.js"
- );
- return;
- }
-
- this.log("Starting Dropbox OAuth flow...", "info");
-
- // Generate PKCE code verifier and challenge
- const verifier = this.generateCodeVerifier();
- const challenge = await this.generateCodeChallenge(verifier);
-
- // Store verifier for later
- sessionStorage.setItem("pkce_verifier", verifier);
-
- // Build authorization URL
- const authUrl = new URL("https://www.dropbox.com/oauth2/authorize");
- authUrl.searchParams.append("client_id", this.clientId);
- authUrl.searchParams.append("response_type", "code");
- authUrl.searchParams.append("code_challenge", challenge);
- authUrl.searchParams.append("code_challenge_method", "S256");
- authUrl.searchParams.append("redirect_uri", this.redirectUri);
- authUrl.searchParams.append("token_access_type", "offline"); // Get refresh token
-
- // Redirect to Dropbox
- window.location.href = authUrl.toString();
- }
-
- // Handle OAuth callback with authorization code
- async handleOAuthCallback(code) {
- this.log("Handling OAuth callback...", "info");
-
- const verifier = sessionStorage.getItem("pkce_verifier");
- if (!verifier) {
- this.log("Missing PKCE verifier in session", "error");
- return;
- }
-
- try {
- // Exchange authorization code for access token
- const response = await fetch("https://api.dropbox.com/oauth2/token", {
- method: "POST",
- headers: {
- "Content-Type": "application/x-www-form-urlencoded",
- },
- body: new URLSearchParams({
- code: code,
- grant_type: "authorization_code",
- code_verifier: verifier,
- client_id: this.clientId,
- redirect_uri: this.redirectUri,
- }),
- });
-
- if (!response.ok) {
- throw new Error(`Token exchange failed: ${response.statusText}`);
- }
-
+
+ // Start OAuth flow with PKCE
+ async connect() {
+ if (this.clientId === "YOUR_DROPBOX_APP_KEY") {
+ alert(
+ "Dropbox integration not configured. Please set your Dropbox App Key in dropbox.js\n\n" +
+ "Steps:\n" +
+ "1. Create app at https://www.dropbox.com/developers/apps\n" +
+ "2. Choose 'Scoped access' and 'App folder' access\n" +
+ "3. Copy App key and replace YOUR_DROPBOX_APP_KEY in dropbox.js"
+ );
+ return;
+ }
+
+ this.log("Starting Dropbox OAuth flow...", "info");
+
+ // Generate PKCE code verifier and challenge
+ const verifier = this.generateCodeVerifier();
+ const challenge = await this.generateCodeChallenge(verifier);
+
+ // Store verifier for later
+ sessionStorage.setItem("pkce_verifier", verifier);
+
+ // Build authorization URL
+ const authUrl = new URL("https://www.dropbox.com/oauth2/authorize");
+ authUrl.searchParams.append("client_id", this.clientId);
+ authUrl.searchParams.append("response_type", "code");
+ authUrl.searchParams.append("code_challenge", challenge);
+ authUrl.searchParams.append("code_challenge_method", "S256");
+ authUrl.searchParams.append("redirect_uri", this.redirectUri);
+ authUrl.searchParams.append("token_access_type", "offline"); // Get refresh token
+
+ // Redirect to Dropbox
+ window.location.href = authUrl.toString();
+ }
+
+ // Handle OAuth callback with authorization code
+ async handleOAuthCallback(code) {
+ this.log("Handling OAuth callback...", "info");
+
+ const verifier = sessionStorage.getItem("pkce_verifier");
+ if (!verifier) {
+ this.log("Missing PKCE verifier in session", "error");
+ return;
+ }
+
+ try {
+ // Exchange authorization code for access token
+ const response = await fetch("https://api.dropbox.com/oauth2/token", {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/x-www-form-urlencoded",
+ },
+ body: new URLSearchParams({
+ code: code,
+ grant_type: "authorization_code",
+ code_verifier: verifier,
+ client_id: this.clientId,
+ redirect_uri: this.redirectUri,
+ }),
+ });
+
+ if (!response.ok) {
+ throw new Error(`Token exchange failed: ${response.statusText}`);
+ }
+
const data = await response.json();
const tokenInfo = {
accessToken: data.access_token,
@@ -150,23 +150,23 @@ class DropboxManager {
// Get user info
const client = await this.ensureDropboxClient();
const account = await client.usersGetCurrentAccount();
- this.account = account?.result || null;
- this.log(`Connected to Dropbox as ${account.result.name.display_name}`, "success");
-
- // Create app folder structure
- await this.initializeFolderStructure();
-
- this.notifyConnectionChange();
-
- // Clean up session storage
- sessionStorage.removeItem("pkce_verifier");
- } catch (error) {
- this.log(`OAuth callback failed: ${error.message}`, "error");
- throw error;
- }
- }
-
- // Disconnect from Dropbox
+ this.account = account?.result || null;
+ this.log(`Connected to Dropbox as ${account.result.name.display_name}`, "success");
+
+ // Create app folder structure
+ await this.initializeFolderStructure();
+
+ this.notifyConnectionChange();
+
+ // Clean up session storage
+ sessionStorage.removeItem("pkce_verifier");
+ } catch (error) {
+ this.log(`OAuth callback failed: ${error.message}`, "error");
+ throw error;
+ }
+ }
+
+ // Disconnect from Dropbox
disconnect() {
this.clearStoredToken();
this.dbx = null;
@@ -176,7 +176,7 @@ class DropboxManager {
this.log("Disconnected from Dropbox", "info");
this.notifyConnectionChange();
}
-
+
// Initialize folder structure in user's Dropbox
async initializeFolderStructure() {
const client = await this.ensureDropboxClient();
@@ -215,8 +215,8 @@ class DropboxManager {
}
}
}
-
- // Save workout to Dropbox
+
+ // Save workout to Dropbox
async saveWorkout(workout) {
if (!this.isConnected) {
throw new Error("Not connected to Dropbox");
@@ -229,25 +229,57 @@ class DropboxManager {
const filename = `workout_${timestamp.toISOString().replace(/[:.]/g, "-")}.json`;
const path = `/workouts/${filename}`;
- // Convert workout to JSON
- const contents = JSON.stringify(workout, null, 2);
-
- // Upload to Dropbox
+ // Convert workout to JSON
+ const contents = JSON.stringify(workout, null, 2);
+
+ // Upload to Dropbox
await client.filesUpload({
path: path,
contents: contents,
mode: { ".tag": "add" },
autorename: true,
});
-
- this.log(`Saved workout: ${filename}`, "success");
- return true;
- } catch (error) {
- this.log(`Failed to save workout: ${error.message}`, "error");
- throw error;
- }
- }
-
+
+ this.log(`Saved workout: ${filename}`, "success");
+ return true;
+ } catch (error) {
+ this.log(`Failed to save workout: ${error.message}`, "error");
+ throw error;
+ }
+ }
+
+ async overwriteWorkout(workout) {
+ if (!this.isConnected) {
+ throw new Error("Not connected to Dropbox");
+ }
+
+ try {
+ const client = await this.ensureDropboxClient();
+
+ // Get the original path from metadata
+ const originalPath = workout?._dropboxMetadata?.path;
+ if (!originalPath) {
+ throw new Error("No Dropbox path metadata found. Cannot overwrite.");
+ }
+
+ // Convert workout to JSON (exclude metadata from the JSON)
+ const contents = JSON.stringify(workout, null, 2);
+
+ // Overwrite existing file
+ await client.filesUpload({
+ path: originalPath,
+ contents: contents,
+ mode: { ".tag": "overwrite" },
+ });
+
+ this.log(`Overwritten workout: ${workout?._dropboxMetadata?.name || originalPath}`, "success");
+ return true;
+ } catch (error) {
+ this.log(`Failed to overwrite workout: ${error.message}`, "error");
+ throw error;
+ }
+ }
+
// Load workouts from Dropbox. By default returns latest 25, but maxEntries can override.
async loadWorkouts(options = {}) {
if (!this.isConnected) {
@@ -258,36 +290,36 @@ class DropboxManager {
const client = await this.ensureDropboxClient();
this.log("Loading workouts from Dropbox...", "info");
- const requestedMax =
- typeof options.maxEntries === "number"
- ? options.maxEntries
- : options.maxEntries === Infinity
- ? Infinity
- : 25;
- const enforceLimit = Number.isFinite(requestedMax);
- const maxWorkoutsToSync = enforceLimit ? requestedMax : Infinity;
- const topFiles = [];
- let totalFileCount = 0;
-
- const considerEntries = (entries) => {
- for (const entry of entries) {
- if (entry[".tag"] === "file" && entry.name.endsWith(".json")) {
- totalFileCount += 1;
- topFiles.push(entry);
- }
- }
-
- topFiles.sort((a, b) => {
- const aTime = new Date(a.server_modified || a.client_modified || 0).getTime();
- const bTime = new Date(b.server_modified || b.client_modified || 0).getTime();
- return bTime - aTime;
- });
-
- if (enforceLimit && topFiles.length > maxWorkoutsToSync) {
- topFiles.length = maxWorkoutsToSync;
- }
- };
-
+ const requestedMax =
+ typeof options.maxEntries === "number"
+ ? options.maxEntries
+ : options.maxEntries === Infinity
+ ? Infinity
+ : 25;
+ const enforceLimit = Number.isFinite(requestedMax);
+ const maxWorkoutsToSync = enforceLimit ? requestedMax : Infinity;
+ const topFiles = [];
+ let totalFileCount = 0;
+
+ const considerEntries = (entries) => {
+ for (const entry of entries) {
+ if (entry[".tag"] === "file" && entry.name.endsWith(".json")) {
+ totalFileCount += 1;
+ topFiles.push(entry);
+ }
+ }
+
+ topFiles.sort((a, b) => {
+ const aTime = new Date(a.server_modified || a.client_modified || 0).getTime();
+ const bTime = new Date(b.server_modified || b.client_modified || 0).getTime();
+ return bTime - aTime;
+ });
+
+ if (enforceLimit && topFiles.length > maxWorkoutsToSync) {
+ topFiles.length = maxWorkoutsToSync;
+ }
+ };
+
let response = await client.filesListFolder({ path: "/workouts" });
considerEntries(response.result.entries || []);
let cursor = response.result.cursor;
@@ -297,44 +329,44 @@ class DropboxManager {
cursor = response.result.cursor;
considerEntries(response.result.entries || []);
}
-
- this.log(`Found ${totalFileCount} workout files`, "info");
-
- if (enforceLimit && totalFileCount > maxWorkoutsToSync) {
- this.log(
- `Limiting sync to the latest ${maxWorkoutsToSync} workouts`,
- "info",
- );
- }
-
- topFiles.sort((a, b) => {
- const aTime = new Date(a.server_modified || a.client_modified || 0).getTime();
- const bTime = new Date(b.server_modified || b.client_modified || 0).getTime();
- return bTime - aTime;
- });
-
- const workouts = [];
- for (const file of topFiles) {
- try {
+
+ this.log(`Found ${totalFileCount} workout files`, "info");
+
+ if (enforceLimit && totalFileCount > maxWorkoutsToSync) {
+ this.log(
+ `Limiting sync to the latest ${maxWorkoutsToSync} workouts`,
+ "info",
+ );
+ }
+
+ topFiles.sort((a, b) => {
+ const aTime = new Date(a.server_modified || a.client_modified || 0).getTime();
+ const bTime = new Date(b.server_modified || b.client_modified || 0).getTime();
+ return bTime - aTime;
+ });
+
+ const workouts = [];
+ for (const file of topFiles) {
+ try {
const downloadResponse = await client.filesDownload({ path: file.path_lower });
- const fileBlob = downloadResponse.result.fileBlob;
- const text = await fileBlob.text();
- const workout = JSON.parse(text);
-
- // Convert timestamp strings back to Date objects
- if (workout.timestamp) {
- workout.timestamp = new Date(workout.timestamp);
- }
- if (workout.startTime) {
- workout.startTime = new Date(workout.startTime);
- }
- if (workout.warmupEndTime) {
- workout.warmupEndTime = new Date(workout.warmupEndTime);
- }
- if (workout.endTime) {
- workout.endTime = new Date(workout.endTime);
- }
-
+ const fileBlob = downloadResponse.result.fileBlob;
+ const text = await fileBlob.text();
+ const workout = JSON.parse(text);
+
+ // Convert timestamp strings back to Date objects
+ if (workout.timestamp) {
+ workout.timestamp = new Date(workout.timestamp);
+ }
+ if (workout.startTime) {
+ workout.startTime = new Date(workout.startTime);
+ }
+ if (workout.warmupEndTime) {
+ workout.warmupEndTime = new Date(workout.warmupEndTime);
+ }
+ if (workout.endTime) {
+ workout.endTime = new Date(workout.endTime);
+ }
+
this.attachDropboxMetadata(workout, {
path: file.path_lower,
name: file.name,
@@ -342,19 +374,19 @@ class DropboxManager {
rev: downloadResponse?.result?.rev || downloadResponse?.result?.metadata?.rev || file.rev || null,
});
workouts.push(workout);
- } catch (error) {
- this.log(`Failed to load ${file.name}: ${error.message}`, "error");
- }
- }
-
- // Sort by timestamp, newest first
- workouts.sort((a, b) => {
- const timeA = (a.timestamp || a.endTime || new Date(0)).getTime();
- const timeB = (b.timestamp || b.endTime || new Date(0)).getTime();
- return timeB - timeA;
- });
-
- this.log(`Loaded ${workouts.length} workouts`, "success");
+ } catch (error) {
+ this.log(`Failed to load ${file.name}: ${error.message}`, "error");
+ }
+ }
+
+ // Sort by timestamp, newest first
+ workouts.sort((a, b) => {
+ const timeA = (a.timestamp || a.endTime || new Date(0)).getTime();
+ const timeB = (b.timestamp || b.endTime || new Date(0)).getTime();
+ return timeB - timeA;
+ });
+
+ this.log(`Loaded ${workouts.length} workouts`, "success");
return workouts;
} catch (error) {
this.log(`Failed to load workouts: ${error.message}`, "error");
@@ -414,7 +446,7 @@ class DropboxManager {
customExercisesPath() {
return "/custom_exercises/custom_exercises.json";
}
-
+
async loadPlansIndex() {
if (!this.isConnected) {
throw new Error("Not connected to Dropbox");
@@ -423,49 +455,49 @@ class DropboxManager {
try {
const client = await this.ensureDropboxClient();
const response = await client.filesDownload({ path: this.plansIndexPath() });
- const fileBlob = response.result.fileBlob;
- const text = await fileBlob.text();
- const data = JSON.parse(text);
-
- const plans = data && typeof data.plans === "object" ? data.plans : {};
- return {
- version: data?.version ?? 1,
- updatedAt: data?.updatedAt ?? null,
- plans,
- };
- } catch (error) {
- const summary = error?.error?.error_summary || "";
- if (summary.includes("path/not_found/")) {
- this.log("Plans index not found in Dropbox; starting with an empty set", "info");
- return { version: 1, updatedAt: null, plans: {} };
- }
-
- this.log(`Failed to load plans index: ${error.message}`, "error");
- throw error;
- }
- }
-
+ const fileBlob = response.result.fileBlob;
+ const text = await fileBlob.text();
+ const data = JSON.parse(text);
+
+ const plans = data && typeof data.plans === "object" ? data.plans : {};
+ return {
+ version: data?.version ?? 1,
+ updatedAt: data?.updatedAt ?? null,
+ plans,
+ };
+ } catch (error) {
+ const summary = error?.error?.error_summary || "";
+ if (summary.includes("path/not_found/")) {
+ this.log("Plans index not found in Dropbox; starting with an empty set", "info");
+ return { version: 1, updatedAt: null, plans: {} };
+ }
+
+ this.log(`Failed to load plans index: ${error.message}`, "error");
+ throw error;
+ }
+ }
+
async savePlansIndex(plansMap) {
if (!this.isConnected) {
throw new Error("Not connected to Dropbox");
}
- const payload = {
- version: 1,
- updatedAt: new Date().toISOString(),
- plans: plansMap || {},
- };
-
+ const payload = {
+ version: 1,
+ updatedAt: new Date().toISOString(),
+ plans: plansMap || {},
+ };
+
const client = await this.ensureDropboxClient();
await client.filesUpload({
path: this.plansIndexPath(),
contents: JSON.stringify(payload, null, 2),
mode: { ".tag": "overwrite" },
});
-
- return true;
- }
-
+
+ return true;
+ }
+
async loadPersonalRecords() {
if (!this.isConnected) {
throw new Error("Not connected to Dropbox");
@@ -474,50 +506,50 @@ class DropboxManager {
try {
const client = await this.ensureDropboxClient();
const response = await client.filesDownload({ path: this.personalRecordsPath() });
- const fileBlob = response.result.fileBlob;
- const text = await fileBlob.text();
- const data = JSON.parse(text);
-
- const records = Array.isArray(data?.records) ? data.records : [];
- return {
- version: data?.version ?? 1,
- updatedAt: data?.updatedAt ?? null,
- records,
- };
- } catch (error) {
- const summary = error?.error?.error_summary || "";
- if (summary.includes("path/not_found/")) {
- this.log("Personal records file not found in Dropbox; starting fresh", "info");
- return { version: 1, updatedAt: null, records: [] };
- }
-
- this.log(`Failed to load personal records: ${error.message}`, "error");
- throw error;
- }
- }
-
+ const fileBlob = response.result.fileBlob;
+ const text = await fileBlob.text();
+ const data = JSON.parse(text);
+
+ const records = Array.isArray(data?.records) ? data.records : [];
+ return {
+ version: data?.version ?? 1,
+ updatedAt: data?.updatedAt ?? null,
+ records,
+ };
+ } catch (error) {
+ const summary = error?.error?.error_summary || "";
+ if (summary.includes("path/not_found/")) {
+ this.log("Personal records file not found in Dropbox; starting fresh", "info");
+ return { version: 1, updatedAt: null, records: [] };
+ }
+
+ this.log(`Failed to load personal records: ${error.message}`, "error");
+ throw error;
+ }
+ }
+
async savePersonalRecords(recordsPayload = {}) {
if (!this.isConnected) {
throw new Error("Not connected to Dropbox");
}
- const payload = {
- version: 1,
- updatedAt: new Date().toISOString(),
- records: Array.isArray(recordsPayload.records)
- ? recordsPayload.records
- : Array.isArray(recordsPayload)
- ? recordsPayload
- : [],
- };
-
+ const payload = {
+ version: 1,
+ updatedAt: new Date().toISOString(),
+ records: Array.isArray(recordsPayload.records)
+ ? recordsPayload.records
+ : Array.isArray(recordsPayload)
+ ? recordsPayload
+ : [],
+ };
+
const client = await this.ensureDropboxClient();
await client.filesUpload({
path: this.personalRecordsPath(),
contents: JSON.stringify(payload, null, 2),
mode: { ".tag": "overwrite" },
});
-
+
this.log(`Saved ${payload.records.length} personal record(s)`, "success");
return true;
}
@@ -577,27 +609,27 @@ class DropboxManager {
this.log(`Saved plan "${name}" to Dropbox`, "success");
return true;
}
-
- async deletePlan(name) {
- if (!this.isConnected) {
- throw new Error("Not connected to Dropbox");
- }
-
- const index = await this.loadPlansIndex();
- const plans = index.plans || {};
-
- if (!Object.prototype.hasOwnProperty.call(plans, name)) {
- this.log(`Plan "${name}" not found in Dropbox`, "warning");
- return false;
- }
-
- delete plans[name];
- await this.savePlansIndex(plans);
- this.log(`Deleted plan "${name}" from Dropbox`, "info");
- return true;
- }
-
- // Delete a workout from Dropbox (by timestamp match)
+
+ async deletePlan(name) {
+ if (!this.isConnected) {
+ throw new Error("Not connected to Dropbox");
+ }
+
+ const index = await this.loadPlansIndex();
+ const plans = index.plans || {};
+
+ if (!Object.prototype.hasOwnProperty.call(plans, name)) {
+ this.log(`Plan "${name}" not found in Dropbox`, "warning");
+ return false;
+ }
+
+ delete plans[name];
+ await this.savePlansIndex(plans);
+ this.log(`Deleted plan "${name}" from Dropbox`, "info");
+ return true;
+ }
+
+ // Delete a workout from Dropbox (by timestamp match)
async deleteWorkout(workout) {
if (!this.isConnected) {
throw new Error("Not connected to Dropbox");
@@ -607,39 +639,39 @@ class DropboxManager {
const client = await this.ensureDropboxClient();
// Find the file with matching timestamp
const response = await client.filesListFolder({ path: "/workouts" });
- const timestampValue = workout.timestamp || workout.endTime;
- const timestamp =
- timestampValue instanceof Date
- ? timestampValue
- : timestampValue
- ? new Date(timestampValue)
- : null;
-
- if (!timestamp || Number.isNaN(timestamp.getTime())) {
- this.log("Workout timestamp not available for Dropbox deletion", "error");
- return false;
- }
-
- const timestampStr = timestamp.toISOString().replace(/[:.]/g, "-");
-
- const file = response.result.entries.find(
- (entry) => entry.name.includes(timestampStr)
- );
-
+ const timestampValue = workout.timestamp || workout.endTime;
+ const timestamp =
+ timestampValue instanceof Date
+ ? timestampValue
+ : timestampValue
+ ? new Date(timestampValue)
+ : null;
+
+ if (!timestamp || Number.isNaN(timestamp.getTime())) {
+ this.log("Workout timestamp not available for Dropbox deletion", "error");
+ return false;
+ }
+
+ const timestampStr = timestamp.toISOString().replace(/[:.]/g, "-");
+
+ const file = response.result.entries.find(
+ (entry) => entry.name.includes(timestampStr)
+ );
+
if (file) {
await client.filesDeleteV2({ path: file.path_lower });
- this.log(`Deleted workout: ${file.name}`, "success");
- return true;
- } else {
- this.log("Workout file not found in Dropbox", "error");
- return false;
- }
- } catch (error) {
- this.log(`Failed to delete workout: ${error.message}`, "error");
- throw error;
- }
- }
-
+ this.log(`Deleted workout: ${file.name}`, "success");
+ return true;
+ } else {
+ this.log("Workout file not found in Dropbox", "error");
+ return false;
+ }
+ } catch (error) {
+ this.log(`Failed to delete workout: ${error.message}`, "error");
+ throw error;
+ }
+ }
+
async exportExcelWorkbook(filename, contents) {
if (!this.isConnected) {
throw new Error("Not connected to Dropbox");
@@ -652,50 +684,50 @@ class DropboxManager {
contents,
mode: { ".tag": "overwrite" },
});
-
- this.log(`Exported Excel workbook: ${filename}`, "success");
- return true;
- } catch (error) {
- this.log(`Failed to export Excel workbook: ${error.message}`, "error");
- throw error;
- }
- }
-
- // Export individual workout with detailed movement data as CSV
- async exportWorkoutDetailedCSV(workout, unitLabel = "kg", toDisplayFn = (v) => v) {
- if (!this.isConnected) {
- throw new Error("Not connected to Dropbox");
- }
-
- try {
- // Check if workout has movement data
- if (!workout.movementData || workout.movementData.length === 0) {
- this.log("Workout does not have detailed movement data", "error");
- return false;
- }
-
- // Build CSV content with detailed movement data
- let csv = `Timestamp,Total Load (${unitLabel}),Right Load (${unitLabel}),Left Load (${unitLabel}),Right Position,Left Position\n`;
-
- const csvDecimals = unitLabel === "lb" ? 2 : 1;
- for (const point of workout.movementData) {
- const timestamp = point.timestamp;
- const totalKg = point.loadA + point.loadB;
- const totalLoad = toDisplayFn(totalKg).toFixed(csvDecimals);
- const loadA = toDisplayFn(point.loadA).toFixed(csvDecimals);
- const loadB = toDisplayFn(point.loadB).toFixed(csvDecimals);
- const posA = point.posA;
- const posB = point.posB;
- csv += `${timestamp},${totalLoad},${loadA},${loadB},${posA},${posB}\n`;
- }
-
- // Generate filename
- const timestamp = workout.timestamp || workout.endTime || new Date();
- const dateStr = new Date(timestamp).toISOString().replace(/[:.]/g, "-");
- const mode = (workout.mode || "workout").replace(/\s+/g, "_");
- const setName = workout.setName ? `_${workout.setName.replace(/\s+/g, "_")}` : "";
- const filename = `workout_detailed_${mode}${setName}_${dateStr}.csv`;
-
+
+ this.log(`Exported Excel workbook: ${filename}`, "success");
+ return true;
+ } catch (error) {
+ this.log(`Failed to export Excel workbook: ${error.message}`, "error");
+ throw error;
+ }
+ }
+
+ // Export individual workout with detailed movement data as CSV
+ async exportWorkoutDetailedCSV(workout, unitLabel = "kg", toDisplayFn = (v) => v) {
+ if (!this.isConnected) {
+ throw new Error("Not connected to Dropbox");
+ }
+
+ try {
+ // Check if workout has movement data
+ if (!workout.movementData || workout.movementData.length === 0) {
+ this.log("Workout does not have detailed movement data", "error");
+ return false;
+ }
+
+ // Build CSV content with detailed movement data
+ let csv = `Timestamp,Total Load (${unitLabel}),Right Load (${unitLabel}),Left Load (${unitLabel}),Right Position,Left Position\n`;
+
+ const csvDecimals = unitLabel === "lb" ? 2 : 1;
+ for (const point of workout.movementData) {
+ const timestamp = point.timestamp;
+ const totalKg = point.loadA + point.loadB;
+ const totalLoad = toDisplayFn(totalKg).toFixed(csvDecimals);
+ const loadA = toDisplayFn(point.loadA).toFixed(csvDecimals);
+ const loadB = toDisplayFn(point.loadB).toFixed(csvDecimals);
+ const posA = point.posA;
+ const posB = point.posB;
+ csv += `${timestamp},${totalLoad},${loadA},${loadB},${posA},${posB}\n`;
+ }
+
+ // Generate filename
+ const timestamp = workout.timestamp || workout.endTime || new Date();
+ const dateStr = new Date(timestamp).toISOString().replace(/[:.]/g, "-");
+ const mode = (workout.mode || "workout").replace(/\s+/g, "_");
+ const setName = workout.setName ? `_${workout.setName.replace(/\s+/g, "_")}` : "";
+ const filename = `workout_detailed_${mode}${setName}_${dateStr}.csv`;
+
// Upload to Dropbox in /workouts folder
const client = await this.ensureDropboxClient();
await client.filesUpload({
@@ -704,36 +736,36 @@ class DropboxManager {
mode: { ".tag": "add" },
autorename: true,
});
-
- this.log(`Exported detailed workout CSV: ${filename} (${workout.movementData.length} data points)`, "success");
- return true;
- } catch (error) {
- this.log(`Failed to export detailed workout CSV: ${error.message}`, "error");
- throw error;
- }
- }
-
- // PKCE helper: Generate code verifier
- generateCodeVerifier() {
- const array = new Uint8Array(32);
- crypto.getRandomValues(array);
- return this.base64URLEncode(array);
- }
-
- // PKCE helper: Generate code challenge from verifier
- async generateCodeChallenge(verifier) {
- const encoder = new TextEncoder();
- const data = encoder.encode(verifier);
- const hash = await crypto.subtle.digest("SHA-256", data);
- return this.base64URLEncode(new Uint8Array(hash));
- }
-
- // PKCE helper: Base64 URL encode
- base64URLEncode(buffer) {
- const base64 = btoa(String.fromCharCode(...buffer));
- return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
- }
-
+
+ this.log(`Exported detailed workout CSV: ${filename} (${workout.movementData.length} data points)`, "success");
+ return true;
+ } catch (error) {
+ this.log(`Failed to export detailed workout CSV: ${error.message}`, "error");
+ throw error;
+ }
+ }
+
+ // PKCE helper: Generate code verifier
+ generateCodeVerifier() {
+ const array = new Uint8Array(32);
+ crypto.getRandomValues(array);
+ return this.base64URLEncode(array);
+ }
+
+ // PKCE helper: Generate code challenge from verifier
+ async generateCodeChallenge(verifier) {
+ const encoder = new TextEncoder();
+ const data = encoder.encode(verifier);
+ const hash = await crypto.subtle.digest("SHA-256", data);
+ return this.base64URLEncode(new Uint8Array(hash));
+ }
+
+ // PKCE helper: Base64 URL encode
+ base64URLEncode(buffer) {
+ const base64 = btoa(String.fromCharCode(...buffer));
+ return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+ }
+
// Token storage helpers
normalizeTokenPayload(token) {
if (!token) {
@@ -867,9 +899,9 @@ class DropboxManager {
notifyConnectionChange() {
if (this.onConnectionChange) {
this.onConnectionChange(this.isConnected);
- }
- }
-
+ }
+ }
+
// Get connection status
getConnectionStatus() {
const token = this.getStoredToken();
diff --git a/workout-time/index.html b/workout-time/index.html
index 816f2e1..0e1a09d 100644
--- a/workout-time/index.html
+++ b/workout-time/index.html
@@ -3429,6 +3429,9 @@
+