Ein paar bugfixes

This commit is contained in:
Matthias Nagel 2025-11-18 23:04:42 +01:00
parent 9b2d00106f
commit baf9727a37
6 changed files with 15 additions and 10 deletions

View File

@ -4,9 +4,9 @@ from .models import CustomUser, AbsencePeriod
class CustomUserAdmin(UserAdmin):
model = CustomUser
list_display = ['email', 'username', 'team', 'display_parents', 'is_staff']
list_display = ['email', 'username', 'team', 'display_parents', 'is_staff','birth_date','player_number']
fieldsets = UserAdmin.fieldsets + (
(None, {'fields': ('team', 'parents')}),
(None, {'fields': ('team', 'parents','birth_date','player_number')}),
)
filter_horizontal = ('parents',)

View File

@ -46,7 +46,7 @@ INSTALLED_APPS = [
MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'baseball_organisator.middleware.TimezoneMiddleware',
# 'baseball_organisator.middleware.TimezoneMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
@ -117,7 +117,7 @@ AUTH_PASSWORD_VALIDATORS = [
LANGUAGE_CODE = 'de-de'
TIME_ZONE = 'UTC'
TIME_ZONE = 'Europe/Berlin'
USE_I18N = True

View File

@ -45,6 +45,7 @@ class TrainingCreateView(LoginRequiredMixin, CreateView):
def get_form(self, form_class=None):
form = super().get_form(form_class)
user = self.request.user
print("DEBUG: "+str(user.coached_teams.all()))
if not user.is_superuser:
coached_teams = user.coached_teams.all()
assisted_teams = user.assisted_teams.all()

View File

@ -1,5 +1,6 @@
{% extends "base.html" %}
{% load l10n %}
{% load tz %}
{% block content %}
<div class="d-flex justify-content-between align-items-center mb-3">
@ -34,7 +35,7 @@
<i class="bi bi-house-door-fill"></i>
{% endif %}
</h5>
<small>{{ item.event.start_time|localize }}</small>
<small>{{ item.event.start_time|timezone:'Europe/Berlin'}}</small>
</div>
<p class="mb-1"><strong>Team:</strong> {{ item.event.team.name }}</p>
{% if item.event.game %}
@ -94,6 +95,7 @@
<p>No events found for you.</p>
{% endif %}
DEBUGGER: {{ mtp_debug }}
{% if children_events %}
<hr>
<h3>Your Children's Events</h3>

View File

@ -23,12 +23,13 @@ def dashboard(request):
now = timezone.now()
three_hours_ago = now - datetime.timedelta(hours=3)
week_ago = now - datetime.timedelta(weeks=1)
if all_teams:
user_events = Event.objects.filter(team__in=all_teams)
opened_games = Event.objects.filter(game__opened_for_teams__in=all_teams)
events = (user_events | opened_games).distinct().filter(
Q(end_time__gte=three_hours_ago) | Q(end_time__isnull=True, start_time__gte=three_hours_ago)
Q(end_time__gte=week_ago) | Q(end_time__isnull=True, start_time__gte=week_ago)
).select_related('game', 'training').prefetch_related('team__players', 'eventparticipation_set__user', 'game__opened_for_teams').order_by('start_time')
for event in events:
@ -66,6 +67,7 @@ def dashboard(request):
# Get children's events
if hasattr(user, 'children'):
print('haschild')
for child in user.children.all():
child_events_list = []
if child.team:

Binary file not shown.