diff --git a/events/admin.py b/events/admin.py index 9a254b5..ccdab45 100644 --- a/events/admin.py +++ b/events/admin.py @@ -1,7 +1,7 @@ from django.contrib import admin -from .models import Event, Availability +from .models import Event # Register your models here. admin.site.register(Event) -admin.site.register(Availability) + diff --git a/events/migrations/0004_delete_availability.py b/events/migrations/0004_delete_availability.py new file mode 100644 index 0000000..3b81fae --- /dev/null +++ b/events/migrations/0004_delete_availability.py @@ -0,0 +1,16 @@ +# Generated by Django 3.2.6 on 2021-11-14 23:59 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('events', '0003_delete_positioning'), + ] + + operations = [ + migrations.DeleteModel( + name='Availability', + ), + ] diff --git a/events/models.py b/events/models.py index c474a33..51eb2e2 100644 --- a/events/models.py +++ b/events/models.py @@ -12,23 +12,5 @@ class Event(models.Model): def __str__(self): return f"{self.start:%Y-%m-%d %H:%M}" -class Availability(models.Model): - event = models.ForeignKey(Event, on_delete=models.CASCADE) - player = models.ForeignKey(Player, on_delete=models.CASCADE) - choices = [ - ('Yes', 'YES'), - ('No', 'NO'), - ('Maybe', 'MAY'), - ('Unknown', 'UNK') - ] - available = models.CharField(choices=choices, default='UNK',max_length = 7) - - def __str__(self): - return f"{self.event}; {self.player}; {self.available}" - - class Meta: - unique_together = ('event', 'player',) - verbose_name_plural = "availabilities" - class Season(models.Model): name = models.CharField(max_length=50) \ No newline at end of file diff --git a/lineups/admin.py b/lineups/admin.py index 8c38f3f..d067bb9 100644 --- a/lineups/admin.py +++ b/lineups/admin.py @@ -1,3 +1,6 @@ from django.contrib import admin +from .models import Availability, Positioning # Register your models here. +admin.site.register(Availability) +admin.site.register(Positioning) \ No newline at end of file diff --git a/lineups/migrations/0002_availability.py b/lineups/migrations/0002_availability.py new file mode 100644 index 0000000..4811e01 --- /dev/null +++ b/lineups/migrations/0002_availability.py @@ -0,0 +1,29 @@ +# Generated by Django 3.2.6 on 2021-11-14 23:59 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('players', '0003_player_team'), + ('events', '0004_delete_availability'), + ('lineups', '0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name='Availability', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('available', models.IntegerField(choices=[(2, 'Yes'), (-1, 'No'), (1, 'MAY'), (0, 0)], default=0, max_length=7)), + ('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={ + 'verbose_name_plural': 'availabilities', + 'unique_together': {('event', 'player')}, + }, + ), + ] diff --git a/lineups/migrations/0003_alter_availability_available.py b/lineups/migrations/0003_alter_availability_available.py new file mode 100644 index 0000000..c01a5ea --- /dev/null +++ b/lineups/migrations/0003_alter_availability_available.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.6 on 2021-11-15 00:32 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('lineups', '0002_availability'), + ] + + operations = [ + migrations.AlterField( + model_name='availability', + name='available', + field=models.IntegerField(choices=[(2, 'Yes'), (0, 'No'), (1, 'MAY'), (-1, 0)], default=-1), + ), + ] diff --git a/lineups/migrations/0004_alter_availability_available.py b/lineups/migrations/0004_alter_availability_available.py new file mode 100644 index 0000000..27be08f --- /dev/null +++ b/lineups/migrations/0004_alter_availability_available.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.6 on 2021-11-15 00:40 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('lineups', '0003_alter_availability_available'), + ] + + operations = [ + migrations.AlterField( + model_name='availability', + name='available', + field=models.IntegerField(choices=[(2, 'Yes'), (0, 'No'), (1, 'Maybe'), (-1, 'Unknown')], default=-1), + ), + ] diff --git a/lineups/models.py b/lineups/models.py index 36c0938..fddcb32 100644 --- a/lineups/models.py +++ b/lineups/models.py @@ -23,4 +23,27 @@ class Positioning(models.Model): order = models.IntegerField(default=None, null=True) class Meta: - unique_together = ('player', 'event',) \ No newline at end of file + unique_together = ('player', 'event',) + +class Availability(models.Model): + YES = 2 + MAYBE = 1 + NO = 0 + UNKNOWN = -1 + + event = models.ForeignKey(Event, on_delete=models.CASCADE) + player = models.ForeignKey(Player, on_delete=models.CASCADE) + choices = [ + (YES, 'Yes'), + (NO, 'No'), + (MAYBE, 'Maybe'), + (UNKNOWN, 'Unknown') + ] + available = models.IntegerField(choices=choices, default=UNKNOWN) + + def __str__(self): + return f"{self.event}; {self.player}; {self.available}" + + class Meta: + unique_together = ('event', 'player',) + verbose_name_plural = "availabilities" \ No newline at end of file