From a7ce59026a0d32715e135cae33ffa31c6c29af87 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 13 Jan 2025 20:07:33 +0100 Subject: [PATCH] fif --- rowers/integrations/intervals.py | 5 ++++- rowers/tests/testdata/testdata.tcx.gz | Bin 3989 -> 3989 bytes rowers/views/importviews.py | 8 +++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/rowers/integrations/intervals.py b/rowers/integrations/intervals.py index ae67709f..159f0559 100644 --- a/rowers/integrations/intervals.py +++ b/rowers/integrations/intervals.py @@ -227,6 +227,8 @@ class IntervalsIntegration(SyncIntegration): token = self.open() except NoTokenError: return [] + + type_filter = kwargs.get('type_filter', None) url = self.oauth_data['base_url'] + 'athlete/0/activities?' startdate = timezone.now() - timedelta(days=30) @@ -278,7 +280,8 @@ class IntervalsIntegration(SyncIntegration): values = [i, d, ttot, s, r, s2, c, nnn] ress = dict(zip(keys, values)) - workouts.append(ress) + if not type_filter or r in type_filter: + workouts.append(ress) except KeyError: dologging('intervals.icu.log', item) diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index d865fa8bed106a375ec526f99734aaa3aaa1c7ff..b5c20fb0e12702021679c69067f060b1915edf48 100644 GIT binary patch delta 15 WcmbO#KUJPhzMF$%PW(o;etrNW+5~w3 delta 15 WcmbO#KUJPhzMF&NLGVVletrNYHUzN% diff --git a/rowers/views/importviews.py b/rowers/views/importviews.py index 995fc5cf..1d31f0ed 100644 --- a/rowers/views/importviews.py +++ b/rowers/views/importviews.py @@ -413,6 +413,11 @@ def workout_import_view(request, source='c2'): url = reverse('workouts_view') return HttpResponseRedirect(url) + if request.method == 'GET': + type_filter = request.GET.get('type', None) + else: + type_filter = None + try: _ = integration.open() except NoTokenError: # pragma: no cover @@ -463,7 +468,8 @@ def workout_import_view(request, source='c2'): before=before, after=after, startdate=startdate, - enddate=enddate + enddate=enddate, + type_filter=type_filter ) except NoTokenError: # pragma: no cover messages.error(request,"You must first make the connection to {source}".format(