Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added full name to emergency contact updates as well as insurance updates in admin logs (Updated) | Eun Sung & Mustafa #1285

Merged
merged 2 commits into from
Jul 24, 2024
Merged

Added full name to emergency contact updates as well as insurance updates in admin logs (Updated) | Eun Sung & Mustafa #1285

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cf0bad
Updated and made the changes, ready for a PR Review
esw0624 Jul 18, 2024
789f297
Merge branch 'development' into adminlogchanges
BrianRamsay Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions app/controllers/main/routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,8 @@ def emergencyContactInfo(username):
if not (g.current_user.username == username or g.current_user.isCeltsAdmin):
abort(403)


user = User.get(User.username == username)

if request.method == 'GET':
readOnly = g.current_user.username != username
contactInfo = EmergencyContact.get_or_none(EmergencyContact.user_id == username)
Expand All @@ -227,7 +228,7 @@ def emergencyContactInfo(username):
rowsUpdated = EmergencyContact.update(**request.form).where(EmergencyContact.user == username).execute()
if not rowsUpdated:
EmergencyContact.create(user = username, **request.form)
createActivityLog(f"{g.current_user} updated {username}'s emergency contact information.")
createActivityLog(f"{g.current_user.fullName} updated {user.fullName}'s emergency contact information.")
flash('Emergency contact information saved successfully!', 'success')

if request.args.get('action') == 'exit':
Expand All @@ -242,6 +243,8 @@ def insuranceInfo(username):
"""
if not (g.current_user.username == username or g.current_user.isCeltsAdmin):
abort(403)

user = User.get(User.username == username)

if request.method == 'GET':
readOnly = g.current_user.username != username
Expand All @@ -260,7 +263,7 @@ def insuranceInfo(username):
rowsUpdated = InsuranceInfo.update(**request.form).where(InsuranceInfo.user == username).execute()
if not rowsUpdated:
InsuranceInfo.create(user = username, **request.form)
createActivityLog(f"{g.current_user} updated {username}'s emergency contact information.")
createActivityLog(f"{g.current_user.fullName} updated {user.fullName}'s insurance information.")
flash('Insurance information saved successfully!', 'success')

if request.args.get('action') == 'exit':
Expand Down
Loading