From baf9727a37182873cd47807a08bb9b38f92ed779 Mon Sep 17 00:00:00 2001 From: Matthias Nagel Date: Tue, 18 Nov 2025 23:04:42 +0100 Subject: [PATCH] Ein paar bugfixes --- accounts/admin.py | 6 +++--- baseball_organisator/settings.py | 4 ++-- calendars/views.py | 3 ++- dashboard/templates/dashboard/dashboard.html | 6 ++++-- dashboard/views.py | 6 ++++-- db.sqlite3 | Bin 311296 -> 311296 bytes 6 files changed, 15 insertions(+), 10 deletions(-) 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 10de515fb724bcc189f8cd7578ef08d80401fe82..47616a744096a1f102902d4740b26552e4bbf08d 100644 GIT binary patch delta 5283 zcmb7IeQ+Da6~DccA3&MXVJOoAQwns#XPGI5Fip}H7z%;zo&2GE z6ocj2z1w~Jd%u1A_U*pgzu&!ozx%HB==HlVY(=j>cEfWU(N7lzp5_kmUJtSy3VYkx zM(!_!<$M>Vpz_IEEbC~JAlBQct57);LFXNM#d`&6IP{gb1=$X@w5S{GP$udKf^a*i zEod~F(lfDWHn&fo(KC5iJkV0&H#n~*>})>)S8~J7Pn~x;cR2p#xYr@sU$J}G{zbu~ zvhIaWyNg)3MxvXWH(gCL5vAdAV>)A{?n#nKsYkGED+HA(H-k5#{79ZdR>iq?QHMj?9xBG%i z8G}1xau3Gar__WvGcYvWHxlMkde5XhH?w)LHLK3;kmW?zc73u-;5+)JI@*NoT`j3y zJ5z(9snJA?*CJ|HYh?5c?vfS|d9ROGG*JjeGx&e|WHF~_#-o{Sv(Z>AQ>dlrFy|}C z0a>QrUwmaEi5l@T8A}zi0^uZRcjNj?X<9nel@=BcraRHPWgCh9fFOB!RaJO-@tw?O zMBCve0&a(!7U`)eI3K8HRAV=L9py%t414gNQstf!n(Do*0S*)JCcFkO!wc|xcp9F7 zMfepQhR@++I1V4cd+>935bj^xG?j$%37{+?TZ5HCh^aSAmsx^Q+Bmaxnx(@m?PkfE zC1aMfS=O1Qt^D5GXj7HKs=Bkum;~VP3I%JY$$&H&kR}7tWI&n>NRt6+G9XO`q{)CZ z8IUFe(quql2FKARmyKyAxTDS^j=SwCwu5QLo(@duz$Tlu`(QYjpVTy2ADLIOd`=OI z6G|?c)MLDFJgv(aP0x7s(A>cIj<%k}e6Ty%yDwQ7nw$+ywU24LWvQ=C%eC*G>lt0$&G!%I=XVx_*pS>6E(Tjev3R;QylXeKh$mMLxxw#`cOiGVP(tAEcxprdDxFp|;ts$#2_o`?_dovpf}`g+G^ zg-|ZoxqB=@U9!HJ2PiRyL|xANl3*7W*SRhHxfO;&8BNHChp3NblVROe^qyniB= z8;=X4Bcs!bIF^blTD<($DYRJH)z{q`=-4jA`SHx?Xg)cwZyz0)?id`5h>`KR6rV4| zlv#04Jd)ovq)Lg-8oh!)AZh_Y^~#b@_DctvET&#{LKgXS+NVilKA)IWqZuWWpU%pH zI42c_OtiW>-MOB`craW(b_)Hhv@0Bo1v(=kIjnXHvwP?FjL!M@X%jgmErh3{dTTUR z2rKP_V^VCcKi-?p)spZ9WWm^TnqT%Qc=D7f9}Y}=9W=X3hNm@?5P4R>_+?;4$* z8(j%#sz=}hvJwz|UY{mvvRXNE3hgE@Yha!r;BlA+jXTBN#`QX%c1}9oj*27ZXt2L% z?_~eZ9%Sp8C$Mwh!3+;HFhqSbiXapegqjdRUVCHH=vXw9&|^&j&y7v-q@If9@Z+^j z{dzRrbp6dYUvDE<$e58!@dtQp5lxjfVXD4-2S;9a;c|q+L?zsZ-f72{MnfT{_JV zzZtk{_?;*UlFzrBHo;9_UxWDSn%6FQ313G5NpE`v+<)a(P z%Q5o~0{#ZSgNNW2h(iZvED02F(S63@Vm-6_^ssMP?Z%Pmtbj}z z-KhM`m*~5dcU#DhTadl-+CEZqRa`HjKf~RnS=|Z;3=eXKNeF7gX*6)7{tQHC} z_R7f@$qgw<(A8sE7+k*TEKmD2IOJm(3n zw4`dz1wjb#IL7g{O=9^mFE!)af&=&Z^Qv(8a-YJ#ST3H6uZa4MOUCJ=aZ`1)yxGYT z=Q*pR6N&6tzGj%926(Mjsox{uD5I4>+)Cv_0S8NH7gR?M&+18IBK<~kfqw~)Ac*l; zd^SE?izl6pCokg-b=p~COKTOc4WBEkaEWeg8qdU%f#wUjXnx*IW0ILfExd9z{0iNx zwy-R*p|J{|!}d;zaXlW>SIoo{&%_ZGFSgiH#wIFNy){&fre%m}L{-vTsImp`)g}Ut!V$O| zQqTcSc&~C0YPQixLXC()(3we0rtqN=%X=cmJ!D?be$UXtFwNFwA@=_Zl~dPHKfzkw zBx(|vH}T$hzM8zyU^7w=)>{6chg#oIR~7sOPQpjPW;ux8xe};an=&U-pg5C^{2Nutd2%2aUMeHXmLbmtlS3#hi$X;=Wws~IjxR{)i=8p zUOi3Hwb}=?1I)L66O^MJ+-j$jb~snx95k?2Vgo{1eOw>S>oJ;f*-vN4&<@Ay06Sg2 z;ce<6ZzBv5Fof^RMMy#vd%$Nn+kF|HhiBknobld=UG!F1fOp}qI46D#JL;uyL!AX7 zWMvwwHMg!>JKfdV-cYR_^=3_jt6FnVt({!8b~vlG-BGO>yIC_dTYlm=)rFZIByjfq z`BMH}n-CwwTn^(5{eGOI--$ExTj4>>EL?TD9ZaL)THHFLbh?ewZf433GgAgLQ|3(9 zahjPjwxc0qX3C72DPsyRd`0=I6z<2W?!+n%F72f%k>yVWMpkZo9>AXsRw*Fsq1zwW za0zXyqD@t_sfspL(WWZeRK;LbVDVQhy_OGww6f(B8!hWt3O*n(>}PNid;3wKP0LtW zOZjAr#f^K96WA*FV*&1cw>oR5wYsg$4MiWBviuuJ)>8Sn#{#`H>EsFSmrfohJ)52G z1GA)+K(|c7jZMi6j{1pxLOJ}XW%DJXnd^*A;87Lm9N)m>+ux#GoQ5im51Vv4s{ZXCgB*v(JT~hn{}^@0{~3=lhb$Kr$IrQ`*uo1^neYN` zq{hM#u2PXmWr+!!5rYN1av|Tfv%aoj_s;zXcGMlJYdDza9EmhW3kfwn8HPpHHs6r1 z#ka!y)!XJR_hg({=$gmL?A^nyO$L~cxdStb=DFRgQ=8+lyl~}`vS?Ykb2Pq|=SLSu zW1(1VS+r_dMR|BhC1FdQmko2cGSSK$Zz6$IjlcM4Yol&$$|cP5pKFbb6F;5SC#zGhD$wR9T}|Gg)@n(#@7Q z%-sT-p%uvFDB8?(2wuPP9Q`zxw5lk zqLluxCdNgPnl^4f?lSzsOAH~0w|I&S>FyHi>Xa!Dg0jr-^28bDTHAf+yjkyZPn^cz z>e2Cq(pFxDdWIgPaUAue+YY;ar94654}V>z@RO-@pEt?^t=h#949NwT>2@&&E;Ua` zmtVV*@^{ehLNCKle8U&=rx))@errN*=)Q|G6e`3c>bsWV2CeWJRX&C`oW*|BI