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

Merge branch 'release/v13.28'

Browse Source
This commit is contained in:
Sander Roosendaal
2020-07-08 19:43:59 +02:00
parent 74e8edf2db 8f62b62903
commit cd4da67da1
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/garmin_stuff.py
View File

@@ -14,6 +14,7 @@ import pandas as pd
import numpy import numpy
import json import json
from json.decoder import JSONDecodeError from json.decoder import JSONDecodeError
from uuid import uuid4
from rowsandall_app.settings import ( from rowsandall_app.settings import (
GARMIN_CLIENT_KEY, GARMIN_REDIRECT_URI, GARMIN_CLIENT_SECRET GARMIN_CLIENT_KEY, GARMIN_REDIRECT_URI, GARMIN_CLIENT_SECRET
@@ -153,7 +154,10 @@ def garmin_getworkout(garminid,r,activity):
try: try:
w = Workout.objects.get(uploadedtogarmin=garminid) w = Workout.objects.get(uploadedtogarmin=garminid)
except Workout.DoesNotExist: except Workout.DoesNotExist:
newcsvfile='media/garmin{code}_{importid}.csv' newcsvfile='media/garmin{code}_{importid}.csv'.format(
code=uuid4().hex[:16],
importid=garminid,
)
w = Workout(user=r,csvfilename=newcsvfile) w = Workout(user=r,csvfilename=newcsvfile)
utc_offset = datetime.timedelta(seconds=offset) utc_offset = datetime.timedelta(seconds=offset)

2
rowers/tasks.py
View File

@@ -17,7 +17,7 @@ from scipy import optimize
from scipy.signal import savgol_filter from scipy.signal import savgol_filter
import rowingdata import rowingdata
from uuid import uuid4
from rowingdata import rowingdata as rdata from rowingdata import rowingdata as rdata
from datetime import timedelta from datetime import timedelta
from sqlalchemy import create_engine from sqlalchemy import create_engine