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

excluding strava from analysis

Browse Source
This commit is contained in:
Sander Roosendaal
2024-12-04 21:02:58 +01:00
parent fd7e7e35e5
commit 1daed90104
8 changed files with 138 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
rowers/views/analysisviews.py
View File

@@ -199,14 +199,14 @@ def analysis_new(request,
startdatetime__lte=enddate,
workouttype__in=modalities,
rankingpiece__in=rankingtypes,
)
).exclude(workoutsource='strava')
elif theteam is not None and theteam.viewing == 'coachonly': # pragma: no cover
workouts = Workout.objects.filter(team=theteam, user=r,
startdatetime__gte=startdate,
startdatetime__lte=enddate,
workouttype__in=modalities,
rankingpiece__in=rankingtypes,
)
).exclude(workoutsource='strava')
elif thesession is not None:
workouts = get_workouts_session(r, thesession)
else:
@@ -363,6 +363,7 @@ def trendflexdata(workouts, options, userid=0):
savedata = options.get('savedata',False)
workouts = workouts.exclude(workoutsource='strava')
fieldlist, fielddict = dataprep.getstatsfields()
fieldlist = [xparam, yparam, groupby,
@@ -566,6 +567,8 @@ def flexalldata(workouts, options):
trendline = options['trendline']
promember = True
workouts = workouts.exclude(workoutsource='strava')
workstrokesonly = not includereststrokes
userid = options['userid']
@@ -612,6 +615,9 @@ def histodata(workouts, options):
workmax = options['workmax']
userid = options['userid']
workouts = workouts.exclude(workoutsource='strava')
if userid == 0: # pragma: no cover
extratitle = ''
else:
@@ -645,7 +651,8 @@ def cpdata(workouts, options):
u = User.objects.get(id=userid)
r = u.rower
delta, cpvalue, avgpower, workoutnames, urls = dataprep.fetchcp_new(
r, workouts)
@@ -798,6 +805,8 @@ def cpdata(workouts, options):
def statsdata(workouts, options):
workouts = workouts.exclude(workoutsource='strava')
includereststrokes = options['includereststrokes']
ids = options['ids']
@@ -872,12 +881,13 @@ def statsdata(workouts, options):
def comparisondata(workouts, options):
workouts = workouts.exclude(workoutsource='strava')
includereststrokes = options['includereststrokes']
xparam = options['xaxis']
yparam1 = options['yaxis1']
plottype = options['plottype']
promember = True
workstrokesonly = not includereststrokes
ids = [w.id for w in workouts]
@@ -915,6 +925,7 @@ def comparisondata(workouts, options):
def boxplotdata(workouts, options):
workouts = workouts.exclude(workoutsource='strava')
includereststrokes = options['includereststrokes']
spmmin = options['spmmin']
@@ -926,7 +937,7 @@ def boxplotdata(workouts, options):
plotfield = options['plotfield']
workstrokesonly = not includereststrokes
datemapping = {
w.id: w.date for w in workouts
}
@@ -1020,11 +1031,14 @@ def analysis_view_data(request, userid=0):
for id in ids:
try:
workouts.append(Workout.objects.get(id=id))
w = Workout.objects.get(id=id)
if w.workoutsource != 'strava':
workouts.append(w)
except Workout.DoesNotExist: # pragma: no cover
pass
if function == 'boxplot':
script, div = boxplotdata(workouts, options)
elif function == 'trendflex': # pragma: no cover
@@ -1069,7 +1083,7 @@ def create_marker_workouts_view(request, userid=0,
workouts = Workout.objects.filter(user=theuser.rower, date__gte=startdate,
date__lte=enddate,
workouttype__in=mytypes.rowtypes,
duplicate=False).order_by('date')
duplicate=False).order_by('date').exclude(workoutsource='strava')
for workout in workouts:
_ = dataprep.check_marker(workout)
@@ -1113,7 +1127,7 @@ def goldmedalscores_view(request, userid=0,
theuser, startdate=startdate, enddate=enddate,
)
bestworkouts = Workout.objects.filter(id__in=ids).order_by('-date')
bestworkouts = Workout.objects.filter(id__in=ids).order_by('-date').exclude(workoutsource='strava')
breadcrumbs = [
{
@@ -1311,7 +1325,7 @@ def performancemanager_view(request, userid=0, mode='rower',
user = therower, date__gte=startdate-datetime.timedelta(days=90),
date__lte=enddate,
duplicate=False,
rankingpiece=True, workouttype__in=mytypes.rowtypes).order_by('date')
rankingpiece=True, workouttype__in=mytypes.rowtypes).order_by('date').exclude(workoutsource='strava')
ids = [w.id for w in markerworkouts]
form = PerformanceManagerForm(initial={
@@ -1323,7 +1337,7 @@ def performancemanager_view(request, userid=0, mode='rower',
ids = pd.Series(ids, dtype='int').dropna().values
bestworkouts = Workout.objects.filter(id__in=ids).order_by('-date')
bestworkouts = Workout.objects.filter(id__in=ids).order_by('-date').exclude(workoutsource='strava')
breadcrumbs = [
{