diff --git a/rowers/models.py b/rowers/models.py index 221e11f9..8e6cfba1 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -4966,3 +4966,13 @@ class ShareKey(models.Model): @property def expiration_date(self): # pragma: no cover return self.creation_date + datetime.timedelta(self.expiration_seconds) + +class InStrokeAnalysis(models.Model): + workout = models.ForeignKey(Workout, on_delete=models.CASCADE) + name = models.CharField(max_length=150, blank=True, null=True) + date = models.DateField(blank=True, null=True) + notes = models.TextField(blank=True) + start_second = models.IntegerField(default=0) + end_second = models.IntegerField(default=3600) + min_spm = models.IntegerField(default=10) + max_spm = models.IntegerField(default=45) diff --git a/rowers/tasks.py b/rowers/tasks.py index bff93d3e..5cf8866b 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -1715,6 +1715,7 @@ def handle_sendemail_breakthrough(workoutid, useremail, tablevalues = [ {'delta': t.delta, + 'time': str(timedelta(seconds=t.delta)), 'cpvalue': t.cpvalues, 'pwr': t.pwr } for t in btvalues.itertuples() diff --git a/rowers/templates/breakthroughemail.html b/rowers/templates/breakthroughemail.html index beadc132..d4280b5c 100644 --- a/rowers/templates/breakthroughemail.html +++ b/rowers/templates/breakthroughemail.html @@ -40,7 +40,7 @@ {% for set in btvalues %} - {{ set["delta"] }} + {{ set["time"] }} {{ set["cpvalue"] }} {{ set["pwr"] }} diff --git a/rowers/tests/test_async_tasks.py b/rowers/tests/test_async_tasks.py index daa642e6..43718b36 100644 --- a/rowers/tests/test_async_tasks.py +++ b/rowers/tests/test_async_tasks.py @@ -306,6 +306,7 @@ class AsyncTaskTests(TestCase): btvalues = pd.DataFrame({ 'delta':[3,1,3], + 'time': str(timedelta(seconds=t) for t in [3,1,3]), 'cpvalues':[100,200,300], 'pwr':[100,200,300] }).to_json()