From f35249e5086692be46f4c8c30fed54654f3a0a17 Mon Sep 17 00:00:00 2001
From: Tony <anthony@correa.co>
Date: Wed, 22 Dec 2021 19:47:10 -0600
Subject: [PATCH] fix ordering in list, fix navbar in lineup

---
 .../templates/benchcoach/event-list.html      |  7 +++++--
 .../templates/benchcoach/player-list.html     | 20 +++++++++++++++++++
 benchcoach/views.py                           |  2 +-
 templates/base.html                           | 11 +++++-----
 4 files changed, 32 insertions(+), 8 deletions(-)
 create mode 100644 benchcoach/templates/benchcoach/player-list.html

diff --git a/benchcoach/templates/benchcoach/event-list.html b/benchcoach/templates/benchcoach/event-list.html
index ffda130..b18c9d6 100644
--- a/benchcoach/templates/benchcoach/event-list.html
+++ b/benchcoach/templates/benchcoach/event-list.html
@@ -12,12 +12,15 @@ Events
 
 {% block content %}
     <ul class="list-group">
-        {% for event in events %}
+        {% for event in events%}
+            {% if event.teamsnap_event.is_game %}
             <li class="list-group-item">
             <h6>{{ event.away_team|default_if_none:"" }} vs. {{ event.home_team|default_if_none:"" }}</h6>
-                {{ event.start.date }}<br>{{ event.start.time }}<br>
+            {{ event.start|date:"l, F j, Y g:i A" }} <br>
+            {{ event.venue.name }} <br>
             <a href="{% url 'edit lineup' event_id=event.id %}">Edit Lineup...</a>
             </li>
+            {% endif %}
         {% endfor %}
     </ul>
 {% endblock %}
diff --git a/benchcoach/templates/benchcoach/player-list.html b/benchcoach/templates/benchcoach/player-list.html
new file mode 100644
index 0000000..35ff7b2
--- /dev/null
+++ b/benchcoach/templates/benchcoach/player-list.html
@@ -0,0 +1,20 @@
+{% extends 'base.html' %}
+
+{% block navbar %}
+    {% with events_tab=events_tab_active members_tab=members_tab_active opponents_tab=opponents_tab_active venues_tab=venues_tab_active %}
+        {{ block.super }}
+    {% endwith %}
+{% endblock %}
+
+{% block page_heading %}
+{{ page_title }}
+{% endblock %}
+
+{% block content %}
+    <ul class="list-group">
+        {% for object in object_list|dictsort:"last_name.lower" %}
+            <li class="list-group-item">{{ object }}</li>
+        {% endfor %}
+    </ul>
+{% endblock %}
+</html>
\ No newline at end of file
diff --git a/benchcoach/views.py b/benchcoach/views.py
index 47f0bd6..ea825f7 100644
--- a/benchcoach/views.py
+++ b/benchcoach/views.py
@@ -20,7 +20,7 @@ class EventListView(ListView):
 
 class PlayerListView(ListView):
     model = Player
-    template_name = 'benchcoach/list.html'
+    template_name = 'benchcoach/player-list.html'
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
diff --git a/templates/base.html b/templates/base.html
index e7947a9..5225311 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -15,10 +15,7 @@
             {% include 'navbar.html' %}
         {% endblock %}
     </div>
-    <div>
-        {% block header %}
-        {% endblock %}
-    </div>
+
 </header>
 
 <div class="d-inline-flex min-vw-100">
@@ -28,10 +25,14 @@
         {% endblock %}
     </div>
     <div class="container m-2">
+        <div>
+            {% block header %}
+            {% endblock %}
+        </div>
         <h1>{% block page_heading %}{% endblock %}</h1>
         {% block content %}{% endblock %}
     </div>
-    </div></div>
+</div>
 
 </body>
 </html>
\ No newline at end of file