Private
Public Access
1
0

changed duration check in dataprep (h>23, min>59, etc)

This commit is contained in:
Sander Roosendaal
2017-02-22 10:19:00 +01:00
parent 580cd771f8
commit 3711d2140e
2 changed files with 21 additions and 3 deletions

View File

@@ -295,15 +295,30 @@ def save_workout_database(f2,r,dosmooth=True,workouttype='rower',
totaltime = totaltime+row.df.ix[0,' ElapsedTime (sec)']
hours = int(totaltime/3600.)
if hours>23:
message = 'Warning: The workout duration was longer than 23 hours'
message = 'Warning: The workout duration was longer than 23 hours. '
hours = 23
minutes = int((totaltime - 3600.*hours)/60.)
if minutes>59:
minutes = 59
if not message:
message = 'Warning: there is something wrong with the workout duration'
seconds = int(totaltime - 3600.*hours - 60.*minutes)
if seconds > 59:
seconds = 59
if not message:
message = 'Warning: there is something wrong with the workout duration'
tenths = int(10*(totaltime - 3600.*hours - 60.*minutes - seconds))
if tenths > 9:
tenths = 9
if not message:
message = 'Warning: there is something wrong with the workout duration'
duration = "%s:%s:%s.%s" % (hours,minutes,seconds,tenths)
if dosummary:

View File

@@ -4902,7 +4902,10 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
itime,idist,itype = rowdata.intervalstats_values()
nrintervals = len(idist)
row.summary = intervalstats
#intervalstats = rowdata.allstats()
#intervalstats = rowdata.allstats()
row.notes += u'{n} \n {s}'.format(
n = row.notes,
s = s
)
row.save()
rowdata.write_csv(f1,gzip=True)