Updated dialogs.

Commit
0195468d854e4fc216f19bd368e63f50416e7ea2
Author
Marius Peter <marius.peter@tutanota.com>
Author date
Committer
Marius Peter <marius.peter@tutanota.com>
Committer date
Changed files
src/MyFitnessTracker/MFTExerciseDialog.class.st
index ae22f5ec..cc30cb14 100644..100644
@@ -1,3 +1,6 @@
1 Added: "
2 Added: I represent a dialog for a single exercise.
3 Added: "
1 4 Class {
2 5 #name : #MFTExerciseDialog,
3 6 #superclass : #MFTDialog,
@@ -50,6 +53,7 @@
50 53 with: 'Add' ].
51 54 html
52 55 tableData;
56 Added: tableData;
53 57 tableData ]
54 58 ]
55 59
@@ -96,14 +100,18 @@
96 100 beSecondary;
97 101 beSmall;
98 102 callback: [
99 Removed: sets add: (MFTSet reps: set reps rpe: set rpe) afterIndex: i ];
103 Added: sets add: (MFTSet reps: set reps weight: set weight rpe: set rpe) afterIndex: i ];
100 104 with: 'Duplicate' ] ].
101 105 html tableData: [
102 Removed: html numberInput
106 Added: html numberInput formControl
103 107 value: set reps;
104 108 callback: [ :value | set reps: value ] ].
105 109 html tableData: [
106 Removed: html numberInput
110 Added: html numberInput formControl
111 Added: value: set weight;
112 Added: callback: [ :value | set weight: value ] ].
113 Added: html tableData: [
114 Added: html numberInput formControl
107 115 value: set rpe;
108 116 callback: [ :value | set rpe: value ] ] ] ]
109 117 ]
@@ -143,7 +151,7 @@
143 151 html tableHead: [
144 152 html
145 153 tableHeading;
146 Removed: tableHeading: 'Reps';
154 Added: tableHeading: 'Reps';tableHeading: 'Weight';
147 155 tableHeading: 'RPE' ]
148 156 ]
149 157
src/MyFitnessTracker/MFTExercisesDialog.class.st
index 19bd16b5..54367e39 100644..100644
@@ -99,7 +99,9 @@
99 99 html tableData: exercise englishName.
100 100 html tableData: exercise primaryMuscle englishName.
101 101 ((exercises collect: #sets) anySatisfy: #isNotEmpty) ifTrue: [
102 Removed: html tableData: exercise repsBySet asCommaString ] ] ]
102 Added: html tableData: exercise repsBySet size ].
103 Added: ((exercises collect: #volume) anySatisfy: [ :volume | volume ~~ 0 ])
104 Added: ifTrue: [ html tableData: exercise volume ] ] ]
103 105 ]
104 106
105 107 { #category : #rendering }
@@ -127,5 +129,7 @@
127 129 tableHeading: 'Exercise';
128 130 tableHeading: 'Primary Muscle'.
129 131 ((exercises collect: #sets) anySatisfy: #isNotEmpty) ifTrue: [
130 Removed: html tableHeading: 'Sets' ] ]
132 Added: html tableHeading: 'Sets' ].
133 Added: ((exercises collect: #volume) anySatisfy: [ :volume | volume ~~ 0 ])
134 Added: ifTrue: [ html tableHeading: 'Volume' ] ]
131 135 ]
src/MyFitnessTracker/MFTWeightDialog.class.st
index 81bb269d..c96e4292 100644..100644
@@ -35,8 +35,8 @@
35 35 html formGroup: [
36 36 html label: 'Weight'.
37 37 html numberInput formControl
38 Removed: placeholder: weight value;
39 Removed: callback: [ :value | weight value: value ] ] ]
38 Added: callback: [ :value | weight value: value ];
39 Added: value: weight value ] ]
40 40 ]
41 41
42 42 { #category : #rendering }