fix alerts
This commit is contained in:
@@ -3,7 +3,7 @@ from rowers.teams import coach_getcoachees
|
|||||||
from rowers.dataprep import getsmallrowdata_db, getrowdata_db
|
from rowers.dataprep import getsmallrowdata_db, getrowdata_db
|
||||||
import datetime
|
import datetime
|
||||||
import numpy as np
|
import numpy as np
|
||||||
|
import math
|
||||||
|
|
||||||
def create_alert(manager, rower, measured, period=7, emailalert=True,
|
def create_alert(manager, rower, measured, period=7, emailalert=True,
|
||||||
reststrokes=False, workouttype='water', boattype='1x',
|
reststrokes=False, workouttype='water', boattype='1x',
|
||||||
@@ -195,7 +195,7 @@ def alert_get_stats(alert, nperiod=0): # pragma: no cover
|
|||||||
median = df[alert.measured.metric].median()
|
median = df[alert.measured.metric].median()
|
||||||
std = df[alert.measured.metric].std()
|
std = df[alert.measured.metric].std()
|
||||||
|
|
||||||
return {
|
data = {
|
||||||
'workouts': workouts.count(),
|
'workouts': workouts.count(),
|
||||||
'startdate': startdate,
|
'startdate': startdate,
|
||||||
'enddate': enddate,
|
'enddate': enddate,
|
||||||
@@ -208,6 +208,18 @@ def alert_get_stats(alert, nperiod=0): # pragma: no cover
|
|||||||
'standard_dev': std,
|
'standard_dev': std,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
data_clean = {}
|
||||||
|
|
||||||
|
for k in data:
|
||||||
|
data_clean[k] = data[k]
|
||||||
|
try:
|
||||||
|
if math.isnan(data[k]):
|
||||||
|
data_clean[k] = 0
|
||||||
|
except TypeError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
return data_clean
|
||||||
|
|
||||||
# run alert report
|
# run alert report
|
||||||
|
|
||||||
# check alert permission
|
# check alert permission
|
||||||
|
|||||||
@@ -408,7 +408,11 @@ def handle_c2_sync(workoutid, url, headers, data, debug=False, **kwargs):
|
|||||||
s = response.json()
|
s = response.json()
|
||||||
c2id = s['data']['id']
|
c2id = s['data']['id']
|
||||||
|
|
||||||
|
try:
|
||||||
workout = Workout.objects.get(id=workoutid)
|
workout = Workout.objects.get(id=workoutid)
|
||||||
|
except Workout.DoesNotExist:
|
||||||
|
return 0
|
||||||
|
|
||||||
workout.uploadedtoc2 = c2id
|
workout.uploadedtoc2 = c2id
|
||||||
workout.save()
|
workout.save()
|
||||||
|
|
||||||
@@ -492,7 +496,11 @@ def handle_strava_sync(stravatoken, workoutid, filename, name, activity_type, de
|
|||||||
failed = True
|
failed = True
|
||||||
|
|
||||||
if not failed:
|
if not failed:
|
||||||
|
try:
|
||||||
workout = Workout.objects.get(id=workoutid)
|
workout = Workout.objects.get(id=workoutid)
|
||||||
|
except Workout.DoesNotExist:
|
||||||
|
return 0
|
||||||
|
|
||||||
workout.uploadedtostrava = res.id
|
workout.uploadedtostrava = res.id
|
||||||
workout.save()
|
workout.save()
|
||||||
try:
|
try:
|
||||||
|
|||||||
@@ -380,7 +380,11 @@ def createShareModel(request, model_id): # pragma: no cover
|
|||||||
|
|
||||||
class JSONResponse(HttpResponse):
|
class JSONResponse(HttpResponse):
|
||||||
def __init__(self, data, **kwargs):
|
def __init__(self, data, **kwargs):
|
||||||
|
try:
|
||||||
content = JSONRenderer().render(data)
|
content = JSONRenderer().render(data)
|
||||||
|
except ValueError:
|
||||||
|
content = ''
|
||||||
|
|
||||||
kwargs['content_type'] = 'application/json'
|
kwargs['content_type'] = 'application/json'
|
||||||
super(JSONResponse, self).__init__(content, **kwargs)
|
super(JSONResponse, self).__init__(content, **kwargs)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user