sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'develop' into feature/charts-microservice

Browse Source
This commit is contained in:
Sander Roosendaal
2024-04-08 20:03:14 +02:00
parent fc96d44e72 a0874ef693
commit 6d549e3b8b
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/dataroutines.py
View File

@@ -2126,6 +2126,7 @@ def dataprep(rowdatadf, id=0, bands=True, barchart=True, otwpower=True,
filename = 'media/strokedata_{id}.parquet.gz'.format(id=id) filename = 'media/strokedata_{id}.parquet.gz'.format(id=id)
df = dd.from_pandas(data, npartitions=1) df = dd.from_pandas(data, npartitions=1)
if polars: if polars:
pldf = pl.from_pandas(data) pldf = pl.from_pandas(data)
try: try:
@@ -2139,6 +2140,10 @@ def dataprep(rowdatadf, id=0, bands=True, barchart=True, otwpower=True,
except FileNotFoundError: except FileNotFoundError:
df2 = dd.from_pandas(df, npartitions=1) df2 = dd.from_pandas(df, npartitions=1)
df2.to_parquet(filename, engine='fastparquet', compression='gzip') df2.to_parquet(filename, engine='fastparquet', compression='gzip')
except FileExistsError:
os.remove(filename)
df.to_parquet(filename, engine='fastparquet', compression='GZIP')
return data return data

13
rowers/views/racesviews.py
View File

@@ -371,11 +371,14 @@ def course_view(request, id=0):
coursecompleted=True).order_by("duration", "-distance") coursecompleted=True).order_by("duration", "-distance")
# get own training results # get own training results
ownrecords = CourseTestResult.objects.filter( if not request.user.is_anonymous:
courseid = course.id, ownrecords = CourseTestResult.objects.filter(
userid = r.id, courseid = course.id,
coursecompleted=True userid = r.id,
).order_by("duration", "-distance") coursecompleted=True
).order_by("duration", "-distance")
else:
ownrecords = []
if request.user.is_authenticated: if request.user.is_authenticated:
notsharing = Rower.objects.filter( notsharing = Rower.objects.filter(