diff --git a/benchcoach/views.py b/benchcoach/views.py index b3c5570..1a7c97f 100644 --- a/benchcoach/views.py +++ b/benchcoach/views.py @@ -2,5 +2,5 @@ from django.http import HttpResponse from django.shortcuts import render def welcome(request): - pages = ['schedule', 'teams list', 'venues list', 'players list'] + pages = ['events list', 'teams list', 'venues list', 'players list'] return render(request,'home.html',{'pages':pages}) \ No newline at end of file diff --git a/events/templates/events/schedule.html b/events/templates/events/schedule.html deleted file mode 100644 index bb542e0..0000000 --- a/events/templates/events/schedule.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends 'base.html' %}{% block title %} {{ title }} {% endblock %}{% block content %} - -

{{ title }}

-
    -{% for event in events %} -
  1. - {{ event.away_team.name }} vs. {{ event.home_team.name }}
    - {{ event.start|date:"l, F j, Y g:i A" }}
    - {{ event.venue.name }}
    - Edit Event Details - Edit Lineup -
    2. -{% endfor %} -
- -{% endblock %} \ No newline at end of file diff --git a/events/urls.py b/events/urls.py index c8f863a..0191034 100644 --- a/events/urls.py +++ b/events/urls.py @@ -6,7 +6,7 @@ from . import views urlpatterns = [ path('', views.root, name="root"), - path('schedule', views.schedule, name="schedule"), + path('list', views.list, name="events list"), path('edit/', views.edit, name="edit event"), path('edit', views.edit, name="edit event"), path('edit', views.edit, name="edit event") diff --git a/events/views.py b/events/views.py index db01cba..03bf718 100644 --- a/events/views.py +++ b/events/views.py @@ -8,9 +8,30 @@ from django.http import HttpResponse def root(request): return redirect('/events/schedule') -def schedule(request): +def list(request): events = Event.objects.all() - return render(request, 'events/schedule.html', {'title':'Schedule', 'events': events}) + context = { + 'title': "Events", + 'items': [ + { + 'id': event.id, + 'title': f'{event.away_team.name} vs. {event.home_team.name}', + 'body':f'{event.start:%a, %b %-d, %-I:%M %p},\n{event.venue.name}', + 'buttons':[ + { + 'label':'Edit', + 'href':reverse('edit event', args=[event.id]) + }, + { + 'label': 'Edit Lineup', + 'href': reverse('edit lineup', args=[event.id]) + } + ] + } + for event in events + ] + } + return render(request, 'list.html', context) def edit(request, id=0): # if this is a POST request we need to process the form data diff --git a/players/views.py b/players/views.py index 5ffb8d1..6808ba5 100644 --- a/players/views.py +++ b/players/views.py @@ -9,15 +9,24 @@ def root(request): return redirect('/players/list') def list(request): - players = Player.objects.all() - return render(request, 'list.html', {'title': "Players", - 'items': [ - {'id':player.id, - 'title':f"{player.first_name} {player.last_name}", - 'subtitle':f"{player.jersey_number}" - } - for player in players], - 'edit_url_name': 'edit player'}) + items = Player.objects.all() + context = { + 'title': "Players", + 'items': [ + {'id': item.id, + 'title': f"{item.first_name} {item.last_name}", + 'subtitle': f"{item.jersey_number}", + 'buttons': [ + { + 'label': 'Edit', + 'href': reverse('edit player', args=[item.id]) + } + ] + } + for item in items] + } + + return render(request, 'list.html', context) def edit(request, id=0): # if this is a POST request we need to process the form data diff --git a/teams/views.py b/teams/views.py index f78fbf1..13bde9e 100644 --- a/teams/views.py +++ b/teams/views.py @@ -8,14 +8,23 @@ def root(request): return redirect('/teams/list') def list(request): - teams = Team.objects.all() - return render(request, 'list.html', {'title': "Players", - 'items': [ - {'id':team.id, - 'title':f"{team.name}" - } - for team in teams], - 'edit_url_name': 'edit team'}) + items = Team.objects.all() + context = { + + 'title': "Teams", + 'items': [ + {'id': item.id, + 'title': f"{item.name}", + 'buttons': [ + { + 'label': 'Edit', + 'href': reverse('edit team', args=[item.id]) + } + ] + } + for item in items] + } + return render(request, 'list.html', context) def edit(request, id=0): # if this is a POST request we need to process the form data diff --git a/templates/base.html b/templates/base.html index 8455c04..01e0c56 100644 --- a/templates/base.html +++ b/templates/base.html @@ -20,7 +20,7 @@