Skip to content

Commit

Permalink
Merge pull request #2078 from MIT-LCP/archive-events
Browse files Browse the repository at this point in the history
Added 'Archive Events' Page to filter events in the admin console
  • Loading branch information
tompollard authored Sep 13, 2023
2 parents ab4e43d + 30ee856 commit 77a1645
Show file tree
Hide file tree
Showing 4 changed files with 76 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,17 @@
<span class="nav-link-text">Events</span>
</a>
<!-- submenu -->
{% if events_nav %}
{% if events_nav or archive_event_nav %}
<ul class="sidenav-second-level collapse show" id="events">
{% else %}
<ul class="sidenav-second-level collapse" id="events">
{% endif %}
<li class="nav-item {% if events_nav %}active{% endif %}">
<a id="nav_events" class="nav-link" href="{% url 'event' %}">Event List</a>
</li>
<li class="nav-item {% if archive_event_nav %}active{% endif %}">
<a id="nav_archive_event" class="nav-link" href="{% url 'archive_event' %}">Archived Events</a>
</li>
</ul>
</li>
{% endif %}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{% extends "console/base_console.html" %}

{% load static %}

{% block title %}Archived Events{% endblock %}

{% block local_css %}
<link rel="stylesheet" type="text/css" href="{% static 'custom/css/pagination.css' %}">
{% endblock %}

{% load console_templatetags %}

{% block content %}
<div class="card mb-3">
<div class="card-header">
Archived Events <span class="badge badge-pill badge-info">{{ archive_event.paginator.count }}</span>
</div>
<div class="card-body">
<div class="table-responsive">
<table class="table table-bordered">
<thead>
<tr>
<th>Event</th>
<th>Event Type</th>
<th>Host</th>
<th>Created</th>
<th>Started</th>
<th>Ended</th>
<th>Credentialing</th>
<th>Training</th>
<th>Manage</th>
</tr>
</thead>
<tbody>
{% for event in archive_event %}
<tr>
<td><a href="{% url 'event_detail' event.slug %}">{{ event.title }}</a></td>
<td>{{ event.get_category_display|title }}</td>
<td>{{ event.host }}</td>
<td>{{ event.added_datetime|date }}</td>
<td>{{ event.start_date }}</td>
<td>{{ event.end_date }}</td>
<td><a href = "{% url 'credential_processing' %}?event={{ event.slug }}">View list</a></td>
<td><a href = "{% url 'training_list' status='review' %}?event={{ event.slug }}">View list</a></td>
<td><a href="{% url 'event_management' event.slug %}" class="btn btn-sm btn-primary" role="button">Manage</a></td>
</tr>
{% endfor %}
</tbody>
</table>
{% include "console/pagination.html" with pagination=events %}
</div>
</div>
</div>
{% endblock %}

2 changes: 2 additions & 0 deletions physionet-django/console/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@
# Lists of event components
path('event/', views.event,
name='event'),
path('archive_event/', views.archive_event,
name='archive_event'),
path('event/manage/<event_slug>', views.event_management, name='event_management'),
path('event_agreements/', views.event_agreement_list, name='event_agreement_list'),
path('event_agreements/<int:pk>/', views.event_agreement_detail, name='event_agreement_detail'),
Expand Down
15 changes: 15 additions & 0 deletions physionet-django/console/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -2951,6 +2951,21 @@ def event(request):
})


@permission_required('user.view_all_events', raise_exception=True)
def archive_event(request):
"""
List of archived events
"""
now = timezone.now()
archive_event = Event.objects.filter(end_date__lte=now)
archive_event = paginate(request, archive_event, 50)

return render(request, 'console/event_archive_event.html',
{'archive_event': archive_event,
'archive_event_nav': True
})


@permission_required('user.view_all_events', raise_exception=True)
def event_management(request, event_slug):
"""
Expand Down

0 comments on commit 77a1645

Please sign in to comment.