Admin customization

.gitignore

@@ -18,3 +18,4 @@ docker-stack*.yml
 geckodriver.log
 hbscorez.log
 src/hbscorez/settings_docker_stack*.py
+src/mails/

src/associations/admin.py

@@ -7,4 +7,5 @@
 
 @admin.register(Association)
 class AssociationAdmin(admin.ModelAdmin):
-    search_fields = ASSOCIATION_SEARCH_FIELDS
+    list_display = ['bhv_id', 'abbreviation', 'name']
+    search_fields = ['name', 'abbreviation', 'bhv_id']

src/associations/apps.py

@@ -3,3 +3,4 @@
 
 class AssociationsConfig(AppConfig):
     name = 'associations'
+    verbose_name = 'Verbände'

src/associations/management/commands/import_associations.py

@@ -48,17 +48,23 @@ def scrape_association(url: str, options):
     html = http.get_text(url)
     dom = parsing.html_dom(html)
 
-    abbreviation = parsing.parse_association_abbreviation(url)
-    name = parsing.parse_association_name(dom)
     bhv_id = parsing.parse_association_bhv_id(dom)
+    name = parsing.parse_association_name(dom)
+
+    association_api_url = f'{settings.API_URL_TEMPLATE}cmd=po&og={bhv_id}'
+    abbreviation = parsing.parse_association_abbreviation(association_api_url)
 
     if options['associations'] and bhv_id not in options['associations']:
         LOGGER.debug('SKIPPING Association (options): %s %s', bhv_id, name)
         return
 
-    association = Association.objects.filter(bhv_id=bhv_id).first()
-    if association is None:
-        association = Association.objects.create(name=name, abbreviation=abbreviation, bhv_id=bhv_id, source_url=url)
+    try:
+        association = Association.objects.get(bhv_id=bhv_id)
+    except Association.MultipleObjectsReturned:
+        LOGGER.debug('Database contains multiple association objects with same bhv_id.')
+        return
+    except Association.DoesNotExist:
+        association = Association.objects.create(name=name, abbreviation=abbreviation, bhv_id=bhv_id)
         LOGGER.info('CREATED Association: %s', association)
         return
 

src/associations/migrations/0003_alter_association_options_and_more.py

@@ -0,0 +1,35 @@
+# Generated by Django 4.2.4 on 2023-10-20 10:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("associations", "0002_association_source_url"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="association",
+            options={"verbose_name": "Verband", "verbose_name_plural": "Verbände"},
+        ),
+        migrations.RemoveField(
+            model_name="association",
+            name="source_url",
+        ),
+        migrations.AlterField(
+            model_name="association",
+            name="abbreviation",
+            field=models.CharField(max_length=255, verbose_name="Abkürzung"),
+        ),
+        migrations.AlterField(
+            model_name="association",
+            name="bhv_id",
+            field=models.IntegerField(unique=True, verbose_name="ID"),
+        ),
+        migrations.AlterField(
+            model_name="association",
+            name="name",
+            field=models.CharField(max_length=255, unique=True, verbose_name="Name"),
+        ),
+    ]

src/associations/models.py

@@ -4,10 +4,13 @@
 
 
 class Association(models.Model):
-    name = models.TextField(unique=True)
-    abbreviation = models.TextField()
-    bhv_id = models.IntegerField(unique=True)
-    source_url = models.TextField()
+    bhv_id = models.IntegerField('ID', unique=True)
+    name = models.CharField('Name', max_length=255, unique=True)
+    abbreviation = models.CharField('Abkürzung', max_length=255)
+
+    class Meta:
+        verbose_name = 'Verband'
+        verbose_name_plural = 'Verbände'
 
     def __str__(self):
         return f'{self.bhv_id} {self.abbreviation}'

src/base/admin.py

@@ -2,5 +2,9 @@
 
 from base.models import Env, GlobalMessage
 
-admin.site.register(Env)
 admin.site.register(GlobalMessage)
+
+
+@admin.register(Env)
+class EnvAdmin(admin.ModelAdmin):
+    list_display = ('name', 'value')

src/base/http.py

@@ -12,6 +12,14 @@ def get_text(url) -> str:
     response.encoding = 'utf-8'
     return response.text
 
+def get_json(url) -> list[dict]:
+    response = _http.get(url, timeout=5)
+    response.encoding = 'utf-8'
+    try:
+        return response.json()
+    except requests.exceptions.JSONDecodeError:
+        return dict()
+
 
 class EmptyResponseError(RequestException):
     """The response payload was empty."""

src/base/migrations/0003_alter_env_options_alter_env_name.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.4 on 2023-10-23 20:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("base", "0002_globalmessage"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="env",
+            options={
+                "verbose_name": "Umgebungsvariable",
+                "verbose_name_plural": "Umgebungsvariablen",
+            },
+        ),
+        migrations.AlterField(
+            model_name="env",
+            name="name",
+            field=models.CharField(max_length=255, unique=True),
+        ),
+    ]

src/base/models.py

@@ -9,9 +9,13 @@ class Value(Enum):
 
 
 class Env(models.Model):
-    name = models.TextField(unique=True)
+    name = models.CharField(unique=True, max_length=255)
     value = models.TextField()
 
+    class Meta:
+        verbose_name = 'Umgebungsvariable'
+        verbose_name_plural = 'Umgebungsvariablen'
+
     def set_value(self, value: Value):
         self.value = value.value
         self.save()

src/base/parsing.py

@@ -11,6 +11,7 @@
 
 from teams.models import Team
 
+from base import http
 
 def html_dom(html_text: str) -> _Element:
     return html.fromstring(html_text)
@@ -26,8 +27,8 @@ def parse_association_urls(dom: _Element) -> list[str]:
     return cast(list[str], dom.xpath('//ul[@id="main-navi"]/li[contains(@class, "active")]//li/a/@href'))
 
 
-def parse_association_abbreviation(association_url: str) -> str:
-    return association_url.rsplit('/', 1)[1].upper()
+def parse_association_abbreviation(association_url: str) -> str | None:
+    return http.get_json(association_url)[0].get('head', {}).get('sname', None)
 
 
 def parse_association_name(dom: _Element) -> str:

src/districts/admin.py

@@ -1,4 +1,8 @@
 from django.contrib import admin
+from django.utils.html import format_html
+from django.urls import reverse
+from django.forms import CheckboxSelectMultiple
+from django.db import models
 
 from associations.admin import ASSOCIATION_SEARCH_FIELDS
 from districts.models import District
@@ -9,4 +13,20 @@
 
 @admin.register(District)
 class DistrictAdmin(admin.ModelAdmin):
+    list_display = ('bhv_id', 'name', 'get_associations')
+    list_display_links = ('bhv_id', 'name')
     search_fields = DISTRICT_SEARCH_FIELDS
+
+    formfield_overrides = {
+        models.ManyToManyField: {'widget': CheckboxSelectMultiple}
+    }
+
+    @admin.display(description='Verband')
+    def get_associations(self, obj: District) -> str:
+        association_links = [
+            format_html('<a href="{}">{}</a>',
+                        reverse('admin:associations_association_change', args=[a.pk]),
+                        a.name
+                        ) for a in obj.associations.all()
+            ]
+        return ', '.join(association_links)

src/districts/apps.py

@@ -3,3 +3,4 @@
 
 class DistrictsConfig(AppConfig):
     name = 'districts'
+    verbose_name = 'Bezirke'

src/districts/migrations/0002_alter_district_options_alter_district_associations_and_more.py

@@ -0,0 +1,38 @@
+# Generated by Django 4.2.4 on 2023-10-23 20:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("associations", "0003_alter_association_options_and_more"),
+        ("districts", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="district",
+            options={
+                "ordering": ("bhv_id",),
+                "verbose_name": "Bezirk",
+                "verbose_name_plural": "Bezirke",
+            },
+        ),
+        migrations.AlterField(
+            model_name="district",
+            name="associations",
+            field=models.ManyToManyField(
+                to="associations.association", verbose_name="Verbände"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="district",
+            name="bhv_id",
+            field=models.IntegerField(unique=True, verbose_name="ID"),
+        ),
+        migrations.AlterField(
+            model_name="district",
+            name="name",
+            field=models.CharField(max_length=255, unique=True, verbose_name="Name"),
+        ),
+    ]

src/districts/models.py

@@ -8,9 +8,14 @@
 
 
 class District(models.Model):
-    name = models.TextField(unique=True)
-    associations = models.ManyToManyField(Association)
-    bhv_id = models.IntegerField(unique=True)
+    bhv_id = models.IntegerField(verbose_name='ID', unique=True)
+    name = models.CharField('Name', max_length=255, unique=True)
+    associations = models.ManyToManyField(Association, verbose_name='Verbände')
+
+    class Meta:
+        verbose_name = 'Bezirk'
+        verbose_name_plural = 'Bezirke'
+        ordering = ('bhv_id',)
 
     def __str__(self):
         return f'{self.bhv_id} {self.name}'

src/games/admin.py

@@ -1,6 +1,8 @@
 from django.contrib import admin
+from django.utils.html import format_html
+from django.urls import reverse
 
-from games.models import Game
+from games.models import Game, GameOutcome
 from leagues.admin import LEAGUE_SEARCH_FIELDS
 from teams.admin import TEAM_SEARCH_FIELDS
 
@@ -12,4 +14,49 @@
 
 @admin.register(Game)
 class GameAdmin(admin.ModelAdmin):
+    list_display = ('number', 'league_year', 'show_opening_whistle', 'league_name',
+                    'home_team_name', 'guest_team_name', 'report', 'home_goals', 'guest_goals', 'spectators')
+    list_filter = ('league__season',)
     search_fields = GAME_SEARCH_FIELDS
+
+    @admin.display(description='Heimmannschaft')
+    def home_team_name(self, obj: Game) -> str:
+        url = reverse('admin:teams_team_change', args=(obj.home_team.pk,))
+        name = obj.home_team.name
+        if obj.outcome() == GameOutcome.HOME_WIN:
+            return format_html('<a style="color:#28a745;" href="{}">{}</a>', url, name)
+        if obj.outcome() == GameOutcome.TIE:
+            return format_html('<a style="color:#ffc107;" href="{}">{}</a>', url, name)
+        return format_html('<a style="color:#dc3545;" href="{}">{}</a>', url, name)
+
+    @admin.display(description='Gastmannschaft')
+    def guest_team_name(self, obj: Game) -> str:
+        url = reverse('admin:teams_team_change', args=(obj.guest_team.pk,))
+        name = obj.guest_team.name
+        if obj.outcome() == GameOutcome.AWAY_WIN:
+            return format_html('<a style="color:#28a745;" href="{}">{}</a>', url, name)
+        if obj.outcome() == GameOutcome.TIE:
+            return format_html('<a style="color:#ffc107;" href="{}">{}</a>', url, name)
+        return format_html('<a style="color:#dc3545;" href="{}">{}</a>', url, name)
+
+    @admin.display(description='Saison', ordering='league__season__start_year')
+    def league_year(self, obj: Game) -> str:
+        return str(obj.league.season)
+
+    @admin.display(description='Liga')
+    def league_name(self, obj: Game) -> str:
+        return str(obj.league.name)
+
+    @admin.display(description='Anpfiff', ordering='opening_whistle')
+    def show_opening_whistle(self, obj: Game) -> str | None:
+        if not obj.opening_whistle:
+            return None
+        return obj.opening_whistle.strftime('%d.%m.%Y %H:%M')
+
+    @admin.display(description='Bericht')
+    def report(self, obj: Game) -> str | None:
+        report_nr = obj.report_number
+        if report_nr is None:
+            return None
+        url = obj.report_source_url()
+        return format_html('<a href="{}">{}</a>', url, report_nr)

src/games/apps.py

@@ -3,3 +3,4 @@
 
 class GamesConfig(AppConfig):
     name = 'games'
+    verbose_name = 'Spiele'