asc/benchcoach-django
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into add_tests

Browse Source
This commit is contained in:
Anthony Correa
2021-11-12 09:51:11 -06:00
parent a2aece5346 9bf90a2cea
commit 33b4f29de2
24 changed files with 235 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -5,6 +5,7 @@
__pycache__
db.sqlite3
media
/data
# Backup files #
*.bak

4
benchcoach/settings.py
View File

@@ -26,8 +26,7 @@ SECRET_KEY = 'django-insecure-qib_j&47o$5l3*gi7y#8#3pjh_88sfdqn@dmp&gx+2)&1nzmor
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
ALLOWED_HOSTS = ["smithers-ii.local", "127.0.0.1"]
ALLOWED_HOSTS = ["smithers-ii.local", "127.0.0.1", "10.0.1.4", "benchcoach.ascorrea.com"]
# Application definition
@@ -36,6 +35,7 @@ INSTALLED_APPS = [
'teams.apps.TeamsConfig',
'venues.apps.VenuesConfig',
'players.apps.PlayersConfig',
'lineups.apps.LineupsConfig',
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',

3
benchcoach/urls.py
View File

@@ -26,5 +26,6 @@ urlpatterns = [
path('events/', include('events.urls')),
path('teams/', include('teams.urls')),
path('venues/', include('venues.urls')),
path('players/', include('players.urls'))
path('players/', include('players.urls')),
path('lineups/', include('lineups.urls'))
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

16
events/migrations/0003_delete_positioning.py Normal file
View File

@@ -0,0 +1,16 @@
# Generated by Django 3.2.6 on 2021-11-11 03:14
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('events', '0002_alter_availability_options'),
]
operations = [
migrations.DeleteModel(
name='Positioning',
),
]

22
events/models.py
View File

@@ -30,27 +30,5 @@ class Availability(models.Model):
unique_together = ('event', 'player',)
verbose_name_plural = "availabilities"
class Positioning(models.Model):
player = models.ForeignKey(Player, on_delete=models.CASCADE)
event = models.ForeignKey(Event, on_delete=models.CASCADE)
positions = [
('P', 'P'),
('C', 'C'),
('1B', '1B'),
('2B', '2B'),
('3B', '3B'),
('SS', 'SS'),
('LF', 'LF'),
('CF', 'CF'),
('RF', 'RF'),
('DH','DH'),
('EH','EH')
]
position = models.CharField(choices=positions, default=None, max_length=2, null=True)
order = models.IntegerField(default=None, null=True)
class Meta:
unique_together = ('player', 'event',)
class Season(models.Model):
name = models.CharField(max_length=50)

13
events/templates/events/schedule.html
View File

@@ -1,19 +1,14 @@
{% extends 'base.html' %}
{% block title %} {{ title }} {% endblock %}
{% block content %}
{% extends 'base.html' %}{% block title %} {{ title }} {% endblock %}{% block content %}
<h1>{{ title }}</h1>
<ol class="list-group">
{% for event in events %}
<li class="list-group-item">
{{ event.away_team.name }} vs. {{ event.home_team.name }} <br>
<li class="list-group-item fs-6">
<span class="fs-5 fw-bold" style="text-transform: uppercase">{{ event.away_team.name }} vs. {{ event.home_team.name }}</span> <br>
{{ event.start|date:"l, F j, Y g:i A" }} <br>
{{ event.venue.name }} <br>
<a class="btn btn-primary btn-sm" href="{% url 'edit event' event.id%}" role="button">Edit Event Details</a>
<a class="btn btn-primary btn-sm" href="#" role="button">Edit Lineup</a>
<a class="btn btn-primary btn-sm" href="{% url 'edit lineup' event.id%}" role="button">Edit Lineup</a>
</li>
{% endfor %}
</ol>

2
events/views.py
View File

@@ -25,7 +25,7 @@ def edit(request, id=0):
# ...
# redirect to a new URL:
new_event, did_create = Event.objects.update_or_create(pk=id, defaults=form.cleaned_data)
return render(request, 'success.html', {'call_back':'players list'})
return render(request, 'success.html', {'call_back':'schedule'})
# if a GET (or any other method) we'll create a blank form
else:

0
lineups/__init__.py Normal file
View File

3
lineups/admin.py Normal file
View File

@@ -0,0 +1,3 @@
from django.contrib import admin
# Register your models here.

6
lineups/apps.py Normal file
View File

@@ -0,0 +1,6 @@
from django.apps import AppConfig
class LineupsConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'lineups'

31
lineups/forms.py Normal file
View File

@@ -0,0 +1,31 @@
from django import forms
from .models import Positioning
from events.models import Event
from players.models import Player
from django.forms import modelformset_factory, inlineformset_factory, NumberInput
from crispy_forms.helper import FormHelper, Layout
class PositioningForm(forms.ModelForm):
class Meta:
model = Positioning
widgets = {
'order': forms.NumberInput(attrs={'class':'input-group-text w-25'}),
'player': forms.Select(attrs={'class': 'form-control'}),
'position': forms.Select(attrs={'class': 'input-group-text w-25'})
}
exclude = ()
PositioningFormSet = modelformset_factory(
model=Positioning,
form=PositioningForm,
fields = ['player', 'position', 'order'],
min_num=9
)
# class PositioningFormSet(modelformset_factory):
# class Meta:
# model = Positioning
# fields = ['player', 'position', 'order']
# widgets = {
# 'order':forms.NumberInput(attrs={'style':'width:6ch'})
# }

30
lineups/migrations/0001_initial.py Normal file
View File

@@ -0,0 +1,30 @@
# Generated by Django 3.2.6 on 2021-11-11 03:14
from django.db import migrations, models
import django.db.models.deletion
class Migration(migrations.Migration):
initial = True
dependencies = [
('events', '0003_delete_positioning'),
('players', '0003_player_team'),
]
operations = [
migrations.CreateModel(
name='Positioning',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('position', models.CharField(choices=[('P', 'P'), ('C', 'C'), ('1B', '1B'), ('2B', '2B'), ('3B', '3B'), ('SS', 'SS'), ('LF', 'LF'), ('CF', 'CF'), ('RF', 'RF'), ('DH', 'DH'), ('EH', 'EH')], default=None, max_length=2, null=True)),
('order', models.IntegerField(default=None, null=True)),
('event', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='events.event')),
('player', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='players.player')),
],
options={
'unique_together': {('player', 'event')},
},
),
]

0
lineups/migrations/__init__.py Normal file
View File

26
lineups/models.py Normal file
View File

@@ -0,0 +1,26 @@
from django.db import models
from players.models import Player
from events.models import Event
# Create your models here.
class Positioning(models.Model):
player = models.ForeignKey(Player, on_delete=models.CASCADE)
event = models.ForeignKey(Event, on_delete=models.CASCADE)
positions = [
('P', 'P'),
('C', 'C'),
('1B', '1B'),
('2B', '2B'),
('3B', '3B'),
('SS', 'SS'),
('LF', 'LF'),
('CF', 'CF'),
('RF', 'RF'),
('DH','DH'),
('EH','EH')
]
position = models.CharField(choices=positions, default=None, max_length=2, null=True)
order = models.IntegerField(default=None, null=True)
class Meta:
unique_together = ('player', 'event',)

38
lineups/templates/lineups/lineup.html Normal file
View File

@@ -0,0 +1,38 @@
{% extends 'base.html' %}{% block title %} {{ title }} {% endblock %}{% load crispy_forms_tags %}
{% block content %}
<h1>{{ title }}</h1>
{{ event.away_team.name }} vs. {{ event.home_team.name }} <br>
{{ event.start|date:"l, F j, Y g:i A" }} <br>
{{ event.venue.name }} <br>
<div class="container">
<div class="row">
<div class="col-6">
{# <ul class="list-group">#}
<form action="{% url 'edit lineup' id=event.id%}" method="post">
{% csrf_token %}
{{ positionings_formset.management_form }}
{% for pos in positionings_formset %}
<div class="input-group mb-1">
{{ pos.id }}
{{ pos.order }}
{{ pos.player }}
{{ pos.position }}
</div>
{% endfor %}
<input type="submit" value="Submit">
</form>
</div>
<div class="col-6">
<ul class="list-group">
{% for player in players %}
<li class="list-group-item">{{ player.first_name }} {{ player.last_name }}</li>
{% endfor %}
</ul>
</div>
</div>
</div>
{% endblock %}

3
lineups/tests.py Normal file
View File

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

9
lineups/urls.py Normal file
View File

@@ -0,0 +1,9 @@
from django.contrib import admin
from django.urls import path, include
from . import views
urlpatterns = [
path('edit/<int:id>', views.edit, name="edit lineup"),
]

34
lineups/views.py Normal file
View File

@@ -0,0 +1,34 @@
from django.shortcuts import render, redirect, get_object_or_404
from django.forms import formset_factory
from .models import Positioning
from .forms import PositioningFormSet
from django.http import HttpResponse
from django import forms
from events.models import Event
from players.models import Player
# Create your views here.
def edit(request, id):
if request.method == 'POST':
# create a form instance and populate it with data from the request:
formset = PositioningFormSet(request.POST)
for form in formset:
if form.is_valid():
# process the data in form.cleaned_data as required
# ...
# redirect to a new URL:
form.cleaned_data.pop('id') #FIXME this is a workaround, not sure why it is necessary
new_positioning, did_create = Positioning.objects.update_or_create(id=form['id'].data, defaults=form.cleaned_data)
# return render(request, 'success.html', {'call_back':'schedule'})
event = Event.objects.get(id=id)
players = Player.objects.all()
qset = Positioning.objects.filter(event_id=id, order__isnull = False)
formset = PositioningFormSet(queryset=qset)
for form in formset:
for field in form.fields:
field
return render(request, 'lineups/lineup.html', {'title': 'Lineup',
'event': event,
'players': players,
'positionings_formset':formset})

1
players/fixtures/sample_players.yaml
View File

@@ -5,7 +5,6 @@
last_name: Tosser
jersey_number: 1
team: 1
team: 1
- model: players.player
pk: 2
fields:

7
players/views.py
View File

@@ -10,7 +10,12 @@ def root(request):
def list(request):
players = Player.objects.all()
return render(request, 'list.html', {'title': "Players",
'items': [(player.id, f"{player.first_name} {player.last_name}") for player in 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'})
def edit(request, id=0):

8
teams/views.py
View File

@@ -8,7 +8,13 @@ def root(request):
def list(request):
teams = Team.objects.all()
return render(request, 'list.html', {'title': "Teams", 'items': [(team.id, f"{team.name}") for team in teams], 'edit_url_name':'edit team'})
return render(request, 'list.html', {'title': "Players",
'items': [
{'id':team.id,
'title':f"{team.name}"
}
for team in teams],
'edit_url_name': 'edit team'})
def edit(request, id=0):
# if this is a POST request we need to process the form data

4
templates/base.html
View File

@@ -14,7 +14,8 @@
<body class="bg-light">
<nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top">
<a class="navbar-brand" href="{% url 'home' %}">⚾️ Bench Coach</a>
<div class="container-fluid">
<a class="navbar-brand fw-bolder text-uppercase" href="{% url 'home' %}">⚾️ Bench Coach</a>
<div class="collapse navbar-collapse">
<ul class="navbar-nav mr-auto">
@@ -32,6 +33,7 @@
</li>
</ul>
</div>
</div>
</nav>
<main role="main" class="container">

5
templates/list.html
View File

@@ -7,8 +7,9 @@
<ol class="list-group">
{% for item in items %}
<li class="list-group-item">
<h5>{{ item.1 }}</h5>
<a class="btn btn-primary btn-sm" href="{% url edit_url_name item.0%}" role="button">Edit</a>
<span class="fs-5 fw-bold">{{ item.title }}</span> <span class="fs-6">{{ item.subtitle }}</span>
<br>
<a class="btn btn-primary btn-sm" href="{% url edit_url_name item.id%}" role="button">Edit</a>
</li>
{% endfor %}
</ol>

13
venues/views.py
View File

@@ -1,5 +1,5 @@
from django.shortcuts import render, redirect, get_object_or_404
from django.http import HttpResponse
from django.http import HttpResponse, HttpResponseBadRequest
from .models import Venue
from .forms import VenueForm
@@ -8,7 +8,13 @@ def root(request):
def list(request):
venues = Venue.objects.all()
return render(request, 'list.html', {'title': "Venues", 'items': [(venue.id, f"{venue.name}") for venue in venues], 'edit_url_name': 'edit venue'})
return render(request, 'list.html', {'title': "Venues",
'items': [
{'id':venue.id,
'title':f"{venue.name}"
}
for venue in venues],
'edit_url_name': 'edit venue'})
def edit(request, id=0):
@@ -26,7 +32,8 @@ def edit(request, id=0):
# ...
# redirect to a new URL:
new_venue, did_create = Venue.objects.update_or_create(pk=id, defaults=form.cleaned_data)
return render(request, 'success.html', {'call_back':'players list'})
return render(request, 'success.html', {'call_back':'players list','id':new_venue.id}, status=201 if did_create else 200)
return HttpResponseBadRequest()
# if a GET (or any other method) we'll create a blank form
else: