Private
Public Access
1
0

fixing links in tasks

This commit is contained in:
Sander Roosendaal
2022-08-19 09:08:46 +02:00
parent ec3c3c0b9a
commit 0a83a26044
4 changed files with 48 additions and 87 deletions

View File

@@ -82,16 +82,26 @@ import rowers.rowing_workout_metrics_pb2 as metrics_pb2
import rowers.rowing_workout_metrics_pb2_grpc as metrics_pb2_grpc
from django.conf import settings
SITE_URL = settings.SITE_URL
SITE_URL_DEV = settings.SITE_URL
PROGRESS_CACHE_SECRET = settings.PROGRESS_CACHE_SECRET
SETTINGS_NAME = settings.SETTINGS_NAME
UPLOAD_SERVICE_URL = settings.UPLOAD_SERVICE_URL
UPLOAD_SERVICE_SECRET = settings.UPLOAD_SERVICE_SECRET
NK_API_LOCATION = settings.NK_API_LOCATION
TP_CLIENT_ID = settings.TP_CLIENT_ID
TP_CLIENT_SECRET = settings.TP_CLIENT_SECRET
# extra read of config
SITE_URL = CFG['site_url']
SITE_URL_DEV = CFG['site_url']
PROGRESS_CACHE_SECRET = CFG['progress_cache_secret']
SETTINGS_NAME = CFG['settings_name']
try:
UPLOAD_SERVICE_URL = CFG['upload_service_url']
except KeyError: # pragma: no cover
UPLOAD_SERVICE_URL = "http://localhost:8000/rowers/workout/api/upload/"
try:
UPLOAD_SERVICE_SECRET = CFG['upload_service_secret']
except KeyError: # pragma: no cover
UPLOAD_SERVICE_SECRET = "FoYezZWLSyfAVimumpHEeYsJjsNCerxV"
NK_API_LOCATION = CFG["nk_api_location"]
TP_CLIENT_ID = CFG["tp_client_id"]
TP_CLIENT_SECRET = CFG["tp_client_secret"]
from requests_oauthlib import OAuth1, OAuth1Session
@@ -1204,7 +1214,10 @@ def handle_calctrimp(id,
if hrtss > 1000: # pragma: no cover
hrtss = 0
workout = Workout.objects.get(id=id)
try:
workout = Workout.objects.get(id=id)
except Workout.DoesNotExist:
return 0
workout.rscore = int(tss)
workout.normp = int(normp)
workout.trimp = int(trimp)