Rename some functions, a bit of cleanup

This commit is contained in:
Roland Geider
2025-01-10 15:52:26 +01:00
parent b42112075c
commit 5a39c6c229
23 changed files with 434 additions and 172 deletions

View File

@@ -59,6 +59,7 @@ final benchPress = Exercise(
equipment: const [tEquipment1, tEquipment2],
muscles: const [tMuscle1, tMuscle2],
musclesSecondary: const [tMuscle3],
translations: [benchPressEn, benchPressDe],
);
final crunches = Exercise(
@@ -70,6 +71,7 @@ final crunches = Exercise(
equipment: const [tEquipment2],
muscles: const [tMuscle1],
musclesSecondary: const [tMuscle2],
translations: [crunchesEn, crunchesDe, crunchesFr],
);
final deadLift = Exercise(
@@ -81,6 +83,7 @@ final deadLift = Exercise(
equipment: const [tEquipment2],
muscles: const [tMuscle1],
musclesSecondary: const [tMuscle2],
translations: [deadLiftEn],
);
final curls = Exercise(
@@ -92,7 +95,9 @@ final curls = Exercise(
equipment: const [tEquipment2],
muscles: const [tMuscle1],
musclesSecondary: const [tMuscle2],
translations: [curlsEn],
);
final squats = Exercise(
id: 5,
uuid: '361f024c-fdf8-4146-b7d7-0c1b67c58141',
@@ -102,7 +107,9 @@ final squats = Exercise(
equipment: const [tEquipment2],
muscles: const [tMuscle1],
musclesSecondary: const [tMuscle2],
translations: [squatsEn],
);
final sideRaises = Exercise(
id: 6,
uuid: '721ff972-c568-41e3-8cf5-cf1e5c5c801c',
@@ -112,6 +119,7 @@ final sideRaises = Exercise(
equipment: const [tEquipment2],
muscles: const [tMuscle1],
musclesSecondary: const [tMuscle2],
translations: [sideRaisesEn],
);
final benchPressDe = Translation(
@@ -120,16 +128,17 @@ final benchPressDe = Translation(
created: DateTime(2021, 1, 15),
name: 'Bankdrücken',
description: 'add clever text',
exerciseId: benchPress.id,
exerciseId: 1,
language: tLanguage1,
);
final benchPressEn = Translation(
id: 7,
uuid: 'f4cc326b-e497-4bd7-a71d-0eb1db522743',
created: DateTime(2021, 1, 15),
name: 'Bench press',
description: 'add clever text',
exerciseId: benchPress.id,
exerciseId: 1,
language: tLanguage1,
);
@@ -139,7 +148,7 @@ final deadLiftEn = Translation(
created: DateTime(2021, 1, 15),
name: 'Dead Lift',
description: 'Lorem ipsum etc',
exerciseId: crunches.id,
exerciseId: 3,
language: tLanguage2,
);
@@ -149,7 +158,7 @@ final crunchesFr = Translation(
created: DateTime(2021, 4, 1),
name: 'Crunches',
description: 'The man in black fled across the desert, and the gunslinger followed',
exerciseId: deadLift.id,
exerciseId: 2,
language: tLanguage3,
);
@@ -159,7 +168,7 @@ final crunchesDe = Translation(
created: DateTime(2021, 4, 1),
name: 'Crunches',
description: 'The story so far: in the beginning, the universe was created',
exerciseId: deadLift.id,
exerciseId: 2,
language: tLanguage1,
);
@@ -169,7 +178,7 @@ final crunchesEn = Translation(
created: DateTime(2021, 4, 1),
name: 'test exercise 5',
description: 'I am an invisible man',
exerciseId: deadLift.id,
exerciseId: 2,
language: tLanguage2,
);
@@ -179,7 +188,7 @@ final curlsEn = Translation(
created: DateTime(2021, 4, 1),
name: 'Curls',
description: 'It was a bright cold day in April, and the clocks were striking thirteen',
exerciseId: curls.id,
exerciseId: 4,
language: tLanguage2,
);
@@ -189,7 +198,7 @@ final squatsEn = Translation(
created: DateTime(2021, 4, 1),
name: 'Squats',
description: 'It was a bright cold day in April, and the clocks were striking thirteen',
exerciseId: curls.id,
exerciseId: 5,
language: tLanguage2,
);
@@ -199,18 +208,11 @@ final sideRaisesEn = Translation(
created: DateTime(2022, 11, 1),
name: 'Side raises',
description: 'It was a bright cold day in April, and the clocks were striking thirteen',
exerciseId: curls.id,
exerciseId: 6,
language: tLanguage2,
);
List<Exercise> getTestExercises() {
benchPress.translations = [benchPressEn, benchPressDe];
crunches.translations = [crunchesEn, crunchesDe, crunchesFr];
deadLift.translations = [deadLiftEn];
curls.translations = [curlsEn];
squats.translations = [squatsEn];
sideRaises.translations = [sideRaisesEn];
return [benchPress, crunches, deadLift, curls, squats, sideRaises];
}

View File

@@ -23,6 +23,7 @@ import 'package:wger/models/workouts/day_data.dart';
import 'package:wger/models/workouts/log.dart';
import 'package:wger/models/workouts/repetition_unit.dart';
import 'package:wger/models/workouts/routine.dart';
import 'package:wger/models/workouts/set_config_data.dart';
import 'package:wger/models/workouts/slot.dart';
import 'package:wger/models/workouts/slot_data.dart';
import 'package:wger/models/workouts/slot_entry.dart';
@@ -32,12 +33,14 @@ import './exercises.dart';
const testWeightUnit1 = WeightUnit(id: 1, name: 'kg');
const testWeightUnit2 = WeightUnit(id: 2, name: 'metric tonnes');
const testWeightUnits = [testWeightUnit1, testWeightUnit2];
const RepetitionUnit testRepetitionUnit1 = RepetitionUnit(id: 1, name: 'Repetitions');
const RepetitionUnit testRepetitionUnit2 = RepetitionUnit(id: 2, name: 'Hours');
const testRepetitionUnits = [testRepetitionUnit1, testRepetitionUnit2];
Routine getRoutine({List<Exercise>? exercises}) {
final testExercise = exercises ?? getTestExercises();
Routine getTestRoutine({List<Exercise>? exercises}) {
final testExercises = exercises ?? getTestExercises();
final log1 = Log.empty()
..id = 1
@@ -46,7 +49,7 @@ Routine getRoutine({List<Exercise>? exercises}) {
..date = DateTime(2021, 5, 1)
..reps = 10
..routineId = 1;
log1.exerciseBase = testExercise[0];
log1.exerciseBase = testExercises[0];
log1.weightUnit = testWeightUnit1;
log1.repetitionUnit = testRepetitionUnit1;
@@ -57,7 +60,7 @@ Routine getRoutine({List<Exercise>? exercises}) {
..date = DateTime(2021, 5, 1)
..reps = 12
..routineId = 1;
log2.exerciseBase = testExercise[0];
log2.exerciseBase = testExercises[0];
log2.weightUnit = testWeightUnit1;
log2.repetitionUnit = testRepetitionUnit1;
@@ -68,7 +71,7 @@ Routine getRoutine({List<Exercise>? exercises}) {
..date = DateTime(2021, 5, 2)
..reps = 8
..routineId = 1;
log3.exerciseBase = testExercise[1];
log3.exerciseBase = testExercises[1];
log3.weightUnit = testWeightUnit1;
log3.repetitionUnit = testRepetitionUnit1;
@@ -84,7 +87,13 @@ Routine getRoutine({List<Exercise>? exercises}) {
comment: 'ddd',
repetitionUnit: testRepetitionUnit1,
weightUnit: testWeightUnit1,
exercise: testExercise[0],
exercise: testExercises[0],
nrOfSetsConfigs: [
BaseConfig.firstIteration(4, 1),
],
repsConfigs: [
BaseConfig.firstIteration(3, 1),
],
weightConfigs: [
BaseConfig.firstIteration(100, 1),
BaseConfig(
@@ -99,12 +108,6 @@ Routine getRoutine({List<Exercise>? exercises}) {
repeat: true,
),
],
repsConfigs: [
BaseConfig.firstIteration(3, 1),
],
nrOfSetsConfigs: [
BaseConfig.firstIteration(4, 1),
],
);
final slotBenchPress = Slot.withData(
@@ -113,7 +116,7 @@ Routine getRoutine({List<Exercise>? exercises}) {
order: 1,
comment: 'Make sure to warm up',
);
slotBenchPress.addExerciseBase(testExercise[0]);
slotBenchPress.addExerciseBase(testExercises[0]);
slotBenchPress.entries.add(slotEntryBenchPress);
final slotEntrySquat = SlotEntry(
@@ -128,7 +131,7 @@ Routine getRoutine({List<Exercise>? exercises}) {
comment: 'ddd',
repetitionUnit: testRepetitionUnit1,
weightUnit: testWeightUnit1,
exercise: testExercise[4],
exercise: testExercises[4],
weightConfigs: [
BaseConfig.firstIteration(80, 1),
],
@@ -141,7 +144,7 @@ Routine getRoutine({List<Exercise>? exercises}) {
);
final slotSquat = Slot.withData(id: 2, day: 1, order: 1);
slotSquat.addExerciseBase(testExercise[4]);
slotSquat.addExerciseBase(testExercises[4]);
slotSquat.entries.add(slotEntrySquat);
final slotEntrySideRaises = SlotEntry(
@@ -156,21 +159,21 @@ Routine getRoutine({List<Exercise>? exercises}) {
comment: 'ddd',
repetitionUnit: testRepetitionUnit1,
weightUnit: testWeightUnit1,
exercise: testExercise[5],
weightConfigs: [
BaseConfig.firstIteration(10, 1),
exercise: testExercises[5],
nrOfSetsConfigs: [
BaseConfig.firstIteration(4, 1),
],
repsConfigs: [
BaseConfig.firstIteration(12, 1),
],
nrOfSetsConfigs: [
BaseConfig.firstIteration(4, 1),
weightConfigs: [
BaseConfig.firstIteration(10, 1),
],
);
// settingSideRaises.weight = 6;
final slotSideRaises = Slot.withData(id: 3, day: 1, order: 1);
slotSideRaises.addExerciseBase(testExercise[5]);
slotSideRaises.addExerciseBase(testExercises[5]);
slotSideRaises.entries.add(slotEntrySideRaises);
final dayChestShoulders = Day(
@@ -189,63 +192,309 @@ Routine getRoutine({List<Exercise>? exercises}) {
slots: [slotSquat],
);
final List<DayData> dayDataDisplay = [
DayData(
iteration: 1,
date: DateTime(2024, 11, 01),
label: '',
day: dayChestShoulders,
slots: [
SlotData(
comment: 'Bench press',
isSuperset: false,
exerciseIds: [1],
setConfigs: [
SetConfigData(
exerciseId: 1,
exercise: testExercises[0],
slotEntryId: 1,
nrOfSets: 4,
reps: 3,
repsUnit: testRepetitionUnit1,
weight: 100,
weightUnit: testWeightUnit1,
restTime: 120,
rir: '1.5',
rpe: '8',
textRepr: '4 sets 3x100kg',
),
],
),
SlotData(
comment: 'Side rises',
isSuperset: false,
exerciseIds: [6],
setConfigs: [
SetConfigData(
exerciseId: 6,
exercise: testExercises[5],
slotEntryId: 1,
nrOfSets: 4,
reps: 12,
repsUnit: testRepetitionUnit1,
weight: 10,
weightUnit: testWeightUnit1,
restTime: 60,
rir: '',
rpe: '',
textRepr: '4 sets 12x10kg',
),
],
)
],
),
DayData(
iteration: 1,
date: DateTime(2024, 11, 02),
label: '',
day: dayLegs,
slots: [
SlotData(
comment: 'Squats',
isSuperset: false,
exerciseIds: [8],
setConfigs: [
SetConfigData(
exerciseId: 8,
exercise: testExercises[4],
slotEntryId: 1,
nrOfSets: 4,
reps: 3,
repsUnit: testRepetitionUnit1,
weight: 100,
weightUnit: testWeightUnit1,
restTime: 120,
rir: '1.5',
rpe: '8',
textRepr: '4 sets 3x100kg',
),
],
)
],
),
DayData(
iteration: 1,
date: DateTime(2024, 11, 02),
label: 'null day (filled because of fitInWeek flag)',
day: null,
slots: [],
),
DayData(
iteration: 1,
date: DateTime(2024, 11, 02),
label: 'null day (filled because of fitInWeek flag)',
day: null,
slots: [],
),
];
final routine = Routine(
id: 1,
created: DateTime(2021, 01, 01),
name: '3 day workout',
start: DateTime(2024, 11, 01),
end: DateTime(2024, 12, 01),
days: [
dayChestShoulders,
dayLegs
],
logs: [
log1,
log2,
log3
],
dayDataCurrentIteration: [
DayData(
iteration: 1,
date: DateTime(2024, 11, 01),
label: '',
day: dayChestShoulders,
slots: [
SlotData(
comment: 'foo',
isSuperset: false,
exerciseIds: [1],
setConfigs: [
// SetConfigData(
// reps: 10,
// weight: 10,
// rir: '1.5',
// ),
],
)
],
),
DayData(
iteration: 1,
date: DateTime(2024, 11, 02),
label: '',
day: dayLegs,
slots: [
SlotData(
comment: 'foo',
isSuperset: false,
exerciseIds: [8],
setConfigs: [
// SetConfigData(
// reps: 8,
// weight: 50,
// rir: '',
// ),
],
)
],
),
]);
id: 1,
created: DateTime(2021, 01, 01),
name: '3 day workout',
start: DateTime(2024, 11, 01),
end: DateTime(2024, 12, 01),
days: [dayChestShoulders, dayLegs],
logs: [log1, log2, log3],
dayData: dayDataDisplay,
dayDataCurrentIteration: [
...dayDataDisplay,
DayData(
iteration: 2,
date: DateTime(2024, 11, 02),
label: '',
day: dayLegs,
slots: [
SlotData(
comment: 'Squats',
isSuperset: false,
exerciseIds: [8],
setConfigs: [
SetConfigData(
exerciseId: 8,
exercise: testExercises[4],
slotEntryId: 1,
nrOfSets: 5,
reps: 8,
repsUnit: testRepetitionUnit1,
weight: 105,
weightUnit: testWeightUnit1,
restTime: 120,
rir: '1',
rpe: '9',
textRepr: '5 sets 8x105kg',
),
],
)
],
),
],
dayDataGym: [
DayData(
iteration: 1,
date: DateTime(2024, 11, 01),
label: '',
day: dayChestShoulders,
slots: [
SlotData(
comment: 'Make sure to warm up',
isSuperset: false,
exerciseIds: [testExercises[0].id!],
setConfigs: [
SetConfigData(
exerciseId: 1,
exercise: testExercises[0],
slotEntryId: 1,
nrOfSets: 1,
reps: 3,
repsUnit: testRepetitionUnit1,
weight: 100,
weightUnit: testWeightUnit1,
restTime: 120,
rir: '1.5',
rpe: '8',
textRepr: '3x100kg',
),
SetConfigData(
exerciseId: testExercises[0].id!,
exercise: testExercises[0],
slotEntryId: 1,
nrOfSets: 1,
reps: 3,
repsUnit: testRepetitionUnit1,
weight: 100,
weightUnit: testWeightUnit1,
restTime: 120,
rir: '1.5',
rpe: '8',
textRepr: '3x100kg',
),
SetConfigData(
exerciseId: testExercises[0].id!,
exercise: testExercises[0],
slotEntryId: 1,
nrOfSets: 1,
reps: 3,
repsUnit: testRepetitionUnit1,
weight: 100,
weightUnit: testWeightUnit1,
restTime: 120,
rir: '1.5',
rpe: '8',
textRepr: '3x100kg',
),
],
),
SlotData(
comment: 'Side rises',
isSuperset: false,
exerciseIds: [testExercises[5].id!],
setConfigs: [
SetConfigData(
exerciseId: testExercises[5].id!,
exercise: testExercises[5],
slotEntryId: 1,
nrOfSets: 1,
reps: 12,
repsUnit: testRepetitionUnit1,
weight: 10,
weightUnit: testWeightUnit1,
restTime: 60,
rir: '',
rpe: '',
textRepr: '12x10kg',
),
SetConfigData(
exerciseId: testExercises[5].id!,
exercise: testExercises[5],
slotEntryId: 1,
nrOfSets: 1,
reps: 12,
repsUnit: testRepetitionUnit1,
weight: 10,
weightUnit: testWeightUnit1,
restTime: 60,
rir: '',
rpe: '',
textRepr: '12x10kg',
),
SetConfigData(
exerciseId: testExercises[5].id!,
exercise: testExercises[5],
slotEntryId: 1,
nrOfSets: 1,
reps: 12,
repsUnit: testRepetitionUnit1,
weight: 10,
weightUnit: testWeightUnit1,
restTime: 60,
rir: '',
rpe: '',
textRepr: '12x10kg',
),
],
)
],
),
DayData(
iteration: 1,
date: DateTime(2024, 11, 02),
label: '',
day: dayLegs,
slots: [
SlotData(
comment: 'Squats',
isSuperset: false,
exerciseIds: [testExercises[4].id!],
setConfigs: [
SetConfigData(
exerciseId: 8,
exercise: testExercises[4],
slotEntryId: 1,
nrOfSets: 1,
reps: 3,
repsUnit: testRepetitionUnit1,
weight: 100,
weightUnit: testWeightUnit1,
restTime: 120,
rir: '1.5',
rpe: '8',
textRepr: '3x100kg',
),
SetConfigData(
exerciseId: testExercises[4].id!,
exercise: testExercises[4],
slotEntryId: 1,
nrOfSets: 1,
reps: 3,
repsUnit: testRepetitionUnit1,
weight: 100,
weightUnit: testWeightUnit1,
restTime: 120,
rir: '1.5',
rpe: '8',
textRepr: '3x100kg',
),
SetConfigData(
exerciseId: testExercises[4].id!,
exercise: testExercises[4],
slotEntryId: 1,
nrOfSets: 1,
reps: 3,
repsUnit: testRepetitionUnit1,
weight: 100,
weightUnit: testWeightUnit1,
restTime: 120,
rir: '1.5',
rpe: '8',
textRepr: '3x100kg',
),
],
)
],
),
],
);
return routine;
}