diff --git a/accounts/admin.py b/accounts/admin.py index d70a4f6..615110c 100644 --- a/accounts/admin.py +++ b/accounts/admin.py @@ -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',) @@ -15,4 +15,4 @@ class CustomUserAdmin(UserAdmin): display_parents.short_description = 'Parents' admin.site.register(CustomUser, CustomUserAdmin) -admin.site.register(AbsencePeriod) \ No newline at end of file +admin.site.register(AbsencePeriod) diff --git a/baseball_organisator/settings.py b/baseball_organisator/settings.py index f18ca0f..73169b9 100644 --- a/baseball_organisator/settings.py +++ b/baseball_organisator/settings.py @@ -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 diff --git a/calendars/views.py b/calendars/views.py index ae8bd13..67f507a 100644 --- a/calendars/views.py +++ b/calendars/views.py @@ -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() @@ -177,4 +178,4 @@ def record_results(request, game_id): 'guest': form[f'inning_{i}_guest'], }) - return render(request, 'calendars/record_results.html', {'form': form, 'game': game, 'form_fields_by_inning': form_fields_by_inning}) \ No newline at end of file + return render(request, 'calendars/record_results.html', {'form': form, 'game': game, 'form_fields_by_inning': form_fields_by_inning}) diff --git a/dashboard/templates/dashboard/dashboard.html b/dashboard/templates/dashboard/dashboard.html index 393e8ba..cb56979 100644 --- a/dashboard/templates/dashboard/dashboard.html +++ b/dashboard/templates/dashboard/dashboard.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% load l10n %} +{% load tz %} {% block content %}
@@ -34,7 +35,7 @@ {% endif %} - {{ item.event.start_time|localize }} + {{ item.event.start_time|timezone:'Europe/Berlin'}}

Team: {{ item.event.team.name }}

{% if item.event.game %} @@ -94,6 +95,7 @@

No events found for you.

{% endif %} + DEBUGGER: {{ mtp_debug }} {% if children_events %}

Your Children's Events

@@ -166,4 +168,4 @@ document.addEventListener('DOMContentLoaded', function() { }); }); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/dashboard/views.py b/dashboard/views.py index c7b5a44..c3507d2 100644 --- a/dashboard/views.py +++ b/dashboard/views.py @@ -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: @@ -85,4 +87,4 @@ def dashboard(request): 'children_events': children_events, 'now': timezone.now() } - return render(request, 'dashboard/dashboard.html', context) \ No newline at end of file + return render(request, 'dashboard/dashboard.html', context) diff --git a/db.sqlite3 b/db.sqlite3 index 10de515..47616a7 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ