[Pharo] Personal fitness tracker web app.
Updated MFTUser attribute method arguments. newFromDictionary: now takes passwordHash into account.
src/MyFitnessTracker/MFTUser.class.st
@@ -46,6 +46,8 @@
46
46
47
47
^ self new
48
48
username: (aDictionary at: 'username' ifAbsent: [ String new ]);
49
Added:
passwordHash:
50
Added:
(aDictionary at: 'password_hash' ifAbsent: [ ByteArray new ]);
49
51
dateOfBirth:
50
52
(aDictionary at: 'date_of_birth' ifAbsent: [ Date new ]);
51
53
realFirstName:
@@ -82,9 +84,9 @@
82
84
]
83
85
84
86
{ #category : #accessing }
85
Removed:
MFTUser >> dateOfBirth: anObject [
87
Added:
MFTUser >> dateOfBirth: aDate [
86
88
87
Removed:
dateOfBirth := anObject
89
Added:
dateOfBirth := aDate
88
90
]
89
91
90
92
{ #category : #initialization }
@@ -121,9 +123,9 @@
121
123
]
122
124
123
125
{ #category : #accessing }
124
Removed:
MFTUser >> lastLoginDateAndTime: anObject [
126
Added:
MFTUser >> lastLoginDateAndTime: aDateAndTime [
125
127
126
Removed:
lastLoginDateAndTime := anObject
128
Added:
lastLoginDateAndTime := aDateAndTime
127
129
]
128
130
129
131
{ #category : #accessing }
@@ -133,9 +135,9 @@
133
135
]
134
136
135
137
{ #category : #accessing }
136
Removed:
MFTUser >> passwordHash: aPasswordHash [
138
Added:
MFTUser >> passwordHash: aByteArray [
137
139
138
Removed:
passwordHash := aPasswordHash
140
Added:
passwordHash := aByteArray
139
141
]
140
142
141
143
{ #category : #accessing }
@@ -151,9 +153,9 @@
151
153
]
152
154
153
155
{ #category : #accessing }
154
Removed:
MFTUser >> realFirstName: anObject [
156
Added:
MFTUser >> realFirstName: aString [
155
157
156
Removed:
realFirstName := anObject
158
Added:
realFirstName := aString
157
159
]
158
160
159
161
{ #category : #accessing }
@@ -163,9 +165,9 @@
163
165
]
164
166
165
167
{ #category : #accessing }
166
Removed:
MFTUser >> realLastName: anObject [
168
Added:
MFTUser >> realLastName: aString [
167
169
168
Removed:
realLastName := anObject
170
Added:
realLastName := aString
169
171
]
170
172
171
173
{ #category : #rendering }
@@ -198,35 +200,35 @@
198
200
]
199
201
200
202
{ #category : #accessing }
201
Removed:
MFTUser >> username: anObject [
203
Added:
MFTUser >> username: aString [
202
204
203
Removed:
username := anObject
205
Added:
username := aString
204
206
]
205
207
206
208
{ #category : #accessing }
207
209
MFTUser >> weights [
208
210
209
Removed:
self session user isLoggedIn ifTrue: [
210
Removed:
weights := self session db allUserWeights ].
211
Removed:
^ weights
211
Added:
^ self session user isLoggedIn
212
Added:
ifTrue: [ self session db allUserWeights ]
213
Added:
ifFalse: [ weights ]
212
214
]
213
215
214
216
{ #category : #accessing }
215
Removed:
MFTUser >> weights: aCollection [
217
Added:
MFTUser >> weights: aMFTWeightCollection [
216
218
217
Removed:
weights := aCollection
219
Added:
weights := aMFTWeightCollection
218
220
]
219
221
220
222
{ #category : #accessing }
221
223
MFTUser >> workouts [
222
224
223
Removed:
self session user isLoggedIn ifTrue: [
224
Removed:
workouts := self session db allUserWorkouts ].
225
Removed:
^ workouts
225
Added:
^ self session user isLoggedIn
226
Added:
ifTrue: [ self session db allUserWorkouts ]
227
Added:
ifFalse: [ workouts ]
226
228
]
227
229
228
230
{ #category : #accessing }
229
Removed:
MFTUser >> workouts: anObject [
231
Added:
MFTUser >> workouts: aMFTWorkoutCollection [
230
232
231
Removed:
workouts := anObject
233
Added:
workouts := aMFTWorkoutCollection
232
234
]