[Pharo] Personal fitness tracker web app.
Updated cards.
Changed files
src/MyFitnessTracker-Components/MFTActionsCard.class.st
@@ -10,9 +10,17 @@
10
10
MFTActionsCard >> renderContentOn: html [
11
11
12
12
self renderCardOn: html with: [
13
Removed:
html form: [
14
Removed:
html formButton
15
Removed:
formControl;
16
Removed:
callback: [ MFTWorkoutTask new ];
17
Removed:
with: 'Log Workout' ] ]
13
Added:
html cardBody: [
14
Added:
html form: [
15
Added:
html buttonGroupVertical: [
16
Added:
html outlineButton
17
Added:
beSecondary;
18
Added:
formControl;
19
Added:
callback: [ self addWorkout ];
20
Added:
with: 'Log Workout'.
21
Added:
html outlineButton
22
Added:
beSecondary;
23
Added:
formControl;
24
Added:
callback: [ self addWeight ];
25
Added:
with: 'Log weight' ] ] ] ]
18
26
]
src/MyFitnessTracker-Components/MFTCard.class.st
@@ -6,6 +6,45 @@
6
6
#tag : 'Widgets'
7
7
}
8
8
9
Added:
{ #category : 'adding' }
10
Added:
MFTCard >> addWeight [
11
Added:
12
Added:
| newWeight newWeightMatchesOldWeight |
13
Added:
newWeight := self session pageManager activePage call:
14
Added:
MFTWeightDialog new.
15
Added:
16
Added:
newWeight ifNil: [ ^ self ] ifNotNil: [
17
Added:
self session pageManager setActivePageAt: #logs.
18
Added:
(self session pageManager mainPages at: #logs) setActiveLogAt:
19
Added:
#weights ].
20
Added:
21
Added:
newWeightMatchesOldWeight := self session user weights anySatisfy: [
22
Added:
:existingWeight |
23
Added:
newWeight date = existingWeight date
24
Added:
and: [
25
Added:
newWeight value = existingWeight value ] ].
26
Added:
newWeightMatchesOldWeight ifTrue: [ ^ self ].
27
Added:
28
Added:
self session user isLoggedIn
29
Added:
ifTrue: [ self session db insert: newWeight ]
30
Added:
ifFalse: [ self session user weights add: newWeight ]
31
Added:
]
32
Added:
33
Added:
{ #category : 'adding' }
34
Added:
MFTCard >> addWorkout [
35
Added:
36
Added:
| newWorkout |
37
Added:
newWorkout := self session pageManager activePage call:
38
Added:
MFTWorkoutForm new.
39
Added:
newWorkout
40
Added:
ifNil: [ ^ self ]
41
Added:
ifNotNil: [ self session pageManager setActivePageAt: #logs ].
42
Added:
43
Added:
self session user isLoggedIn
44
Added:
ifTrue: [ self session db insert: newWorkout ]
45
Added:
ifFalse: [ self session user workouts add: newWorkout ]
46
Added:
]
47
Added:
9
48
{ #category : 'rendering' }
10
49
MFTCard >> renderCardOn: html with: aBlock [
11
50
src/MyFitnessTracker-Components/MFTMainPublicCard.class.st
@@ -6,21 +6,6 @@
6
6
#tag : 'Widgets'
7
7
}
8
8
9
Removed:
{ #category : 'adding' }
10
Removed:
MFTMainPublicCard >> addWorkout [
11
Removed:
12
Removed:
| newWorkout |
13
Removed:
newWorkout := self session pageManager activePage call:
14
Removed:
MFTWorkoutForm new.
15
Removed:
newWorkout
16
Removed:
ifNil: [ ^ self ]
17
Removed:
ifNotNil: [ self session pageManager setActivePageAt: #logs ].
18
Removed:
19
Removed:
self session user isLoggedIn
20
Removed:
ifTrue: [ self session db insert: newWorkout ]
21
Removed:
ifFalse: [ self session user workouts add: newWorkout ]
22
Removed:
]
23
Removed:
24
9
{ #category : 'rendering' }
25
10
MFTMainPublicCard >> renderContentOn: html [
26
11
src/MyFitnessTracker-Components/MFTWeightsCard.class.st
@@ -6,21 +6,6 @@
6
6
#tag : 'Widgets'
7
7
}
8
8
9
Removed:
{ #category : 'adding' }
10
Removed:
MFTWeightsCard >> addWeight [
11
Removed:
12
Removed:
| newWeight |
13
Removed:
newWeight := self session pageManager activePage call:
14
Removed:
MFTWeightDialog new.
15
Removed:
(self session user weights anySatisfy: [ :existingWeight |
16
Removed:
newWeight date = existingWeight date and: [
17
Removed:
newWeight value = existingWeight value ] ]) ifTrue: [ ^ self ].
18
Removed:
19
Removed:
self session user isLoggedIn
20
Removed:
ifTrue: [ self session db insert: newWeight ]
21
Removed:
ifFalse: [ self session user weights add: newWeight ]
22
Removed:
]
23
Removed:
24
9
{ #category : 'rendering' }
25
10
MFTWeightsCard >> renderContentOn: html [
26
11