Added edit button and forms for Players, Teams, Venues

This commit is contained in:
2021-11-07 17:01:20 -06:00
parent c7c454c696
commit 8a9a955f3a
16 changed files with 248 additions and 10 deletions

112
events/tests.py Normal file
View File

@@ -0,0 +1,112 @@
from django.test import TestCase
from events.models import Player, Event, Availability, Team, Positioning
import datetime
import pytz
# Create your tests here.
class BenchcoachTestCase(TestCase):
def setUp(self):
for first_name, last_name, jersey_number in [
("Rush", "Valenzuela", 1),
("Baby", "Triumphant", 2)
]:
Player.objects.create(first_name=first_name, last_name=last_name, jersey_number=jersey_number)
for name in ["Firefighters", "Garages"]:
Team.objects.create(name=name)
for start, home_team_id, away_team_id in [
(datetime.datetime(2020, 1, 2, 12, 0), 1, 2), # id = 1
(datetime.datetime(2020, 1, 3, 12, 0), 2, 1), # id = 2
(datetime.datetime(2020, 1, 4, 12, 0), 2, 1) # id = 3
]:
Event.objects.create(start=start, home_team_id=home_team_id, away_team_id=away_team_id)
for event_id in [
1
]:
for player_id, available in [
(1,"Yes"),
(2,"No")
]:
Availability.objects.create(event_id=event_id, player_id=player_id, available=available)
for event_id in [
1
]:
for player_id, position in [
(1, "C"),
(2, "1B")
]:
Positioning.objects.create(event_id=event_id, player_id=player_id, position=position)
for event_id in [
2
]:
for player_id, available in [
(1,"Yes"),
(2,"Yes")
]:
Availability.objects.create(event_id=event_id, player_id=player_id, available=available)
for event_id in [
3
]:
for player_id, available in [
(1,"No"),
(2,"No")
]:
Availability.objects.create(event_id=event_id, player_id=player_id, available=available)
pass
def test_player(self):
"""Test that player works"""
player_1 = Player.objects.get(first_name="Rush")
player_2 = Player.objects.get(first_name="Baby")
self.assertEqual(str(player_1), f"Valenzuela, Rush")
self.assertEqual(str(player_2), f"Triumphant, Baby")
pass
def test_event(self):
event = Event.objects.get(pk=1)
self.assertEqual(event.start.year, 2020)
self.assertEqual(event.start.month, 1)
self.assertEqual(event.start.day, 2)
self.assertEqual(event.start.hour, 12)
self.assertEqual(event.start.minute, 0)
self.assertEqual(event.home_team.name, "Firefighters")
self.assertEqual(event.away_team.name, "Garages")
def test_availability(self):
availability_1 = Availability.objects.get(event_id=1, player_id=1)
availability_2 = Availability.objects.get(event_id=1, player_id=2)
self.assertEqual(availability_1.available, "Yes")
self.assertEqual(availability_2.available, "No")
pass
def test_positioning(self):
positioning_1 = Positioning.objects.get(event_id=1, player_id=1)
positioning_2 = Positioning.objects.get(event_id=1, player_id=2)
# positing_1
pass
def test_combine_info(self):
event = Event.objects.get(pk=1)
event_id = 1
player_query = Player.objects.all()
positioning_query = Positioning.objects.filter(event=event).select_related('player')
availability_query = Availability.objects.filter(event=event).select_related('player')
player_event_info = []
for player in player_query:
player_event_info.append(
{
"player":player,
"positioning":positioning_query.get(player_id=player.id),
"availability":availability_query.get(player_id=player.id)
}
)
pass

7
players/forms.py Normal file
View File

@@ -0,0 +1,7 @@
from django import forms
from .models import Player
class PlayerForm(forms.ModelForm):
class Meta:
model = Player
fields = ['first_name', 'last_name', 'jersey_number']

View File

@@ -0,0 +1,9 @@
{% extends 'base.html' %}}
{% block content %}
<form action={% url 'edit player' id=id%} method="post">
{% csrf_token %}
{{ form }}
<input type="submit" value="Submit">
</form>
{% endblock %}

3
players/tests.py Normal file
View File

@@ -0,0 +1,3 @@
from django.test import TestCase
# Create your tests here.

View File

@@ -4,5 +4,6 @@ from . import views
urlpatterns = [
path('', views.root, name="root"),
path('list', views.list, name="players list")
path('list', views.list, name="players list"),
path('edit/<int:id>', views.edit, name="edit player")
]

View File

@@ -1,5 +1,7 @@
from django.shortcuts import render, redirect
from django.shortcuts import render, redirect, get_object_or_404
from django.http import HttpResponse
from .models import Player
from .forms import PlayerForm
# Create your views here.
def root(request):
@@ -7,4 +9,28 @@ def root(request):
def list(request):
players = Player.objects.all()
return render(request, 'list.html', {'title': "Players", 'items': [f"{player.first_name} {player.last_name}" for player in players]})
return render(request, 'list.html', {'title': "Players",
'items': [(player.id, f"{player.first_name} {player.last_name}") for player in players],
'edit_url_name': 'edit player'})
def edit(request, id=None):
# if this is a POST request we need to process the form data
if request.method == 'POST':
# create a form instance and populate it with data from the request:
form = PlayerForm(request.POST)
# check whether it's valid:
if form.is_valid():
# process the data in form.cleaned_data as required
# ...
# redirect to a new URL:
return HttpResponse(str(form.cleaned_data))
# if a GET (or any other method) we'll create a blank form
else:
if id:
instance = get_object_or_404(Player, id=id)
form = PlayerForm(request.POST or None, instance=instance)
else:
form = PlayerForm
return render(request, 'players/edit.html', {'form': form, 'id': id})

7
teams/forms.py Normal file
View File

@@ -0,0 +1,7 @@
from django import forms
from .models import Team
class TeamForm(forms.ModelForm):
class Meta:
model = Team
fields = ['name']

3
teams/tests.py Normal file
View File

@@ -0,0 +1,3 @@
from django.test import TestCase
# Create your tests here.

View File

@@ -6,5 +6,6 @@ from . import views
urlpatterns = [
path('', views.root, name="root"),
path('list', views.list, name="teams list")
path('list', views.list, name="teams list"),
path('edit/<int:id>', views.edit, name="edit team")
]

View File

@@ -1,4 +1,6 @@
from django.shortcuts import render, redirect
from django.shortcuts import render, redirect, get_object_or_404
from django.http import HttpResponse
from .forms import TeamForm
from .models import Team
def root(request):
@@ -6,4 +8,26 @@ def root(request):
def list(request):
teams = Team.objects.all()
return render(request, 'list.html', {'title': "Teams", 'items': [f"{team.name}" for team in teams]})
return render(request, 'list.html', {'title': "Teams", 'items': [(team.id, f"{team.name}") for team in teams], 'edit_url_name':'edit team'})
def edit(request, id=None):
# if this is a POST request we need to process the form data
if request.method == 'POST':
# create a form instance and populate it with data from the request:
form = TeamForm(request.POST)
# check whether it's valid:
if form.is_valid():
# process the data in form.cleaned_data as required
# ...
# redirect to a new URL:
return HttpResponse(str(form.cleaned_data))
# if a GET (or any other method) we'll create a blank form
else:
if id:
instance = get_object_or_404(Team, id=id)
form = TeamForm(request.POST or None, instance=instance)
else:
form = TeamForm
return render(request, 'venues/edit.html', {'form': form, 'id':id})

View File

@@ -7,7 +7,8 @@
<ol class="list-group">
{% for item in items %}
<li class="list-group-item">
{{ item }}
<h5>{{ item.1 }}</h5>
<a class="btn btn-primary btn-sm" href="{% url edit_url_name item.0%}" role="button">Edit</a>
</li>
{% endfor %}
</ol>

7
venues/forms.py Normal file
View File

@@ -0,0 +1,7 @@
from django import forms
from .models import Venue
class VenueForm(forms.ModelForm):
class Meta:
model = Venue
fields = ['name']

View File

@@ -0,0 +1,9 @@
{% extends 'base.html' %}}
{% block content %}
<form action={% url 'edit venue' id=id%} method="post">
{% csrf_token %}
{{ form }}
<input type="submit" value="Submit">
</form>
{% endblock %}

3
venues/tests.py Normal file
View File

@@ -0,0 +1,3 @@
from django.test import TestCase
# Create your tests here.

View File

@@ -4,5 +4,6 @@ from . import views
urlpatterns = [
path('', views.root, name="root"),
path('list', views.list, name="venues list")
path('list', views.list, name="venues list"),
path('edit/<int:id>', views.edit, name="edit venue")
]

View File

@@ -1,4 +1,5 @@
from django.shortcuts import render, redirect
from django.shortcuts import render, redirect, get_object_or_404
from django.http import HttpResponse
from .models import Venue
def root(request):
@@ -6,4 +7,27 @@ def root(request):
def list(request):
venues = Venue.objects.all()
return render(request, 'list.html', {'title': "Venues", 'items': [f"{venue.name}" for venue in venues]})
return render(request, 'list.html', {'title': "Venues", 'items': [(venue.id, f"{venue.name}") for venue in venues], 'edit_url_name': 'edit venue'})
from .forms import VenueForm
def edit(request, id=None):
# if this is a POST request we need to process the form data
if request.method == 'POST':
# create a form instance and populate it with data from the request:
form = VenueForm(request.POST)
# check whether it's valid:
if form.is_valid():
# process the data in form.cleaned_data as required
# ...
# redirect to a new URL:
return HttpResponse(str(form.cleaned_data))
# if a GET (or any other method) we'll create a blank form
else:
if id:
instance = get_object_or_404(Venue, id=id)
form = VenueForm(request.POST or None, instance=instance)
else:
form = VenueForm
return render(request, 'venues/edit.html', {'form': form, 'id':id})