Hide upcoming events, add dates to event lists

diff --git a/src/littlesongplace/templates/jam-event-list.html b/src/littlesongplace/templates/jam-event-list.html
index 715b2b7aa49d66df41341667af86c6ad5d21b20f..4340d7b5a2141efae00604ff99fed2fbbe6f2d8a 100644 (file)
--- a/src/littlesongplace/templates/jam-event-list.html
+++ b/src/littlesongplace/templates/jam-event-list.html
@@ -1,19 +1,26 @@
-{% macro jam_event_list(list_title, events) %}
+{% macro jam_event_list(list_title, events, date_label, which_date) %}
 {% if events %}
 <h3>{{ list_title }}</h3>
 <div class="jam-event-list">
     {% for event in events %}
     <div class="jam-event-list-entry">
+        {% if event.hidden -%}
+        <span class="visibility-indicator">[Upcoming Event]</span>
+        {%- else -%}
         <span class="jam-event-list-title">
             <a href="/jams/{{ event.jamid }}/events/{{ event.eventid }}">{{ event.title }}</a>
         </span>
+        {%- endif %}
         -
         <span class="jam-event-list-jam-title">
             <a href="/jams/{{ event.jamid }}">{{ event.jam_title }}</a>
         </span>
-        <span class="jam-event-list-owner">
-            Hosted by <a href="/users/{{ event.jam_ownername }}" class="profile-link">{{ event.jam_ownername }}</a>
-        </span>
+        <strong>{{ date_label }}:</strong>
+        {% if which_date == "start" and event.startdate %}
+        <span class="date" data-date="{{ event.startdate.isoformat() }}"><!-- Populated by nav.js --></span>
+        {% elif which_date == "end" and event.enddate %}
+        <span class="date" data-date="{{ event.enddate.isoformat() }}"><!-- Populated by nav.js --></span>
+        {% endif %}
     </div>
     {% endfor %}
 </div>

diff --git a/src/littlesongplace/templates/jam.html b/src/littlesongplace/templates/jam.html
index 8cad63540c0d35bb66436c99a65012761f7de95a..6c602247fbefe4fa35d25ed6ea72321528df217c 100644 (file)
--- a/src/littlesongplace/templates/jam.html
+++ b/src/littlesongplace/templates/jam.html
@@ -31,9 +31,9 @@
     {%- endif -%}
 
     {% from "jam-event-list.html" import jam_event_list %}
-    {{ jam_event_list("Ongoing Events", ongoing) }}
-    {{ jam_event_list("Upcoming Events", upcoming) }}
-    {{ jam_event_list("Past Events", past) }}
+    {{ jam_event_list("Ongoing Events", ongoing, "Ends", "end") }}
+    {{ jam_event_list("Upcoming Events", upcoming, "Starts", "start") }}
+    {{ jam_event_list("Past Events", past, "Ended", "end") }}
 </div> <!-- jam-view -->
 
 {% if session["userid"] == jam.ownerid -%}

diff --git a/src/littlesongplace/templates/jams-main.html b/src/littlesongplace/templates/jams-main.html
index a1829d11547f97af6f534053a9ed9d8526b497c3..435c6bd5d851211fcd9cda1b19397d6788c9bb0a 100644 (file)
--- a/src/littlesongplace/templates/jams-main.html
+++ b/src/littlesongplace/templates/jams-main.html
@@ -8,9 +8,9 @@
 
 <h2>Events</h2>
 {% from "jam-event-list.html" import jam_event_list %}
-{{ jam_event_list("Ongoing Events", ongoing) }}
-{{ jam_event_list("Upcoming Events", upcoming) }}
-{{ jam_event_list("Recent Events", past) }}
+{{ jam_event_list("Ongoing Events", ongoing, "Ends", "end") }}
+{{ jam_event_list("Upcoming Events", upcoming, "Starts", "start") }}
+{{ jam_event_list("Recent Events", past, "Ended", "end") }}
 
 <h2>All Jams</h2>
 <ul class="jam-list">

diff --git a/test/test_jams.py b/test/test_jams.py
index e2191159667250e4133d5c0dc3ea7162c005649f..37a95cfef0f71d8484216bea0d29fbd6dcce92db 100644 (file)
--- a/test/test_jams.py
+++ b/test/test_jams.py
@@ -242,8 +242,8 @@ def test_jam_events_sorted_on_jams_page(client, user, jam):
                 b"OngoingJam",
 
                 b"Upcoming Events",
-                b"UpcomingJam",
-                b"OtherJam",
+                b"[Upcoming Event]", # Upcoming jam name hidden
+                b"[Upcoming Event]", # Upcoming jam name hidden
 
                 b"Recent Events",
                 b"PastJam",
@@ -266,7 +266,7 @@ def test_jam_events_sorted_on_jam_info_page(client, user, jam):
                 b"OngoingJam",
 
                 b"Upcoming Events",
-                b"UpcomingJam",
+                b"[Upcoming Event]", # Upcoming jam name hidden
 
                 b"Past Events",
                 b"PastJam",