Update domain model.

Commit
7b8c72d34815ce104ed27ae9060ff508199084f4
Author
Marius Peter <dev@marius-peter.com>
Author date
Committer
Marius Peter <dev@marius-peter.com>
Committer date
Changed files
src/MyFitnessTracker-Core/MFTEquipment.class.st
index c0b410ad..aa3f4b76 100644..100644
@@ -44,6 +44,12 @@
44 44 ^ self newWithEnglishName
45 45 ]
46 46
47 Added: { #category : 'machines' }
48 Added: MFTEquipment class >> legPressMachine [
49 Added:
50 Added: ^ self newWithEnglishName
51 Added: ]
52 Added:
47 53 { #category : 'as yet unclassified' }
48 54 MFTEquipment class >> newWithEnglishName [
49 55 "I return a MFTEquipment instance for which englishName is set to the calling method selector, as a space-separated string."
src/MyFitnessTracker-Core/MFTExercise.class.st
index 83083254..a0788966 100644..100644
@@ -46,6 +46,12 @@
46 46 ]
47 47
48 48 { #category : 'back' }
49 Added: MFTExercise class >> cableCross [
50 Added:
51 Added: ^ self newWithEnglishName activates: MFTMuscleGroup chest
52 Added: ]
53 Added:
54 Added: { #category : 'back' }
49 55 MFTExercise class >> cableRow [
50 56
51 57 ^ self newWithEnglishName activates: MFTMuscleGroup back
@@ -148,6 +154,14 @@
148 154 equipment: MFTEquipment legExtensionMachine
149 155 ]
150 156
157 Added: { #category : 'back' }
158 Added: MFTExercise class >> legPress [
159 Added:
160 Added: ^ self newWithEnglishName
161 Added: activates: MFTMuscleGroup leg;
162 Added: equipment: MFTEquipment legPressMachine
163 Added: ]
164 Added:
151 165 { #category : 'tricep' }
152 166 MFTExercise class >> lyingFrenchPress [
153 167
@@ -167,6 +181,14 @@
167 181 ^ self new englishName: exerciseNameFromSender
168 182 ]
169 183
184 Added: { #category : 'leg' }
185 Added: MFTExercise class >> pecDeck [
186 Added:
187 Added: ^ self newWithEnglishName
188 Added: activates: MFTMuscleGroup chest;
189 Added: equipment: MFTEquipment pecDeck
190 Added: ]
191 Added:
170 192 { #category : 'traps' }
171 193 MFTExercise class >> rearDeltFly [
172 194
@@ -210,6 +232,14 @@
210 232
211 233 { #category : 'tricep' }
212 234 MFTExercise class >> tricepExtension [
235 Added:
236 Added: ^ self newWithEnglishName
237 Added: activates: MFTMuscleGroup arm;
238 Added: equipment: MFTEquipment cable
239 Added: ]
240 Added:
241 Added: { #category : 'chest' }
242 Added: MFTExercise class >> tricepPressdown [
213 243
214 244 ^ self newWithEnglishName
215 245 activates: MFTMuscleGroup arm;
src/MyFitnessTracker-Core/MFTSetPrescription.class.st
index a7559431..9397393d 100644..100644
@@ -6,6 +6,7 @@
6 6 #superclass : 'MFTObject',
7 7 #instVars : [
8 8 'exercise',
9 Added: 'alternativeExercises',
9 10 'repScheme'
10 11 ],
11 12 #category : 'MyFitnessTracker-Core-Prescription',
@@ -22,6 +23,15 @@
22 23 ]
23 24
24 25 { #category : 'as yet unclassified' }
26 Added: MFTSetPrescription class >> exercise: aMFTExercise alternativeExercises: aMFTExerciseCollection [
27 Added:
28 Added: ^ self new
29 Added: exercise: aMFTExercise;
30 Added: alternativeExercises: aMFTExerciseCollection;
31 Added: yourself
32 Added: ]
33 Added:
34 Added: { #category : 'as yet unclassified' }
25 35 MFTSetPrescription class >> exercise: aMFTExercise repScheme: aMFTRepScheme [
26 36
27 37 ^ self new
@@ -38,6 +48,18 @@
38 48 ^ repScheme = anObject repScheme and: [ exercise = anObject exercise ]
39 49 ]
40 50
51 Added: { #category : 'accessing' }
52 Added: MFTSetPrescription >> alternativeExercises [
53 Added:
54 Added: ^ alternativeExercises
55 Added: ]
56 Added:
57 Added: { #category : 'accessing' }
58 Added: MFTSetPrescription >> alternativeExercises: aMFTExerciseCollection [
59 Added:
60 Added: alternativeExercises := aMFTExerciseCollection
61 Added: ]
62 Added:
41 63 { #category : 'initialization' }
42 64 MFTSetPrescription >> canonicalName [
43 65
@@ -67,7 +89,8 @@
67 89 MFTSetPrescription >> initialize [
68 90
69 91 super initialize.
70 Removed: repScheme := MFTRepScheme from: 6 to: 10
92 Added: repScheme := MFTRepScheme from: 6 to: 10.
93 Added: alternativeExercises := OrderedCollection new
71 94 ]
72 95
73 96 { #category : 'as yet unclassified' }
src/MyFitnessTracker-Core/MFTWorkoutPrescription.class.st
index 9405518f..b3c85589 100644..100644
@@ -19,14 +19,20 @@
19 19 ^ self new
20 20 title: 'Day 1';
21 21 prescribePreExhaustSuperset: {
22 Removed: (MFTSetPrescription exercise: MFTExercise dumbbellFly).
22 Added: (MFTSetPrescription
23 Added: exercise: MFTExercise dumbbellFly
24 Added: alternativeExercises: {
25 Added: MFTExercise cableCross.
26 Added: MFTExercise pecDeck }).
23 27 (MFTSetPrescription exercise: MFTExercise inclinePress) };
24 28 prescribeStraightSet:
25 29 (MFTSetPrescription exercise: MFTExercise lateralRaise);
26 30 prescribeStraightSet:
27 31 (MFTSetPrescription exercise: MFTExercise rearDeltFly);
28 32 prescribeSuperset: {
29 Removed: (MFTSetPrescription exercise: MFTExercise lyingFrenchPress).
33 Added: (MFTSetPrescription
34 Added: exercise: MFTExercise lyingFrenchPress
35 Added: alternativeExercises: { MFTExercise tricepPressdown }).
30 36 (MFTSetPrescription exercise: MFTExercise dip) }
31 37 ]
32 38
@@ -56,7 +62,9 @@
56 62 title: 'Day 3';
57 63 prescribeSuperset: {
58 64 (MFTSetPrescription exercise: MFTExercise legExtension).
59 Removed: (MFTSetPrescription exercise: MFTExercise barbellSquat) };
65 Added: (MFTSetPrescription
66 Added: exercise: MFTExercise barbellSquat
67 Added: alternativeExercises: { MFTExercise legPress }) };
60 68 prescribeStraightSet:
61 69 (MFTSetPrescription exercise: MFTExercise seatedLegCurl);
62 70 prescribeStraightSet: