Ein paar bugfixes
This commit is contained in:
parent
9b2d00106f
commit
baf9727a37
@ -4,9 +4,9 @@ from .models import CustomUser, AbsencePeriod
|
|||||||
|
|
||||||
class CustomUserAdmin(UserAdmin):
|
class CustomUserAdmin(UserAdmin):
|
||||||
model = CustomUser
|
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 + (
|
fieldsets = UserAdmin.fieldsets + (
|
||||||
(None, {'fields': ('team', 'parents')}),
|
(None, {'fields': ('team', 'parents','birth_date','player_number')}),
|
||||||
)
|
)
|
||||||
filter_horizontal = ('parents',)
|
filter_horizontal = ('parents',)
|
||||||
|
|
||||||
|
|||||||
@ -46,7 +46,7 @@ INSTALLED_APPS = [
|
|||||||
MIDDLEWARE = [
|
MIDDLEWARE = [
|
||||||
'django.middleware.security.SecurityMiddleware',
|
'django.middleware.security.SecurityMiddleware',
|
||||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||||
'baseball_organisator.middleware.TimezoneMiddleware',
|
# 'baseball_organisator.middleware.TimezoneMiddleware',
|
||||||
'django.middleware.common.CommonMiddleware',
|
'django.middleware.common.CommonMiddleware',
|
||||||
'django.middleware.csrf.CsrfViewMiddleware',
|
'django.middleware.csrf.CsrfViewMiddleware',
|
||||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||||
@ -117,7 +117,7 @@ AUTH_PASSWORD_VALIDATORS = [
|
|||||||
|
|
||||||
LANGUAGE_CODE = 'de-de'
|
LANGUAGE_CODE = 'de-de'
|
||||||
|
|
||||||
TIME_ZONE = 'UTC'
|
TIME_ZONE = 'Europe/Berlin'
|
||||||
|
|
||||||
USE_I18N = True
|
USE_I18N = True
|
||||||
|
|
||||||
|
|||||||
@ -45,6 +45,7 @@ class TrainingCreateView(LoginRequiredMixin, CreateView):
|
|||||||
def get_form(self, form_class=None):
|
def get_form(self, form_class=None):
|
||||||
form = super().get_form(form_class)
|
form = super().get_form(form_class)
|
||||||
user = self.request.user
|
user = self.request.user
|
||||||
|
print("DEBUG: "+str(user.coached_teams.all()))
|
||||||
if not user.is_superuser:
|
if not user.is_superuser:
|
||||||
coached_teams = user.coached_teams.all()
|
coached_teams = user.coached_teams.all()
|
||||||
assisted_teams = user.assisted_teams.all()
|
assisted_teams = user.assisted_teams.all()
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
{% load l10n %}
|
{% load l10n %}
|
||||||
|
{% load tz %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="d-flex justify-content-between align-items-center mb-3">
|
<div class="d-flex justify-content-between align-items-center mb-3">
|
||||||
@ -34,7 +35,7 @@
|
|||||||
<i class="bi bi-house-door-fill"></i>
|
<i class="bi bi-house-door-fill"></i>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</h5>
|
</h5>
|
||||||
<small>{{ item.event.start_time|localize }}</small>
|
<small>{{ item.event.start_time|timezone:'Europe/Berlin'}}</small>
|
||||||
</div>
|
</div>
|
||||||
<p class="mb-1"><strong>Team:</strong> {{ item.event.team.name }}</p>
|
<p class="mb-1"><strong>Team:</strong> {{ item.event.team.name }}</p>
|
||||||
{% if item.event.game %}
|
{% if item.event.game %}
|
||||||
@ -94,6 +95,7 @@
|
|||||||
<p>No events found for you.</p>
|
<p>No events found for you.</p>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
DEBUGGER: {{ mtp_debug }}
|
||||||
{% if children_events %}
|
{% if children_events %}
|
||||||
<hr>
|
<hr>
|
||||||
<h3>Your Children's Events</h3>
|
<h3>Your Children's Events</h3>
|
||||||
|
|||||||
@ -23,12 +23,13 @@ def dashboard(request):
|
|||||||
|
|
||||||
now = timezone.now()
|
now = timezone.now()
|
||||||
three_hours_ago = now - datetime.timedelta(hours=3)
|
three_hours_ago = now - datetime.timedelta(hours=3)
|
||||||
|
week_ago = now - datetime.timedelta(weeks=1)
|
||||||
|
|
||||||
if all_teams:
|
if all_teams:
|
||||||
user_events = Event.objects.filter(team__in=all_teams)
|
user_events = Event.objects.filter(team__in=all_teams)
|
||||||
opened_games = Event.objects.filter(game__opened_for_teams__in=all_teams)
|
opened_games = Event.objects.filter(game__opened_for_teams__in=all_teams)
|
||||||
events = (user_events | opened_games).distinct().filter(
|
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')
|
).select_related('game', 'training').prefetch_related('team__players', 'eventparticipation_set__user', 'game__opened_for_teams').order_by('start_time')
|
||||||
|
|
||||||
for event in events:
|
for event in events:
|
||||||
@ -66,6 +67,7 @@ def dashboard(request):
|
|||||||
|
|
||||||
# Get children's events
|
# Get children's events
|
||||||
if hasattr(user, 'children'):
|
if hasattr(user, 'children'):
|
||||||
|
print('haschild')
|
||||||
for child in user.children.all():
|
for child in user.children.all():
|
||||||
child_events_list = []
|
child_events_list = []
|
||||||
if child.team:
|
if child.team:
|
||||||
|
|||||||
BIN
db.sqlite3
BIN
db.sqlite3
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user