diff --git a/app/controllers/main/routes.py b/app/controllers/main/routes.py index 9c5d93b5c..1a1a2a559 100644 --- a/app/controllers/main/routes.py +++ b/app/controllers/main/routes.py @@ -235,7 +235,7 @@ def viewUsersProfile(username): totalSustainedEngagements = getEngagementTotal(getCommunityEngagementByTerm(volunteer)) handbookOverdue = getHandbookStatus(volunteer) - training = hasGoneToTraining(g.current_user, g.current_term) + training = hasGoneToTraining(volunteer, g.current_term) return render_template ("/main/userProfile.html", username=username, diff --git a/app/logic/events.py b/app/logic/events.py index ae02cf477..57ef86832 100644 --- a/app/logic/events.py +++ b/app/logic/events.py @@ -428,7 +428,7 @@ def getParticipatedEventsForUser(user): .join(Program, JOIN.LEFT_OUTER).switch() .join(EventParticipant) .where(EventParticipant.user == user, - Event.isAllVolunteerTraining == False, Event.deletionDate == None, Event.isCeltsTraining == False) + Event.isAllVolunteerTraining == False, Event.deletionDate == None) .order_by(Event.startDate, Event.name)) allVolunteer = (Event.select(Event, "", Value("Volunteer").alias("participatedType"), Value(0).alias("hoursEarned")) diff --git a/app/static/css/base.css b/app/static/css/base.css index 8aa23189c..374356faf 100644 --- a/app/static/css/base.css +++ b/app/static/css/base.css @@ -36,7 +36,7 @@ select.empty { } .scroll-container { - min-height: 100vh; + max-height: 100vh; } .bi-list { diff --git a/app/templates/main/userProfile.html b/app/templates/main/userProfile.html index 024927369..fc67984ea 100644 --- a/app/templates/main/userProfile.html +++ b/app/templates/main/userProfile.html @@ -818,38 +818,37 @@
Dietary Restrictions

- + + {% set isOwnProfile = volunteer.bnumber == g.current_user.bnumber %} + {% set isLaborViewer = g.current_user.isAdmin or g.current_user.hasCurrentCeltsLabor %} + {% set isLaborHandbook = training.isCeltsTraining or volunteer.isAdmin or volunteer.hasCurrentCeltsLabor %} + {% set handbookAvailable = g.current_term.laborHandbook if isLaborHandbook else g.current_term.volunteerHandbook %} +
AY {{g.current_term.academicYear}} Handbook
-
+
{# All CELTS Training #} - {% if training.isCeltsTraining %} - {% if not g.current_term.laborHandbook %} -

No CELTS Labor Handbook available for {{g.current_term.description}} yet.

- {% else %} -

CELTS Labor Handbook

- {% endif %} - - {# All Volunteer Training #} + {% if not handbookAvailable %} +

No {{ "CELTS Labor" if isLaborHandbook else "Volunteer" }} Handbook available for {{ g.current_term.description }} yet.

{% else %} - {% if not g.current_term.volunteerHandbook %} -

No Volunteer Handbook available for {{g.current_term.description}} yet.

- {% else %} -

CELTS Student Handbook

- {% endif %} - {% endif %} +

+ + {{ "CELTS Labor Handbook" if isLaborHandbook else "CELTS Student Handbook" }} + +

+ {% endif %}
- {% if g.current_user.signatureTerm.academicYear != g.current_term.academicYear and not training %} -

To volunteer, you must sign the CELTS handbook for {{g.current_term.academicYear}}, and you must do this at an All Volunteers Training.

- {% else %} - {% if volunteer.signatureTerm.academicYear != g.current_term.academicYear %} -
Sign the handbook
- {% else %} -

Your handbook signature is good for AY {{volunteer.signatureTerm.academicYear}}.

+ {% if handbookOverdue and not training%} + {% if isOwnProfile %} +

To volunteer, you must sign the CELTS handbook for {{g.current_term.academicYear}}, and you must do this at an All Volunteers Training or All CELTS Training (Labor).

+ {% elif isLaborViewer %} +

To volunteer, {{volunteer.fullName}} must sign the CELTS handbook for {{g.current_term.academicYear}}, and they must do this at an All Volunteers Training or All CELTS Training (Labor).

{% endif %} - - {% if g.current_term.volunteerHandbook %} - {% if handbookOverdue and g.current_user.username == volunteer.username %} + + {% elif handbookOverdue %} +
Sign the handbook
+ {% if handbookAvailable %} + {% if isOwnProfile %}
@@ -867,9 +866,15 @@
Sign the handbook

Handbook signed for AY {{g.current_term.academicYear}}!

+ {% else %} +

{{ volunteer.fullName }} has attended the training but they still need to sign the CELTS handbook for {{ g.current_term.academicYear }}.

{% endif %} {% endif %} - {% endif %} + {% else %} +

+ {% if isOwnProfile %} Your handbook signature is good for AY {% else %} {{ volunteer.fullName }}'s handbook signature is good for AY {% endif %} {{ volunteer.signatureTerm.academicYear }}. +

+ {% endif %}
diff --git a/tests/code/test_events.py b/tests/code/test_events.py index 852e84b1f..647e95516 100644 --- a/tests/code/test_events.py +++ b/tests/code/test_events.py @@ -948,6 +948,12 @@ def test_volunteerHistory(): contactEmail = "test@email", contactName = "testName",) + participatedACTProgram = Program.create(id = 14, + programName = "ACT", + isBonnerScholars = False, + contactEmail = "test@email", + contactName = "testName",) + # Create a program event in the past that the test user will have # participated in participatedProgramEvent = Event.create(name = "Attended program event", @@ -960,6 +966,17 @@ def test_volunteerHistory(): isAllVolunteerTraining = False, program = participatedProgram) + participatedProgramACTEvent = Event.create(name = "All CELTS Training (Labor)", + term = 2, + description = "Test attended ACT program event.", + timeStart = "18:00:00", + timeEnd = "21:00:00", + location = "The moon", + startDate = "2021-12-12", + isAllVolunteerTraining = False, + isCeltsTraining = True, + program = participatedACTProgram) + # Create a non-program event in the past that the test user will have # participated in participatedEvent = Event.create(name = "Attended event", @@ -980,6 +997,10 @@ def test_volunteerHistory(): EventParticipant.create(user = user, event = participatedEvent.id) assert participatedEvent in getParticipatedEventsForUser(user) + # Add the created user as a participant to the created ALL CELTS Training (Labor) program event + EventParticipant.create(user = user, event = participatedProgramACTEvent.id) + assert participatedProgramACTEvent in getParticipatedEventsForUser(user) + # Make sure an event that is not supposed to be returned isnt assert Event.get_by_id(1) not in getParticipatedEventsForUser(user)