From 2587f4938f72fec47fbab788a55915f2a6ce0079 Mon Sep 17 00:00:00 2001
From: conwelld <conwelld@berea.edu>
Date: Thu, 16 Jul 2026 15:26:41 -0400
Subject: [PATCH 1/3] solved issue service hours not being displayed in
 participation history

---
 app/controllers/main/routes.py      | 2 ++
 app/templates/main/userProfile.html | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/app/controllers/main/routes.py b/app/controllers/main/routes.py
index 6f83f32dd..52cb7ca89 100644
--- a/app/controllers/main/routes.py
+++ b/app/controllers/main/routes.py
@@ -233,6 +233,7 @@ 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 +253,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 13fafda69..dae71a97c 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -169,6 +169,7 @@ <h3 class="accordion-header" id="headingTwo">
                 <th scope="col">Event Name</th>
                 <th scope="col">Participation Type</th>
                 <th scope="col">Event Date</th>
+                <th scope="col">Service Hours</th>
               </thead>
               {% for event in participatedEvents %}
               <tr>
@@ -176,6 +177,11 @@ <h3 class="accordion-header" id="headingTwo">
                 <td><a href= '/event/{{event.id}}/view' class="link-primary">{{event.name}}</a></td>
                 <td>{{event.participatedType}}</td>
                 <td nowrap>{{event.startDate.strftime('%m/%d/%Y')}}</td>
+                {% if event.participatedType == 'Volunteer' %}
+                  <td>{{eventparticipant[loop.index0].hoursEarned}}</td>
+                {% else %}
+                  <td>-</td>
+                {% endif %}
               </tr>
               {% endfor %}
               {% else %}

From 2d0f90bfca68ad254e5a4b49829cc6f9176755c8 Mon Sep 17 00:00:00 2001
From: conwelld <conwelld@berea.edu>
Date: Thu, 16 Jul 2026 16:34:33 -0400
Subject: [PATCH 2/3] fixed pr request changes

---
 app/controllers/main/routes.py      | 7 +++++--
 app/templates/main/userProfile.html | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/controllers/main/routes.py b/app/controllers/main/routes.py
index 52cb7ca89..6fcaa6c68 100644
--- a/app/controllers/main/routes.py
+++ b/app/controllers/main/routes.py
@@ -233,7 +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()))
+        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,
@@ -253,7 +256,7 @@ def viewUsersProfile(username):
                                 managersList = managersList,
                                 participatedInLabor = getCeltsLaborHistory(volunteer),
                                 totalSustainedEngagements = totalSustainedEngagements,
-                                eventparticipant = eventparticipant
+                                eventParticipant = eventParticipant
                             )
     abort(403)
 
diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index dae71a97c..c73b00e22 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -178,7 +178,7 @@ <h3 class="accordion-header" id="headingTwo">
                 <td>{{event.participatedType}}</td>
                 <td nowrap>{{event.startDate.strftime('%m/%d/%Y')}}</td>
                 {% if event.participatedType == 'Volunteer' %}
-                  <td>{{eventparticipant[loop.index0].hoursEarned}}</td>
+                  <td>{{eventParticipant[loop.index0].hoursEarned}}</td>
                 {% else %}
                   <td>-</td>
                 {% endif %}

From a08d6f38534fe92d8c7625adbe5753aeaee155a6 Mon Sep 17 00:00:00 2001
From: conwelld <conwelld@berea.edu>
Date: Fri, 17 Jul 2026 11:13:49 -0400
Subject: [PATCH 3/3] fixed pr changes

---
 app/templates/main/userProfile.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html
index c73b00e22..a8b3a76cb 100644
--- a/app/templates/main/userProfile.html
+++ b/app/templates/main/userProfile.html
@@ -168,20 +168,20 @@ <h3 class="accordion-header" id="headingTwo">
                 <th scope="col">Program</th>
                 <th scope="col">Event Name</th>
                 <th scope="col">Participation Type</th>
-                <th scope="col">Event Date</th>
                 <th scope="col">Service Hours</th>
+                <th scope="col">Event Date</th>
               </thead>
               {% for event in participatedEvents %}
               <tr>
                 <td>{{event.programName}}</td>
                 <td><a href= '/event/{{event.id}}/view' class="link-primary">{{event.name}}</a></td>
                 <td>{{event.participatedType}}</td>
-                <td nowrap>{{event.startDate.strftime('%m/%d/%Y')}}</td>
                 {% if event.participatedType == 'Volunteer' %}
                   <td>{{eventParticipant[loop.index0].hoursEarned}}</td>
                 {% else %}
-                  <td>-</td>
+                  <td>N/A</td>
                 {% endif %}
+                <td nowrap>{{event.startDate.strftime('%m/%d/%Y')}}</td>
               </tr>
               {% endfor %}
               {% else %}