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

fit file download ok

Browse Source
This commit is contained in:
Sander Roosendaal
2021-02-24 19:49:03 +01:00
parent 197d6c9464
commit 8496178eee
6 changed files with 77 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rowers/models.py
View File

@@ -2244,6 +2244,9 @@ class PlannedSession(models.Model):
max_length=150,
verbose_name='Session Type')
sessionsport = models.CharField(default='water',choices=mytypes.workouttypes,
max_length=50,verbose_name='Sport')
sessionvalue = models.IntegerField(default=60,verbose_name='Value')
approximate_distance = models.IntegerField(default=10000,verbose_name='Approximate Distance')
@@ -2322,12 +2325,14 @@ class PlannedSession(models.Model):
"You must be a Self-Coach user or higher to create a planned session"
)
# interval string
if self.interval_string:
dct = trainingparser.parsetodict(interval_string)
dct = trainingparser.parsetodict(self.interval_string)
dct = [item for item in dct if item['value'] != 0]
dct = trainingparser.tofitdict(dct)
ps.steps_json = json.dumps(dct)
self.steps_json = json.dumps(dct)
@@ -2370,6 +2375,7 @@ class PlannedSession(models.Model):
#super(PlannedSession,self).save(*args, **kwargs)
# read file
if self.fitfile:
if self.fitfile.name == 'False':
@@ -2379,8 +2385,12 @@ class PlannedSession(models.Model):
self.steps_json = json.dumps(steps)
if self.steps_json and not self.fitfile:
fitfile = steps_write_fit(settings.MEDIA_ROOT+'/session_'+str(self.id)+'.fit',json.loads(self.steps_json))
filename = settings.MEDIA_ROOT+'/session'+encoder.encode_hex(self.id)+'.fit'
steps = json.loads(self.steps_json)
steps['filename'] = filename
fitfile = steps_write_fit(steps)
self.fitfile = fitfile
self.steps_json = json.dumps(steps)
super(PlannedSession,self).save(*args, **kwargs)
@@ -2532,6 +2542,7 @@ class PlannedSessionForm(ModelForm):
'enddate',
'preferreddate',
'name',
'sessionsport',
'sessiontype',
'sessionmode',
'criterium',