MFTWorkout must ensure that exercises and secondary muscles are stored as OrderedCollections.

Commit
daa76f2454b5d3320be973755e2075435d5df96d
Author
Marius Peter <marius.peter@tutanota.com>
Author date
Committer
Marius Peter <marius.peter@tutanota.com>
Committer date
src/MyFitnessTracker/MFTWorkout.class.st
index 29706729..e6fe82a1 100644..100644
@@ -51,31 +51,33 @@
51 51 workout1 := self new
52 52 date: (Date fromString: '01/01/2024');
53 53 primaryMuscle: MFTMuscleGroup chest;
54 Removed: exercises: (OrderedCollection
55 Removed: with: (MFTExercise cableRow sets: {
56 Removed: (MFTSet reps: 8 weight: 20 rpe: 6).
57 Removed: (MFTSet reps: 6 weight: 20 rpe: 8).
58 Removed: (MFTSet reps: 6 weight: 20 rpe: 10).
59 Removed: (MFTSet reps: 15 rpe: 4) } asOrderedCollection)
60 Removed: with: (MFTExercise shoulderPressDumbell sets: {
61 Removed: (MFTSet reps: 10 weight: 10 rpe: 6).
62 Removed: (MFTSet reps: 6 weight: 15 rpe: 8).
63 Removed: (MFTSet reps: 6 weight: 17.5 rpe: 10) }
64 Removed: asOrderedCollection)
65 Removed: with: (MFTExercise declineBenchPress sets: {
66 Removed: (MFTSet reps: 5 rpe: 6).
67 Removed: (MFTSet reps: 6 rpe: 8).
68 Removed: (MFTSet reps: 8 rpe: 10) } asOrderedCollection)).
54 Added: secondaryMuscles: {
55 Added: MFTMuscle tricepsBrachii.
56 Added: MFTMuscleGroup arm };
57 Added: exercises: {
58 Added: (MFTExercise cableRow sets: {
59 Added: (MFTSet reps: 8 weight: 20 rpe: 6).
60 Added: (MFTSet reps: 6 weight: 20 rpe: 8).
61 Added: (MFTSet reps: 6 weight: 20 rpe: 10).
62 Added: (MFTSet reps: 15 rpe: 4) }).
63 Added: (MFTExercise shoulderPressDumbell sets: {
64 Added: (MFTSet reps: 10 weight: 10 rpe: 6).
65 Added: (MFTSet reps: 6 weight: 15 rpe: 8).
66 Added: (MFTSet reps: 6 weight: 17.5 rpe: 10) }).
67 Added: (MFTExercise declineBenchPress sets: {
68 Added: (MFTSet reps: 5 rpe: 6).
69 Added: (MFTSet reps: 6 rpe: 8).
70 Added: (MFTSet reps: 8 rpe: 10) }) }.
69 71 workout2 := self new
70 72 date: (Date fromString: '01/02/2024');
71 Removed: exercises: (OrderedCollection
72 Removed: with: (MFTExercise cableRow sets: {
73 Removed: (MFTSet reps: 8 rpe: 6).
74 Removed: (MFTSet reps: 6 rpe: 8).
75 Removed: (MFTSet reps: 6 rpe: 10).
76 Removed: (MFTSet reps: 15 rpe: 4) } asOrderedCollection)
77 Removed: with: MFTExercise shoulderPressDumbell
78 Removed: with: MFTExercise declineBenchPress).
73 Added: exercises: {
74 Added: (MFTExercise cableRow sets: {
75 Added: (MFTSet reps: 8 rpe: 6).
76 Added: (MFTSet reps: 6 rpe: 8).
77 Added: (MFTSet reps: 6 rpe: 10).
78 Added: (MFTSet reps: 15 rpe: 4) }).
79 Added: MFTExercise shoulderPressDumbell.
80 Added: MFTExercise declineBenchPress }.
79 81 workout3 := self new
80 82 date: (Date fromString: '01/03/2024');
81 83 addExercise: MFTExercise cableRow;
@@ -86,13 +88,13 @@
86 88 exercises: {
87 89 MFTExercise cableRow.
88 90 MFTExercise shoulderPressDumbell.
89 Removed: MFTExercise declineBenchPress } asOrderedCollection.
91 Added: MFTExercise declineBenchPress }.
90 92 workout5 := self new
91 93 date: (Date fromString: '01/10/2024');
92 94 exercises: {
93 95 MFTExercise cableRow.
94 96 MFTExercise shoulderPressDumbell.
95 Removed: MFTExercise declineBenchPress } asOrderedCollection.
97 Added: MFTExercise declineBenchPress }.
96 98
97 99 ^ OrderedCollection withAll: {
98 100 workout1.
@@ -144,7 +146,7 @@
144 146 { #category : #accessing }
145 147 MFTWorkout >> exercises: aMFTExerciseCollection [
146 148
147 Removed: exercises := aMFTExerciseCollection
149 Added: exercises := aMFTExerciseCollection asOrderedCollection
148 150 ]
149 151
150 152 { #category : #'as yet unclassified' }
@@ -180,12 +182,6 @@
180 182 primaryMuscle := aMFTMuscle
181 183 ]
182 184
183 Removed: { #category : #initialization }
184 Removed: MFTWorkout >> removeExercise: anExercise [
185 Removed:
186 Removed: exercises remove: anExercise
187 Removed: ]
188 Removed:
189 185 { #category : #rendering }
190 186 MFTWorkout >> renderContentOn: html [
191 187
@@ -275,7 +271,7 @@
275 271 { #category : #accessing }
276 272 MFTWorkout >> secondaryMuscles: aMFTMuscleCollection [
277 273
278 Removed: secondaryMuscles := aMFTMuscleCollection
274 Added: secondaryMuscles := aMFTMuscleCollection asOrderedCollection
279 275 ]
280 276
281 277 { #category : #'as yet unclassified' }