diff --git a/app/controllers/main/routes.py b/app/controllers/main/routes.py index 6f83f32dd..6fcaa6c68 100644 --- a/app/controllers/main/routes.py +++ b/app/controllers/main/routes.py @@ -233,6 +233,10 @@ def viewUsersProfile(username): managersProgramDict = getManagerProgramDict(g.current_user) managersList = [id[1] for id in managersProgramDict.items()] totalSustainedEngagements = getEngagementTotal(getCommunityEngagementByTerm(volunteer)) + eventParticipant = list(EventParticipant.select(EventParticipant.hoursEarned) + .join(Event) + .where(EventParticipant.user == volunteer, EventParticipant.event == Event.id,) + .order_by(Event.id.asc())) return render_template ("/main/userProfile.html", username=username, @@ -252,6 +256,7 @@ def viewUsersProfile(username): managersList = managersList, participatedInLabor = getCeltsLaborHistory(volunteer), totalSustainedEngagements = totalSustainedEngagements, + eventParticipant = eventParticipant ) abort(403) diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html index b4cafbccf..9d23d3bb0 100644 --- a/app/templates/main/userProfile.html +++ b/app/templates/main/userProfile.html @@ -168,6 +168,7 @@

Program Event Name Participation Type + Service Hours Event Date {% for event in participatedEvents %} @@ -175,6 +176,11 @@

{{event.programName}} {{event.name}} {{event.participatedType}} + {% if event.participatedType == 'Volunteer' %} + {{eventParticipant[loop.index0].hoursEarned}} + {% else %} + N/A + {% endif %} {{event.startDate.strftime('%m/%d/%Y')}} {% endfor %}