Skip to content

Frontend Mods #56

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

Open
joshgarde wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Frontend Mods #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions backend/api/event.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,8 @@ def create_event(org_id):
return {'message': "You do not have any role in this organization",
'success': False}

if roleObj.role != Roles.ADMIN:
return {'message': 'You need to be an ADMIN in this organization to create events',
if roleObj.role != Roles.ADMIN and roleObj.role != Roles.CHAIRMAN:
return {'message': 'You need to be an administrator or chairperson in this organization to create events',
'success': False}

userObj = sessionObj.user
Expand Down
19 changes: 3 additions & 16 deletions backend/api/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from database.session import Session
from database.user import User
from database.organization import Organization, OrganizationSchema
from database.event import Event
from database.event import Event, EventSchema
from sqlalchemy.dialects.postgresql import UUID

@app.route('/login', methods=['POST'])
Expand Down Expand Up @@ -299,24 +299,11 @@ def get_registered_events():
register_obj = db.session.query(Registration).filter(Registration.register_id == request.user.user_id).all()
#print("...DEBUGGING...")
#print(register_obj)
event_schema = EventSchema()
events = []
for registered in register_obj:
event_obj = db.session.query(Event).filter(Event.event_id == registered.event_id).first()
data = {
'categories': event_obj.categories,
'contact_id': event_obj.contact_id,
'creator_id': event_obj.creator_id,
'start_date': event_obj.start_date,
'end_date': event_obj.end_date,
'perk': event_obj.perk,
'phase': event_obj.phase,
'info': event_obj.info,
'organization_id': event_obj.organization_id,
'event_id': registered.event_id,
'event_name': event_obj.event_name,
'created_at': registered.created_at
}
events.append(data)
events.append(event_schema.dump(event_obj))
return jsonify({'success': True, 'message': 'show my registered events', 'events': events})


Expand Down