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

Merge branch 'release/v16.4.11'

Browse Source
This commit is contained in:
Sander Roosendaal
2021-06-13 15:51:00 +02:00
parent 94aca194ed f3ae66f419
commit 96ac6812d7
5 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/dataprep.py
View File

@@ -2478,7 +2478,7 @@ def getsmallrowdata_db(columns, ids=[], doclean=True,workstrokesonly=True,comput
#df = dd.read_parquet(f,columns=columns,engine='pyarrow') #df = dd.read_parquet(f,columns=columns,engine='pyarrow')
df = pd.read_parquet(f,columns=columns) df = pd.read_parquet(f,columns=columns)
data.append(df) data.append(df)
except (OSError,ArrowInvalid): # pragma: no cover except (OSError,ArrowInvalid,IndexError): # pragma: no cover
rowdata, row = getrowdata(id=id) rowdata, row = getrowdata(id=id)
if rowdata and len(rowdata.df): if rowdata and len(rowdata.df):
datadf = dataprep(rowdata.df,id=id,bands=True,otwpower=True,barchart=True) datadf = dataprep(rowdata.df,id=id,bands=True,otwpower=True,barchart=True)

2
rowers/models.py
View File

@@ -2507,10 +2507,12 @@ class PlannedSession(models.Model):
steps = steps_read_fit(os.path.join(settings.MEDIA_ROOT,self.fitfile.name)) steps = steps_read_fit(os.path.join(settings.MEDIA_ROOT,self.fitfile.name))
self.steps = steps self.steps = steps
if self.steps and not self.fitfile: if self.steps and not self.fitfile:
filename = 'aap.fit' filename = 'aap.fit'
filename = get_file_path(self,filename) filename = get_file_path(self,filename)
steps = self.steps steps = self.steps
steps['filename'] = os.path.join(settings.MEDIA_ROOT,filename) steps['filename'] = os.path.join(settings.MEDIA_ROOT,filename)
fitfile = steps_write_fit(steps) fitfile = steps_write_fit(steps)

6
rowers/rows.py
View File

@@ -140,8 +140,10 @@ def handle_uploaded_image(i): # pragma: no cover
def handle_uploaded_file(f): def handle_uploaded_file(f):
fname = f.name fname = f.name
timestr = uuid.uuid4().hex[:10]+'-'+time.strftime("%Y%m%d-%H%M%S") ext = fname.split('.')[-1]
fname = timestr+'-'+fname fname = '%s.%s' % (uuid.uuid4(),ext)
#timestr = uuid.uuid4().hex[:10]+'-'+time.strftime("%Y%m%d-%H%M%S")
#fname = timestr+'-'+fname
fname2 = 'media/'+fname fname2 = 'media/'+fname
with open(fname2,'wb+') as destination: with open(fname2,'wb+') as destination:
for chunk in f.chunks(): for chunk in f.chunks():

3
rowers/views/importviews.py
View File

@@ -1158,6 +1158,9 @@ def strava_webhook_view(request):
f.write(' ') f.write(' ')
f.write('Rower not found') f.write('Rower not found')
return HttpResponse(status=200) return HttpResponse(status=200)
except MultipleObjectsReturned:
rs = Rower.objects.filter(strava_owner_id=strava_owner)
r = rs[0]
if r.strava_auto_import: if r.strava_auto_import:
for key, value in updates.items(): for key, value in updates.items():
for w in ws: for w in ws:

2
rowers/views/statements.py
View File

@@ -83,7 +83,7 @@ from rowers.forms import (
from django.urls import reverse, reverse_lazy from django.urls import reverse, reverse_lazy
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied, MultipleObjectsReturned
from django.template import RequestContext from django.template import RequestContext
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
from django.conf import settings from django.conf import settings