@@ -106,7 +106,7 @@ def register(request):
106
106
try :
107
107
dob_date = datetime .strptime (dob , '%Y-%m-%d' ).date ()
108
108
except ValueError :
109
- logger .warning (f "Invalid dob: { dob } " )
109
+ logger .warning ("Invalid date of birth format provided " )
110
110
Patient .objects .create (
111
111
username = user .username ,
112
112
first_name = first_name ,
@@ -129,24 +129,14 @@ def register(request):
129
129
logger .error (f"Register error: { e } " )
130
130
return Response ({"error" : "Failed to create account" }, status = 500 )
131
131
132
-
133
132
@never_cache
133
+ @login_required (login_url = 'login' )
134
134
def dashboard (request ):
135
- token = request .COOKIES .get ('access_token' ) or request .session .get ('access_token' )
136
- if not token :
137
- return redirect ('login' )
138
- try :
139
- jwt_auth = JWTAuthentication ()
140
- validated_token = jwt_auth .get_validated_token (token )
141
- user = jwt_auth .get_user (validated_token )
142
- appointments = Appointment .objects .filter (user = user ).order_by ('date' )
143
- return render (request , "users/dashboard.html" , {
144
- 'user' : user ,
145
- 'appointments' : appointments
146
- })
147
- except (InvalidToken , TokenError ):
148
- return redirect ('login' )
149
-
135
+ appointments = Appointment .objects .filter (user = request .user ).order_by ('date' )
136
+ return render (request , "users/dashboard.html" , {
137
+ 'user' : request .user ,
138
+ 'appointments' : appointments
139
+ })
150
140
151
141
@never_cache
152
142
def forgot_password_page (request ):
@@ -225,33 +215,37 @@ def reset_password(request):
225
215
def profile (request ):
226
216
user = request .user
227
217
patient_data = Patient .objects .filter (username = user .username ).first ()
228
- user_data = User .objects .filter (username = user .username ).first ()
218
+ user_data = User .objects .filter (username = user .username ).first ()
219
+
229
220
if not patient_data :
230
221
return HttpResponse ("Patient data not found" , status = 404 )
231
222
232
- form = CustomUserUpdateForm (initial = {
233
- "firstname" : patient_data .first_name ,
234
- "lastname" : patient_data .last_name ,
235
- "email" : patient_data .email ,
236
- "phone" : patient_data .phone_number ,
237
- "birth_date" : patient_data .date_of_birth
238
- })
239
223
if request .method == 'POST' :
240
224
form = CustomUserUpdateForm (request .POST )
241
225
if form .is_valid ():
242
- patient_data .first_name = form .cleaned_data ["first_name" ]
243
- patient_data .last_name = form .cleaned_data ["last_name" ]
244
- patient_data .email = form .cleaned_data ["email" ]
245
- patient_data .phone_number = form .cleaned_data ["phone" ]
226
+ patient_data .first_name = form .cleaned_data ["first_name" ]
227
+ patient_data .last_name = form .cleaned_data ["last_name" ]
228
+ patient_data .email = form .cleaned_data ["email" ]
229
+ patient_data .phone_number = form .cleaned_data ["phone" ]
246
230
patient_data .date_of_birth = form .cleaned_data ["birth_date" ]
247
- user_data .first_name = form .cleaned_data ["first_name" ]
248
- user_data .last_name = form .cleaned_data ["last_name" ]
249
- user_data .email = form .cleaned_data ["email" ]
231
+
232
+ user_data .first_name = form .cleaned_data ["first_name" ]
233
+ user_data .last_name = form .cleaned_data ["last_name" ]
234
+ user_data .email = form .cleaned_data ["email" ]
235
+
250
236
patient_data .save ()
251
237
user_data .save ()
252
238
return redirect ("profile" )
253
- return render (request , 'users/profile.html' , {"form" : form })
239
+ else :
240
+ form = CustomUserUpdateForm (initial = {
241
+ "first_name" : patient_data .first_name ,
242
+ "last_name" : patient_data .last_name ,
243
+ "email" : patient_data .email ,
244
+ "phone" : patient_data .phone_number ,
245
+ "birth_date" : patient_data .date_of_birth
246
+ })
254
247
248
+ return render (request , 'users/profile.html' , {"form" : form })
255
249
256
250
@login_required (login_url = 'login' )
257
251
def cancel_appointment (request , appointment_id ):
0 commit comments