From 7c62d4c55bb5d0fb0d438b4b572c5e1e66f91d31 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 19 Jun 2024 19:13:28 +0200 Subject: [PATCH 1/3] small fix --- rowers/dataroutines.py | 4 ++-- rowers/tests/testdata/testdata.tcx.gz | Bin 4001 -> 4001 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rowers/dataroutines.py b/rowers/dataroutines.py index 3acdf49e..8c36c546 100644 --- a/rowers/dataroutines.py +++ b/rowers/dataroutines.py @@ -96,7 +96,7 @@ from dask.delayed import delayed import pyarrow.parquet as pq import pyarrow as pa -from pyarrow.lib import ArrowInvalid +from pyarrow.lib import ArrowInvalid, ArrowTypeError from django.utils import timezone from django.utils.timezone import get_current_timezone @@ -2156,7 +2156,7 @@ def dataplep(rowdatadf, id=0, inboard=0.88, forceunit='lbs', bands=True, barchar try: df = pl.from_pandas(rowdatadf) - except ArrowInvalid: + except (ArrowInvalid, ArrowTypeError): for k, v in dtypes.items(): try: rowdatadf[k] = rowdatadf[k].astype(v) diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 15b6e7a2bbfcad3a97b1061ad445965759957e41..6446376824931c784e706b3299b791d44b6fd5a2 100644 GIT binary patch delta 1102 zcmV-U1hM;}AE6(AABzYG01tC!0{?Vnb97{3bYU)ZV|W1Vok?#THx_{J{uP1`$zc%o zTllyrvVv@bF<@tc*vRBIs7M{TXQYyrKR9~6=~nC2`t1AVx?gU8e(3t{_inp9NIS2$j~>40 z`>Vsn;`Qs-=B(RXtk&k_@?w#`+@8ExUUb{V?T0U3(Zl^I4!bv>ah7jS`qisd|L2cy z`sF&`;EfZ!*{(h~!)rE|o3jN0;NrKZPoC{g@zrX*?Ys5KG99&D9q!NjJ^!PH`~*{KJf2d|9y9Uxmhi@i&yy9`~T7PC;R=E*O$W2yVM|{yB@m#jSr6> z92^|IeE{iaT=URdic-&#d7m-|7H66@#!%Ey01XKB6yB`Xz`GoiH!DX_*chXUnm`a`uwu*&huf6ct@e!Tu}+4b9>mz$@n^~-+w@BYS*NT>O=JAb)6Mw>3O|MUG77PnmD#@A1~ zH>-<(mlyx18xVKP4cu~x8(%+O?_SmZ&*R-&u}oyIx7>V?r_1z!j|uZ*-2Z)p;%0Sr zmTqm?zqmX-e%h^HcIS!W2U~CM-JSgRgS+2txw>4f``HifO`_SNrC()6!s);NASS|hFhNRZink7(QEt3WuO22+h@-Nw~pZ-pD~^DUtQlP zv57~E{a+tnbCE9k@sptfRsnXC_yT$XgtK!4#{mJmlRE`M0_<9|e+3u<0T7dz2e1K< zlSv410sFJN2&e)dwM_IXHP4D|E}iK+a(68g(d*`VCzDCgYH67R=)C9#<>u|aKXvKt*<8NfcI(sb{CxMc(#O^M?6m88D@67}w|iH*IC%=14#}9U>R~zf}9KKH|mzy8b U)A&7I`uM^B057$EDa3#Q0NJi_GXMYp delta 1102 zcmV-U1hM;}AE6(AABzYG-u`lC0{?Vnb97{3bYU)ZV|W1Vok?#THx_{J{uP1_$zc%o zTllyriUP;ZU<}xvATctz4JuMw?ir~isLR{GAF|t#Wm|>hNmB%?KpzZsb!}Z=J@V~5 z{Qlkf+1{Jw)n;|E{%#))?C*Vl^x*KtRkvEN)~An_>wbBE^|m7w3!g<>vU+^1RzDZa;kShW2--IOyK}g|j?7?pJSC{rex^ z^~-g>!5b%dw^@C1hPP}ku1*&OfQ#RrJ^f{Sif>lyP2a7Lm+7d@>R@-?rx(Xvzx}m$ zx`93YQE$k9yxW}o`GJ4$`bXW_#no!LS-inN-~VOTAMf^GUSA6T+NA~o-SyDjZ`?n6 zu(x;k;Q^$dkw1Ri@P6-?%Zsc2yZwLmua;N)yD!t%Pfm^q(0v2)4Z#cK1B(abOmxH% z{swRWaJWc2{jvYk?sD&!zPsvQtj?F;?f==a*B45EhrYPzyR&@QFU#YL^~vT)*dH#w z*!uB+$E)2N^lX`a>?Yl3zL(E7e%$*Hd`F1kaB=p#sCB2ye=O78|J?P@pEW3X5)AH)sYW=!j{=2{NBhqPp?ap2=kI<%z?Ed_Cg~ctGxbgL~ z?%nEt{Pp?&=?28zas#(q;>Ooc*4tOLe}A-nE0&4u^_H6t@?@DF@DX8tjJv;YP`p~5 zo~Bz{_OC8Zj-GYv*WFp7_{r9rdw0kG{p9YqTP`nF>;C5E{6%^P{=&Ps-R;vOKYJy_ z*x}b?d%!&j+@wJM3ko|DwNDmBlFZ7!YZJ94)z6VdDDdMA@f&}wO!1L(uHlYt9B0&ZKA z!wW3|Ewk|p3IY?`m8=21%8?sUCgak9);Dhu{dSWM4le<>lRgeC0k@ND4jq4C>mM5q z7f-v(>krQ_`sL>6tF!*wAJ3NO%XPo^^>)+OdtJW=@BB+X!IwV5OAB9}_TL^Zb_YDz zo#~I?m_J{CTJ63+d~}sKUR-_H_j#Azo~w(un{Iv5otyx`pMLuFi*bGKFHV-e`{DKK?Bx3A{+iy$bm)zT^I^-g z?my|0*;#P&^Ow7=)@ieskNa&mTtC{+&VTqK-SpAV%d=&-Stbto(}zcQj^Pk#HDjvj1LuhtsrIXp@zmsgL| U)A&7I`sl&`09YmYPsD%$02*C#1^@s6 From 83c1edf123e0d9153e257ff42087b04ef83e74ef Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 25 Jun 2024 16:32:57 +0200 Subject: [PATCH 2/3] fix --- rowers/forms.py | 2 +- rowers/interactiveplots.py | 4 +--- rowers/tests/testdata/testdata.tcx.gz | Bin 4001 -> 3999 bytes rowers/views/analysisviews.py | 15 +++++++++------ 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/rowers/forms.py b/rowers/forms.py index 641afe89..66d723c0 100644 --- a/rowers/forms.py +++ b/rowers/forms.py @@ -1216,7 +1216,7 @@ bulkactions = ( ('rower assign','rower assign'), ) destinations = ( - ('C2','C2'), + ('c2','c2'), ('strava','strava'), ('sporttracks','sporttracks'), ('trainingpeaks','trainingpeaks') diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 3e1336fc..891e7a14 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -342,7 +342,6 @@ def interactive_boxchart(datadf, fieldname, extratitle='', return '', 'Not enough data' - datadf = datadf.with_columns((pl.col("date").dt.strftime("%Y-%m-%d")).alias("date")) datadf = datadf.with_columns((pl.col(fieldname)).alias("value")) @@ -352,7 +351,6 @@ def interactive_boxchart(datadf, fieldname, extratitle='', "data": data_dict } - script, div = get_chart("/boxplot", boxplot_data, debug=False) return script, div @@ -1802,7 +1800,7 @@ def interactive_flexchart_stacked(id, r, xparam='time', 'metrics': metrics_list, } - script, div = get_chart("/stacked", chart_data, debug=True) + script, div = get_chart("/stacked", chart_data, debug=False) return script, div diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 6446376824931c784e706b3299b791d44b6fd5a2..4c96e43b7a62f417ab87b7e4282417281b4d5c6b 100644 GIT binary patch literal 3999 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 F0RSm_8n^%e literal 4001 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 H#DD<+<7+=6 diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 5fa3fa82..a2c254f9 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -938,17 +938,17 @@ def boxplotdata(workouts, options): try: datadf = datadf.filter( - pl.col("spm")>spmmin, - pl.col("spm")workmin, - pl.col("driveenergy")=spmmin, + pl.col("spm")<=spmmax, + pl.col("driveenergy")>=workmin, + pl.col("driveenergy")<=workmax, ) except ColumnNotFoundError: pass try: datadf = datadf.with_columns((pl.col("workoutid").apply(lambda x: datemapping[x])).alias("date")) - except ComputeError: + except ComputeError as e: return ("","No Valid Data") if userid == 0: # pragma: no cover @@ -959,7 +959,10 @@ def boxplotdata(workouts, options): savedata = options.get('savedata',False) if savedata: # pragma: no cover - return datadf.to_pandas() + return datadf.to_pandas() + + + script, div = interactive_boxchart(datadf, plotfield, extratitle=extratitle, From 552b84bcc5aeaa9d38e822d3fb484863815906ef Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 14 Jul 2024 12:33:28 +0200 Subject: [PATCH 3/3] fix call back for pocketcox --- rowsandall_app/settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index 63ae2609..3f0be6be 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -455,7 +455,8 @@ OAUTH2_PROVIDER = { 'ALLOWED_REDIRECT_URI_SCHEMES': ["http", "https", "rowingcoachexport", - "com.performancephones.crewnerd"], + "com.performancephones.crewnerd", + "pocketcox"], 'ACCESS_TOKEN_MODEL': 'oauth2_provider.AccessToken', 'APPLICATION_MODEL': 'oauth2_provider.Application', 'REFRESH_TOKEN_MODEL': 'oauth2_provider.RefreshToken',