Merge branch 'master' into add_tests

events/migrations/0003_delete_positioning.py

@@ -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',
+        ),
+    ]

events/models.py

@@ -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)

events/templates/events/schedule.html

@@ -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>

events/views.py

@@ -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: