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

further enhancements

Browse Source
This commit is contained in:
Sander Roosendaal
2021-03-01 17:43:57 +01:00
parent 19560145e2
commit f2ec2585cc
3 changed files with 338 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rowers/models.py
View File

@@ -508,7 +508,7 @@ class TeamRequest(models.Model):
from rowers.utils import (
workflowleftpanel,workflowmiddlepanel,
defaultleft,defaultmiddle,landingpages,
steps_read_fit, steps_write_fit
steps_read_fit, steps_write_fit, ps_dict_order
)
from rowers.utils import geo_distance
@@ -2418,11 +2418,27 @@ class PlannedSession(models.Model):
filename = 'session'+encoder.encode_hex(self.pk)+'.fit'
else:
file = tempfile.NamedTemporaryFile(mode='w+b',suffix='.fit',dir=settings.MEDIA_ROOT)
filename = file.name
filename = file
steps = self.steps
steps['filename'] = filename
steps['filename'] = settings.MEDIA_ROOT+'/'+filename
fitfile = steps_write_fit(steps)
self.fitfile.name = fitfile
filelist = fitfile.split('/media/')
self.fitfile.name = filelist[-1]
# calculate approximate distance
if self.steps:
sdict, totalmeters, totalseconds = ps_dict_order(self.steps)
self.approximate_distance = int(totalmeters)
self.approximate_duration = int(totalseconds/60.)
self.criterium = 'none'
if self.sessionmode == 'time':
self.sessionvalue = self.approximate_duration
elif self.sessionmode == 'distance':
self.sessionvalue = self.approximate_distance
super(PlannedSession,self).save(*args, **kwargs)