- {exercisesWithHistory.map(({ exercise }, index) => (
-
-
{exercise.name}
- {exercise.notes ?
{exercise.notes}
: null}
-
- {exercise.sets.map((set) => (
-
- {set.reps ?? "?"}×{set.weightKg !== undefined ? `${set.weightKg} kg` : "—"}
-
- ))}
+ {exercisesWithHistory.map(({ exercise }, index) => {
+ const e1rm = exerciseE1rm(exercise);
+ return (
+
+
{exercise.name}
+ {exercise.notes ?
{exercise.notes}
: null}
+
+ {exercise.sets.map((set) => {
+ const pct =
+ e1rm && set.weightKg != null
+ ? Math.round((set.weightKg / e1rm) * 100)
+ : null;
+ return (
+
+ {set.reps ?? "?"}×{set.weightKg !== undefined ? `${set.weightKg} kg` : "—"}
+ {pct !== null ? (
+ {pct}%
+ ) : null}
+
+ );
+ })}
+
-
- ))}
+ );
+ })}
{exercisesWithHistory.some(({ history }) => history.length >= 2) ? (
@@ -75,6 +87,7 @@ export default async function StrengthWorkoutPage({
label: formatDateShort(point.date),
volumeKg: point.volumeKg,
topWeightKg: point.topWeightKg,
+ e1rmKg: point.e1rmKg,
}))}
/>
))}
diff --git a/components/exercise-progress-chart.tsx b/components/exercise-progress-chart.tsx
index 186f9e0..6becc27 100644
--- a/components/exercise-progress-chart.tsx
+++ b/components/exercise-progress-chart.tsx
@@ -4,9 +4,27 @@ import { CartesianGrid, Line, LineChart, ResponsiveContainer, Tooltip, XAxis, YA
type ExerciseProgressChartProps = {
name: string;
- data: { label: string; volumeKg: number; topWeightKg?: number }[];
+ data: { label: string; volumeKg: number; topWeightKg?: number; e1rmKg?: number }[];
};
+function E1rmDelta({ data }: { data: ExerciseProgressChartProps["data"] }) {
+ const points = data.filter((d) => d.e1rmKg != null).slice(-5);
+ if (points.length < 2) return null;
+
+ const first = points[0].e1rmKg!;
+ const last = points[points.length - 1].e1rmKg!;
+ const diffKg = Math.round((last - first) * 10) / 10;
+ const diffPct = Math.round(((last - first) / first) * 100);
+ const sign = diffKg >= 0 ? "+" : "";
+ const color = diffKg > 0 ? "text-emerald-400" : diffKg < 0 ? "text-rose-400" : "text-fg/40";
+
+ return (
+
+ E1RM {sign}{diffKg} kg ({sign}{diffPct}%)
+
+ );
+}
+
export function ExerciseProgressChart({ name, data }: ExerciseProgressChartProps) {
if (data.length < 2) {
return null;
@@ -14,7 +32,10 @@ export function ExerciseProgressChart({ name, data }: ExerciseProgressChartProps
return (
-
{name}
+
+ {name}
+
+
@@ -36,10 +57,12 @@ export function ExerciseProgressChart({ name, data }: ExerciseProgressChartProps
fontSize: 12,
color: "var(--color-fg)",
}}
- formatter={(value, key) => [
- key === "topWeightKg" ? `${value} kg` : `${Math.round(Number(value)).toLocaleString("pl-PL")} kg`,
- key === "topWeightKg" ? "Maks. ciężar" : "Wolumen",
- ]}
+ formatter={(value, key) => {
+ if (key === "volumeKg") return [`${Math.round(Number(value)).toLocaleString("pl-PL")} kg`, "Wolumen"];
+ if (key === "topWeightKg") return [`${value} kg`, "Maks. ciężar"];
+ if (key === "e1rmKg") return [`${value} kg`, "E1RM (Epley)"];
+ return [`${value}`, String(key)];
+ }}
/>
+
diff --git a/lib/strength/stats.ts b/lib/strength/stats.ts
index 720c05a..48713bd 100644
--- a/lib/strength/stats.ts
+++ b/lib/strength/stats.ts
@@ -1,5 +1,6 @@
import type { StrengthExercise, StrengthWorkout } from "@/lib/models/strength";
+
export function exerciseVolumeKg(exercise: StrengthExercise): number {
return exercise.sets.reduce((sum, set) => sum + (set.weightKg ?? 0) * (set.reps ?? 0), 0);
}
@@ -11,6 +12,17 @@ export function exerciseTopWeightKg(exercise: StrengthExercise): number | undefi
return weights.length > 0 ? Math.max(...weights) : undefined;
}
+// Epley formula: weight × (1 + reps / 30). Returns best e1rm across all sets.
+export function exerciseE1rm(exercise: StrengthExercise): number | undefined {
+ let best: number | undefined;
+ for (const set of exercise.sets) {
+ if (set.weightKg == null || set.reps == null || set.reps < 1) continue;
+ const e1rm = set.weightKg * (1 + set.reps / 30);
+ if (best === undefined || e1rm > best) best = e1rm;
+ }
+ return best !== undefined ? Math.round(best * 10) / 10 : undefined;
+}
+
export function workoutVolumeKg(workout: StrengthWorkout): number {
return workout.exercises.reduce((sum, exercise) => sum + exerciseVolumeKg(exercise), 0);
}
@@ -19,6 +31,7 @@ export type ExerciseHistoryPoint = {
date: Date;
volumeKg: number;
topWeightKg?: number;
+ e1rmKg?: number;
};
/**
@@ -38,6 +51,7 @@ export function getExerciseHistory(
date: workout.date,
volumeKg: exerciseVolumeKg(exercise),
topWeightKg: exerciseTopWeightKg(exercise),
+ e1rmKg: exerciseE1rm(exercise),
});
}