From d23b71e9f3d2e0d89a5fb469c30ef7756c062ed3 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 21 Sep 2023 08:51:40 +0200 Subject: [PATCH] additional logging --- boatmovers/forms.py | 9 +++++---- boatmovers/views.py | 13 +++++++++++++ rowers/tasks.py | 9 +++++++-- rowers/tests/testdata/testdata.tcx.gz | Bin 3999 -> 4001 bytes rowers/uploads.py | 4 ++++ 5 files changed, 29 insertions(+), 6 deletions(-) diff --git a/boatmovers/forms.py b/boatmovers/forms.py index fb5fe184..b629878b 100644 --- a/boatmovers/forms.py +++ b/boatmovers/forms.py @@ -18,12 +18,13 @@ choices = [ ('ScoreIncrease','Score Increase') ] -filenameslist = glob.glob('media/boatmovers_*.csv') -datechoices = [ - (a[17:-4],a[17:-4]) for a in filenameslist -] class DatesForm(forms.Form): + filenameslist = glob.glob('media/boatmovers_*.csv') + filenameslist.sort() + datechoices = [ + (a[17:-4],a[17:-4]) for a in filenameslist + ] date1 = forms.ChoiceField(choices=datechoices) date2 = forms.ChoiceField(choices=datechoices) sort_by = forms.ChoiceField(choices=choices) diff --git a/boatmovers/views.py b/boatmovers/views.py index 76352b31..5513da66 100644 --- a/boatmovers/views.py +++ b/boatmovers/views.py @@ -17,6 +17,8 @@ from boatmovers.scrapers import * import django_rq queue = django_rq.get_queue('high') +import glob + class AthleteCreateView(CreateView): model = Athlete fields = [ @@ -100,11 +102,22 @@ def boatmovers_view(request): ) def boatmovers_compareview(request): + filenameslist = glob.glob('media/boatmovers_*.csv') + filenameslist.sort() + datechoices = [ + (a[17:-4],a[17:-4]) for a in filenameslist + ] + form = DatesForm() + form.fields['date1'].choices = datechoices + form.fields['date2'].choices = datechoices + df = pd.DataFrame() if request.method == 'POST': form = DatesForm(request.POST) + form.fields['date1'].choices = datechoices + form.fields['date2'].choices = datechoices if form.is_valid(): date1 = form.cleaned_data['date1'] date2 = form.cleaned_data['date2'] diff --git a/rowers/tasks.py b/rowers/tasks.py index f4d58eb4..d18a38fc 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -1496,13 +1496,14 @@ def handle_calctrimp(id, normv = response.normv normw = response.normw hrtss = response.hrtss - dologging('metrics.log','Got tss {tss}, normp {normp} trimp {trimp} normv {normv} normw {normw} hrtss {hrtss}'.format( + dologging('metrics.log','File {csvfile}. Got tss {tss}, normp {normp} trimp {trimp} normv {normv} normw {normw} hrtss {hrtss}'.format( tss = tss, normp = normp, trimp = trimp, normv = normv, normw = normw, - hrtss = hrtss + hrtss = hrtss, + csvfile=csvfile, )) @@ -1555,6 +1556,10 @@ def handle_calctrimp(id, workout.normv = normv workout.normw = normw workout.save() + dologging('metrics.log','Saving to workout {id} {obscure}'.format( + id = id, + obscure = encoder.encode_hex(id) + )) return 1 diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 71e1bc0f5f0cb3abf412b31ec03eea99f8c3a13d..92adbaccb321e63ef905905dd5a035c642d3dbc0 100644 GIT binary patch delta 3996 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