diff --git a/rowers/integrations/intervals.py b/rowers/integrations/intervals.py index 182a8863..20cce3ca 100644 --- a/rowers/integrations/intervals.py +++ b/rowers/integrations/intervals.py @@ -497,7 +497,10 @@ class IntervalsIntegration(SyncIntegration): # got data if data: ps.name = data['name'] - ps.comment = data['description'] + try: + ps.comment = data['description'] + except KeyError: + ps.comment = '' ps.startdate = arrow.get(data['start_date_local']).datetime ps.enddate = arrow.get(data['end_date_local']).datetime ps.preferreddate = arrow.get(data['start_date_local']).datetime diff --git a/rowers/management/commands/processemail.py b/rowers/management/commands/processemail.py index be02ab17..9ea9dfc0 100644 --- a/rowers/management/commands/processemail.py +++ b/rowers/management/commands/processemail.py @@ -117,16 +117,16 @@ class Command(BaseCommand): lines = traceback.format_exception(exc_type, exc_value, exc_traceback) dologging('processemail.log', ''.join('!! ' + line for line in lines)) - rowers = Rower.objects.filter(intervals_auto_import=True) - for r in rowers: - try: - if user_is_not_basic(r.user) or user_is_coachee(r.user): - intervals_integration = IntervalsIntegration(r.user) - _ = intervals_integration.get_workouts() - except: - exc_type, exc_value, exc_traceback = sys.exc_info() - lines = traceback.format_exception(exc_type, exc_value, exc_traceback) - dologging('processemail.log', ''.join('!! ' + line for line in lines)) + #rowers = Rower.objects.filter(intervals_auto_import=True) + #for r in rowers: + # try: + # if user_is_not_basic(r.user) or user_is_coachee(r.user): + # intervals_integration = IntervalsIntegration(r.user) + # _ = intervals_integration.get_workouts() + # except: + # exc_type, exc_value, exc_traceback = sys.exc_info() + # lines = traceback.format_exception(exc_type, exc_value, exc_traceback) + # dologging('processemail.log', ''.join('!! ' + line for line in lines)) self.stdout.write(self.style.SUCCESS( 'Successfully processed email attachments')) diff --git a/rowers/templates/plannedsessions.html b/rowers/templates/plannedsessions.html index ece78a74..83728c8b 100644 --- a/rowers/templates/plannedsessions.html +++ b/rowers/templates/plannedsessions.html @@ -137,8 +137,16 @@ {% else %} + {% if request.GET.startdate %} + {% elif request.GET.when %} + + {% else %} + + {% endif %} {% endif %} {% endif %} diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 5ad9c172..3db752f7 100644 Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ