Skip to content

Commit a004192

Browse files
committed
Correctly pass the base ID to render log charts
See wger-project/wger#1180
1 parent 08becd2 commit a004192

29 files changed

+226
-118
lines changed

lib/helpers/ui.dart

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import 'package:flutter/material.dart';
2222
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
2323
import 'package:provider/provider.dart';
2424
import 'package:wger/exceptions/http_exception.dart';
25+
import 'package:wger/models/exercises/base.dart';
2526
import 'package:wger/models/exercises/exercise.dart';
2627
import 'package:wger/models/workouts/log.dart';
2728
import 'package:wger/providers/workout_plans.dart';
@@ -102,8 +103,13 @@ void showHttpExceptionErrorDialog(WgerHttpException exception, BuildContext cont
102103
// showDialog(context: context, builder: (context) => Container());
103104
}
104105

105-
dynamic showDeleteDialog(BuildContext context, String confirmDeleteName, Log log, Exercise exercise,
106-
Map<Exercise, List<Log>> exerciseData) async {
106+
dynamic showDeleteDialog(
107+
BuildContext context,
108+
String confirmDeleteName,
109+
Log log,
110+
Exercise exercise,
111+
Map<ExerciseBase, List<Log>> exerciseData,
112+
) async {
107113
final res = await showDialog(
108114
context: context,
109115
builder: (BuildContext contextDialog) {

lib/models/body_weight/weight_entry.g.dart

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/models/exercises/base.g.dart

Lines changed: 15 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/models/exercises/category.g.dart

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/models/exercises/exercise.g.dart

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/models/exercises/image.g.dart

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/models/measurements/measurement_category.g.dart

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/models/measurements/measurement_entry.g.dart

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/models/nutrition/ingredient.g.dart

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/models/nutrition/ingredient_weight_unit.g.dart

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)