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

removing imports.py and increasing coverage

Browse Source
This commit is contained in:
Sander Roosendaal
2023-09-21 16:09:48 +02:00
parent b1d4534ff2
commit ddac7ef18f
15 changed files with 177 additions and 406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
rowers/views/workoutviews.py
View File

@@ -417,7 +417,7 @@ def workout_forcecurve_view(request, id=0, analysis=0, userid=0, workstrokesonly
if r == row.user:
mayedit = 1
if analysis:
if analysis: # pragma: no cover
try:
forceanalysis = ForceCurveAnalysis.objects.get(id=analysis)
dist_min = forceanalysis.dist_min
@@ -473,7 +473,7 @@ def workout_forcecurve_view(request, id=0, analysis=0, userid=0, workstrokesonly
plottype = form.cleaned_data['plottype']
workstrokesonly = not includereststrokes
if "_save" in request.POST and "new" not in request.POST:
if "_save" in request.POST and "new" not in request.POST: # pragma: no cover
if not analysis:
forceanalysis = ForceCurveAnalysis(
workout = row,
@@ -929,7 +929,7 @@ def workout_recalcsummary_view(request, id=0):
def workouts_duplicates_select_view(request, userid=0):
r = getrequestrower(request, userid=userid)
if request.method == 'POST':
if request.method == 'POST': # pragma: no cover
form = WorkoutMultipleCompareForm(request.POST)
if form.is_valid():
workouts = form.cleaned_data['workouts']
@@ -1922,16 +1922,17 @@ def plannedsession_compare_view(request, id=0, userid=0):
# set RPE for list of workouts
@login_required()
def workouts_setrpe_view(request):
def workouts_setrpe_view(request,userid=0):
today = timezone.now()
startdate = today-timezone.timedelta(days=32)
enddate = today+timezone.timedelta(days=1)
r = getrequestrower(request)
r = getrequestrower(request,userid=userid)
startdate = datetime.datetime.combine(startdate, datetime.time())
enddate = datetime.datetime.combine(enddate, datetime.time(23, 59, 59))
startdate = pytz.utc.localize(startdate)
enddate = pytz.utc.localize(enddate)
workouts = Workout.objects.filter(
user=r,rpe=0,
@@ -1950,9 +1951,14 @@ def workouts_setrpe_view(request):
)
if request.method == 'POST':
if request.method == 'POST': # pragma: no cover
dateform = DateRangeForm(request.POST)
rpe_formset = WorkoutsRPEFormSet(request.POST)
rpe_formset = WorkoutsRPEFormSet(request.POST,
queryset=Workout.objects.filter(user=r,rpe=0,duplicate=False,
startdatetime__gte=startdate,
startdatetime__lte=enddate
)
)
if dateform.is_valid(): # pragma: no cover
startdate = dateform.cleaned_data['startdate']
enddate = dateform.cleaned_data['enddate']
@@ -2209,7 +2215,7 @@ def workouts_view(request, message='', successmessage='',
'%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
norpecount = len([w for w in workouts if w.rpe==0 and not w.duplicate])
if norpecount and r.get_rpe_warnings:
if norpecount and r.get_rpe_warnings: # pragma: no cover
messages.info(request,'You have workouts with no RPE value set. \
Click <a href="/rowers/workouts/setrpe">here</a> to update them. \
You can switch off this warning in <a href="/rowers/me/edit">settings</a>.')
@@ -3138,7 +3144,7 @@ def instroke_chart(request, id=0, metric=''): # pragma: no cover
" If you are already a Pro user, please log in to access this functionality",
redirect_field_name=None)
@permission_required('workout.change_workout', fn=get_workout_by_opaqueid, raise_exception=True)
def instroke_data(request, metric='', spm_min=15, spm_max=45, activeminutesmin=0, activeminutesmax=0, id=0, ):
def instroke_data(request, metric='', spm_min=15, spm_max=45, activeminutesmin=0, activeminutesmax=0, id=0, ): # pragma: no cover
r = getrequestrower(request, userid=0)
w = get_workoutuser(id, request)
rowdata = rrdata(csvfile=w.csvfilename)
@@ -3255,7 +3261,7 @@ def instroke_chart_interactive(request, id=0, analysis=0, userid=0):
'maxminutes': maxminutes,
})
if analysis:
if analysis: # pragma: no cover
try:
instroke_analysis = InStrokeAnalysis.objects.get(id=analysis)
if instroke_analysis.rower != r: