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

feat(ui): affichage du chrono de score dans le plan et l'historique (ticket #28)

Browse Source 
Affiche le chrono du score chronométré sur workout_execution_screen.dart
(plan de séance) et history_screen.dart (historique). flutter analyze
propre, 77/77 tests verts, build APK debug validé. Dernier ticket du
backlog — clôture aussi le ticket parent #18 (score chronométré).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Blomios
2026-07-18 14:40:37 +02:00
parent a1b27fdcbc
commit 1a315d586f
4 changed files with 202 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
lib/presentation/workout_execution_screen.dart
View File

@ -1515,7 +1515,7 @@ final class _WorkoutPlanSetTile extends StatelessWidget {
child: ListTile(
enabled: tappable,
title: Text('Série ${position.setIndex + 1}'),
subtitle: Text(_planSetSubtitle(planState, state?.result)),
subtitle: Text(_planSetSubtitle(planState, state?.result, exercise)),
trailing: _PlanStatusBadge(status: planState, onTap: onTap),
onTap: onTap,
),
@ -1851,9 +1851,13 @@ _PlanSetStatus _planSetState(
return _PlanSetStatus.todo;
}
String _planSetSubtitle(_PlanSetStatus status, ActiveSetResult? result) {
String _planSetSubtitle(
_PlanSetStatus status,
ActiveSetResult? result,
ExecutionExercise exercise,
) {
if (status == _PlanSetStatus.completed && result != null) {
return _setResultSummary(result);
return _setResultSummary(result, exercise: exercise);
}
if (status == _PlanSetStatus.passed) {
return 'Aucun résultat';
@ -1861,7 +1865,10 @@ String _planSetSubtitle(_PlanSetStatus status, ActiveSetResult? result) {
return '';
}
String _setResultSummary(ActiveSetResult result) {
String _setResultSummary(
ActiveSetResult result, {
ExecutionExercise? exercise,
}) {
final parts = <String>[];
if (result.actualTimeMs != null) {
parts.add(_formatDuration(Duration(milliseconds: result.actualTimeMs!)));
@ -1878,7 +1885,15 @@ String _setResultSummary(ActiveSetResult result) {
final value = _formatScoreStopwatch(
Duration(milliseconds: result.actualScoreTimeMs!),
);
parts.add('Temps réalisé $value');
final targetScoreTimeMs = exercise?.targetScoreTimeMs;
if (targetScoreTimeMs == null) {
parts.add('Score chrono $value');
} else {
final targetValue = _formatScoreStopwatchTarget(
Duration(milliseconds: targetScoreTimeMs),
);
parts.add('Score chrono $value / objectif $targetValue');
}
}
return parts.isEmpty ? 'Aucun résultat' : parts.join(' · ');
}
@ -2050,6 +2065,7 @@ final class ExecutionExercise {
this.targetTimeSeconds,
this.targetReps,
this.targetScore,
this.targetScoreTimeMs,
this.scoreUnit,
});
@ -2084,6 +2100,9 @@ final class ExecutionExercise {
targetScore:
(override?['targetScoreOverride'] as num?)?.toDouble() ??
(exercise['targetScore'] as num?)?.toDouble(),
targetScoreTimeMs:
(override?['targetScoreTimeMsOverride'] as int?) ??
(exercise['targetScoreTimeMs'] as int?),
scoreUnit: exercise['scoreUnitSnapshot'] as String?,
);
}
@ -2102,6 +2121,7 @@ final class ExecutionExercise {
final int? targetTimeSeconds;
final int? targetReps;
final double? targetScore;
final int? targetScoreTimeMs;
final String? scoreUnit;
bool get manualScoreEnabled {
@ -2235,3 +2255,10 @@ String _formatScoreStopwatch(Duration duration) {
final tenths = totalTenths % 10;
return '$minutes:$seconds.$tenths';
}
String _formatScoreStopwatchTarget(Duration duration) {
if (duration.inMilliseconds % 1000 == 0) {
return _formatDuration(duration);
}
return _formatScoreStopwatch(duration);
}