diff --git a/rowers/templates/strava_list_import.html b/rowers/templates/strava_list_import.html index c370abe1..1fe1ea27 100644 --- a/rowers/templates/strava_list_import.html +++ b/rowers/templates/strava_list_import.html @@ -21,7 +21,7 @@
{% csrf_token %} - Select All New + Select All New @@ -38,7 +38,11 @@ {% for workout in workouts %} diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz new file mode 100644 index 00000000..eb1f78b9 Binary files /dev/null and b/rowers/tests/testdata/testdata.tcx.gz differ diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index b91b27a7..3240ec6b 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -1021,7 +1021,10 @@ def workout_stravaimport_view(request,message="",userid=0): csvfilename, rower.user.id ) - messages.info(request,'Strava workout nr {stravaid} will be imported in the background'.format(stravaid=stravaid)) + messages.info(request,'Strava workout nr {stravaid} will be imported in the background. It may take a few minutes before it appears.'.format(stravaid=stravaid)) + # done, redirect to workouts list + url = reverse('workouts_view') + return HttpResponseRedirect(url) except KeyError: pass @@ -1036,8 +1039,7 @@ def workout_stravaimport_view(request,message="",userid=0): }, ] - - r = getrower(request.user) + checknew = request.GET.get('selectallnew',False) return render(request,'strava_list_import.html', {'workouts':workouts, @@ -1045,6 +1047,7 @@ def workout_stravaimport_view(request,message="",userid=0): 'active':'nav-workouts', 'breadcrumbs':breadcrumbs, 'teams':get_my_teams(request.user), + 'checknew':checknew, }) return HttpResponse(res) # pragma: no cover
+ {% if workout|lookup:'new' == 'NEW' and checknew == 'true' %} + + {% else %} + {% endif %} {{ workout|lookup:'name' }} {{ workout|lookup:'starttime' }}