[Pharo] Personal fitness tracker web app.
Normalize englishName throughout.
Changed files
src/MyFitnessTracker/MFTExercise.class.st
@@ -34,7 +34,7 @@
34
34
#name : #MFTExercise,
35
35
#superclass : #Object,
36
36
#instVars : [
37
Removed:
'name',
37
Added:
'englishName',
38
38
'sets',
39
39
'primaryMuscle',
40
40
'secondaryMuscles'
@@ -108,7 +108,7 @@
108
108
MFTExercise class >> shoulderPressDumbell [
109
109
110
110
^ self new
111
Removed:
name: 'shoulder press (dumbell)';
111
Added:
englishName: 'shoulder press (dumbell)';
112
112
primaryMuscle: MFTMuscle deltoidAnterior;
113
113
secondaryMuscles: MFTMuscle deltoidMedial;
114
114
yourself
@@ -126,26 +126,26 @@
126
126
yourself
127
127
]
128
128
129
Removed:
{ #category : #initialization }
130
Removed:
MFTExercise >> initialize [
129
Added:
{ #category : #accessing }
130
Added:
MFTExercise >> englishName [
131
131
132
Removed:
super initialize.
133
Removed:
name := String new.
134
Removed:
sets := OrderedCollection new.
135
Removed:
primaryMuscle := MFTMuscleGroup new.
136
Removed:
secondaryMuscles := OrderedCollection new
132
Added:
^ englishName
137
133
]
138
134
139
135
{ #category : #accessing }
140
Removed:
MFTExercise >> name [
136
Added:
MFTExercise >> englishName: aString [
141
137
142
Removed:
^ name
138
Added:
englishName := aString
143
139
]
144
140
145
Removed:
{ #category : #accessing }
146
Removed:
MFTExercise >> name: aString [
141
Added:
{ #category : #initialization }
142
Added:
MFTExercise >> initialize [
147
143
148
Removed:
name := aString
144
Added:
super initialize.
145
Added:
englishName := String new.
146
Added:
sets := OrderedCollection new.
147
Added:
primaryMuscle := MFTMuscleGroup new.
148
Added:
secondaryMuscles := OrderedCollection new
149
149
]
150
150
151
151
{ #category : #accessing }
@@ -163,7 +163,7 @@
163
163
{ #category : #rendering }
164
164
MFTExercise >> renderContentOn: html [
165
165
166
Removed:
html text: name
166
Added:
html text: englishName
167
167
]
168
168
169
169
{ #category : #'as yet unclassified' }
src/MyFitnessTracker/MFTMainTabsComponent.class.st
@@ -48,7 +48,20 @@
48
48
id: 'navbarCollapsed';
49
49
with: [
50
50
html navigationBarNavigation: [
51
Removed:
mainTabs do: [ :tab | self renderTab: tab on: html ] ] ] ].
51
Added:
mainTabs do: [ :tab | self renderTab: tab on: html ].
52
Added:
html navigationItem dropdown with: [
53
Added:
html navigationLink
54
Added:
dropdownToggle;
55
Added:
dataToggle: 'dropdown';
56
Added:
with: 'Learn'.
57
Added:
58
Added:
html dropdownMenu
59
Added:
attributeAt: 'aria-labelledby' put: 'navbarDropdown';
60
Added:
with: [
61
Added:
html dropdownItem: 'Exercises'.
62
Added:
html dropdownItem: 'Muscles'
63
Added:
"html dropdownDivider.
64
Added:
html dropdownItem: 'Something else here'" ] ] ] ] ].
52
65
html break.
53
66
html render: activeTab
54
67
]
@@ -60,12 +73,6 @@
60
73
beActiveIf: [ tab = activeTab ];
61
74
with: [
62
75
html navigationLink
63
Removed:
callback: [ self setActiveTab: tab ];
76
Added:
callback: [ activeTab := tab ];
64
77
with: tab title ]
65
Removed:
]
66
Removed:
67
Removed:
{ #category : #initialization }
68
Removed:
MFTMainTabsComponent >> setActiveTab: aTab [
69
Removed:
70
Removed:
activeTab := aTab
71
78
]
src/MyFitnessTracker/MFTMuscleGroup.class.st
@@ -2,10 +2,10 @@
2
2
#name : #MFTMuscleGroup,
3
3
#superclass : #Object,
4
4
#instVars : [
5
Removed:
'description',
6
Removed:
'muscles',
7
5
'englishName',
8
Removed:
'latinName'
6
Added:
'latinName',
7
Added:
'description',
8
Added:
'muscles'
9
9
],
10
10
#category : #MyFitnessTracker
11
11
}
src/MyFitnessTracker/MFTWorkout.class.st
@@ -127,7 +127,7 @@
127
127
html tableRow: [
128
128
html tableData: [
129
129
html
130
Removed:
text: exercise name;
130
Added:
text: exercise englishName;
131
131
text: ': '.
132
132
exercise sets
133
133
ifNotEmpty: [