From 9b2d00106f991ae31b4e2c38b38ce1fca173aa0b Mon Sep 17 00:00:00 2001
From: Matthias Nagel <mnagel@sg-1.sg-center.net>
Date: Thu, 2 Oct 2025 21:42:46 +0200
Subject: [PATCH] feat: Ausblenden vergangener Termine im Dashboard

---
 dashboard/__pycache__/views.cpython-313.pyc | Bin 4961 -> 5452 bytes
 dashboard/views.py                          |  13 +++++++++++--
 db.sqlite3                                  | Bin 311296 -> 311296 bytes
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/dashboard/__pycache__/views.cpython-313.pyc b/dashboard/__pycache__/views.cpython-313.pyc
index dd92471b5a7fef64aeb88ba2dbef6301ee813f0c..32eab016756696fefb1d628d203f3605fca38406 100644
GIT binary patch
delta 2518
zcmcH)OKcNIbaw6dyIz0eB>u(u@Nr0-6cW-@gcfL<5Sm!oWm+R6oF!gjx6ay`-5lVO
z^w=V`M04TLN^onX9zawos(RqiLo0E>MQW-orBtef%84jQy|hwi)?OA=pr@|1^Zsw%
zym{}<Z#!=e@Y_D02as>;;@xuHzrlAh<&9l$>=uFOIOd(<5SIo7cOLU0-$|S3ih(hz
zO+LggIWz8!^`pC(`3$4Gw92x4uBOOyi%e6&SgCIt`L|Q<s}DvPJiw;#gEmiIaYJ{Z
z(^M2<CT782Alk*Y31*16P(0AJyCs@prBeVD5~ik*GBFDAUu-N5U7}-xQM@lw3J@hH
zQR4F73^@T1`tUtR470Y#T49Ij5PC${1Y^;nn{Yf6EHxNwol@9kYFkkBirg66q=k&d
zH!;yC@}hr?=7oI1o+fOq-3Al`<_3xn`ods}nf{vOfrmUkX&+fo{DooDN({yT^oJi`
z%wxkqp|t}5kQcpXL}ntTDCG+yrXLFmd+`lhM>04Jln~LdTM`o!M)4_o_J9)pk1eL3
zyTyLuV9XhTVHjyT3(>49;n`jQydVu=xOpX=N|+w*?RJ$N0V*2?)1+3EcG!+b9FaBH
zF1%vKWWgdkOUi?KQKCdOOpNvsqYfAqCM_)!gB`*_6StrkGV`T$!jN#tl9(9mfO|T{
zaF#U_o(8j|IgH?W;jpP@LcE(zlhXIEy>4<WsB{$~CMCRSVixSB7xgcXRuL*O$UZYf
z9tL0#hF}+r2}hg$aNfn?8+I2fM({_DzIeNNPO~ni7>U#@WP}-VMI$_^JlcVAQVa<g
z$1Z0w{_BhTZxqI#RWo9gv|I8;J-PEah8@H(1(PuK|90xreQ0Fsi8kzp-K36QCaK^H
zZyCaO$olm3X=Yf+HQ|#hjFT4ZoM2bUSWwbR4@^AgzS3eBzToQE_pE}8!-N=nvfiec
zSzoK-SZFhcYfg-3ZAx!p-V6W&F#&tcdDBnYC{2E){S3$?=XAR!OUsDF1;`k0TP#Zz
z<qtYIC{?blA{8HU4~!GaCo82Q9rMNFk|rO|uzJAaR8(cPTGjokCLztzy7rzs&oKS?
zThC!8iJjha39sQA(b-Qt*jH5<Av$q0EZTuT^{xanXpoS)vn;8SrXl3T-Q2z`M|t*Y
zMb&hhDr?A1Xtb9yT_s7AX;`|Ot|hsuNm%02ZOBE$_<e4MiQt>u*jkcm+m>WaXDcP$
zA=T?7eAGp`_L6i~)!o(FqEv0Vs;IRyHMA^gh?WI%P%R&^E!I$R5y@mrWF)CicOrRZ
zRaP}4Y(&Q?dWmXt^{RAMMn#%l6^()+BG^x*#!=i-wb~LHr|@fKB+Er3;YDewhA;aP
zYjnmN$<g^bNo!@XQkS$!O;OQKDxpsgqHU{lbdzFpLlw~!Bl?c$!KciM%TgWnQz1<S
zqA!ykFwR`Gt_@`k!^Lu?iVyHdm?6B*N9}!ti7)dpe1&(%QJSi_OOjeXU6W7=6$wo*
zMEx88$gib;_k=zk{BZDmcKygt(XLOXHxt<(64@*Bjl_5(I=-I6(0{o6Y9sjS9nN<#
z*Wd=fSh>-EE5FnjE;qRHwv7#W?t3~v$X<+Iirw}MZVpX0h9<AqZsnFA0#IkB*=+!_
zN7+9Cm|+EWs|komWQ$ZZ!!EE7+ko5u$OWQ_Yj^z@7-kdKf(w%;8r>)EMA|Rq8j;a2
zSHA1NwNPt}*Bg;K*)tuwA4+dzFGW9#-42a@mA{(5UcEhbj5rD=w_PALfFA{Oo=t9k
zs|!Rk4^wzHG!V`)pl6OzX?1)b?GZeVj31v5RgVWs?@G#2En7OBU9OReRE=8HxfXj>
zs}Pn^!u0tv^7lC)p%Xk!7TtA#n5|ajgQ!eMhWzRX9u7x)Q@?<opMn1#<KJTE80Ix*
N+XmP`3r9;t@gF+8$=(0}

delta 1955
zcmah~OKclO7@nE+E6)0{@hg7CcGILdv`(aAASgs>3Uxxsqr07|!nEl&HnAgT<Ib){
zDJbrd6C@f=h$9!^m>Y+}F$WHbDz(TWJVb?n10>3UD>JsYF(HAGc4qhgzyJOJv)>H;
zH0VBXxtxHl5AS|o`pvcB?uA!3&b;b>Q&4OXkmVe<NcWOG?b!HeI^{6RE5&=OT5%D!
zSk0Yl5ZH4t?%1@z5$MK_XWHx>QeUQPwq#5Ww<#S5b|{unsCCi%w!YIR0IUq)y#Dby
zI{<Q&eqfD^$?*;q?N`O7*t4khAt#REJCrWPnHA_CC=ye;vu*FSZrtqyIXLwt0GfzJ
z`4qix&(t+ne!$eBh!KEYzNfi(D(cSjkedsOip{ic2CfDHU<wCK%;71UkV6ufg9_3-
z!$9*g8F~f!kUYd)8PlZyF*9|dnX^p6h&YvGq4i)1_p~(j@Jwpb%qal6K@wo8nbqj9
z#Dl!%)6odfkq=Bo7|Mrza;C$}_A8@~&~L5rx}PB=hCR=)0qmFAd351`{M=C*0E){@
zmlnic`GtQYZ~zAtcLtg1PJ$WMjZKe5`NbBVZdpY!|B@*zkI@Mf8$8FlQ64vmho=_m
zfKD)|A7PPxZS`kN8(J?$$NC~-H}+sJ4&h$;BJV+@c<7|PKk7BZFiV<)s*M!{%CEGN
z|0~N(n3Xkx!*m|T;R8Mk!DCxJOm8^?R*AKHl+VL|fIK}66vI&*JDiHh$y335zTVOE
zaU5qgV>#5s{3SC#GHchPOP)STVWEXtv-?I-jSZXDrzLRYgpBnm{*LNRgBez*X8D9;
z1;RL@1Udx3%<pYH!a_&knl-+l1T%t`%wIPB!$1k)WVSt!r&$Ll*`xX10_on_hQ%nV
zD}>(;Y1ptXmejIFr=3HapF6KZ7^i|b2}AUfcrV89u{0z-{6Gy$O)nC{FOxJP3HqIQ
zM;au2o*VX(s;h=Uh?CxQo%eKenx#_KjfS8X4f>TUNuRi0gKj$P&Za_~D=Za_1}YaC
zHnmzUY6aqBRN~;<S^BO!2?yvW?)ZgN!%m8KYDL{>8X`j+@GMs#Rx9c|MY6y{(Fq?)
zGQzi}?Jl)aX>q966RW2=gZtfZS5;z^7t2-ED6eWdNpen#Z*2UTQm$>GrCBFDdctq%
zhV&1yg%!0*`Z$w^Li#zvTUlLHD+{{8^e^y#0^t+TkQPhj3jM-!5uTxcdV&^iib~!n
zO?qun!mbq1=qjjs>GrBh3gjC5W|tArKczWuo&MsT%;k2Z+?H*7{*8xH{;^cqkt*9O
z@9hClhc^&A7SP-10Dzvm=r6Wk5cZopV@wLO0%yz#@7taPqMPf|I)smC%6Dr(-ASn1
zw@cg0#=}JIabj&JvBm@@(Cb`Nat5u7KgZMbfp5<FNW8Ki0KxQLgogY>{>u=gW}(jJ
z8Ekc><|DS*v`DY|E6ZYGS=E+SGc}`J(OX62p?n6ILYAOrn2xcP)k3XO949v!jsI?R
pUd%lKLbwb1cfsfn;Q3t;-vy~3p=TfEAe?{)0zlsOJGsH&e*<lgPz3-0

diff --git a/dashboard/views.py b/dashboard/views.py
index 32fcebd..c7b5a44 100644
--- a/dashboard/views.py
+++ b/dashboard/views.py
@@ -2,7 +2,9 @@ from django.shortcuts import render
 from django.contrib.auth.decorators import login_required
 from calendars.models import Event, EventParticipation
 from clubs.models import Team
+from django.db.models import Q
 from django.utils import timezone
+import datetime
 
 @login_required
 def dashboard(request):
@@ -19,10 +21,15 @@ def dashboard(request):
     from itertools import chain
     all_teams = list(set(chain(player_teams, coached_teams, assisted_teams)))
     
+    now = timezone.now()
+    three_hours_ago = now - datetime.timedelta(hours=3)
+
     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().select_related('game', 'training').prefetch_related('team__players', 'eventparticipation_set__user', 'game__opened_for_teams').order_by('start_time')
+        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)
+        ).select_related('game', 'training').prefetch_related('team__players', 'eventparticipation_set__user', 'game__opened_for_teams').order_by('start_time')
         
         for event in events:
             participations = event.eventparticipation_set.all()
@@ -64,7 +71,9 @@ def dashboard(request):
             if child.team:
                 child_user_events = Event.objects.filter(team=child.team)
                 child_opened_games = Event.objects.filter(game__opened_for_teams=child.team)
-                child_events = (child_user_events | child_opened_games).distinct().select_related('game', 'training').order_by('start_time')
+                child_events = (child_user_events | child_opened_games).distinct().filter(
+                    Q(end_time__gte=three_hours_ago) | Q(end_time__isnull=True, start_time__gte=three_hours_ago)
+                ).select_related('game', 'training').order_by('start_time')
                 
                 for event in child_events:
                     participation, created = EventParticipation.objects.get_or_create(user=child, event=event)
diff --git a/db.sqlite3 b/db.sqlite3
index 5098404bba7d56aa055358f15a2d273d6b4e0b1e..10de515fb724bcc189f8cd7578ef08d80401fe82 100644
GIT binary patch
delta 601
zcmZ9IPiPZC6o+Rzlgw-q^IM7WV#TfhPNvy3sMrV=MMXSV=s|=+v)E7zX<Cv!d2t&H
zQt;3qxZdhfPf`LdJqli8PkITZ6=}Vgi@OC2)*f^=>7mFR2Ht$XH{W}XlX9HY(h0iQ
z=)XZ1SBmMuC^wSqCUuuw)=#w;uLe6*JgsM+)w9&AXZz}b9*xfsoKKD)d7B6lh4@S}
zXFP~spT8?&WZ+~ze}8_A-nMGCF*Y|{D%(}79G)R_=wc>kX3R^5d1ctVJZzeWO1YdW
zxptO4_X-zSizPV91RHpd2FlHWxpAC3!zInrG?i4`sZ7n5YqmA1{&@Jvsyr@LuZGPu
z&23y`H5Kj<>|+-`I?bcbI@|z^_X+O#_gH!~8O0{SAN;~kY-7{YU$akLBtnI^{f?bB
zj%z3qd{p_bN?`#n@di~CmB=le)wKvYMX6=mrOM=VWlCte{I4S2g>TGJT~-Npu!jyl
zqlFLH!a7!!(K2+wDW#gwy0;Y4ZTYOA5^F?x?}z62u6}Q;<eEyX^k$Gki!e$R-u}xn
zJ-jz)4-G?yajlC>>9xT#Ba-0<!EXfN$Y0PHjmaqIMD=5CFu{+-Sh%=7r5vtp1F|b8
j7<YGOdCKD>%tyGz-6tHng8c(m1#cbfn5oxg9yk60e$cTq

delta 321
zcmXAiK}!Nb7>0M8PYv7V)s{{fY?nX?t@9oVqI3O#pngFK{eXsDp{q;Kbn9BDhy~{y
z)M0OSl8}h(PzI$|3g)3EJ3r6+yiz(+I@MVgg!wfVT<**iQ`{ANovEtgd6qspDYjWE
z@Jok&iD|!-@Vg>udlnYN*3`M(wY_NBE!f&y<T1~1gch2pA&hb|fC^XmzNRvDpg%Ww
zZc`-Dvha;ByrYE|Bh{h0;7R>_!ROrRG%6OZ(ZRiGRB(*5XuiA)Re9jjz}P|$L$q;=
z7>~F!`v@xTaL>Sog+4}R+s2dGHw?TQ$4NDRctMPfk#YX&4K3>I<{#@OsIaOjOK(uU
lZE`fZ^Z_;4BcW-D`q0Azn#@il&>w&3oJ_nz4^AoL{sQ9#aqIv9