Cleaned up variable names to be consistent. Changed submenu names. Ch…

…anged url link name.

physionet-django/console/templates/console/console_navbar.html

@@ -123,16 +123,16 @@
               <span class="nav-link-text">Events</span>
             </a>
             <!-- submenu -->
-          {% if events_nav or archive_event_nav %}
+          {% if nav_event_active or nav_event_archive %}
             <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 class="nav-item {% if nav_event_active %}active{% endif %}">
+                <a id="nav_event_active" class="nav-link" href="{% url 'event_active' %}">Active</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 class="nav-item {% if nav_event_archive %}active{% endif %}">
+                <a id="nav_event_archive" class="nav-link" href="{% url 'event_archive' %}">Archived</a>
               </li>
             </ul>
         </li>

physionet-django/console/templates/console/event.html → physionet-django/console/templates/console/event_active.html

@@ -13,7 +13,7 @@
 {% block content %}
 <div class="card mb-3">
     <div class="card-header">
-        Events <span class="badge badge-pill badge-info">{{ events.paginator.count }}</span> 
+        Active Events <span class="badge badge-pill badge-info">{{ event_active.paginator.count }}</span> 
     </div>
     <div class="card-body">
         <div class="table-responsive">
@@ -32,7 +32,7 @@
                 </tr>
               </thead>
               <tbody>
-              {% for event in events %}
+              {% for event in event_active %}
                 <tr>
                     <td><a href="{% url 'event_detail' event.slug %}">{{ event.title }}</a></td>
                     <td>{{ event.get_category_display|title }}</td>

physionet-django/console/templates/console/event_archive_event.html → physionet-django/console/templates/console/event_archive.html

@@ -13,7 +13,7 @@
 {% 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> 
+        Archived Events <span class="badge badge-pill badge-info">{{ event_archive.paginator.count }}</span> 
     </div>
     <div class="card-body">
         <div class="table-responsive">
@@ -32,7 +32,7 @@
                 </tr>
               </thead>
               <tbody>
-              {% for event in archive_event %}
+              {% for event in event_archive %}
                 <tr>
                     <td><a href="{% url 'event_detail' event.slug %}">{{ event.title }}</a></td>
                     <td>{{ event.get_category_display|title }}</td>

physionet-django/console/urls.py

@@ -146,10 +146,10 @@
     ),
     path('code-of-conducts/<int:pk>/activate/', views.code_of_conduct_activate, name='code_of_conduct_activate'),
     # Lists of event components
-    path('event/', views.event,
-         name='event'),
-    path('archive_event/', views.archive_event,
-         name='archive_event'),
+    path('event/active/', views.event_active,
+         name='event_active'),
+    path('event/archived/', views.event_archive,
+         name='event_archive'),
     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'),

physionet-django/console/views.py

@@ -2938,31 +2938,30 @@ def code_of_conduct_activate(request, pk):
 
 
 @permission_required('user.view_all_events', raise_exception=True)
-def event(request):
+def event_active(request):
     """
     List of events
     """
-    events = Event.objects.all()
-    events = paginate(request, events, 50)
+    event_active = Event.objects.filter(end_date__gte=timezone.now())
+    event_active = paginate(request, event_active, 50)
 
-    return render(request, 'console/event.html',
-                  {'events': events,
-                   'events_nav': True
+    return render(request, 'console/event_active.html',
+                  {'event_active': event_active,
+                   'nav_event_active': True
                    })
 
 
 @permission_required('user.view_all_events', raise_exception=True)
-def archive_event(request):
+def event_archive(request):
     """
     List of archived events
     """
-    now = timezone.now()
-    archive_event = Event.objects.filter(end_date__lte=now)
-    archive_event = paginate(request, archive_event, 50)
+    event_archive = Event.objects.filter(end_date__lte=timezone.now())
+    event_archive = paginate(request, event_archive, 50)
 
-    return render(request, 'console/event_archive_event.html',
-                  {'archive_event': archive_event,
-                   'archive_event_nav': True
+    return render(request, 'console/event_archive.html',
+                  {'event_archive': event_archive,
+                   'nav_event_archive': True
                    })