diff --git a/rowers/models.py b/rowers/models.py index e5da3360..08b45b26 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -3697,13 +3697,22 @@ class Workout(models.Model): def __str__(self): + try: + dates = self.date.strftime('%Y-%m-%d') + except AttributeError: + dates = '' + try: + durations = self.duration.strftime("%H:%M:%S"), + except AttributeError: + durations = '' + elements = dict( - date = self.date.strftime('%Y-%m-%d'), + date = dates, name = self.name, distance = str(self.distance)+'m', ownerfirst = self.user.user.first_name, ownerlast = self.user.user.last_name, - duration = self.duration.strftime("%H:%M:%S"), + duration = durations, boattype = self.boattype, workouttype = self.workouttype, seatnumber = 'seat '+str(self.seatnumber), diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 424ee975..8f7a4540 100644 Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 587db08d..327cce0b 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -2229,7 +2229,8 @@ def history_view_data(request, userid=0): df = df.with_columns(pl.col('time').diff().clip(lower_bound=0).alias("deltat")) except KeyError: # pragma: no cover pass - + except ColumnNotFoundError: + pass totalmeters, totalhours, totalminutes, totalseconds = get_totals( g_workouts)