From a12fcfdd856b2d52755a4c0c919c3acd99f4151a Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 31 Oct 2021 16:01:23 +0100 Subject: [PATCH] c2 import list --- rowers/c2stuff.py | 6 +-- rowers/templates/c2_list_import2.html | 12 +++++- rowers/tests/testdata/testdata.tcx.gz | Bin 0 -> 4000 bytes rowers/views/importviews.py | 53 +++++++++++++++++++++----- rowers/views/statements.py | 1 + 5 files changed, 58 insertions(+), 14 deletions(-) create mode 100644 rowers/tests/testdata/testdata.tcx.gz diff --git a/rowers/c2stuff.py b/rowers/c2stuff.py index 35e3518f..6fdbda9c 100644 --- a/rowers/c2stuff.py +++ b/rowers/c2stuff.py @@ -141,13 +141,13 @@ def c2_open(user): return thetoken -def get_c2_workouts(rower,do_async=True): +def get_c2_workouts(rower,page=1,do_async=True): try: thetoken = c2_open(rower.user) except NoTokenError: # pragma: no cover return 0 - res = get_c2_workout_list(rower.user,page=1) + res = get_c2_workout_list(rower.user,page=page) if (res.status_code != 200): # pragma: no cover return 0 @@ -634,7 +634,7 @@ def createc2workoutdata(w): try: spmav = int(row.df[' Cadence (stokes/min)'][mask].mean()) hrav = int(row.df[' HRCur (bpm)'][mask].mean()) - except ValuError: + except ValueError: smpav = 0 try: hrav = int(row.df[' HRCur (bpm)'][mask].mean()) diff --git a/rowers/templates/c2_list_import2.html b/rowers/templates/c2_list_import2.html index 898fcc4e..2902fc23 100644 --- a/rowers/templates/c2_list_import2.html +++ b/rowers/templates/c2_list_import2.html @@ -30,6 +30,10 @@

  • +
    + {% csrf_token %} + + Select All New @@ -47,7 +51,12 @@ {% for workout in workouts %} + {% if workout|lookup:'new' == 'NEW' and checknew == 'true' %} + + {% else %} + + {% endif %} + @@ -62,6 +71,7 @@ {% endfor %}
    - Import {{ workout|lookup:'starttime' }} {{ workout|lookup:'duration' }} {{ workout|lookup:'distance' }}
    +
    • {% else %}

    No workouts found

    diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz new file mode 100644 index 0000000000000000000000000000000000000000..39f655f81007cbc884ea27caa17265fbaa0931de GIT binary patch literal 4000 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 GfB^u-l|MrO literal 0 HcmV?d00001 diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 3bcf2cc6..86787cce 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -1499,7 +1499,7 @@ def workout_getc2workout_all(request,page=1,message=""): # pragma: no cover r = getrequestrower(request) - result = c2stuff.get_c2_workouts(r,do_async=True) + result = c2stuff.get_c2_workouts(r,page=page,do_async=True) if result: messages.info(request,'Your C2 workouts will be imported in the coming few minutes') @@ -1534,8 +1534,8 @@ def workout_getrp3workout_all(request): # pragma: no cover @permission_required('rower.is_not_freecoach',fn=get_user_by_userid, raise_exception=True) def workout_c2import_view(request,page=1,userid=0,message=""): - r = getrequestrower(request,userid=userid) - if r.user != request.user: + rower = getrequestrower(request,userid=userid) + if rower.user != request.user: messages.error(request,'You can only access your own workouts on the NK Logbook, not those of your athletes') url = reverse('workout_c2import_view',kwargs={'userid':request.user.id}) return HttpResponseRedirect(url) @@ -1556,17 +1556,17 @@ def workout_c2import_view(request,page=1,userid=0,message=""): workouts = [] c2ids = [item['id'] for item in res.json()['data']] knownc2ids = uniqify([ - w.uploadedtoc2 for w in Workout.objects.filter(user=r) + w.uploadedtoc2 for w in Workout.objects.filter(user=rower) ]) tombstones = [ - t.uploadedtoc2 for t in TombStone.objects.filter(user=r) + t.uploadedtoc2 for t in TombStone.objects.filter(user=rower) ] parkedids = [] try: with open('c2blocked.json','r') as c2blocked: jsondata = json.load(c2blocked) parkedids = jsondata['ids'] - except FileNotFoundError: # pragma: no cover + except (FileNotFoundError,JSONDecodeError): # pragma: no cover pass knownc2ids = uniqify(knownc2ids+tombstones+parkedids) @@ -1586,8 +1586,38 @@ def workout_c2import_view(request,page=1,userid=0,message=""): nnn = 'NEW' keys = ['id','distance','duration','starttime','rowtype','source','comment','new'] values = [i,d,ttot,s,r,s2,c,nnn] - res = dict(zip(keys,values)) - workouts.append(res) + ress = dict(zip(keys,values)) + workouts.append(ress) + + if request.method == "POST": + try: # pragma: no cover + tdict = dict(request.POST.lists()) + ids = tdict['workoutid'] + c2ids = [int(id) for id in ids] + alldata = {} + + for item in res.json()['data']: + alldata[item['id']] = item + counter = 0 + for c2id in c2ids: + csvfilename = 'media/{code}_{c2id}.csv'.format(code=uuid4().hex[:16],c2id=c2id) + result = myqueue( + queue, + handle_c2_async_workout, + alldata, + rower.user.id, + rower.c2token, + c2id, + counter, + rower.defaulttimezone + ) + counter = counter+1 + # done, redirect to workouts list + messages.info(request,'Your Concept2 workouts will be imported in the background. It may take a few minutes before it appears.'.format(c2id=c2id)) + url = reverse('workouts_view') + return HttpResponseRedirect(url) + except KeyError: + pass breadcrumbs = [ @@ -1605,16 +1635,19 @@ def workout_c2import_view(request,page=1,userid=0,message=""): } ] - r = getrower(request.user) + rower = getrower(request.user) + + checknew = request.GET.get('selectallnew',False) return render(request, 'c2_list_import2.html', {'workouts':workouts, - 'rower':r, + 'rower':rower, 'active':'nav-workouts', 'breadcrumbs':breadcrumbs, 'teams':get_my_teams(request.user), 'page':page, + 'checknew':checknew, }) importlistviews = { diff --git a/rowers/views/statements.py b/rowers/views/statements.py index d386d6a9..13434a98 100644 --- a/rowers/views/statements.py +++ b/rowers/views/statements.py @@ -220,6 +220,7 @@ from rowers.tasks import ( handle_sendemail_racesubmission, handle_sendemail_optout, handle_sendemail_ical, + handle_c2_async_workout, ) from scipy.signal import savgol_filter