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

Merge branch 'develop' into feature/embeddedvideo

Browse Source
This commit is contained in:
Sander Roosendaal
2019-11-11 21:57:23 +01:00
parent 9ded10d692 680c64a43c
commit 7329fb4f3b
10 changed files with 166 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/c2stuff.py
View File

@@ -529,8 +529,8 @@ def createc2workoutdata(w):
try:
spm[0] = spm[1]
except IndexError:
pass
except (KeyError,IndexError):
spm = 0*t
try:
hr = row.df[' HRCur (bpm)'].astype(int)
except ValueError:

4
rowers/dataprep.py
View File

@@ -1775,10 +1775,12 @@ def getsmallrowdata_db(columns, ids=[], doclean=True,workstrokesonly=True,comput
# )
# df = df.loc[:,~df.columns.duplicated()]
else:
df = pd.DataFrame()
if compute:
if compute and len(df):
data = df.copy()
if doclean:
data = clean_df_stats(data, ignorehr=True,

5
rowers/models.py
View File

@@ -106,7 +106,7 @@ class TemplateListField(models.TextField):
return value.split(self.token)
def from_db_value(self,value, expression, connection, context):
def from_db_value(self,value, expression, connection):
if value is None:
return value
if isinstance(value, list):
@@ -149,7 +149,7 @@ class PowerZonesField(models.TextField):
return value.split(self.token)
def from_db_value(self,value, expression, connection, context):
def from_db_value(self,value, expression, connection):
if value is None:
return value
if isinstance(value, list):
@@ -3030,7 +3030,6 @@ strokedatafields = {
'hr_an':models.IntegerField(null=True),
'hr_max':models.IntegerField(null=True),
'hr_bottom':models.IntegerField(null=True),
'x_right':models.FloatField(null=True),
'ergpace':models.FloatField(null=True),
'nowindpace':models.FloatField(null=True),
'equivergpower':models.FloatField(null=True),

4
rowers/ownapistuff.py
View File

@@ -190,7 +190,7 @@ def get_ownapi_workout(user,ownapiid):
def createownapiworkoutdata(w):
filename = w.csvfilename
row = rowingdata(filename)
row = rowingdata(csvfile=filename)
averagehr = int(row.df[' HRCur (bpm)'].mean())
maxhr = int(row.df[' HRCur (bpm)'].max())
@@ -283,5 +283,3 @@ def getidfromresponse(response):
id = uri[len(uri)-13:len(uri)-5]
return int(id)

3
rowers/runkeeperstuff.py
View File

@@ -111,7 +111,7 @@ def get_workout(user,runkeeperid):
def createrunkeeperworkoutdata(w):
filename = w.csvfilename
try:
row = rowingdata(filename)
row = rowingdata(csvfile=filename)
except:
return 0
@@ -505,4 +505,3 @@ def add_workout_from_data(user,importid,data,strokedata,source='runkeeper',
notes=comments)
return (id,message)

2
rowers/sporttracksstuff.py
View File

@@ -120,7 +120,7 @@ def createsporttracksworkoutdata(w):
filename = w.csvfilename
try:
row = rowingdata(filename)
row = rowingdata(csvfile=filename)
except:
return 0

4
rowers/stravastuff.py
View File

@@ -388,7 +388,7 @@ def get_workout(user,stravaid):
def createstravaworkoutdata(w,dozip=True):
filename = w.csvfilename
try:
row = rowingdata(filename)
row = rowingdata(csvfile=filename)
except IOError:
data = dataprep.read_df_sql(w.id)
try:
@@ -402,7 +402,7 @@ def createstravaworkoutdata(w,dozip=True):
index_label='index',
compression='gzip')
try:
row = rowingdata(filename)
row = rowingdata(csvfile=filename)
except IOError:
return '','Error - could not find rowing data'
else:

2
rowers/tpstuff.py
View File

@@ -97,7 +97,7 @@ def getidfromresponse(response):
def createtpworkoutdata(w):
filename = w.csvfilename
row = rowingdata(filename)
row = rowingdata(csvfile=filename)
tcxfilename = filename[:-4]+'.tcx'
try:
newnotes = w.notes+'\n from '+w.workoutsource+' via rowsandall.com'

3
rowers/underarmourstuff.py
View File

@@ -97,7 +97,7 @@ def get_workout(user,underarmourid):
def createunderarmourworkoutdata(w):
filename = w.csvfilename
try:
row = rowingdata(filename)
row = rowingdata(csvfile=filename)
except:
return 0
@@ -540,4 +540,3 @@ def add_workout_from_data(user,importid,data,strokedata,
notes=comments)
return (id,message)

11
rowers/views/workoutviews.py
View File

@@ -1665,8 +1665,9 @@ def workouts_view(request,message='',successmessage='',
'enddate':enddate,
})
startdate = datetime.datetime.combine(startdate,datetime.time())
enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
usertimezone = pytz.timezone(r.defaulttimezone)
startdate = datetime.datetime.combine(startdate,datetime.time()).astimezone(usertimezone)
enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59)).astimezone(usertimezone)
#enddate = enddate+datetime.timedelta(days=1)
@@ -1683,9 +1684,11 @@ def workouts_view(request,message='',successmessage='',
activity_startdate = enddate-datetime.timedelta(days=15)
try:
if utc.localize(enddate) > timezone.now():
if enddate > timezone.now():
activity_enddate = timezone.now()
activity_enddate = activity_enddate.replace(hour=23,minute=59,second=59).astimezone(usertimezone)
activity_startdate = activity_enddate-datetime.timedelta(days=15)
activity_startdate = activity_startdate.replace(hour=0,minute=0,second=0)
else:
activity_enddate = enddate
except ValueError:
@@ -1752,7 +1755,6 @@ def workouts_view(request,message='',successmessage='',
startdatetime__gte=activity_startdate,
startdatetime__lte=activity_enddate).order_by("-startdatetime")
if g_workouts.count() == 0:
g_workouts = Workout.objects.filter(
user=r,
@@ -2891,6 +2893,7 @@ def workout_data_view(request, id=0):
'catch','finish','peakforceangle','wash','slip','rhythm',
'effectiveangle','totalangle','distanceperstroke','velo']
cols = [c for c in cols if c in datadf.columns]
tcols = ['ftime','cumdist','fpace','spm','hr','power']