blomios/GameTime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(execution): reprise en temps réel de la séance en cours (ticket #14)

Browse Source 
Corrige la reprise de séance sur workout_execution_screen.dart suite
aux retours de QA. flutter analyze propre, 26/26 tests verts, build
APK debug validé.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Blomios
2026-07-17 22:18:24 +02:00
parent 586813e76f
commit 576238b490
2 changed files with 201 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
lib/presentation/workout_execution_screen.dart
View File

@ -36,6 +36,8 @@ final class _WorkoutExecutionScreenState extends State<WorkoutExecutionScreen> {
Timer? _ticker;
Timer? _restTicker;
WorkoutHistory? _completedHistory;
String? _activeRestStateId;
late DateTime _seriesStartedAt;
var _reps = 0;
final _scoreController = TextEditingController();
var _remainingRestSeconds = 0;
@ -56,9 +58,11 @@ final class _WorkoutExecutionScreenState extends State<WorkoutExecutionScreen> {
_mode = _session.status == ActiveWorkoutStatus.running
? WorkoutExecutionMode.active
: WorkoutExecutionMode.paused;
_seriesStartedAt = DateTime.now().toUtc();
_ticker = Timer.periodic(const Duration(seconds: 1), (_) {
if (mounted) setState(() {});
});
unawaited(_restoreActiveRest());
}
@override
@ -158,20 +162,14 @@ final class _WorkoutExecutionScreenState extends State<WorkoutExecutionScreen> {
children: [
Expanded(
child: OutlinedButton(
onPressed: () => setState(() {
_remainingRestSeconds = (_remainingRestSeconds - 15)
.clamp(0, 9999)
.toInt();
}),
onPressed: () => _adjustRest(-15),
child: const Text('-15 s'),
),
),
const SizedBox(width: 12),
Expanded(
child: OutlinedButton(
onPressed: () => setState(() {
_remainingRestSeconds += 15;
}),
onPressed: () => _adjustRest(15),
child: const Text('+15 s'),
),
),
@ -267,6 +265,8 @@ final class _WorkoutExecutionScreenState extends State<WorkoutExecutionScreen> {
Future<void> _resume() async {
_session = await widget.activeUseCases.resume(_session.metadata.id);
if (!mounted) return;
final restoredRest = await _restoreActiveRest();
if (!mounted || restoredRest) return;
setState(() => _mode = WorkoutExecutionMode.active);
}
@ -302,6 +302,10 @@ final class _WorkoutExecutionScreenState extends State<WorkoutExecutionScreen> {
Future<void> _finishSet({required bool skipped}) async {
final score = double.tryParse(_scoreController.text.trim());
final actualTimeMs = DateTime.now()
.toUtc()
.difference(_seriesStartedAt)
.inMilliseconds;
await widget.activeUseCases.recordCurrentSetResult(
sessionId: _session.metadata.id,
programSnapshotId: _plan.programAt(_position).id,
@ -312,7 +316,9 @@ final class _WorkoutExecutionScreenState extends State<WorkoutExecutionScreen> {
actualReps: skipped ? null : (_exercise.repsEnabled ? _reps : null),
actualScore: skipped ? null : (_exercise.scoreEnabled ? score : null),
scoreUnitSnapshot: _exercise.scoreUnit,
actualTimeMs: skipped ? null : (_exercise.timeEnabled ? 0 : null),
actualTimeMs: skipped
? null
: (_exercise.timeEnabled ? actualTimeMs : null),
);
final next = _plan.nextPosition(_position);
@ -322,7 +328,7 @@ final class _WorkoutExecutionScreenState extends State<WorkoutExecutionScreen> {
}
final shouldRest = _plan.shouldShowRestAfter(_position);
if (shouldRest) {
await widget.activeUseCases.startRestAfterSet(
final rest = await widget.activeUseCases.startRestAfterSet(
sessionId: _session.metadata.id,
afterProgramIndex: _position.programIndex,
afterExerciseIndex: _position.exerciseIndex,
@ -330,6 +336,7 @@ final class _WorkoutExecutionScreenState extends State<WorkoutExecutionScreen> {
plannedRestSeconds: _exercise.restSeconds,
);
if (!mounted) return;
_activeRestStateId = rest.metadata.id;
_remainingRestSeconds = _exercise.restSeconds;
_startRestTicker(next);
setState(() => _mode = WorkoutExecutionMode.rest);
@ -344,16 +351,73 @@ final class _WorkoutExecutionScreenState extends State<WorkoutExecutionScreen> {
if (!mounted) return;
if (_remainingRestSeconds <= 1) {
timer.cancel();
unawaited(_moveTo(next));
unawaited(_finishRestAndMove(next));
} else {
setState(() => _remainingRestSeconds -= 1);
}
});
}
Future<bool> _restoreActiveRest() async {
final rest = await widget.activeUseCases.findActiveRest(
sessionId: _session.metadata.id,
);
if (!mounted || rest == null) {
return false;
}
final after = ExecutionPosition(
programIndex: rest.afterProgramIndex,
exerciseIndex: rest.afterExerciseIndex,
setIndex: rest.afterSetIndex,
);
final next = _plan.nextPosition(after);
final remaining = _remainingSecondsFor(rest);
_activeRestStateId = rest.metadata.id;
if (next == null || remaining <= 0) {
await _finishRestAndMove(next);
return true;
}
_remainingRestSeconds = remaining;
_startRestTicker(next);
if (!mounted) return true;
setState(() => _mode = WorkoutExecutionMode.rest);
return true;
}
int _remainingSecondsFor(ActiveRestState rest) {
final elapsedSeconds = DateTime.now()
.toUtc()
.difference(rest.startedAt.toUtc())
.inSeconds;
return (rest.adjustedRestSeconds - elapsedSeconds).clamp(0, 9999).toInt();
}
Future<void> _adjustRest(int deltaSeconds) async {
final restStateId = _activeRestStateId;
setState(() {
_remainingRestSeconds = (_remainingRestSeconds + deltaSeconds)
.clamp(0, 9999)
.toInt();
});
if (restStateId == null) return;
await widget.activeUseCases.adjustRestSeconds(
restStateId: restStateId,
deltaSeconds: deltaSeconds,
);
}
Future<void> _skipRest() async {
_restTicker?.cancel();
final next = _plan.nextPosition(_position);
await _finishRestAndMove(next);
}
Future<void> _finishRestAndMove(ExecutionPosition? next) async {
final restStateId = _activeRestStateId;
_activeRestStateId = null;
if (restStateId != null) {
await widget.activeUseCases.skipRest(restStateId: restStateId);
}
if (next == null) {
await _complete();
return;
@ -364,6 +428,8 @@ final class _WorkoutExecutionScreenState extends State<WorkoutExecutionScreen> {
Future<void> _moveTo(ExecutionPosition position) async {
_scoreController.clear();
_reps = 0;
_activeRestStateId = null;
_seriesStartedAt = DateTime.now().toUtc();
_session = await widget.activeUseCases.updateProgress(
sessionId: _session.metadata.id,
programIndex: position.programIndex,

127
test/presentation/workout_execution_screen_test.dart
View File

@ -115,6 +115,108 @@ void main() {
expect(find.text('Pas de repos'), findsOneWidget);
});
testWidgets('un repos actif est repris avec le temps restant recalculé', (
tester,
) async {
final clock = _FakeClock(DateTime.utc(2026, 7, 17, 12));
final repository = _FakeActiveSessionRepository();
final session = ActiveWorkoutSession(
metadata: _metadata('session-1'),
sourceWorkoutTemplateId: 'template-1',
status: ActiveWorkoutStatus.running,
startedAt: DateTime.utc(2026, 7, 17, 12),
lastPersistedAt: DateTime.utc(2026, 7, 17, 12),
elapsedActiveMs: 0,
currentProgramIndex: 0,
currentExerciseIndex: 0,
currentSetIndex: 0,
resolvedTemplateSnapshotJson: _sessionSnapshot(
setsCount: 2,
restSeconds: 60,
),
);
repository.session = session;
repository.restStates.add(
ActiveRestState(
metadata: _metadata('rest-1'),
activeWorkoutSessionId: 'session-1',
afterProgramIndex: 0,
afterExerciseIndex: 0,
afterSetIndex: 0,
plannedRestSeconds: 60,
adjustedRestSeconds: 60,
startedAt: DateTime.now().toUtc().subtract(const Duration(seconds: 15)),
),
);
await tester.pumpWidget(
MaterialApp(
home: WorkoutExecutionScreen(
initialSession: session,
activeUseCases: _activeUseCases(repository, clock),
closeUseCase: _closeUseCase(repository, clock),
historyUseCases: _historyUseCases(clock),
workoutTemplateUseCases: _workoutTemplateUseCases(),
),
),
);
await tester.pump();
expect(find.text('Repos avant la prochaine série'), findsOneWidget);
expect(find.text('00:45'), findsOneWidget);
await tester.tap(find.text('+15 s'));
await tester.pump();
expect(find.text('01:00'), findsOneWidget);
expect(repository.restStates.single.adjustedRestSeconds, 75);
await tester.tap(find.text('Ignorer le repos'));
await tester.pump();
expect(repository.restStates.single.skippedAt, isNotNull);
});
testWidgets('la mesure temps enregistre une durée réelle de série', (
tester,
) async {
final clock = _FakeClock(DateTime.utc(2026, 7, 17, 12));
final repository = _FakeActiveSessionRepository();
final session = ActiveWorkoutSession(
metadata: _metadata('session-1'),
sourceWorkoutTemplateId: 'template-1',
status: ActiveWorkoutStatus.running,
startedAt: DateTime.utc(2026, 7, 17, 12),
lastPersistedAt: DateTime.utc(2026, 7, 17, 12),
elapsedActiveMs: 0,
currentProgramIndex: 0,
currentExerciseIndex: 0,
currentSetIndex: 0,
resolvedTemplateSnapshotJson: _sessionSnapshot(
setsCount: 2,
restSeconds: 0,
),
);
repository.session = session;
await tester.pumpWidget(
MaterialApp(
home: WorkoutExecutionScreen(
initialSession: session,
activeUseCases: _activeUseCases(repository, clock),
closeUseCase: _closeUseCase(repository, clock),
historyUseCases: _historyUseCases(clock),
workoutTemplateUseCases: _workoutTemplateUseCases(),
),
),
);
await tester.pump(const Duration(seconds: 2));
await tester.tap(find.text('Terminer la série'));
await tester.pump();
expect(repository.results.single.actualTimeMs, greaterThan(0));
});
}
ActiveWorkoutSessionUseCases _activeUseCases(
@ -221,6 +323,7 @@ final class _FakeIds implements IdGenerator {
final class _FakeActiveSessionRepository implements ActiveSessionRepository {
ActiveWorkoutSession? session;
final results = <ActiveSetResult>[];
final restStates = <ActiveRestState>[];
@override
Future<ActiveWorkoutSession?> findById(String id) async {
@ -231,11 +334,20 @@ final class _FakeActiveSessionRepository implements ActiveSessionRepository {
Future<ActiveWorkoutSession?> findOpen() async => session;
@override
Future<ActiveRestState?> findRestStateById(String id) async => null;
Future<ActiveRestState?> findRestStateById(String id) async {
for (final restState in restStates) {
if (restState.metadata.id == id) {
return restState;
}
}
return null;
}
@override
Future<List<ActiveRestState>> listRestStates(String sessionId) async {
return const [];
return restStates
.where((restState) => restState.activeWorkoutSessionId == sessionId)
.toList();
}
@override
@ -249,7 +361,16 @@ final class _FakeActiveSessionRepository implements ActiveSessionRepository {
}
@override
Future<void> saveRestState(ActiveRestState restState) async {}
Future<void> saveRestState(ActiveRestState restState) async {
final index = restStates.indexWhere(
(saved) => saved.metadata.id == restState.metadata.id,
);
if (index == -1) {
restStates.add(restState);
} else {
restStates[index] = restState;
}
}
@override
Future<void> saveSetResult(ActiveSetResult result) async {