wger-project/flutter
1
0
Fork 0
mirror of https://github.com/wger-project/flutter.git synced 2026-02-18 00:17:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add the newly created session to the routine

Browse Source
This commit is contained in:
Roland Geider
2025-01-26 15:07:37 +01:00
parent 123b45e6b3
commit b4f8a59a70
12 changed files with 67 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/models/workouts/session_api.dart
View File

@@ -30,7 +30,7 @@ class WorkoutSessionApi {
@JsonKey(required: false, includeToJson: false, defaultValue: [])
List<Log> logs = [];
WorkoutSessionApi();
WorkoutSessionApi({required this.session, this.logs = const []});
// Boilerplate
factory WorkoutSessionApi.fromJson(Map<String, dynamic> json) =>

9
lib/models/workouts/session_api.g.dart
View File

@@ -11,12 +11,13 @@ WorkoutSessionApi _$WorkoutSessionApiFromJson(Map<String, dynamic> json) {
json,
requiredKeys: const ['session'],
);
return WorkoutSessionApi()
..session = WorkoutSession.fromJson(json['session'] as Map<String, dynamic>)
..logs = (json['logs'] as List<dynamic>?)
return WorkoutSessionApi(
session: WorkoutSession.fromJson(json['session'] as Map<String, dynamic>),
logs: (json['logs'] as List<dynamic>?)
?.map((e) => Log.fromJson(e as Map<String, dynamic>))
.toList() ??
[];
[],
);
}
Map<String, dynamic> _$WorkoutSessionApiToJson(WorkoutSessionApi instance) => <String, dynamic>{

6
lib/providers/routines.dart
View File

@@ -454,7 +454,6 @@ class RoutinesProvider with ChangeNotifier {
baseProvider.makeUrl(_daysUrlPath),
);
day = Day.fromJson(data);
day.slots = [];
final routine = findById(day.routineId);
routine.days.add(day);
if (refresh) {
@@ -676,12 +675,15 @@ class RoutinesProvider with ChangeNotifier {
return sessions;
}
Future<WorkoutSession> addSession(WorkoutSession session) async {
Future<WorkoutSession> addSession(WorkoutSession session, int routineId) async {
final data = await baseProvider.post(
session.toJson(),
baseProvider.makeUrl(_sessionUrlPath),
);
final newSession = WorkoutSession.fromJson(data);
final routine = findById(routineId);
routine.sessions.add(WorkoutSessionApi(session: newSession));
notifyListeners();
return newSession;
}

2
lib/widgets/routines/gym_mode.dart
View File

@@ -921,7 +921,7 @@ class _SessionPageState extends State<SessionPage> {
// Save the entry on the server
try {
if (widget._session.id == null) {
await routinesProvider.addSession(widget._session);
await routinesProvider.addSession(widget._session, widget._routine.id!);
} else {
await routinesProvider.editSession(widget._session);
}

10
test/workout/day_form_test.mocks.dart
View File

@@ -427,12 +427,16 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
) as _i13.Future<List<_i10.WorkoutSession>>);
@override
_i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session) => (super.noSuchMethod(
Invocation.method(#addSession, [session]),
_i13.Future<_i10.WorkoutSession> addSession(
_i10.WorkoutSession? session,
int? routineId,
) =>
(super.noSuchMethod(
Invocation.method(#addSession, [session, routineId]),
returnValue: _i13.Future<_i10.WorkoutSession>.value(
_FakeWorkoutSession_8(
this,
Invocation.method(#addSession, [session]),
Invocation.method(#addSession, [session, routineId]),
),
),
) as _i13.Future<_i10.WorkoutSession>);

10
test/workout/repetition_unit_form_widget_test.mocks.dart
View File

@@ -427,12 +427,16 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
) as _i13.Future<List<_i10.WorkoutSession>>);
@override
_i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session) => (super.noSuchMethod(
Invocation.method(#addSession, [session]),
_i13.Future<_i10.WorkoutSession> addSession(
_i10.WorkoutSession? session,
int? routineId,
) =>
(super.noSuchMethod(
Invocation.method(#addSession, [session, routineId]),
returnValue: _i13.Future<_i10.WorkoutSession>.value(
_FakeWorkoutSession_8(
this,
Invocation.method(#addSession, [session]),
Invocation.method(#addSession, [session, routineId]),
),
),
) as _i13.Future<_i10.WorkoutSession>);

10
test/workout/routine_edit_screen_test.mocks.dart
View File

@@ -427,12 +427,16 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
) as _i13.Future<List<_i10.WorkoutSession>>);
@override
_i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session) => (super.noSuchMethod(
Invocation.method(#addSession, [session]),
_i13.Future<_i10.WorkoutSession> addSession(
_i10.WorkoutSession? session,
int? routineId,
) =>
(super.noSuchMethod(
Invocation.method(#addSession, [session, routineId]),
returnValue: _i13.Future<_i10.WorkoutSession>.value(
_FakeWorkoutSession_8(
this,
Invocation.method(#addSession, [session]),
Invocation.method(#addSession, [session, routineId]),
),
),
) as _i13.Future<_i10.WorkoutSession>);

10
test/workout/routine_edit_test.mocks.dart
View File

@@ -427,12 +427,16 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
) as _i13.Future<List<_i10.WorkoutSession>>);
@override
_i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session) => (super.noSuchMethod(
Invocation.method(#addSession, [session]),
_i13.Future<_i10.WorkoutSession> addSession(
_i10.WorkoutSession? session,
int? routineId,
) =>
(super.noSuchMethod(
Invocation.method(#addSession, [session, routineId]),
returnValue: _i13.Future<_i10.WorkoutSession>.value(
_FakeWorkoutSession_8(
this,
Invocation.method(#addSession, [session]),
Invocation.method(#addSession, [session, routineId]),
),
),
) as _i13.Future<_i10.WorkoutSession>);

10
test/workout/routine_form_test.mocks.dart
View File

@@ -427,12 +427,16 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
) as _i13.Future<List<_i10.WorkoutSession>>);
@override
_i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session) => (super.noSuchMethod(
Invocation.method(#addSession, [session]),
_i13.Future<_i10.WorkoutSession> addSession(
_i10.WorkoutSession? session,
int? routineId,
) =>
(super.noSuchMethod(
Invocation.method(#addSession, [session, routineId]),
returnValue: _i13.Future<_i10.WorkoutSession>.value(
_FakeWorkoutSession_8(
this,
Invocation.method(#addSession, [session]),
Invocation.method(#addSession, [session, routineId]),
),
),
) as _i13.Future<_i10.WorkoutSession>);

10
test/workout/routine_logs_screen_test.mocks.dart
View File

@@ -427,12 +427,16 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
) as _i13.Future<List<_i10.WorkoutSession>>);
@override
_i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session) => (super.noSuchMethod(
Invocation.method(#addSession, [session]),
_i13.Future<_i10.WorkoutSession> addSession(
_i10.WorkoutSession? session,
int? routineId,
) =>
(super.noSuchMethod(
Invocation.method(#addSession, [session, routineId]),
returnValue: _i13.Future<_i10.WorkoutSession>.value(
_FakeWorkoutSession_8(
this,
Invocation.method(#addSession, [session]),
Invocation.method(#addSession, [session, routineId]),
),
),
) as _i13.Future<_i10.WorkoutSession>);

10
test/workout/slot_entry_form_test.mocks.dart
View File

@@ -427,12 +427,16 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
) as _i13.Future<List<_i10.WorkoutSession>>);
@override
_i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session) => (super.noSuchMethod(
Invocation.method(#addSession, [session]),
_i13.Future<_i10.WorkoutSession> addSession(
_i10.WorkoutSession? session,
int? routineId,
) =>
(super.noSuchMethod(
Invocation.method(#addSession, [session, routineId]),
returnValue: _i13.Future<_i10.WorkoutSession>.value(
_FakeWorkoutSession_8(
this,
Invocation.method(#addSession, [session]),
Invocation.method(#addSession, [session, routineId]),
),
),
) as _i13.Future<_i10.WorkoutSession>);

10
test/workout/weight_unit_form_widget_test.mocks.dart
View File

@@ -427,12 +427,16 @@ class MockRoutinesProvider extends _i1.Mock implements _i12.RoutinesProvider {
) as _i13.Future<List<_i10.WorkoutSession>>);
@override
_i13.Future<_i10.WorkoutSession> addSession(_i10.WorkoutSession? session) => (super.noSuchMethod(
Invocation.method(#addSession, [session]),
_i13.Future<_i10.WorkoutSession> addSession(
_i10.WorkoutSession? session,
int? routineId,
) =>
(super.noSuchMethod(
Invocation.method(#addSession, [session, routineId]),
returnValue: _i13.Future<_i10.WorkoutSession>.value(
_FakeWorkoutSession_8(
this,
Invocation.method(#addSession, [session]),
Invocation.method(#addSession, [session, routineId]),
),
),
) as _i13.Future<_i10.WorkoutSession>);