From 057fde3a85f48861112a80beef8e2426f0fe781b Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 10 Dec 2023 10:40:15 +0100 Subject: [PATCH 1/2] fixes --- rowers/tests/testdata/testdata.tcx.gz | Bin 4000 -> 4001 bytes rowers/views/analysisviews.py | 7 +++++-- rowers/views/apiviews.py | 2 +- rowers/views/workoutviews.py | 10 ++++++---- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index ae9481cc270069942bb600e1d5d4edfd3c633cce..772a88aa561c6cc1c069e2b95c5da25ca5c63adb 100644 GIT binary patch delta 259 zcmV+e0sQ`;AE6%yABzYG0fTk12dNH!zBuyEhVJMHzB}%JJXq`wxU)Oc$KRMgUw&Hc zzCUv$vaW{jxhb**>lGakV~v+4WsIZ?}895|vNK9o&E2zdF0P z@|xT~KR;O=b$$BjmoLWUxxYGD`tIk~tCN?PKlk_aKBhyjJe&_(o^=07m(0#`f~%ju z-fgu`o4tJ6Z@c00(SC9MgXig{4}V*pEW6Dzamb%OJi06Qb?~@bA3u6{_{-DGX8Y%E z`>*LOe){_K#WLL)zz+bs{|^>dzSuqa?PEH;vqimHr|0k>p)%y5l*LUf>-R|v5R6ZSdaQ}7x>g?jm zYjXem{A6|1_35Wyz8IJ1{_14uyPsdLPF`OA+~3ptm=3-2a6W8#()}l0GCK=#u73V{ zx79jr_VQ`J?S{)o`^EVWo~N5W{B3!%>^959A%FVt=&sz?!Q*ay{OIA~FHbX@?Vr2t zzoxhN>Fd)M%XDV|KLG6hKUiG(V)x{?kLmEv7WHbKp2LHLa(VGEJ&hOX(ua5c2b=Is I3dDc`0I@ipnE(I) diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 7b599b43..f8f21150 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -2109,8 +2109,11 @@ class SavedAnalysisView(UserPassesTestMixin, View): self.searchform = SearchForm(initial={'q': query}) date_initial = {} if startdate: - self.analyses = self.analyses.filter(date__gte=startdate) - date_initial['startdate'] = startdate + try: + self.analyses = self.analyses.filter(date__gte=startdate) + date_initial['startdate'] = startdate + except ValidationError: + messages.error(request,"{startdate} is not a valid start date".format(startdate=startdate)) if enddate: self.analyses = self.analyses.filter(date__lte=enddate) date_initial['enddate'] = enddate diff --git a/rowers/views/apiviews.py b/rowers/views/apiviews.py index 6c7f9979..4b07edbc 100644 --- a/rowers/views/apiviews.py +++ b/rowers/views/apiviews.py @@ -192,7 +192,7 @@ def api_get_dataframe(startdatetime, df): ' longitude': longitude, }) - return 200, "", data + return 200, "Success", data @login_required() diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index 6a3313b4..93d4ad29 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -1833,10 +1833,12 @@ def virtualevent_compare_view(request, id=0): id=id)) except Workout.DoesNotExist: # pragma: no cover pass - - labeldict = { - int(w.id): w.__str__() for w in workouts - } + try: + labeldict = { + int(w.id): w.__str__() for w in workouts + } + except: + labeldict = {} res = interactive_multiple_compare_chart(workoutids, xparam, yparam, promember=promember, From bc366c40dfff0895aee98eadedf7ec7ae411544c Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 10 Dec 2023 10:49:04 +0100 Subject: [PATCH 2/2] fix --- rowers/tests/testdata/testdata.tcx.gz | Bin 4001 -> 4000 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 772a88aa561c6cc1c069e2b95c5da25ca5c63adb..35f0ce5c7337a79784aa2845340e746e2b5f9c07 100644 GIT binary patch delta 257 zcmV+c0sj7>AD|xwABzYG?uW4kst$jK7h+=&egWSd_dgyib_d+qo$2Fm%%3kmt#;oZ zJh(_4&n`af`?O1M&&Ao>O}Bp8ot$i+R{FSFAHVGSE}ggAyRK|D;Q1XTfpR&tLDh zTBprkKJB;NaQSGzIRC-(bkm2wEl-x+W|=tTPahuLmHRq)+^vrvJv{v7X=bzibGQB1 z^cFvTefnaV?hN1ufZhKGiz{F3p8WPP9p2fZUaiw}c#u#oFCM0+@giON@Xr4Ll(3SP H#DD<+B#Dn2 delta 258 zcmV+d0sa1Cm zKX`DFIG$a6*!O9d-kyuIx0`PLvO781KCSd|wLX5?^<6q|w|l!1l~2bV+<)D_I=i^? zn%qA>KUp1hefsH_FUIA$zdBj^?&sI5lb4r2_xJQZrbDkhoDW-`bpJ`0%+7LxtDnE# zZM9CDy?oklyW#TDesTVT=jo;oe_Ng`yUj9j$e%tux-0i}@VHwaKYDoh%hSwe`{!=^ zujws*`ug<6GTj-#4*-OEMZH?5=kOq*TwXj(Pvb?p^x>WV0hy3Q I_QZez071==GXMYp