Skip to content

Bonner req #1738

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
DanielRukwasha wants to merge 15 commits into
base: development
Choose a base branch
from
Open

Bonner req #1738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9fbcccf
We created the back button for create event tab pages
DanielRukwasha Jun 18, 2026
9f32827
Back button added to student search and create event
DanielRukwasha Jun 18, 2026
edd1c0a
back button fix
DanielRukwasha Jun 18, 2026
0cbe105
Back button centered
DanielRukwasha Jun 18, 2026
62be9a5
Merge branch 'development' into daniel_back_buttom
MImran2002 Jun 18, 2026
27c2eb0
Fix back button: replace javascript href with explicit routes, center…
DanielRukwasha Jun 19, 2026
f1825cd
Remove btn-sm from back button to match save button size
DanielRukwasha Jun 19, 2026
ddddfdd
changed the X to not completed
nahom70 Jun 22, 2026
335ecfb
Replace ambiguous X icons with clear status badges in Requirement Pro…
DanielRukwasha Jun 22, 2026
2f2ed65
Change 'Not Started' badge label to 'Incomplete'
DanielRukwasha Jun 22, 2026
d3afac2
Change spelling
DanielRukwasha Jun 22, 2026
3f47b05
Add RequirementMatch test data to verify Completed/Incomplete badges
DanielRukwasha Jun 22, 2026
e4d6ca7
Fixing a math line
DanielRukwasha Jun 23, 2026
3f12a89
Removing unecessery lines
DanielRukwasha Jun 23, 2026
858e1c3
Merge branch 'development' into bonner_req
MImran2002 Jun 23, 2026
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
10 changes: 7 additions & 3 deletions app/templates/events/createEvent.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
{% else %}
<div class="text-center">
<h1 id="pageTitle">{{page_title}}</h1>

</div>
{% endif %}

Expand Down Expand Up @@ -310,10 +311,13 @@ <h1 id="pageTitle">{{page_title}}</h1>
{% endif %}
</div>
</div>
<div class="row justify-content-left mt-2">
<div class="row justify-content-center mt-2">
<div class="col-md-6 offset-md-3">
<div class="text-center mb-2">
<div class="w-100 m-auto">
<!--Submission buttons-->
{% if not event %}
<a href="{{ url_for('admin.templateSelect') }}" class="btn btn-secondary m-2">Back</a>
{% endif %}
{% if event %}
<button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#deleteWarning">Delete
Event</button>
Expand All @@ -326,7 +330,7 @@ <h1 id="pageTitle">{{page_title}}</h1>
<button type="button" class="btn btn-success" data-bs-toggle="modal" data-bs-target="#renewWarning">Renew
Event</button>
{% endif %}
<input type="button" class="btn btn-primary" id="saveButton" value="Save" />
<input type="button" class="btn btn-primary" id="saveButton" value="Save" />
</div>
</div>
</div>
Expand Down
30 changes: 22 additions & 8 deletions app/templates/main/userProfile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,14 +522,20 @@ <h5>Notes</h5>
{# Bonner Requirements #}
<div class="col-md-6">
<h5>Requirement Progress</h5>
<ul>
<ul class="list-unstyled">
{% for req in bonnerRequirements %}
<li>{{req.name}}
{% if req.completed %}
<span class="bi bi-check fs-3 text-success"></span>
{% else %}
<span class="bi bi-x fs-3"></span>
{% endif %}
<li class="d-flex justify-content-between align-items-center py-1 border-bottom">
<span>
{{req.name}}
{% if not req.isRequired %}
<small class="text-muted">(Optional)</small>
{% endif %}
</span>
{% if req.completed %}
<span class="badge bg-success ms-2">Completed</span>
{% else %}
<span class="badge bg-secondary ms-2">Incompleted</span>
{% endif %}
</li>
{% endfor %}
</ul>
Expand Down Expand Up @@ -663,6 +669,13 @@ <h6 align="left" class="d-inline-flex" id="unbanVolunteerEndDate">End Date: &nbs
<!-- ################# Ban or Unban Modal ################ -->


{% if volunteer != g.current_user %}
<div class="text-center my-3">
<a href="{{ url_for('admin.studentSearchPage') }}" class="btn btn-secondary">Back</a>
</div>
{% endif %}


<!-- ################# Edit Volunteer Information Modal ################ -->
<div class="modal fade" id="editVolunteerModal" tabindex="-1" aria-labelledby="editVolunteerModalLabel" aria-hidden="true">
<div class="modal-dialog">
Expand Down Expand Up @@ -707,10 +720,11 @@ <h5>Dietary Restrictions</h5>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-danger" data-bs-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
</div>
<!-- ################# Edit Volunteer Information Modal ################ -->

{% endblock %}

1 change: 1 addition & 0 deletions database/test_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1314,6 +1314,7 @@
]
EventParticipant.insert_many(eventParticipants).on_conflict_replace().execute()


eventRsvp = [
{
"user":"mupotsal",
Expand Down
Loading