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

further code refactoring

Browse Source
This commit is contained in:
Sander Roosendaal
2018-06-26 21:43:57 +02:00
parent cff1626603
commit e0dd903d68
6 changed files with 21 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
rowers/runkeeperstuff.py
View File

@@ -1,47 +1,12 @@
# All the functionality needed to connect to Runkeeper
from rowers.imports import *
# Python
import oauth2 as oauth
import pytz
import cgi
import requests
import requests.auth
import json
from django.utils import timezone
from datetime import datetime
import numpy as np
from dateutil import parser
import time
import dateutil
from time import strftime
import math
from math import sin,cos,atan2,sqrt
import os,sys
# Django
from django.shortcuts import render_to_response
from django.http import HttpResponseRedirect, HttpResponse,JsonResponse
from django.conf import settings
from django.contrib.auth import authenticate, login, logout
from django.contrib.auth.models import User
from django.contrib.auth.decorators import login_required
# Project
# from .models import Profile
from rowingdata import rowingdata
import pandas as pd
from rowers.models import Rower,Workout,checkworkoutuser
from uuid import uuid4
import iso8601
import arrow
from rowers import types
from rowsandall_app.settings import (
C2_CLIENT_ID, C2_REDIRECT_URI, C2_CLIENT_SECRET,
STRAVA_CLIENT_ID, STRAVA_REDIRECT_URI, STRAVA_CLIENT_SECRET,
RUNKEEPER_CLIENT_ID, RUNKEEPER_CLIENT_SECRET,RUNKEEPER_REDIRECT_URI,
)
from utils import geo_distance,ewmovingaverage,NoTokenError, custom_exception_handler
def splitrunkeeperlatlongdata(lijst,tname,latname,lonname):
t = []
@@ -63,7 +28,6 @@ def splitrunkeeperdata(lijst,xname,yname):
return [np.array(x),np.array(y)]
import dataprep
# Checks if user has SportTracks token, renews them if they are expired
def runkeeper_open(user):
@@ -390,7 +354,7 @@ def add_workout_from_data(user,importid,data,strokedata,source='runkeeper',
rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc)
except ValueError:
try:
rowdatetime = dateutil.parser.parse(data['start_time'])
rowdatetime = parser.parse(data['start_time'])
#rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc)
except:
rowdatetime = datetime.strptime(data['date'],"%Y-%m-%d %H:%M:%S")